Fixing Integration tests for 0.7.0 - io.brooklyn.camp.brooklyn.JavaWebAppsIntegrationTest.testWithDbDeploy() - io.brooklyn.camp.brooklyn.JavaWebAppsIntegrationTest.testWithPolicyDeploy()
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/6c947393 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/6c947393 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/6c947393 Branch: refs/heads/0.7.0-incubating Commit: 6c9473933d8a474c9fa7c61173bd859238f6c219 Parents: 060a5ad Author: Yavor Yanchev <[email protected]> Authored: Tue Jun 23 17:50:56 2015 +0300 Committer: Yavor Yanchev <[email protected]> Committed: Tue Jun 23 18:37:00 2015 +0300 ---------------------------------------------------------------------- .../java/io/brooklyn/camp/brooklyn/JavaWebAppsIntegrationTest.java | 2 +- usage/camp/src/test/resources/java-web-app-and-db-with-policy.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/6c947393/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/JavaWebAppsIntegrationTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/JavaWebAppsIntegrationTest.java b/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/JavaWebAppsIntegrationTest.java index bda6bd9..eb14811 100644 --- a/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/JavaWebAppsIntegrationTest.java +++ b/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/JavaWebAppsIntegrationTest.java @@ -111,7 +111,7 @@ public class JavaWebAppsIntegrationTest { Entities.dumpInfo(app); Assert.assertEquals(app.getChildren().size(), 1); - Assert.assertEquals(app.getChildren().iterator().next().getDisplayName(), "jboss1"); + Assert.assertEquals(app.getChildren().iterator().next().getDisplayName(), "tomcat1"); Assert.assertEquals(app.getChildren().iterator().next().getLocations().size(), 1); final String url = Asserts.succeedsEventually(MutableMap.of("timeout", Duration.TEN_SECONDS), new Callable<String>() { http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/6c947393/usage/camp/src/test/resources/java-web-app-and-db-with-policy.yaml ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/resources/java-web-app-and-db-with-policy.yaml b/usage/camp/src/test/resources/java-web-app-and-db-with-policy.yaml index cd4c24d..107686c 100644 --- a/usage/camp/src/test/resources/java-web-app-and-db-with-policy.yaml +++ b/usage/camp/src/test/resources/java-web-app-and-db-with-policy.yaml @@ -26,7 +26,7 @@ services: http.port: 9280+ proxy.http.port: 9210+ java.sysprops: - brooklyn.example.db.url: $brooklyn:formatString("jdbc:%s%s?user=%s\\&password=%s", + brooklyn.example.db.url: $brooklyn:formatString("jdbc:%s%s?user=%s&password=%s", component("db").attributeWhenReady("datastore.url"), "visitors", "brooklyn", "br00k11n") brooklyn.policies: - policyType: brooklyn.policy.autoscaling.AutoScalerPolicy
