[PAXWICKET-182] Tried to use a different port to run tests on hudson

Signed-off-by: Andreas Pieber <anpieber@gmail.com>
ops4j · Jul 7, 2011 · 6221f52 · 6221f52
1 parent 2114922
commit 6221f52
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/itests/src/test/java/org/ops4j/pax/wicket/it/PaxWicketIntegrationTest.java b/itests/src/test/java/org/ops4j/pax/wicket/it/PaxWicketIntegrationTest.java
@@ -20,6 +20,8 @@
 import static org.ops4j.pax.exam.CoreOptions.options;
 import static org.ops4j.pax.exam.CoreOptions.provision;
 import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+import static org.ops4j.pax.exam.CoreOptions.waitForFrameworkStartup;
+import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
 
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
@@ -31,6 +33,7 @@
 @RunWith(JUnit4TestRunner.class)
 public abstract class PaxWicketIntegrationTest {
 
+    protected static final String WEBUI_PORT = "9081";
     protected static final String SYMBOLIC_NAME_PAX_WICKET_SERVICE = "org.ops4j.pax.wicket.pax-wicket-service";
 
     @Configuration
@@ -44,11 +47,11 @@ public final Option[] configureProvisions() {
             provision(mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.configadmin")
                 .versionAsInProject()),
             provision(mavenBundle().groupId("org.apache.geronimo.specs").artifactId("geronimo-activation_1.1_spec")
-                    .versionAsInProject()),
+                .versionAsInProject()),
             provision(mavenBundle().groupId("org.apache.geronimo.specs").artifactId("geronimo-servlet_2.5_spec")
                 .versionAsInProject()),
             provision(mavenBundle().groupId("org.apache.geronimo.specs").artifactId("geronimo-jta_1.1_spec")
-                    .versionAsInProject()),
+                .versionAsInProject()),
             provision(mavenBundle().groupId("org.apache.servicemix.bundles")
                 .artifactId("org.apache.servicemix.bundles.javax.mail").versionAsInProject()),
             provision(mavenBundle().groupId("org.apache.servicemix.bundles")
@@ -73,7 +76,8 @@ public final Option[] configureProvisions() {
             provision(mavenBundle().groupId("org.apache.servicemix.bundles")
                 .artifactId("org.apache.servicemix.bundles.cglib")
                 .versionAsInProject()),
-            systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("WARN"));
+            systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("WARN"),
+            vmOption("-Dorg.osgi.service.http.port=" + WEBUI_PORT), waitForFrameworkStartup());
     }
 
     /**

diff --git a/itests/src/test/java/org/ops4j/pax/wicket/it/samples/SampleWebUiTest.java b/itests/src/test/java/org/ops4j/pax/wicket/it/samples/SampleWebUiTest.java
@@ -77,23 +77,23 @@ public final Option[] configureAdditionalProvision() {
     @Test
     public void testNonSpringSampleApplication_shouldAllowBaseFunctions() throws Exception {
         WebClient webclient = new WebClient();
-        HtmlPage page = webclient.getPage("http://localhost:8080/deptStore/");
+        HtmlPage page = webclient.getPage("http://localhost:" + WEBUI_PORT + "/deptStore/");
         assertThatAllTabsExist(page.asText());
         assertTrue(page.asText().contains("Activator"));
     }
 
     @Test
     public void testSpringSampleApplication_shouldAllowBaseFunctions() throws Exception {
         WebClient webclient = new WebClient();
-        HtmlPage page = webclient.getPage("http://localhost:8080/springDeptStore/");
+        HtmlPage page = webclient.getPage("http://localhost:" + WEBUI_PORT + "/springDeptStore/");
         assertThatAllTabsExist(page.asText());
         assertTrue(page.asText().contains("Spring"));
     }
 
     @Test
     public void testBlueprintSampleApplication_shouldAllowBaseFunctions() throws Exception {
         WebClient webclient = new WebClient();
-        HtmlPage page = webclient.getPage("http://localhost:8080/blueprintDeptStore/");
+        HtmlPage page = webclient.getPage("http://localhost:" + WEBUI_PORT + "/blueprintDeptStore/");
         assertThatAllTabsExist(page.asText());
         assertTrue(page.asText().contains("Blueprint"));
     }