You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2015/01/07 20:18:29 UTC
[08/16] incubator-usergrid git commit: Merge branch 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into
USERGRID-304_Fix-paging-tests
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-304_Fix-paging-tests
# By Shawn Feldman (14) and Rod Simpson (5)
# Via Shawn Feldman (3) and Rod Simpson (1)
* 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid:
remove test utils
remove namespace
tests are passing
tests are passing
remove listener
fix compilation issues
method already defined
fix token.getuser
fix casting
tests passing
compile user tests
cleanup for groups test
updated groups, activity test failing due to problems in stack
Updated Group Tests, added token login methods
users-it
add token helper methods
add context
added data to response, flushed out groupsrolespermissionsusers test
updated groups tests to work with new framework
Conflicts:
stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/EntityEndpoint.java
stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/model/Collection.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/ef6be374
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/ef6be374
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/ef6be374
Branch: refs/heads/USERGRID-313
Commit: ef6be374d9b01b1b440bc175ef5ef97041d92f90
Parents: b6a2f9b 8961fec
Author: grey <gr...@apigee.com>
Authored: Mon Jan 5 12:09:48 2015 -0800
Committer: grey <gr...@apigee.com>
Committed: Mon Jan 5 12:09:48 2015 -0800
----------------------------------------------------------------------
.../applications/assets/AssetResourceIT.java | 43 +-
.../collection/groups/GroupResourceIT.java | 567 +++++---
.../collection/users/UserResourceIT.java | 1260 +++++++-----------
.../rest/applications/utils/TestUtils.java | 19 +
.../rest/applications/utils/UserRepo.java | 51 +-
.../test/resource2point0/AbstractRestIT.java | 38 +-
.../rest/test/resource2point0/ClientSetup.java | 5 +
.../rest/test/resource2point0/RestClient.java | 10 +-
.../endpoints/ApplicationsResource.java | 4 +-
.../endpoints/CollectionEndpoint.java | 29 +-
.../endpoints/EntityEndpoint.java | 24 +-
.../endpoints/NamedResource.java | 10 +-
.../endpoints/OrganizationResource.java | 2 +
.../resource2point0/endpoints/RootResource.java | 1 +
.../endpoints/TokenResource.java | 6 +-
.../endpoints/mgmt/ApplicationResource.java | 1 +
.../endpoints/mgmt/ManagementResource.java | 1 +
.../endpoints/mgmt/OrganizationResource.java | 1 +
.../endpoints/mgmt/TokenResource.java | 4 +
.../resource2point0/model/ActivityEntity.java | 44 +
.../test/resource2point0/model/ApiResponse.java | 6 +-
.../model/ChangePasswordEntity.java | 33 +
.../test/resource2point0/model/Collection.java | 13 +-
.../rest/test/resource2point0/model/Entity.java | 17 +-
.../resource2point0/model/QueryParameters.java | 4 +
.../rest/test/resource2point0/model/Token.java | 5 +-
.../resources/usergrid-custom-test.properties | 2 +
27 files changed, 1116 insertions(+), 1084 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ef6be374/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/CollectionEndpoint.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ef6be374/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/EntityEndpoint.java
----------------------------------------------------------------------
diff --cc stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/EntityEndpoint.java
index 799e57f,00b31c6..104809f
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/EntityEndpoint.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/EntityEndpoint.java
@@@ -24,7 -24,7 +24,8 @@@ import com.fasterxml.jackson.databind.O
import com.sun.jersey.api.client.WebResource;
import org.apache.usergrid.rest.test.resource2point0.model.ApiResponse;
import org.apache.usergrid.rest.test.resource2point0.model.Entity;
+import org.apache.usergrid.rest.test.resource2point0.model.QueryParameters;
+ import org.apache.usergrid.rest.test.resource2point0.model.Token;
import org.apache.usergrid.rest.test.resource2point0.state.ClientContext;
import javax.ws.rs.core.MediaType;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ef6be374/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/model/Collection.java
----------------------------------------------------------------------
diff --cc stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/model/Collection.java
index 77e516a,bb7c41f..5fdfc6e
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/model/Collection.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/model/Collection.java
@@@ -37,10 -37,7 +37,11 @@@ public class Collection implements Iter
private ApiResponse response;
+ //TODO: implement way to have the collection store its own name?
+ private String name;
+
+
+
/**
* Collection usersCollection = app.collection("users").get();
* while(usersCollection.hasNext()){
@@@ -58,13 -55,10 +59,9 @@@
public Collection(ApiResponse response) {
this.response = response;
this.cursor = response.getCursor();
- entities = response.getEntities().iterator();
- }
-
- public ApiResponse getResponse(){
- return response;
+ this.entities = response.getEntities()!=null? response.getEntities().iterator():null;
}
--
-
++
@Override
public Iterator iterator() {
return this;
@@@ -90,5 -84,10 +87,9 @@@
public void remove() {
throw new UnsupportedOperationException( "Remove is unsupported" );
}
+
- public ApiResponse getResponse(){return response;}
-
+
++ public ApiResponse getResponse(){return response;}
+
}