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 2014/12/28 21:36:42 UTC
[7/8] incubator-usergrid git commit: merge from two-o
merge from two-o
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/42da450b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/42da450b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/42da450b
Branch: refs/heads/USERGRID-291-User-Tests
Commit: 42da450b251f3b629a9a27c9fc667a140f8f2cea
Parents: 2a8391e e980398
Author: Shawn Feldman <sf...@apache.org>
Authored: Sun Dec 28 13:34:28 2014 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Sun Dec 28 13:34:28 2014 -0700
----------------------------------------------------------------------
.../collection/groups/GroupResourceIT.java | 567 ++++++++++++-------
.../test/resource2point0/AbstractRestIT.java | 22 +-
.../endpoints/ApplicationsResource.java | 3 +
.../endpoints/OrganizationResource.java | 1 +
.../endpoints/TokenResource.java | 2 +-
.../rest/test/resource2point0/model/Entity.java | 8 +-
6 files changed, 378 insertions(+), 225 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/42da450b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/AbstractRestIT.java
----------------------------------------------------------------------
diff --cc stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/AbstractRestIT.java
index a6c3152,2e47ba8..370823d
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/AbstractRestIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/AbstractRestIT.java
@@@ -24,8 -24,10 +24,9 @@@ import java.util.Arrays
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.usergrid.rest.test.resource2point0.endpoints.ApplicationsResource;
import org.apache.usergrid.rest.test.resource2point0.endpoints.OrganizationResource;
- import org.apache.usergrid.rest.test.resource2point0.model.Token;
+import org.apache.usergrid.rest.test.resource2point0.state.ClientContext;
+ import org.apache.usergrid.rest.test.resource2point0.model.Entity;
+ import org.apache.usergrid.rest.test.resource2point0.model.Token;
import org.junit.ClassRule;
import org.junit.Rule;
@@@ -114,24 -118,14 +115,18 @@@ public class AbstractRestIT extends Jer
}
- public void refreshIndex() {
- //TODO: add error checking and logging
- clientSetup.restClient.getResource().path( "/refreshindex" )
- .queryParam( "org_name", clientSetup.getOrganization().getName() )
- .queryParam( "app_name", clientSetup.getAppName() )
- .accept( MediaType.APPLICATION_JSON ).post();
+ protected ClientContext context(){
+ return this.clientSetup.getRestClient().getContext();
+ }
+ protected Token getAppUserToken(String username, String password){
+ return this.clientSetup.getRestClient().token().post(new Token(username,password));
+ }
+
- protected Token getAdminToken(){
- return this.clientSetup.getRestClient().management().token().post(
- new Token(this.clientSetup.getUsername(),this.clientSetup.getUsername())
- );
- }
-
+ public void refreshIndex() {
+ //TODO: add error checking and logging
+ clientSetup.refreshIndex();
}
@@@ -141,4 -135,24 +136,17 @@@
assertEquals( expectedErrorMessage, errorJson.get( "error" ).asText() );
}
+
- protected Token getAppUserToken(String username, String password){
- Token payload = new Token();
- payload.put("username", username);
- payload.put("password", password);
- payload.put("grant_type", "password");
- return this.clientSetup.getRestClient().org(clientSetup.getOrganization().getName()).app(clientSetup.getAppName()).token().post(payload);
- }
+
+ protected Token getAdminToken(String username, String password){
+ return this.clientSetup.getRestClient().management().token().post(
+ new Token(username, password)
+ );
+ }
+
+ protected Token getAdminToken(){
+ return this.clientSetup.getRestClient().management().token().post(
+ new Token(this.clientSetup.getUsername(),this.clientSetup.getUsername())
+ );
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/42da450b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/ApplicationsResource.java
----------------------------------------------------------------------
diff --cc stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/ApplicationsResource.java
index 33225ce,ef26508..a52e55a
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/ApplicationsResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/ApplicationsResource.java
@@@ -44,8 -42,8 +44,11 @@@ public class ApplicationsResource exten
return new CollectionEndpoint(name,context,this);
}
+ public TokenResource token(){
+ return new TokenResource(context,this);
+ }
+ public TokenResource token() {
+ return new TokenResource(context,this);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/42da450b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/OrganizationResource.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/42da450b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/TokenResource.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/42da450b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/model/Entity.java
----------------------------------------------------------------------