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 2015/03/04 18:50:23 UTC
[4/6] incubator-usergrid git commit: [USERGRID-422] Added test that
proves issue.
[USERGRID-422] Added test that proves issue.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/dcdb3930
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/dcdb3930
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/dcdb3930
Branch: refs/heads/two-dot-o
Commit: dcdb3930019cfc2bda45e21dd0b264374f6d5923
Parents: 3004a45
Author: grey <gr...@apigee.com>
Authored: Tue Mar 3 13:02:03 2015 -0800
Committer: grey <gr...@apigee.com>
Committed: Tue Mar 3 13:02:03 2015 -0800
----------------------------------------------------------------------
.../apache/usergrid/rest/SystemResourceIT.java | 23 ++++++++++++++++++--
.../endpoints/SetupResource.java | 11 ++++++++--
2 files changed, 30 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcdb3930/stack/rest/src/test/java/org/apache/usergrid/rest/SystemResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/SystemResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/SystemResourceIT.java
index 7b13a19..5695143 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/SystemResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/SystemResourceIT.java
@@ -21,6 +21,10 @@ import org.junit.Test;
import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
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 com.sun.jersey.api.client.UniformInterfaceException;
import static org.junit.Assert.assertNotNull;
@@ -32,9 +36,24 @@ public class SystemResourceIT extends AbstractRestIT {
@Test
public void testSystemDatabaseAlreadyRun() {
- Entity ent = clientSetup.getRestClient().system().database().setup().get();
+ //try {
+ QueryParameters queryParameters = new QueryParameters();
+ queryParameters.addParam( "access_token",clientSetup.getSuperuserToken().getAccessToken() );
+ Entity result = clientSetup.getRestClient().system().database().setup().get(queryParameters);
+// }catch(UniformInterfaceException uie) {
+// asser
+// }
+//
+ assertNotNull(result);
+ assertNotNull( "ok" ,(String)result.get( "status" ) );
+
+ result = clientSetup.getRestClient().system().database().setup().get(queryParameters);
+
+ assertNotNull( result );
+ assertNotNull( "ok" ,(String)result.get( "status" ) );
+
+
- assertNotNull(ent);
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dcdb3930/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/SetupResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/SetupResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/SetupResource.java
index 34d1848..1639ce5 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/SetupResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/SetupResource.java
@@ -20,8 +20,12 @@ package org.apache.usergrid.rest.test.resource2point0.endpoints;
import javax.ws.rs.core.MediaType;
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 com.sun.jersey.api.client.WebResource;
+
/**
* Functions as the endpoint for all resources that hit /system/ * /setup
@@ -32,8 +36,11 @@ public class SetupResource extends NamedResource {
super("setup",context,parent);
}
- public Entity get(){
- return getResource(true).type( MediaType.APPLICATION_JSON_TYPE ).accept( MediaType.APPLICATION_JSON )
+ public Entity get(QueryParameters queryParameters){
+ WebResource resource = getResource();
+ resource = addParametersToResource( resource, queryParameters );
+
+ return resource.type( MediaType.APPLICATION_JSON_TYPE ).accept( MediaType.APPLICATION_JSON )
.get( Entity.class );
}
}