diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/AbstractTestOSGi.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/AbstractTestOSGi.java index 03b60d9af04..ac154c6ea6f 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/AbstractTestOSGi.java +++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/AbstractTestOSGi.java @@ -15,6 +15,7 @@ // You may elect to redistribute this code under either of these licenses. // ======================================================================== // + package org.eclipse.jetty.osgi.test; import java.io.IOException; @@ -41,6 +42,9 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; import org.osgi.service.http.HttpService; +/** + * Helper methods for pax-exam tests + */ public class AbstractTestOSGi { 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 d4c94eb2c29..771705f7aea 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 @@ -15,16 +15,16 @@ // You may elect to redistribute this code under either of these licenses. // ======================================================================== // + package org.eclipse.jetty.osgi.test; import static org.ops4j.pax.exam.CoreOptions.mavenBundle; - + import java.util.ArrayList; 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; @@ -32,9 +32,12 @@ import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.Configuration; import org.ops4j.pax.exam.junit.JUnit4TestRunner; import org.osgi.framework.BundleContext; -//import org.eclipse.jetty.osgi.boot.internal.serverfactory.DefaultJettyAtJettyHomeHelper; + + +/** + * Default OSGi setup integration test + */ @RunWith( JUnit4TestRunner.class ) -//@ExamReactorStrategy( AllConfinedStagedReactorFactory.class ) public class TestJettyOSGiBootCore extends AbstractTestOSGi { public static int DEFAULT_JETTY_HTTP_PORT = 9876; 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 4be08847dcc..9394d41d729 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 @@ -15,18 +15,18 @@ // You may elect to redistribute this code under either of these licenses. // ======================================================================== // + package org.eclipse.jetty.osgi.test; import static org.ops4j.pax.exam.CoreOptions.mavenBundle; - + import java.io.File; import java.util.ArrayList; import java.util.List; - + import javax.inject.Inject; - + import org.junit.Assert; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.ops4j.pax.exam.CoreOptions; @@ -34,9 +34,11 @@ import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.Configuration; import org.ops4j.pax.exam.junit.JUnit4TestRunner; import org.osgi.framework.BundleContext; - + +/** + * SPDY setup. + */ @RunWith( JUnit4TestRunner.class ) -//@ExamReactorStrategy( AllConfinedStagedReactorFactory.class ) public class TestJettyOSGiBootSpdy extends AbstractTestOSGi { private static final String JETTY_SPDY_PORT = "jetty.spdy.port"; @@ -86,7 +88,6 @@ public class TestJettyOSGiBootSpdy extends AbstractTestOSGi { } res.add(CoreOptions.vmOptions("-Xbootclasspath/p:"+npnBoot)); -// res.add(CoreOptions.vmOptions("-Xbootclasspath/p:"+"target/npn/npn-boot-"+npnBootVersion+".jar")); res.add(CoreOptions.bootDelegationPackages("org.eclipse.jetty.npn")); res.add(mavenBundle().groupId( "org.eclipse.jetty.spdy" ).artifactId( "spdy-core" ).versionAsInProject().noStart()); @@ -111,10 +112,6 @@ public class TestJettyOSGiBootSpdy extends AbstractTestOSGi { assertAllBundlesActiveOrResolved(bundleContext); } - /** - * This does not work yet. - */ - //@Ignore @Test public void testSpdyOnHttpService() throws Exception { 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 54719e4b5df..9040fbf54fc 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 @@ -51,7 +51,6 @@ import org.osgi.framework.BundleContext; * Then make sure we can deploy an OSGi service on the top of this. */ @RunWith( JUnit4TestRunner.class ) -//@ExamReactorStrategy( AllConfinedStagedReactorFactory.class ) public class TestJettyOSGiBootWithJsp extends AbstractTestOSGi { private static final boolean LOGGING_ENABLED = true;