From d85fc2b176175cf75096849789cd9d6ec3de0b0a Mon Sep 17 00:00:00 2001 From: Andrea Turli Date: Mon, 20 Mar 2017 15:08:16 +0100 Subject: [PATCH 1/2] use http://httpbin instead of https for tests --- .../brooklyn/camp/brooklyn/CompositeEffectorYamlTest.java | 2 +- .../brooklyn/camp/brooklyn/HttpCommandEffectorYamlTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/CompositeEffectorYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/CompositeEffectorYamlTest.java index f114f238e2..f3cc4f3882 100644 --- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/CompositeEffectorYamlTest.java +++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/CompositeEffectorYamlTest.java @@ -51,7 +51,7 @@ public void testCompositeEffector() throws Exception { " brooklyn.config:", " name: myEffector", " description: myDescription", - " uri: https://httpbin.org/get?id=myId", + " uri: http://httpbin.org/get?id=myId", " httpVerb: GET", " jsonPath: $.args.id", " publishSensor: results", diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/HttpCommandEffectorYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/HttpCommandEffectorYamlTest.java index b36771cf7f..77b11b19f3 100644 --- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/HttpCommandEffectorYamlTest.java +++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/HttpCommandEffectorYamlTest.java @@ -48,7 +48,7 @@ public void testHttpCommandEffectorWithParameters() throws Exception { " brooklyn.config:", " name: myEffector", " description: myDescription", - " uri: https://httpbin.org/get?id=myId", + " uri: http://httpbin.org/get?id=myId", " httpVerb: GET", " jsonPath: $.args.id", " publishSensor: results" @@ -60,7 +60,7 @@ public void testHttpCommandEffectorWithParameters() throws Exception { // Invoke with parameters { - Object result = entity.invoke(effector, ImmutableMap.of("uri", "https://httpbin.org/get?pwd=passwd", "jsonPath", "$.args.pwd")).get(); + Object result = entity.invoke(effector, ImmutableMap.of("uri", "http://httpbin.org/get?pwd=passwd", "jsonPath", "$.args.pwd")).get(); assertEquals(((String)result).trim(), "passwd"); } From f540e74364e1f437859a6fa873d026bbbef7c8ba Mon Sep 17 00:00:00 2001 From: Andrea Turli Date: Mon, 20 Mar 2017 18:27:27 +0100 Subject: [PATCH 2/2] mark tests as Integration --- .../brooklyn/camp/brooklyn/CompositeEffectorYamlTest.java | 2 +- .../brooklyn/camp/brooklyn/HttpCommandEffectorYamlTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/CompositeEffectorYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/CompositeEffectorYamlTest.java index f3cc4f3882..8d1ff0bf92 100644 --- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/CompositeEffectorYamlTest.java +++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/CompositeEffectorYamlTest.java @@ -37,7 +37,7 @@ public class CompositeEffectorYamlTest extends AbstractYamlTest { private static final Logger log = LoggerFactory.getLogger(CompositeEffectorYamlTest.class); - @Test + @Test(groups="Integration") public void testCompositeEffector() throws Exception { Entity app = createAndStartApplication( "location: localhost", diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/HttpCommandEffectorYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/HttpCommandEffectorYamlTest.java index 77b11b19f3..c1a1963d71 100644 --- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/HttpCommandEffectorYamlTest.java +++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/HttpCommandEffectorYamlTest.java @@ -34,7 +34,7 @@ public class HttpCommandEffectorYamlTest extends AbstractYamlTest { private static final Logger log = LoggerFactory.getLogger(HttpCommandEffectorYamlTest.class); - @Test + @Test(groups="Integration") public void testHttpCommandEffectorWithParameters() throws Exception { Entity app = createAndStartApplication( "location: localhost",