diff options
author | Jan Bartel | 2014-04-10 01:23:13 +0000 |
---|---|---|
committer | Jan Bartel | 2014-04-10 01:23:13 +0000 |
commit | a5bd46fd57ef717c816cddeb769606d7e93f0f5b (patch) | |
tree | ca8a8d24edd42fd228dcadcd94bd17182e0dfc2e /jetty-osgi | |
parent | 8593ce58206cee0e8ccaa613aec96cad2f2df175 (diff) | |
download | org.eclipse.jetty.project-a5bd46fd57ef717c816cddeb769606d7e93f0f5b.tar.gz org.eclipse.jetty.project-a5bd46fd57ef717c816cddeb769606d7e93f0f5b.tar.xz org.eclipse.jetty.project-a5bd46fd57ef717c816cddeb769606d7e93f0f5b.zip |
409105 Upgrade jetty-osgi build/test to use more recent pax junit test framework
Diffstat (limited to 'jetty-osgi')
10 files changed, 140 insertions, 251 deletions
diff --git a/jetty-osgi/jetty-osgi-httpservice/pom.xml b/jetty-osgi/jetty-osgi-httpservice/pom.xml index 3749cab43e..91087d7bcc 100644 --- a/jetty-osgi/jetty-osgi-httpservice/pom.xml +++ b/jetty-osgi/jetty-osgi-httpservice/pom.xml @@ -28,6 +28,7 @@ <dependency> <groupId>org.eclipse.osgi</groupId> <artifactId>org.eclipse.osgi</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>javax.servlet</groupId> diff --git a/jetty-osgi/test-jetty-osgi-context/pom.xml b/jetty-osgi/test-jetty-osgi-context/pom.xml index 4e1c28a342..941b13bfb3 100644 --- a/jetty-osgi/test-jetty-osgi-context/pom.xml +++ b/jetty-osgi/test-jetty-osgi-context/pom.xml @@ -21,10 +21,12 @@ <dependency> <groupId>org.eclipse.osgi</groupId> <artifactId>org.eclipse.osgi</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.eclipse.osgi</groupId> <artifactId>org.eclipse.osgi.services</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.eclipse.jetty.toolchain</groupId> diff --git a/jetty-osgi/test-jetty-osgi-webapp/pom.xml b/jetty-osgi/test-jetty-osgi-webapp/pom.xml index 00697afd6d..1a0f37b665 100644 --- a/jetty-osgi/test-jetty-osgi-webapp/pom.xml +++ b/jetty-osgi/test-jetty-osgi-webapp/pom.xml @@ -21,10 +21,12 @@ <dependency> <groupId>org.eclipse.osgi</groupId> <artifactId>org.eclipse.osgi</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.eclipse.osgi</groupId> <artifactId>org.eclipse.osgi.services</artifactId> + <scope>provided</scope> </dependency> </dependencies> diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index 5cc1640678..cf6810a052 100644 --- a/jetty-osgi/test-jetty-osgi/pom.xml +++ b/jetty-osgi/test-jetty-osgi/pom.xml @@ -14,40 +14,14 @@ <bundle-symbolic-name>${project.groupId}.boot.test.spdy</bundle-symbolic-name> <jetty-orbit-url>http://download.eclipse.org/jetty/orbit/</jetty-orbit-url> <assembly-directory>target/distribution</assembly-directory> - <exam.version>2.6.0</exam.version> - <url.version>1.4.0</url.version> - <paxswissbox.version>1.5.1</paxswissbox.version> - <felixversion>4.0.3</felixversion> + <exam.version>3.4.0</exam.version> + <url.version>1.5.2</url.version> <injection.bundle.version>1.0</injection.bundle.version> - <runner.version>1.7.6</runner.version> + <runner.version>1.8.5</runner.version> </properties> <dependencies> <!-- Pax Exam Dependencies --> - <!-- OPS4J Swissbox Dependencies --> - <dependency> - <groupId>org.ops4j.pax.swissbox</groupId> - <artifactId>pax-swissbox-core</artifactId> - <version>${paxswissbox.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ops4j.pax.swissbox</groupId> - <artifactId>pax-swissbox-extender</artifactId> - <version>${paxswissbox.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ops4j.pax.swissbox</groupId> - <artifactId>pax-swissbox-lifecycle</artifactId> - <version>${paxswissbox.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ops4j.pax.swissbox</groupId> - <artifactId>pax-swissbox-framework</artifactId> - <version>${paxswissbox.version}</version> - <scope>test</scope> - </dependency> + <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam</artifactId> @@ -55,61 +29,21 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-atinject_1.0_spec</artifactId> - <version>${injection.bundle.version}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-inject</artifactId> <version>${exam.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.aries.spifly</groupId> - <artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId> - <version>1.0.0</version> - <scope>test</scope> - </dependency> - <!-- Don't use the native container for now. Observed limitations: - - single test with a single configuration - - does not read the versions of the dependencies from the pom.xml - and hence hardcode the bundles versions in the source code instead - - no support for most configuration options for the OSGi container. --> - <!--dependency> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam-container-native</artifactId> - <version>${exam.version}</version> - <scope>test</scope> - </dependency--> - - <!-- container is not bad but not enough config parameters yet - can't pass the VMOption for alpn-boot + <!-- use the forked container so we can pass it system properties eg for npn/alpn --> <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-container-forked</artifactId> <version>${exam.version}</version> <scope>test</scope> </dependency> - --> - - <dependency> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam-container-paxrunner</artifactId> - <version>${exam.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.ops4j.pax.runner</groupId> - <artifactId>pax-runner-no-jcl</artifactId> - <version>${runner.version}</version> - <scope>test</scope> - </dependency> - + <dependency> <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-junit4</artifactId> @@ -134,80 +68,120 @@ <version>${url.version}</version> <scope>test</scope> </dependency> + <!-- OSGi R4 frameworks --> +<!-- <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.framework</artifactId> - <version>${felixversion}</version> + <version>4.4.0</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam-testforge</artifactId> - <version>${exam.version}</version> - <scope>test</scope> - </dependency> - <!-- For sane logging --> -<!-- - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.6.1</version> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.enterprise</artifactId> + <version>5.0.0</version> <scope>test</scope> </dependency> --> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> + <groupId>org.eclipse</groupId> + <artifactId>osgi</artifactId> + <version>3.9.1-v20140110-1610</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jta_1.1_spec</artifactId> - <version>1.1.1</version> - <scope>test</scope> + <groupId>org.eclipse.osgi</groupId> + <artifactId>org.eclipse.osgi.services</artifactId> + <scope>test</scope> </dependency> - <!-- OSGi Deps --> + + + <!-- Jetty OSGi Deps --> <dependency> <groupId>org.eclipse.jetty.osgi</groupId> <artifactId>jetty-osgi-boot</artifactId> <version>${project.version}</version> - <scope>provided</scope> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.eclipse.osgi</groupId> + <artifactId>org.eclipse.osgi</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.osgi</groupId> + <artifactId>org.eclipse.osgi.services</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.eclipse.jetty.osgi</groupId> <artifactId>jetty-osgi-boot-jsp</artifactId> <version>${project.version}</version> - <scope>provided</scope> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.eclipse.osgi</groupId> + <artifactId>org.eclipse.osgi</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.osgi</groupId> + <artifactId>org.eclipse.osgi.services</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.eclipse.jetty.toolchain</groupId> <artifactId>jetty-jsp-fragment</artifactId> <version>2.3.3</version> - <scope>provided</scope> + <scope>test</scope> </dependency> <dependency> <groupId>org.eclipse.jetty.osgi</groupId> <artifactId>jetty-httpservice</artifactId> <version>${project.version}</version> - <scope>provided</scope> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jta_1.1_spec</artifactId> + <version>1.1.1</version> + <scope>test</scope> </dependency> - <dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-atinject_1.0_spec</artifactId> + <version>${injection.bundle.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.aries.spifly</groupId> + <artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId> + <version>1.0.0</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.ow2.asm</groupId> <artifactId>asm</artifactId> <version>4.1</version> - </dependency> - <dependency> + </dependency> + <dependency> <groupId>org.ow2.asm</groupId> <artifactId>asm-commons</artifactId> <version>4.1</version> - </dependency> - <dependency> + </dependency> + <dependency> <groupId>org.ow2.asm</groupId> <artifactId>asm-tree</artifactId> <version>4.1</version> - </dependency> + </dependency> <!-- Jetty Deps --> @@ -386,7 +360,9 @@ <version>${project.version}</version> <scope>runtime</scope> </dependency> + <!-- Eclipse OSGi Deps --> +<!-- <dependency> <groupId>org.eclipse.osgi</groupId> <artifactId>org.eclipse.osgi</artifactId> @@ -398,7 +374,6 @@ <scope>runtime</scope> <exclusions> <exclusion> - <!-- we use the servlet jar from orbit --> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> </exclusion> @@ -409,6 +384,9 @@ <artifactId>servlet</artifactId> <scope>runtime</scope> </dependency> + +--> + <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>test-jetty-webapp</artifactId> diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootContextAsService.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootContextAsService.java index 94ecd39df4..0dfc1bb0e1 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootContextAsService.java +++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootContextAsService.java @@ -37,12 +37,13 @@ import org.eclipse.jetty.client.api.ContentResponse; import org.eclipse.jetty.http.HttpStatus; import org.eclipse.jetty.osgi.boot.OSGiServerConstants; import org.eclipse.jetty.server.handler.ContextHandler; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.ops4j.pax.exam.CoreOptions; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; @@ -55,12 +56,11 @@ import org.osgi.framework.ServiceReference; * Tests the ServiceContextProvider. * */ -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class TestJettyOSGiBootContextAsService { - private static final boolean LOGGING_ENABLED = false; + private static final String LOG_LEVEL = "WARN"; - private static final boolean REMOTE_DEBUGGING = false; @Inject BundleContext bundleContext = null; @@ -69,7 +69,6 @@ public class TestJettyOSGiBootContextAsService public static Option[] configure() { ArrayList<Option> options = new ArrayList<Option>(); - TestOSGiUtil.addMoreOSGiContainers(options); options.add(CoreOptions.junitBundles()); options.addAll(configureJettyHomeAndPort("jetty-selector.xml")); options.add(CoreOptions.bootDelegationPackages("org.xml.sax", "org.xml.*", "org.w3c.*", "javax.xml.*")); @@ -79,22 +78,10 @@ public class TestJettyOSGiBootContextAsService // to pick up and deploy options.add(mavenBundle().groupId("org.eclipse.jetty.osgi").artifactId("test-jetty-osgi-context").versionAsInProject().start()); - String logLevel = "WARN"; - // Enable Logging - if (LOGGING_ENABLED) - logLevel = "INFO"; + options.addAll(Arrays.asList(options(systemProperty("pax.exam.logging").value("none")))); + options.addAll(Arrays.asList(options(systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value(LOG_LEVEL)))); + options.addAll(Arrays.asList(options(systemProperty("org.eclipse.jetty.LEVEL").value(LOG_LEVEL)))); - - options.addAll(Arrays.asList(options( - // install log service using pax runners profile abstraction (there - // are more profiles, like DS) - // logProfile(), - // this is how you set the default log level when using pax logging - // (logProfile) - systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value(logLevel), - systemProperty("org.eclipse.jetty.LEVEL").value(logLevel)))); - - return options.toArray(new Option[options.size()]); } @@ -117,6 +104,7 @@ public class TestJettyOSGiBootContextAsService return options; } + @Ignore @Test public void assertAllBundlesActiveOrResolved() { @@ -148,14 +136,6 @@ public class TestJettyOSGiBootContextAsService ServiceReference[] refs = bundleContext.getServiceReferences(ContextHandler.class.getName(), null); assertNotNull(refs); assertEquals(1, refs.length); - //uncomment for debugging - /* - String[] keys = refs[0].getPropertyKeys(); - if (keys != null) - { - for (String k : keys) - System.err.println("service property: " + k + ", " + refs[0].getProperty(k)); - }*/ ContextHandler ch = (ContextHandler) bundleContext.getService(refs[0]); assertEquals("/acme", ch.getContextPath()); diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootCore.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootCore.java index 2c2331875b..f4301bd562 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootCore.java +++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootCore.java @@ -19,19 +19,23 @@ package org.eclipse.jetty.osgi.test; import static org.ops4j.pax.exam.CoreOptions.mavenBundle; +import static org.ops4j.pax.exam.CoreOptions.options; +import static org.ops4j.pax.exam.CoreOptions.systemProperty; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import javax.inject.Inject; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.ops4j.pax.exam.CoreOptions; import org.ops4j.pax.exam.MavenUtils; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; import org.ops4j.pax.exam.options.MavenUrlReference.VersionResolver; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; @@ -40,27 +44,30 @@ import org.osgi.framework.BundleContext; /** * Default OSGi setup integration test */ -@RunWith( JUnit4TestRunner.class ) +@RunWith( PaxExam.class ) public class TestJettyOSGiBootCore { - + private static final String LOG_LEVEL = "WARN"; public static int DEFAULT_JETTY_HTTP_PORT = 9876; - + @Inject private BundleContext bundleContext; - + @Configuration public Option[] config() { VersionResolver resolver = MavenUtils.asInProject(); ArrayList<Option> options = new ArrayList<Option>(); - TestOSGiUtil.addMoreOSGiContainers(options); options.addAll(provisionCoreJetty()); options.add(CoreOptions.junitBundles()); options.addAll(httpServiceJetty()); + options.addAll(Arrays.asList(options(systemProperty("pax.exam.logging").value("none")))); + options.addAll(Arrays.asList(options(systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value(LOG_LEVEL)))); + options.addAll(Arrays.asList(options(systemProperty("org.eclipse.jetty.LEVEL").value(LOG_LEVEL)))); + return options.toArray(new Option[options.size()]); } - + public static List<Option> provisionCoreJetty() { List<Option> res = new ArrayList<Option>(); @@ -124,9 +131,12 @@ public class TestJettyOSGiBootCore return res; } + @Ignore @Test public void assertAllBundlesActiveOrResolved() throws Exception { + + TestOSGiUtil.debugBundles(bundleContext); TestOSGiUtil.assertAllBundlesActiveOrResolved(bundleContext); } diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootSpdy.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootSpdy.java index 7f0d023a0e..0cb66a53f2 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootSpdy.java +++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootSpdy.java @@ -36,18 +36,18 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.ops4j.pax.exam.CoreOptions; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; /** * SPDY setup. */ -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class TestJettyOSGiBootSpdy { - private static final boolean LOGGING_ENABLED = false; + private static final String LOG_LEVEL = "WARN"; private static final String JETTY_SPDY_PORT = "jetty.spdy.port"; @@ -60,31 +60,14 @@ public class TestJettyOSGiBootSpdy public Option[] config() { ArrayList<Option> options = new ArrayList<Option>(); - - TestOSGiUtil.addMoreOSGiContainers(options); - - options.addAll(TestJettyOSGiBootWithJsp.configureJettyHomeAndPort("jetty-spdy.xml")); options.addAll(TestJettyOSGiBootCore.coreJettyDependencies()); options.addAll(spdyJettyDependencies()); options.add(CoreOptions.junitBundles()); options.addAll(TestJettyOSGiBootCore.httpServiceJetty()); - - String logLevel = "WARN"; - - // Enable Logging - if (LOGGING_ENABLED) - logLevel = "INFO"; - - - options.addAll(Arrays.asList(options( - // install log service using pax runners profile abstraction (there - // are more profiles, like DS) - // logProfile(), - // this is how you set the default log level when using pax logging - // (logProfile) - systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value(logLevel), - systemProperty("org.eclipse.jetty.LEVEL").value(logLevel)))); + options.addAll(Arrays.asList(options(systemProperty("pax.exam.logging").value("none")))); + options.addAll(Arrays.asList(options(systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value(LOG_LEVEL)))); + options.addAll(Arrays.asList(options(systemProperty("org.eclipse.jetty.LEVEL").value(LOG_LEVEL)))); return options.toArray(new Option[options.size()]); } @@ -101,7 +84,7 @@ public class TestJettyOSGiBootSpdy res.add(CoreOptions.vmOptions("-Xbootclasspath/p:" + alpnBoot)); - res.add(mavenBundle().groupId("org.eclipse.jetty.osgi").artifactId("jetty-osgi-alpn").versionAsInProject().start()); + res.add(mavenBundle().groupId("org.eclipse.jetty.osgi").artifactId("jetty-osgi-alpn").versionAsInProject().noStart()); res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-alpn-server").versionAsInProject().start()); res.add(mavenBundle().groupId("org.eclipse.jetty.spdy").artifactId("spdy-client").versionAsInProject().noStart()); @@ -112,7 +95,6 @@ public class TestJettyOSGiBootSpdy return res; } - @Ignore @Test public void checkALPNBootOnBootstrapClasspath() throws Exception { @@ -121,13 +103,11 @@ public class TestJettyOSGiBootSpdy Assert.assertNull(alpn.getClassLoader()); } + @Ignore @Test public void assertAllBundlesActiveOrResolved() { - Bundle b = TestOSGiUtil.getBundle(bundleContext, "org.eclipse.jetty.spdy.client"); - TestOSGiUtil.diagnoseNonActiveOrNonResolvedBundle(b); - b = TestOSGiUtil.getBundle(bundleContext, "org.eclipse.jetty.osgi.boot"); - TestOSGiUtil.diagnoseNonActiveOrNonResolvedBundle(b); + TestOSGiUtil.debugBundles(bundleContext); TestOSGiUtil.assertAllBundlesActiveOrResolved(bundleContext); } diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWebAppAsService.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWebAppAsService.java index b43279c07a..cf2e30fab1 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWebAppAsService.java +++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWebAppAsService.java @@ -38,12 +38,13 @@ import org.eclipse.jetty.http.HttpStatus; import org.eclipse.jetty.osgi.boot.OSGiServerConstants; import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.webapp.WebAppContext; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.ops4j.pax.exam.CoreOptions; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; @@ -58,12 +59,10 @@ import org.osgi.framework.ServiceReference; * httpservice web-bundle. Then make sure we can deploy an OSGi service on the * top of this. */ -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class TestJettyOSGiBootWebAppAsService { - private static final boolean LOGGING_ENABLED = false; - - private static final boolean REMOTE_DEBUGGING = false; + private static final String LOG_LEVEL = "WARN"; @Inject BundleContext bundleContext = null; @@ -72,8 +71,6 @@ public class TestJettyOSGiBootWebAppAsService public static Option[] configure() { ArrayList<Option> options = new ArrayList<Option>(); - TestOSGiUtil.addMoreOSGiContainers(options); - options.add(CoreOptions.junitBundles()); options.addAll(configureJettyHomeAndPort("jetty-selector.xml")); options.add(CoreOptions.bootDelegationPackages("org.xml.sax", "org.xml.*", "org.w3c.*", "javax.xml.*")); @@ -82,19 +79,9 @@ public class TestJettyOSGiBootWebAppAsService "com.sun.org.apache.xpath.internal.jaxp", "com.sun.org.apache.xpath.internal.objects")); options.addAll(TestJettyOSGiBootCore.coreJettyDependencies()); - - String logLevel = "WARN"; - if (LOGGING_ENABLED) - logLevel = "INFO"; - - options.addAll(Arrays.asList(options( - // install log service using pax runners profile abstraction (there - // are more profiles, like DS) - // logProfile(), - // this is how you set the default log level when using pax logging - // (logProfile) - systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value(logLevel), - systemProperty("org.eclipse.jetty.LEVEL").value(logLevel)))); + options.addAll(Arrays.asList(options(systemProperty("pax.exam.logging").value("none")))); + options.addAll(Arrays.asList(options(systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value(LOG_LEVEL)))); + options.addAll(Arrays.asList(options(systemProperty("org.eclipse.jetty.LEVEL").value(LOG_LEVEL)))); options.addAll(jspDependencies()); return options.toArray(new Option[options.size()]); @@ -139,6 +126,7 @@ public class TestJettyOSGiBootWebAppAsService return res; } + @Ignore @Test public void assertAllBundlesActiveOrResolved() { diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJsp.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJsp.java index 10b21f5735..b2a9be5887 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJsp.java +++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJsp.java @@ -38,25 +38,21 @@ import org.eclipse.jetty.osgi.boot.OSGiServerConstants; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.CoreOptions; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; -import org.osgi.framework.Bundle; +import org.ops4j.pax.exam.junit.PaxExam; import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; /** * Pax-Exam to make sure the jetty-osgi-boot can be started along with the * httpservice web-bundle. Then make sure we can deploy an OSGi service on the * top of this. */ -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class TestJettyOSGiBootWithJsp { - private static final boolean LOGGING_ENABLED = false; - - private static final boolean REMOTE_DEBUGGING = false; + private static final String LOG_LEVEL = "WARN"; @Inject BundleContext bundleContext = null; @@ -66,9 +62,6 @@ public class TestJettyOSGiBootWithJsp { ArrayList<Option> options = new ArrayList<Option>(); - - TestOSGiUtil.addMoreOSGiContainers(options); - options.add(CoreOptions.junitBundles()); options.addAll(configureJettyHomeAndPort("jetty-selector.xml")); options.add(CoreOptions.bootDelegationPackages("org.xml.sax", "org.xml.*", "org.w3c.*", "javax.xml.*", "javax.activation.*")); @@ -77,39 +70,11 @@ public class TestJettyOSGiBootWithJsp "com.sun.org.apache.xpath.internal.jaxp", "com.sun.org.apache.xpath.internal.objects")); options.addAll(TestJettyOSGiBootCore.coreJettyDependencies()); + options.addAll(Arrays.asList(options(systemProperty("pax.exam.logging").value("none")))); + options.addAll(Arrays.asList(options(systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value(LOG_LEVEL)))); + options.addAll(Arrays.asList(options(systemProperty("org.eclipse.jetty.LEVEL").value(LOG_LEVEL)))); - String logLevel = "WARN"; - - // Enable Logging - if (LOGGING_ENABLED) - logLevel = "INFO"; - - options.addAll(Arrays.asList(options( - // install log service using pax runners profile abstraction (there - // are more profiles, like DS) - // logProfile(), - // this is how you set the default log level when using pax logging - // (logProfile) - systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value(logLevel), - systemProperty("org.eclipse.jetty.annotations.LEVEL").value(logLevel)))); - options.addAll(jspDependencies()); - - // Remote JDWP Debugging, this won't work with the forked container. - // if(REMOTE_DEBUGGING) { - // options.addAll(Arrays.asList(options( - // // this just adds all what you write here to java vm argumenents of - // the (new) osgi process. - // PaxRunnerOptions.vmOption( - // "-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006" ) - // ))); - // } - - // bug at the moment: this would make the httpservice catch all - // requests and prevent the webapp at the root context to catch any of - // them. - // options.addAll(TestJettyOSGiBootCore.httpServiceJetty()); - return options.toArray(new Option[options.size()]); } @@ -157,7 +122,7 @@ public class TestJettyOSGiBootWithJsp return res; } - + @Ignore @Test public void assertAllBundlesActiveOrResolved() { diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java index d9d63eda7d..a3f486d658 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java +++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java @@ -33,7 +33,6 @@ import org.eclipse.jetty.client.api.ContentResponse; import org.eclipse.jetty.http.HttpStatus; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.junit.Assert; -import org.ops4j.pax.exam.CoreOptions; import org.ops4j.pax.exam.Option; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; @@ -46,22 +45,6 @@ import org.osgi.service.http.HttpService; public class TestOSGiUtil { - /** - * Note: this will run many more tests. TODO: find a better way to control - * this and use non-deprecated methods. - * - * @param opti - */ - protected static void addMoreOSGiContainers(List<Option> options) - { - //Uncomment to run more containers - these have been commented out - //to improve speed of builds. - //options.add(CoreOptions.equinox().version("3.6.1")); - //options.add(CoreOptions.equinox().version("3.7.0")); - // options.add(CoreOptions.felix().version("3.2.2")); - options.add(CoreOptions.felix().version("4.0.2")); - } - protected static Bundle getBundle(BundleContext bundleContext, String symbolicName) { Map<String,Bundle> _bundles = new HashMap<String, Bundle>(); @@ -146,7 +129,7 @@ public class TestOSGiUtil for (Bundle b : bundleContext.getBundles()) { bundlesIndexedBySymbolicName.put(b.getSymbolicName(), b); - System.err.println(" " + b.getSymbolicName() + " " + b.getState()); + System.err.println(" " + b.getSymbolicName() + " " + b.getLocation() + " " + b.getVersion()+ " " + b.getState()); } } |