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/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/67fcc4dd Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/67fcc4dd Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/67fcc4dd Branch: refs/heads/master Commit: 67fcc4ddb8dae41a87acde52d1691ce69996a0e7 Parents: 3650dfa 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 ---------------------------------------------------------------------- .../io/brooklyn/camp/brooklyn/JavaWebAppsIntegrationTest.java | 2 +- .../src/test/resources/java-web-app-and-db-with-function.yaml | 4 ++-- .../src/test/resources/java-web-app-and-db-with-policy.yaml | 2 +- usage/camp/src/test/resources/java-web-app-simple.yaml | 6 +++--- usage/camp/src/test/resources/visitors-creation-script.sql | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/67fcc4dd/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/incubator-brooklyn/blob/67fcc4dd/usage/camp/src/test/resources/java-web-app-and-db-with-function.yaml ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/resources/java-web-app-and-db-with-function.yaml b/usage/camp/src/test/resources/java-web-app-and-db-with-function.yaml index 087e160..cb9a00e 100644 --- a/usage/camp/src/test/resources/java-web-app-and-db-with-function.yaml +++ b/usage/camp/src/test/resources/java-web-app-and-db-with-function.yaml @@ -22,11 +22,11 @@ services: name: My Web location: localhost brooklyn.config: - wars.root: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.6.0-M2/brooklyn-example-hello-world-sql-webapp-0.6.0-M2.war + wars.root: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.7.0-M1/brooklyn-example-hello-world-sql-webapp-0.7.0-M1.war 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") - serviceType: brooklyn.entity.database.mysql.MySqlNode id: db http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/67fcc4dd/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 http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/67fcc4dd/usage/camp/src/test/resources/java-web-app-simple.yaml ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/resources/java-web-app-simple.yaml b/usage/camp/src/test/resources/java-web-app-simple.yaml index 7cde93a..558b272 100644 --- a/usage/camp/src/test/resources/java-web-app-simple.yaml +++ b/usage/camp/src/test/resources/java-web-app-simple.yaml @@ -21,8 +21,8 @@ description: Single JBoss using Brooklyn origin: https://github.com/apache/incubator-brooklyn location: localhost services: -- serviceType: brooklyn.entity.webapp.jboss.JBoss7Server - name: jboss1 +- serviceType: brooklyn.entity.webapp.tomcat.Tomcat8Server + name: tomcat1 brooklyn.config: - wars.root: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-webapp/0.5.0/brooklyn-example-hello-world-webapp-0.5.0.war + wars.root: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-webapp/0.7.0-M1/brooklyn-example-hello-world-webapp-0.7.0-M1.war http.port: 9280+ http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/67fcc4dd/usage/camp/src/test/resources/visitors-creation-script.sql ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/resources/visitors-creation-script.sql b/usage/camp/src/test/resources/visitors-creation-script.sql index 2422f8f..a324d2e 100644 --- a/usage/camp/src/test/resources/visitors-creation-script.sql +++ b/usage/camp/src/test/resources/visitors-creation-script.sql @@ -20,7 +20,7 @@ create database visitors; use visitors; # not necessary to create user if we grant (and not supported in some dialects) -# create user 'brooklyn' identified by 'br00k11n'; +create user 'brooklyn' identified by 'br00k11n'; grant usage on *.* to 'brooklyn'@'%' identified by 'br00k11n';
