brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sjcorb...@apache.org
Subject [4/6] brooklyn-server git commit: Fixes integration tests
Date Fri, 24 Mar 2017 18:46:01 GMT
Fixes integration tests

* One is a real problem - http://jsonip.com redirects to https://jsonip.com, which is signed
by a certificate issued by "Let's Encrypt", not supported by java
* The other changes the incorrect expectation in the test


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/363874e6
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/363874e6
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/363874e6

Branch: refs/heads/master
Commit: 363874e6f8a2d0d25930f4bf00038d8fbad15a94
Parents: 32ccd24
Author: Svetoslav Neykov <svetoslav.neykov@cloudsoftcorp.com>
Authored: Fri Mar 24 12:50:35 2017 +0200
Committer: Svetoslav Neykov <svetoslav.neykov@cloudsoftcorp.com>
Committed: Fri Mar 24 12:56:15 2017 +0200

----------------------------------------------------------------------
 .../brooklyn/location/geo/external-ip-address-resolvers.txt     | 5 +++--
 .../util/json/BrooklynJacksonSerializerIntegrationTest.java     | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/363874e6/core/src/main/resources/org/apache/brooklyn/location/geo/external-ip-address-resolvers.txt
----------------------------------------------------------------------
diff --git a/core/src/main/resources/org/apache/brooklyn/location/geo/external-ip-address-resolvers.txt
b/core/src/main/resources/org/apache/brooklyn/location/geo/external-ip-address-resolvers.txt
index c51b394..f1cd8ab 100644
--- a/core/src/main/resources/org/apache/brooklyn/location/geo/external-ip-address-resolvers.txt
+++ b/core/src/main/resources/org/apache/brooklyn/location/geo/external-ip-address-resolvers.txt
@@ -15,10 +15,11 @@
 # specific language governing permissions and limitations
 # under the License.
 
-http://jsonip.com/
+# Uses Let's Encrypt certificate, not supported by current JRE (1.8.0_121-b13)
+# https://jsonip.com/
 http://myip.dnsomatic.com/
 http://checkip.dyndns.org/
-# Uses Let's Encrypt certificate supported only in Java 8u101+
+# Uses Let's Encrypt certificate, not supported by current JRE (1.8.0_121-b13)
 # https://wtfismyip.com/text
 http://whatismyip.akamai.com/
 http://myip.wampdeveloper.com/

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/363874e6/rest/rest-server/src/test/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonSerializerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonSerializerIntegrationTest.java
b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonSerializerIntegrationTest.java
index edad261..4b016ed 100644
--- a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonSerializerIntegrationTest.java
+++ b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonSerializerIntegrationTest.java
@@ -25,8 +25,8 @@ import java.util.Map;
 import javax.ws.rs.core.MediaType;
 
 import org.apache.brooklyn.api.entity.Entity;
+import org.apache.brooklyn.api.mgmt.ManagementContext;
 import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport;
-import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests;
 import org.apache.brooklyn.core.test.entity.TestApplication;
 import org.apache.brooklyn.core.test.entity.TestEntity;
 import org.apache.brooklyn.rest.BrooklynRestApiLauncher;
@@ -103,7 +103,7 @@ public class BrooklynJacksonSerializerIntegrationTest extends BrooklynAppUnitTes
     public void testWithMgmt() throws Exception {
         setConfig(mgmt);
         Map<?, ?> values = getConfigValueAsJson();
-        Assert.assertEquals(values, ImmutableMap.of("type", LocalManagementContextForTests.class.getCanonicalName()),
"values="+values);
+        Assert.assertEquals(values, ImmutableMap.of("type", ManagementContext.class.getCanonicalName()),
"values="+values);
 
         // assert normal API returns the same, containing links
         values = getRestValueAsJson(entityUrl);


Mime
View raw message