Repository: brooklyn-server Updated Branches: refs/heads/master c10fd58eb -> 2aba7433d
Fixes tested response from /server/user Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/a01d5258 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/a01d5258 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/a01d5258 Branch: refs/heads/master Commit: a01d5258eeeec5bb789fd5209045be97a74d6568 Parents: c10fd58 Author: Svetoslav Neykov <svetoslav.ney...@cloudsoftcorp.com> Authored: Sat Jul 15 10:16:25 2017 +0300 Committer: Svetoslav Neykov <svetoslav.ney...@cloudsoftcorp.com> Committed: Sat Jul 15 10:16:25 2017 +0300 ---------------------------------------------------------------------- .../brooklyn/rest/resources/ServerResourceIntegrationTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/a01d5258/rest/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceIntegrationTest.java ---------------------------------------------------------------------- diff --git a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceIntegrationTest.java b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceIntegrationTest.java index 1cae978..927a3c7 100644 --- a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceIntegrationTest.java +++ b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceIntegrationTest.java @@ -41,6 +41,7 @@ import org.eclipse.jetty.server.Server; import org.testng.annotations.Test; import com.google.common.collect.ImmutableMap; +import com.google.gson.Gson; public class ServerResourceIntegrationTest extends BrooklynRestApiLauncherTestFixture { @@ -118,7 +119,7 @@ public class ServerResourceIntegrationTest extends BrooklynRestApiLauncherTestFi HttpToolResponse response = HttpTool.httpGet(client, URI.create(getBaseUriRest(server) + "server/user"), ImmutableMap.<String, String>of()); HttpAsserts.assertHealthyStatusCode(response.getResponseCode()); - return response.getContentAsString(); + return new Gson().fromJson(response.getContentAsString(), String.class); } }
