You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/02/01 18:47:17 UTC
[25/50] [abbrv] brooklyn-library git commit: Fix JBoss6Server
Integration Test
Fix JBoss6Server Integration Test
Remove unnecessary HOSTNAME vs ROOT_URL comparison
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/e419ae14
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/e419ae14
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/e419ae14
Branch: refs/heads/0.7.0-incubating
Commit: e419ae149bdbc588ba5a80884ea5835359c24615
Parents: cce08e8
Author: Valentin Aitken <va...@cloudsoftcorp.com>
Authored: Fri Jun 19 18:17:08 2015 +0300
Committer: Valentin Aitken <va...@cloudsoftcorp.com>
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/brooklyn-library/blob/e419ae14/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