You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/06/30 19:03:55 UTC
[5/7] incubator-usergrid git commit: Convert newer methods to use new
testing framework.
Convert newer methods to use new testing framework.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/b3aa0d87
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/b3aa0d87
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/b3aa0d87
Branch: refs/heads/two-dot-o-dev
Commit: b3aa0d87f0f356d6e3453fc0905d5f7fea93c948
Parents: a06954e
Author: Dave Johnson <dm...@apigee.com>
Authored: Fri Jun 19 07:53:39 2015 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Fri Jun 19 07:53:39 2015 -0400
----------------------------------------------------------------------
.../rest/management/ManagementResourceIT.java | 37 +++++---------------
.../endpoints/NamedResource.java | 12 ++++---
2 files changed, 17 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b3aa0d87/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
index 104d64f..580d629 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
@@ -562,11 +562,7 @@ public class ManagementResourceIT extends AbstractRestIT {
String suToken = clientSetup.getSuperuserToken().getAccessToken();
Map<String, String> props = new HashMap<String, String>();
props.put( USERGRID_CENTRAL_URL, getBaseURI().toURL().toExternalForm() );
- resource().path( "/testproperties" )
- .queryParam("access_token", suToken)
- .accept( MediaType.APPLICATION_JSON )
- .type( MediaType.APPLICATION_JSON_TYPE )
- .post( props );
+ pathResource( "testproperties" ).post( props );
try {
@@ -590,6 +586,7 @@ public class ManagementResourceIT extends AbstractRestIT {
validatedNode = management.externaltoken().get( Entity.class, queryParams );
fail( "Validation should have failed" );
+
} catch (UniformInterfaceException actual) {
assertEquals( 404, actual.getResponse().getStatus() );
String errorMsg = actual.getResponse().getEntity(
@@ -605,11 +602,7 @@ public class ManagementResourceIT extends AbstractRestIT {
// unset the Usergrid Central SSO URL so it does not interfere with other tests
props.put( USERGRID_CENTRAL_URL, "" );
- resource().path( "/testproperties" )
- .queryParam( "access_token", suToken )
- .accept( MediaType.APPLICATION_JSON )
- .type( MediaType.APPLICATION_JSON_TYPE )
- .post( props );
+ pathResource( "testproperties" ).post( props );
}
}
@@ -629,12 +622,8 @@ public class ManagementResourceIT extends AbstractRestIT {
String suToken = clientSetup.getSuperuserToken().getAccessToken();
Map<String, String> props = new HashMap<String, String>();
- props.put( USERGRID_CENTRAL_URL, getBaseURI().toURL().toExternalForm());
- resource().path( "/testproperties" )
- .queryParam( "access_token", suToken)
- .accept( MediaType.APPLICATION_JSON )
- .type( MediaType.APPLICATION_JSON_TYPE )
- .post( props );
+ props.put( USERGRID_CENTRAL_URL, getBaseURI().toURL().toExternalForm() );
+ pathResource( "testproperties" ).post( props );
try {
// calls to login as an Admin User must now fail
@@ -646,9 +635,7 @@ public class ManagementResourceIT extends AbstractRestIT {
put( "password", "password" );
put( "grant_type", "password" );
}};
- JsonNode accessInfoNode = resource().path( "/management/token" )
- .type( MediaType.APPLICATION_JSON_TYPE )
- .post( JsonNode.class, loginInfo );
+ ApiResponse postResponse = pathResource( "management/token" ).post( false, ApiResponse.class, loginInfo );
fail( "Login as Admin User must fail when validate external tokens is enabled" );
} catch (UniformInterfaceException actual) {
@@ -669,10 +656,8 @@ public class ManagementResourceIT extends AbstractRestIT {
put( "password", "superpassword" );
put( "grant_type", "password" );
}};
- JsonNode accessInfoNode = resource().path( "/management/token" )
- .type( MediaType.APPLICATION_JSON_TYPE )
- .post( JsonNode.class, loginInfo );
- String accessToken = accessInfoNode.get( "access_token" ).textValue();
+ ApiResponse postResponse2 = pathResource( "management/token" ).post( loginInfo );
+ String accessToken = postResponse2.getAccessToken();
assertNotNull( accessToken );
} finally {
@@ -680,11 +665,7 @@ public class ManagementResourceIT extends AbstractRestIT {
// turn off validate external tokens by un-setting the usergrid.central.url
props.put( USERGRID_CENTRAL_URL, "" );
- resource().path( "/testproperties" )
- .queryParam( "access_token", suToken )
- .accept( MediaType.APPLICATION_JSON )
- .type( MediaType.APPLICATION_JSON_TYPE )
- .post( props );
+ pathResource( "testproperties" ).post( props );
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b3aa0d87/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/NamedResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/NamedResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/NamedResource.java
index 69d2fcf..8bf1d67 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/NamedResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/NamedResource.java
@@ -215,6 +215,11 @@ public class NamedResource implements UrlResource {
}
+ public <T> T post( boolean useToken, Class<T> type, Map requestEntity) {
+ return post(useToken, type, requestEntity, null, false);
+
+ }
+
/**
* Used to test POST using form payloads.
* @param type
@@ -269,8 +274,7 @@ public class NamedResource implements UrlResource {
}
GenericType<T> gt = new GenericType<>((Class) type);
- return builder
- .post(gt.getRawClass());
+ return builder.post( gt.getRawClass() );
}
@@ -282,13 +286,13 @@ public class NamedResource implements UrlResource {
//For edge cases like Organizations and Tokens without any payload
public <T> T get(Class<T> type, boolean useToken) {
- return get(type,null,useToken);
+ return get( type, null, useToken );
}
public <T> T get(Class<T> type,QueryParameters queryParameters) {
- return get(type,queryParameters,true);
+ return get( type, queryParameters, true );
}
public <T> T get(Class<T> type,QueryParameters queryParameters, boolean useToken) {