brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [03/10] brooklyn-server git commit: make a test more flexible about which port it uses
Date Thu, 02 Mar 2017 12:16:04 GMT
make a test more flexible about which port it uses


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/0cea4881
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/0cea4881
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/0cea4881

Branch: refs/heads/master
Commit: 0cea488186cf6a797c9be836e6269f862d7923c6
Parents: 3eb74a5
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Sat Feb 18 01:35:48 2017 +0000
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Wed Mar 1 08:54:55 2017 +0000

----------------------------------------------------------------------
 .../brooklyn/launcher/WebAppRunnerTest.java     | 26 +++++++++-----------
 1 file changed, 11 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0cea4881/launcher/src/test/java/org/apache/brooklyn/launcher/WebAppRunnerTest.java
----------------------------------------------------------------------
diff --git a/launcher/src/test/java/org/apache/brooklyn/launcher/WebAppRunnerTest.java b/launcher/src/test/java/org/apache/brooklyn/launcher/WebAppRunnerTest.java
index a53ea95..8c5baa7 100644
--- a/launcher/src/test/java/org/apache/brooklyn/launcher/WebAppRunnerTest.java
+++ b/launcher/src/test/java/org/apache/brooklyn/launcher/WebAppRunnerTest.java
@@ -28,9 +28,9 @@ import org.apache.brooklyn.core.entity.Entities;
 import org.apache.brooklyn.core.internal.BrooklynProperties;
 import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext;
 import org.apache.brooklyn.core.mgmt.internal.ManagementContextInternal;
-import org.apache.brooklyn.test.HttpTestUtils;
 import org.apache.brooklyn.test.support.TestResourceUnavailableException;
 import org.apache.brooklyn.util.collections.MutableMap;
+import org.apache.brooklyn.util.http.HttpAsserts;
 import org.apache.brooklyn.util.net.Networking;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -92,24 +92,22 @@ public class WebAppRunnerTest {
     }
 
     public static void assertBrooklynEventuallyAt(String url) {
-        HttpTestUtils.assertContentEventuallyContainsText(url, "Brooklyn Web Console");
+        HttpAsserts.assertContentEventuallyContainsText(url, "Brooklyn Web Console");
     }
 
     @Test
     public void testStartSecondaryWar() throws Exception {
         TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), "/hello-world.war");
 
-        if (!Networking.isPortAvailable(8090))
-            fail("Another process is using port 8090 which is required for this test.");
         BrooklynWebServer server = createWebServer(
-            MutableMap.of("port", 8090, "war", "brooklyn.war", "wars", MutableMap.of("hello",
"hello-world.war")) );
+            MutableMap.of("port", "8091+", "war", "brooklyn.war", "wars", MutableMap.of("hello",
"hello-world.war")) );
         assertNotNull(server);
         
         try {
             server.start();
 
-            assertBrooklynEventuallyAt("http://localhost:8090/");
-            HttpTestUtils.assertContentEventuallyContainsText("http://localhost:8090/hello",
+            assertBrooklynEventuallyAt("http://localhost:"+server.getActualPort()+"/");
+            HttpAsserts.assertContentEventuallyContainsText("http://localhost:"+server.getActualPort()+"/hello",
                 "This is the home page for a sample application");
 
         } finally {
@@ -121,17 +119,15 @@ public class WebAppRunnerTest {
     public void testStartSecondaryWarAfter() throws Exception {
         TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), "/hello-world.war");
 
-        if (!Networking.isPortAvailable(8090))
-            fail("Another process is using port 8090 which is required for this test.");
-        BrooklynWebServer server = createWebServer(MutableMap.of("port", 8090, "war", "brooklyn.war"));
+        BrooklynWebServer server = createWebServer(MutableMap.of("port", "8091+", "war",
"brooklyn.war"));
         assertNotNull(server);
         
         try {
             server.start();
             server.deploy("/hello", "hello-world.war");
 
-            assertBrooklynEventuallyAt("http://localhost:8090/");
-            HttpTestUtils.assertContentEventuallyContainsText("http://localhost:8090/hello",
+            assertBrooklynEventuallyAt("http://localhost:"+server.getActualPort()+"/");
+            HttpAsserts.assertContentEventuallyContainsText("http://localhost:"+server.getActualPort()+"/hello",
                 "This is the home page for a sample application");
 
         } finally {
@@ -154,9 +150,9 @@ public class WebAppRunnerTest {
             details.getWebServer().deploy("/hello2", "hello-world.war");
 
             assertBrooklynEventuallyAt(details.getWebServerUrl());
-            HttpTestUtils.assertContentEventuallyContainsText(details.getWebServerUrl()+"hello",
"This is the home page for a sample application");
-            HttpTestUtils.assertContentEventuallyContainsText(details.getWebServerUrl()+"hello2",
"This is the home page for a sample application");
-            HttpTestUtils.assertHttpStatusCodeEventuallyEquals(details.getWebServerUrl()+"hello0",
404);
+            HttpAsserts.assertContentEventuallyContainsText(details.getWebServerUrl()+"hello",
"This is the home page for a sample application");
+            HttpAsserts.assertContentEventuallyContainsText(details.getWebServerUrl()+"hello2",
"This is the home page for a sample application");
+            HttpAsserts.assertHttpStatusCodeEventuallyEquals(details.getWebServerUrl()+"hello0",
404);
 
         } finally {
             details.getWebServer().stop();


Mime
View raw message