You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2015/06/19 13:53:50 UTC
[1/2] incubator-usergrid git commit: Formatting and import cleanup
only.
Repository: incubator-usergrid
Updated Branches:
refs/heads/USERGRID-703 c2d5e1165 -> b3aa0d87f
Formatting and import cleanup only.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/a06954ef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/a06954ef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/a06954ef
Branch: refs/heads/USERGRID-703
Commit: a06954ef7cfed96bf296a5c7429ef9f92c43f411
Parents: c2d5e11
Author: Dave Johnson <dm...@apigee.com>
Authored: Thu Jun 18 16:18:29 2015 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Thu Jun 18 16:18:29 2015 -0400
----------------------------------------------------------------------
.../rest/management/ManagementResourceIT.java | 108 +++++++++++++------
1 file changed, 74 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a06954ef/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 31064bf..104d64f 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
@@ -23,14 +23,12 @@ import com.sun.jersey.api.client.UniformInterfaceException;
import com.sun.jersey.api.representation.Form;
import net.jcip.annotations.NotThreadSafe;
import org.apache.commons.lang.RandomStringUtils;
-
import org.apache.usergrid.persistence.index.utils.UUIDUtils;
import org.apache.usergrid.rest.management.organizations.OrganizationsResource;
import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
import org.apache.usergrid.rest.test.resource2point0.model.*;
import org.apache.usergrid.rest.test.resource2point0.model.Collection;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -61,7 +59,11 @@ public class ManagementResourceIT extends AbstractRestIT {
@Before
public void setup() {
management= clientSetup.getRestClient().management();
- Token token = management.token().get(new QueryParameters().addParam("grant_type", "password").addParam("username", clientSetup.getEmail()).addParam("password", clientSetup.getPassword()));
+ Token token = management.token()
+ .get( new QueryParameters()
+ .addParam( "grant_type", "password" )
+ .addParam( "username", clientSetup.getEmail() )
+ .addParam( "password", clientSetup.getPassword() ) );
management.token().setToken(token);
}
@@ -72,11 +74,17 @@ public class ManagementResourceIT extends AbstractRestIT {
public void setSelfAdminPasswordAsAdmin() {
UUID uuid = UUIDUtils.newTimeUUID();
management.token().setToken(clientSetup.getSuperuserToken());
- management.orgs().org( clientSetup.getOrganizationName() ).users().post( ApiResponse.class, new User( "test" + uuid, "test" + uuid, "test" + uuid + "@email.com", "test" ) );
+ management.orgs()
+ .org( clientSetup.getOrganizationName() )
+ .users()
+ .post( ApiResponse.class, new User( "test" + uuid, "test" + uuid, "test" + uuid + "@email.com", "test" ) );
Map<String, Object> data = new HashMap<>();
data.put( "newpassword", "foo" );
data.put( "oldpassword", "test" );
- management.users().user("test"+uuid).password().post(Entity.class, data);
+ management.users()
+ .user( "test" + uuid )
+ .password()
+ .post( Entity.class, data );
Token token = management.token().post(Token.class, new Token( "test"+uuid, "foo" ) );
management.token().setToken( token );
data.clear();
@@ -205,7 +213,10 @@ public class ManagementResourceIT extends AbstractRestIT {
userFeed = getUserFeed( lastUser );
assertNotNull( userFeed );
assertTrue( userFeed.size() > 1 );
- String serialized = ((Entity)userFeed.get(0)).get("content").toString()+ ((Entity)userFeed.get(1)).get("content").toString();
+ String serialized = ((Entity)userFeed.get(0))
+ .get( "content" )
+ .toString()+ ((Entity)userFeed.get(1))
+ .get( "content" ).toString();
assertTrue( serialized.indexOf( postFollowContent ) >= 0 );
assertTrue( serialized.indexOf( preFollowContent ) >= 0 );
}
@@ -226,7 +237,13 @@ public class ManagementResourceIT extends AbstractRestIT {
private void follow( String user, String followUser ) {
//post follow
- Entity entity = this.app().collection("users").entity(user).collection("following").collection("users").entity(followUser).post();
+ Entity entity = this.app()
+ .collection( "users" )
+ .entity( user )
+ .collection( "following" )
+ .collection( "users" )
+ .entity( followUser )
+ .post();
}
@@ -238,23 +255,30 @@ public class ManagementResourceIT extends AbstractRestIT {
actorMap.put( "displayName", name );
actorMap.put( "username", user );
activityPayload.put("actor", actorMap);
- Entity entity = this.app().collection("users").entity(user).collection("activities").post(new Entity(activityPayload));
+ Entity entity = this.app()
+ .collection( "users" )
+ .entity( user )
+ .collection( "activities" )
+ .post( new Entity( activityPayload ) );
}
@Test
public void mgmtCreateAndGetApplication() throws Exception {
-
-
// POST /applications
- ApiResponse apiResponse = management().orgs().org( clientSetup.getOrganizationName() ).app().post(new Application("mgmt-org-app"));
+ ApiResponse apiResponse = management()
+ .orgs()
+ .org( clientSetup.getOrganizationName() )
+ .app()
+ .post( new Application( "mgmt-org-app" ) );
refreshIndex();
Entity appdata = apiResponse.getEntities().get(0);
- assertEquals((clientSetup.getOrganizationName() + "/mgmt-org-app").toLowerCase(), appdata.get("name").toString().toLowerCase());
+ assertEquals((clientSetup.getOrganizationName() + "/mgmt-org-app")
+ .toLowerCase(), appdata.get("name") .toString() .toLowerCase());
assertNotNull(appdata.get("metadata"));
Map metadata =(Map) appdata.get( "metadata" );
assertNotNull(metadata.get("collections"));
@@ -290,7 +314,11 @@ public class ManagementResourceIT extends AbstractRestIT {
long ttl = 2000;
- Token token = management.token().get(new QueryParameters().addParam( "grant_type", "password" ).addParam("username", clientSetup.getEmail()).addParam("password", clientSetup.getPassword()).addParam("ttl", String.valueOf(ttl)));
+ Token token = management.token().get( new QueryParameters()
+ .addParam( "grant_type", "password" )
+ .addParam( "username", clientSetup.getEmail() )
+ .addParam( "password", clientSetup.getPassword() )
+ .addParam( "ttl", String.valueOf( ttl ) ) );
long startTime = System.currentTimeMillis();
@@ -319,7 +347,11 @@ public class ManagementResourceIT extends AbstractRestIT {
@Test
public void token() throws Exception {
- Token myToken = management.token().get(new QueryParameters().addParam("grant_type", "password").addParam("username", clientSetup.getEmail()).addParam("password", clientSetup.getPassword()));
+ Token myToken = management.token()
+ .get( new QueryParameters()
+ .addParam( "grant_type", "password" )
+ .addParam( "username", clientSetup.getEmail() )
+ .addParam( "password", clientSetup.getPassword() ) );
String token = myToken.getAccessToken();
assertNotNull( token );
@@ -329,8 +361,7 @@ public class ManagementResourceIT extends AbstractRestIT {
Map<String, Object> properties = new HashMap<String, Object>();
properties.put( "securityLevel", 5 );
payload.put( OrganizationsResource.ORGANIZATION_PROPERTIES, properties );
- management.orgs().org( clientSetup.getOrganizationName() )
- .put(payload);
+ management.orgs().org( clientSetup.getOrganizationName() ).put( payload );
// ensure the organization property is included
@@ -341,9 +372,11 @@ public class ManagementResourceIT extends AbstractRestIT {
@Test
public void meToken() throws Exception {
- QueryParameters queryParameters = new QueryParameters().addParam("grant_type", "password")
- .addParam("username", clientSetup.getUsername()).addParam("password",clientSetup.getPassword());
- Token myToken = management.me().get(Token.class,queryParameters);
+ QueryParameters queryParameters = new QueryParameters()
+ .addParam( "grant_type", "password" )
+ .addParam( "username", clientSetup.getUsername() )
+ .addParam( "password", clientSetup.getPassword() );
+ Token myToken = management.me().get( Token.class, queryParameters );
String token = myToken.getAccessToken();
@@ -372,10 +405,11 @@ public class ManagementResourceIT extends AbstractRestIT {
@Test
public void meTokenPost() throws Exception {
- Map<String, String> payload =
- hashMap( "grant_type", "password" ).map( "username", clientSetup.getUsername() ).map( "password",clientSetup.getPassword() );
+ Map<String, String> payload = hashMap( "grant_type", "password" )
+ .map( "username", clientSetup.getUsername() )
+ .map( "password", clientSetup.getPassword() );
- JsonNode node = management.me().post(JsonNode.class, payload);
+ JsonNode node = management.me().post( JsonNode.class, payload );
logNode( node );
String token = node.get( "access_token" ).textValue();
@@ -410,13 +444,14 @@ public class ManagementResourceIT extends AbstractRestIT {
@Test
public void ttlNan() throws Exception {
- Map<String, String> payload =
- hashMap( "grant_type", "password" ).map("username", clientSetup.getUsername()).map( "password",clientSetup.getPassword() )
- .map("ttl", "derp");
+ Map<String, String> payload = hashMap( "grant_type", "password" )
+ .map( "username", clientSetup.getUsername() )
+ .map( "password", clientSetup.getPassword() )
+ .map( "ttl", "derp" );
Status responseStatus = null;
try {
- management.token().post(JsonNode.class, payload);
+ management.token().post( JsonNode.class, payload );
}
catch ( UniformInterfaceException uie ) {
responseStatus = uie.getResponse().getClientResponseStatus();
@@ -429,14 +464,15 @@ public class ManagementResourceIT extends AbstractRestIT {
@Test
public void ttlOverMax() throws Exception {
- Map<String, String> payload =
- hashMap( "grant_type", "password" ).map( "username", clientSetup.getUsername()).map( "password", clientSetup.getPassword() )
- .map( "ttl", Long.MAX_VALUE + "" );
+ Map<String, String> payload = hashMap( "grant_type", "password" )
+ .map( "username", clientSetup.getUsername() )
+ .map( "password", clientSetup.getPassword() )
+ .map( "ttl", Long.MAX_VALUE + "" );
Status responseStatus = null;
try {
- management.token().post(JsonNode.class, payload);
+ management.token().post( JsonNode.class, payload );
}
catch ( UniformInterfaceException uie ) {
responseStatus = uie.getResponse().getClientResponseStatus();
@@ -459,7 +495,8 @@ public class ManagementResourceIT extends AbstractRestIT {
assertNotNull(response.get("email").toString());
// now revoke the tokens
- response = management.users().user(clientSetup.getUsername()).revokeTokens().post(true,Entity.class,null, null,false);
+ response = management.users().user(
+ clientSetup.getUsername()).revokeTokens().post(true,Entity.class,null, null,false);
// the tokens shouldn't work
@@ -482,7 +519,8 @@ public class ManagementResourceIT extends AbstractRestIT {
// now revoke the token3
QueryParameters queryParameters = new QueryParameters();
queryParameters.addParam( "token", token3.getAccessToken() );
- management.users().user(clientSetup.getUsername()).revokeToken().post( false, Entity.class,null,queryParameters );
+ management.users().user(
+ clientSetup.getUsername()).revokeToken().post( false, Entity.class,null,queryParameters );
// the token3 shouldn't work
status = null;
@@ -554,7 +592,8 @@ public class ManagementResourceIT extends AbstractRestIT {
fail( "Validation should have failed" );
} catch (UniformInterfaceException actual) {
assertEquals( 404, actual.getResponse().getStatus() );
- String errorMsg = actual.getResponse().getEntity( JsonNode.class ).get( "error_description" ).toString();
+ String errorMsg = actual.getResponse().getEntity(
+ JsonNode.class ).get( "error_description" ).toString();
logger.error( "ERROR: " + errorMsg );
assertTrue( errorMsg.contains( "Cannot find Admin User" ) );
}
@@ -614,7 +653,8 @@ public class ManagementResourceIT extends AbstractRestIT {
} catch (UniformInterfaceException actual) {
assertEquals( 400, actual.getResponse().getStatus() );
- String errorMsg = actual.getResponse().getEntity( JsonNode.class ).get( "error_description" ).toString();
+ String errorMsg = actual.getResponse()
+ .getEntity( JsonNode.class ).get( "error_description" ).toString();
logger.error( "ERROR: " + errorMsg );
assertTrue( errorMsg.contains( "Admin Users must login via" ) );
[2/2] incubator-usergrid git commit: Convert newer methods to use new
testing framework.
Posted by sn...@apache.org.
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/USERGRID-703
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) {