Repository: incubator-brooklyn Updated Branches: refs/heads/master ced5e15a5 -> d20d452d8
Fix JBoss6Server Integration Test Remove unnecessary HOSTNAME vs ROOT_URL comparison Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/1b11e3c0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/1b11e3c0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/1b11e3c0 Branch: refs/heads/master Commit: 1b11e3c01d96c85950d297679961a6a87900a733 Parents: 2556b29 Author: Valentin Aitken <[email protected]> Authored: Fri Jun 19 18:17:08 2015 +0300 Committer: Valentin Aitken <[email protected]> Committed: Fri Jun 19 18:17:08 2015 +0300 ---------------------------------------------------------------------- .../webapp/jboss/JBoss6ServerNonInheritingIntegrationTest.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1b11e3c0/software/webapp/src/test/java/brooklyn/entity/webapp/jboss/JBoss6ServerNonInheritingIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/brooklyn/entity/webapp/jboss/JBoss6ServerNonInheritingIntegrationTest.java b/software/webapp/src/test/java/brooklyn/entity/webapp/jboss/JBoss6ServerNonInheritingIntegrationTest.java index c3f5e5e..6c5daeb 100644 --- a/software/webapp/src/test/java/brooklyn/entity/webapp/jboss/JBoss6ServerNonInheritingIntegrationTest.java +++ b/software/webapp/src/test/java/brooklyn/entity/webapp/jboss/JBoss6ServerNonInheritingIntegrationTest.java @@ -87,14 +87,11 @@ public class JBoss6ServerNonInheritingIntegrationTest extends BrooklynAppLiveTes app.start(ImmutableList.of(localhostProvisioningLocation)); - String httpUrl = "http://"+server.getAttribute(JBoss6Server.HOSTNAME)+":"+server.getAttribute(JBoss6Server.HTTP_PORT)+"/"; - - assertEquals(server.getAttribute(JBoss6Server.ROOT_URL).toLowerCase(), httpUrl.toLowerCase()); + String httpUrl = server.getAttribute(JBoss6Server.ROOT_URL); HttpTestUtils.assertHttpStatusCodeEventuallyEquals(httpUrl, 200); HttpTestUtils.assertContentContainsText(httpUrl, "Hello"); - Asserts.succeedsEventually(new Runnable() { @Override public void run() { // TODO Could test other attributes as well; see jboss7 test
