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/22 22:44:18 UTC
[1/3] incubator-usergrid git commit: add context
Repository: incubator-usergrid
Updated Branches:
refs/heads/USERGRID-291-User-Tests [created] 4610ded12
add context
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/92441643
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/92441643
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/92441643
Branch: refs/heads/USERGRID-291-User-Tests
Commit: 92441643b758ada384f39e0a7ab1a48f58621c12
Parents: 81edb67
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon Dec 22 10:24:57 2014 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon Dec 22 10:24:57 2014 -0700
----------------------------------------------------------------------
.../usergrid/rest/test/resource2point0/AbstractRestIT.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/92441643/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/AbstractRestIT.java
----------------------------------------------------------------------
diff --git 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
index 242bb43..e231a97 100644
--- 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
@@ -26,6 +26,8 @@ import javax.ws.rs.core.MediaType;
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.junit.ClassRule;
import org.junit.Rule;
@@ -112,10 +114,14 @@ public class AbstractRestIT extends JerseyTest {
//myorg/myapp
protected ApplicationsResource app(){
- return clientSetup.restClient.org(clientSetup.getOrganization().getName()).app( clientSetup.getAppName() );
+ return clientSetup.restClient.org(clientSetup.getOrganization().getName()).app(clientSetup.getAppName());
}
+ protected ClientContext context(){
+ return this.clientSetup.getRestClient().getContext();
+ }
+
public void refreshIndex() {
//TODO: add error checking and logging
clientSetup.restClient.getResource().path( "/refreshindex" )
[2/3] incubator-usergrid git commit: Merge branch 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Posted by sf...@apache.org.
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-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/5e65bc75
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/5e65bc75
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/5e65bc75
Branch: refs/heads/USERGRID-291-User-Tests
Commit: 5e65bc7500974afd60d50d78b0151e74576108da
Parents: 9244164 fa27c04
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon Dec 22 10:25:40 2014 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon Dec 22 10:25:40 2014 -0700
----------------------------------------------------------------------
.../rest/test/resource2point0/endpoints/CollectionEndpoint.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[3/3] incubator-usergrid git commit: add token helper methods
Posted by sf...@apache.org.
add token helper methods
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/4610ded1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/4610ded1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/4610ded1
Branch: refs/heads/USERGRID-291-User-Tests
Commit: 4610ded12ab7aed2017cb3edf14094f79dcc7f82
Parents: 5e65bc7
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon Dec 22 11:16:40 2014 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon Dec 22 11:16:40 2014 -0700
----------------------------------------------------------------------
.../rest/test/resource2point0/AbstractRestIT.java | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4610ded1/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/AbstractRestIT.java
----------------------------------------------------------------------
diff --git 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
index e231a97..6e300c9 100644
--- 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
@@ -122,6 +122,17 @@ public class AbstractRestIT extends JerseyTest {
return this.clientSetup.getRestClient().getContext();
}
+
+ protected Token getToken(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())
+ );
+ }
+
public void refreshIndex() {
//TODO: add error checking and logging
clientSetup.restClient.getResource().path( "/refreshindex" )