Fix unit tests and launcher config
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/e36ef90f Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/e36ef90f Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/e36ef90f Branch: refs/heads/master Commit: e36ef90f6d18a3d8d25faf587fccfd7dd7ac31a0 Parents: e47107e Author: Thomas Bouron <[email protected]> Authored: Fri Apr 14 13:21:34 2017 +0100 Committer: Thomas Bouron <[email protected]> Committed: Fri Apr 14 13:21:34 2017 +0100 ---------------------------------------------------------------------- .../resources/OSGI-INF/blueprint/service.xml | 2 -- .../rest/resources/ErrorResponseTest.java | 2 +- .../rest/resources/PolicyResourceTest.java | 3 +-- .../rest-server/src/main/webapp/WEB-INF/web.xml | 1 - .../brooklyn/rest/CorsFilterLauncherTest.java | 20 ++++++++++---------- .../rest/CsrfTokenFilterLauncherTest.java | 14 +++++++------- 6 files changed, 19 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e36ef90f/rest/rest-resources/src/main/resources/OSGI-INF/blueprint/service.xml ---------------------------------------------------------------------- diff --git a/rest/rest-resources/src/main/resources/OSGI-INF/blueprint/service.xml b/rest/rest-resources/src/main/resources/OSGI-INF/blueprint/service.xml index 2cfb915..c773806 100644 --- a/rest/rest-resources/src/main/resources/OSGI-INF/blueprint/service.xml +++ b/rest/rest-resources/src/main/resources/OSGI-INF/blueprint/service.xml @@ -84,7 +84,6 @@ limitations under the License. <bean id="sensorResourceBean" class="org.apache.brooklyn.rest.resources.SensorResource"/> <bean id="serverResourceBean" class="org.apache.brooklyn.rest.resources.ServerResource"/> <bean id="usageResourceBean" class="org.apache.brooklyn.rest.resources.UsageResource"/> - <bean id="versionResourceBean" class="org.apache.brooklyn.rest.resources.VersionResource"/> <bean id="logoutResourceBean" class="org.apache.brooklyn.rest.resources.LogoutResource"/> <jaxrs:server id="brooklynRestApiV1" address="/"> @@ -104,7 +103,6 @@ limitations under the License. <ref component-id="sensorResourceBean"/> <ref component-id="serverResourceBean"/> <ref component-id="usageResourceBean"/> - <ref component-id="versionResourceBean"/> <ref component-id="logoutResourceBean"/> </jaxrs:serviceBeans> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e36ef90f/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/ErrorResponseTest.java ---------------------------------------------------------------------- diff --git a/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/ErrorResponseTest.java b/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/ErrorResponseTest.java index b1ae6df..27d8ea5 100644 --- a/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/ErrorResponseTest.java +++ b/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/ErrorResponseTest.java @@ -75,7 +75,7 @@ public class ErrorResponseTest extends BrooklynRestResourceTest { + RestMockSimplePolicy.INTEGER_CONFIG.getName(); Response response = client().path(resource) - .post(toJsonEntity(ImmutableMap.of("value", "notanumber"))); + .post(toJsonEntity("notanumber")); assertEquals(response.getStatus(), Status.BAD_REQUEST.getStatusCode()); assertEquals(response.getHeaders().getFirst("Content-Type"), MediaType.APPLICATION_JSON); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e36ef90f/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 78a29ca..3498e00 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 @@ -121,8 +121,7 @@ public class PolicyResourceTest extends BrooklynRestResourceTest { String configName = RestMockSimplePolicy.SAMPLE_CONFIG.getName(); Response response = client().path(ENDPOINT + policyId + "/config/" + configName) - .header("Content-type", "plain/text") - .post("newval"); + .post(toJsonEntity("newval")); assertEquals(response.getStatus(), Response.Status.OK.getStatusCode()); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e36ef90f/rest/rest-server/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/rest/rest-server/src/main/webapp/WEB-INF/web.xml b/rest/rest-server/src/main/webapp/WEB-INF/web.xml index de15d08..347417a 100644 --- a/rest/rest-server/src/main/webapp/WEB-INF/web.xml +++ b/rest/rest-server/src/main/webapp/WEB-INF/web.xml @@ -60,7 +60,6 @@ org.apache.brooklyn.rest.resources.SensorResource, org.apache.brooklyn.rest.resources.ServerResource, org.apache.brooklyn.rest.resources.UsageResource, - org.apache.brooklyn.rest.resources.VersionResource </param-value> </init-param> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e36ef90f/rest/rest-server/src/test/java/org/apache/brooklyn/rest/CorsFilterLauncherTest.java ---------------------------------------------------------------------- diff --git a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/CorsFilterLauncherTest.java b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/CorsFilterLauncherTest.java index 313b35e..8197014 100644 --- a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/CorsFilterLauncherTest.java +++ b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/CorsFilterLauncherTest.java @@ -57,30 +57,30 @@ public class CorsFilterLauncherTest extends BrooklynRestApiLauncherTestFixture { HttpClient client = client(); // preflight request - HttpToolResponse response = HttpTool.execAndConsume(client, httpOptionsRequest("server/status", "GET", shouldAllowOrigin)); + HttpToolResponse response = HttpTool.execAndConsume(client, httpOptionsRequest("server/ha/state", "GET", shouldAllowOrigin)); assertAcAllowOrigin(response, shouldAllowOrigin, "GET"); assertOkayResponse(response, ""); - HttpUriRequest httpRequest = RequestBuilder.get(getBaseUriRest() + "server/status") + HttpUriRequest httpRequest = RequestBuilder.get(getBaseUriRest() + "server/ha/state") .addHeader("Origin", shouldAllowOrigin) .addHeader(HEADER_AC_REQUEST_METHOD, "GET") .build(); response = HttpTool.execAndConsume(client, httpRequest); assertAcAllowOrigin(response, shouldAllowOrigin, "GET", false); - assertOkayResponse(response, "MASTER"); + assertOkayResponse(response, "\"MASTER\""); // preflight request - response = HttpTool.execAndConsume(client, httpOptionsRequest("server/status", "GET", thirdPartyOrigin)); + response = HttpTool.execAndConsume(client, httpOptionsRequest("server/ha/state", "GET", thirdPartyOrigin)); assertAcNotAllowOrigin(response); assertOkayResponse(response, ""); - httpRequest = RequestBuilder.get(getBaseUriRest() + "server/status") + httpRequest = RequestBuilder.get(getBaseUriRest() + "server/ha/state") .addHeader("Origin", thirdPartyOrigin) .addHeader(HEADER_AC_REQUEST_METHOD, "GET") .build(); response = HttpTool.execAndConsume(client, httpRequest); assertAcNotAllowOrigin(response); - assertOkayResponse(response, "MASTER"); + assertOkayResponse(response, "\"MASTER\""); } @Test @@ -124,7 +124,7 @@ public class CorsFilterLauncherTest extends BrooklynRestApiLauncherTestFixture { setCorsFilterFeature(true, ImmutableList.<String>of()); HttpClient client = client(); // preflight request - HttpToolResponse response = HttpTool.execAndConsume(client, httpOptionsRequest("server/status", "GET", shouldAllowOrigin)); + HttpToolResponse response = HttpTool.execAndConsume(client, httpOptionsRequest("server/ha/state", "GET", shouldAllowOrigin)); List<String> accessControlAllowOrigin = response.getHeaderLists().get(HEADER_AC_ALLOW_ORIGIN); assertEquals(accessControlAllowOrigin.size(), 1); assertEquals(accessControlAllowOrigin.get(0), "*", "Should allow GET requests made from " + shouldAllowOrigin); @@ -133,7 +133,7 @@ public class CorsFilterLauncherTest extends BrooklynRestApiLauncherTestFixture { assertEquals(response.getHeaderLists().get(HEADER_AC_ALLOW_HEADERS).get(0), "x-csrf-token", "Should have asked and allowed x-csrf-token header from " + shouldAllowOrigin); assertOkayResponse(response, ""); - HttpUriRequest httpRequest = RequestBuilder.get(getBaseUriRest() + "server/status") + HttpUriRequest httpRequest = RequestBuilder.get(getBaseUriRest() + "server/ha/state") .addHeader("Origin", shouldAllowOrigin) .addHeader(HEADER_AC_REQUEST_METHOD, "GET") .build(); @@ -141,7 +141,7 @@ public class CorsFilterLauncherTest extends BrooklynRestApiLauncherTestFixture { accessControlAllowOrigin = response.getHeaderLists().get(HEADER_AC_ALLOW_ORIGIN); assertEquals(accessControlAllowOrigin.size(), 1); assertEquals(accessControlAllowOrigin.get(0), "*", "Should allow GET requests made from " + shouldAllowOrigin); - assertOkayResponse(response, "MASTER"); + assertOkayResponse(response, "\"MASTER\""); } @Test @@ -185,7 +185,7 @@ public class CorsFilterLauncherTest extends BrooklynRestApiLauncherTestFixture { setCorsFilterFeature(false, null); HttpClient client = client(); - HttpToolResponse response = HttpTool.execAndConsume(client, httpOptionsRequest("server/status", "GET", shouldAllowOrigin)); + HttpToolResponse response = HttpTool.execAndConsume(client, httpOptionsRequest("server/ha/state", "GET", shouldAllowOrigin)); assertAcNotAllowOrigin(response); assertOkayResponse(response, ""); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e36ef90f/rest/rest-server/src/test/java/org/apache/brooklyn/rest/CsrfTokenFilterLauncherTest.java ---------------------------------------------------------------------- diff --git a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/CsrfTokenFilterLauncherTest.java b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/CsrfTokenFilterLauncherTest.java index d442875..7c77590 100644 --- a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/CsrfTokenFilterLauncherTest.java +++ b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/CsrfTokenFilterLauncherTest.java @@ -52,12 +52,12 @@ public class CsrfTokenFilterLauncherTest extends BrooklynRestApiLauncherTestFixt HttpClient client = client(); HttpToolResponse response = HttpTool.httpGet( - client, URI.create(getBaseUriRest() + "server/status"), + client, URI.create(getBaseUriRest() + "server/ha/state"), ImmutableMap.<String,String>of( CsrfTokenFilter.CSRF_TOKEN_REQUIRED_HEADER, CsrfTokenFilter.CsrfTokenRequiredForRequests.WRITE.toString())); // comes back okay - assertOkayResponse(response, "MASTER"); + assertOkayResponse(response, "\"MASTER\""); Map<String, List<String>> cookies = response.getCookieKeyValues(); String token = Iterables.getOnlyElement(cookies.get(CsrfTokenFilter.CSRF_TOKEN_VALUE_COOKIE)); @@ -84,19 +84,19 @@ public class CsrfTokenFilterLauncherTest extends BrooklynRestApiLauncherTestFixt // can get without token response = HttpTool.httpGet( - client, URI.create(getBaseUriRest() + "server/status"), + client, URI.create(getBaseUriRest() + "server/ha/state"), ImmutableMap.<String,String>of()); - assertOkayResponse(response, "MASTER"); + assertOkayResponse(response, "\"MASTER\""); // but if we set required ALL then need a token to get response = HttpTool.httpGet( - client, URI.create(getBaseUriRest() + "server/status"), + client, URI.create(getBaseUriRest() + "server/ha/state"), ImmutableMap.<String,String>of( CsrfTokenFilter.CSRF_TOKEN_REQUIRED_HEADER, CsrfTokenFilter.CsrfTokenRequiredForRequests.ALL.toString().toLowerCase() )); - assertOkayResponse(response, "MASTER"); + assertOkayResponse(response, "\"MASTER\""); response = HttpTool.httpGet( - client, URI.create(getBaseUriRest() + "server/status"), + client, URI.create(getBaseUriRest() + "server/ha/state"), ImmutableMap.<String,String>of()); assertEquals(response.getResponseCode(), HttpStatus.SC_UNAUTHORIZED);
