Fix PolicyResourceTest.testGetDefaultValue and ServerResourceTest.testGetConfig tests to work with the rest api fix
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/cfb08749 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/cfb08749 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/cfb08749 Branch: refs/heads/master Commit: cfb0874948b984423b377cac3511747156411d1a Parents: 299c2ab Author: Ivana Yovcheva <[email protected]> Authored: Tue Jul 4 18:27:02 2017 +0300 Committer: Ivana Yovcheva <[email protected]> Committed: Tue Jul 4 18:27:02 2017 +0300 ---------------------------------------------------------------------- .../org/apache/brooklyn/rest/resources/PolicyResourceTest.java | 3 ++- .../org/apache/brooklyn/rest/resources/ServerResourceTest.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cfb08749/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/PolicyResourceTest.java ---------------------------------------------------------------------- diff --git a/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/PolicyResourceTest.java b/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/PolicyResourceTest.java index 3498e00..534173b 100644 --- a/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/PolicyResourceTest.java +++ b/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/PolicyResourceTest.java @@ -28,6 +28,7 @@ import java.util.Set; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; +import org.apache.brooklyn.rest.util.WebResourceUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeClass; @@ -109,7 +110,7 @@ public class PolicyResourceTest extends BrooklynRestResourceTest { @Test public void testGetDefaultValue() throws Exception { String configName = RestMockSimplePolicy.SAMPLE_CONFIG.getName(); - String expectedVal = RestMockSimplePolicy.SAMPLE_CONFIG.getDefaultValue(); + String expectedVal = (String) WebResourceUtils.getValueForDisplay(mapper(), RestMockSimplePolicy.SAMPLE_CONFIG.getDefaultValue(), true, true); String configVal = client().path(ENDPOINT + policyId + "/config/" + configName) .get(String.class); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cfb08749/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceTest.java ---------------------------------------------------------------------- diff --git a/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceTest.java b/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceTest.java index f97b87b..e423951 100644 --- a/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceTest.java +++ b/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceTest.java @@ -99,7 +99,7 @@ public class ServerResourceTest extends BrooklynRestResourceTest { void testGetConfig() throws Exception { ((ManagementContextInternal)getManagementContext()).getBrooklynProperties().put("foo.bar.baz", "quux"); try { - assertEquals(client().path("/server/config/foo.bar.baz").get(String.class), "quux"); + assertEquals(client().path("/server/config/foo.bar.baz").get(String.class), "\"quux\""); } finally { ((ManagementContextInternal)getManagementContext()).getBrooklynProperties().remove("foo.bar.baz"); }
