usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sfeld...@apache.org
Subject [1/3] incubator-usergrid git commit: add context
Date Mon, 22 Dec 2014 21:44:18 GMT
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 <sfeldman@apache.org>
Authored: Mon Dec 22 10:24:57 2014 -0700
Committer: Shawn Feldman <sfeldman@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" )


Mime
View raw message