Repository: incubator-usergrid Updated Branches: refs/heads/USERGRID-347 0a2fc00b4 -> fb9085458
Fixed an issue when multiple tests are run. Cleaned up and fixed SystemResourceIT Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/bf04de22 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/bf04de22 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/bf04de22 Branch: refs/heads/USERGRID-347 Commit: bf04de22d01fcaeac2fb988bba99c1f828d7a2af Parents: 0a2fc00 Author: GERey <[email protected]> Authored: Mon Mar 23 13:13:14 2015 -0700 Committer: GERey <[email protected]> Committed: Mon Mar 23 13:13:14 2015 -0700 ---------------------------------------------------------------------- .../java/org/apache/usergrid/rest/SystemResourceIT.java | 10 +++------- .../usergrid/rest/test/resource2point0/ClientSetup.java | 5 ++++- .../test/resource2point0/endpoints/SetupResource.java | 6 ++++++ 3 files changed, 13 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bf04de22/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 5695143..f379672 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 @@ -25,6 +25,7 @@ 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 com.sun.jersey.api.client.filter.HTTPBasicAuthFilter; import static org.junit.Assert.assertNotNull; @@ -36,14 +37,11 @@ public class SystemResourceIT extends AbstractRestIT { @Test public void testSystemDatabaseAlreadyRun() { - //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" ) ); @@ -53,8 +51,6 @@ public class SystemResourceIT extends AbstractRestIT { assertNotNull( "ok" ,(String)result.get( "status" ) ); - - } } http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bf04de22/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/ClientSetup.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/ClientSetup.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/ClientSetup.java index 210284b..65f6749 100644 --- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/ClientSetup.java +++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/ClientSetup.java @@ -106,11 +106,14 @@ public class ClientSetup implements TestRule { organization = restClient.management().orgs() .post( new Organization( orgName, username, username + "@usergrid.com", username, username, null ) ); + refreshIndex(); clientCredentials = restClient.management().orgs().organization( orgName ).credentials().get(); + refreshIndex(); - Token token = restClient.management().token().post(Token.class,new Token(username,username)); + //restClient.management().token().post(Token.class,new Token(username,password)); restClient.management().orgs().organization(organization.getName()).app().post(new Application(appName)); + refreshIndex(); } http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bf04de22/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 1639ce5..086a34f 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 @@ -25,6 +25,7 @@ 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; +import com.sun.jersey.api.client.filter.HTTPBasicAuthFilter; /** @@ -37,9 +38,14 @@ public class SetupResource extends NamedResource { } public Entity get(QueryParameters queryParameters){ + WebResource resource = getResource(); resource = addParametersToResource( resource, queryParameters ); + //added httpBasicauth filter to all setup calls because they all do verification this way. + HTTPBasicAuthFilter httpBasicAuthFilter = new HTTPBasicAuthFilter( "superuser","superpassword" ); + resource.addFilter( httpBasicAuthFilter ); + return resource.type( MediaType.APPLICATION_JSON_TYPE ).accept( MediaType.APPLICATION_JSON ) .get( Entity.class ); }
