SystemResourceIT tests pass only when run separately.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/31bacc8d Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/31bacc8d Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/31bacc8d Branch: refs/heads/usergrid-1007-shiro-cache Commit: 31bacc8d1083337b0eac82c2f094282cd2d864a9 Parents: 1f77ca1 Author: Dave Johnson <[email protected]> Authored: Wed Sep 9 10:00:27 2015 -0400 Committer: Dave Johnson <[email protected]> Committed: Wed Sep 9 10:00:27 2015 -0400 ---------------------------------------------------------------------- .../test/java/org/apache/usergrid/rest/NotificationsIT.java | 6 ++++-- .../test/java/org/apache/usergrid/rest/PartialUpdateTest.java | 6 ++++-- .../test/java/org/apache/usergrid/rest/SystemResourceIT.java | 3 ++- .../org/apache/usergrid/rest/test/resource/ClientSetup.java | 5 ++++- .../usergrid/rest/test/resource/endpoints/SetupResource.java | 2 +- .../usergrid/rest/test/resource/endpoints/SystemResource.java | 2 +- 6 files changed, 16 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/31bacc8d/stack/rest/src/test/java/org/apache/usergrid/rest/NotificationsIT.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/NotificationsIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/NotificationsIT.java index 07ec796..22785dc 100644 --- a/stack/rest/src/test/java/org/apache/usergrid/rest/NotificationsIT.java +++ b/stack/rest/src/test/java/org/apache/usergrid/rest/NotificationsIT.java @@ -188,7 +188,8 @@ public class NotificationsIT extends org.apache.usergrid.rest.test.resource.Abst private int pageThroughAllNotifications( String state ) throws IOException, InterruptedException { - Collection initialNode = this.app().collection("notifications").get(new QueryParameters().setQuery("select * where state='" + state + "'")); + Collection initialNode = this.app().collection("notifications") + .get(new QueryParameters().setQuery("select * where state='" + state + "'")); int count = initialNode.getNumOfEntities(); @@ -202,7 +203,8 @@ public class NotificationsIT extends org.apache.usergrid.rest.test.resource.Abst while (cursor != null) { - Collection anotherNode = this.app().collection("notifications").get(new QueryParameters().setQuery("select * where state='" + state + "'").setCursor(cursor)); + Collection anotherNode = this.app().collection("notifications") + .get(new QueryParameters().setQuery("select * where state='" + state + "'").setCursor(cursor)); int returnCount = anotherNode.getNumOfEntities(); http://git-wip-us.apache.org/repos/asf/usergrid/blob/31bacc8d/stack/rest/src/test/java/org/apache/usergrid/rest/PartialUpdateTest.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/PartialUpdateTest.java b/stack/rest/src/test/java/org/apache/usergrid/rest/PartialUpdateTest.java index bc66467..5ce3c2d 100644 --- a/stack/rest/src/test/java/org/apache/usergrid/rest/PartialUpdateTest.java +++ b/stack/rest/src/test/java/org/apache/usergrid/rest/PartialUpdateTest.java @@ -98,8 +98,10 @@ public class PartialUpdateTest extends AbstractRestIT { // Verify that the location was updated correctly AND that // it is not the same object reference from the original POST - log.info(geolocation.get("latitude") + " != " + Double.parseDouble(((Map<String, Object>) userNode.get("location")).get("latitude").toString())); - log.info(geolocation.get("longitude") + " != " + Double.parseDouble(((Map<String, Object>) userNode.get("location")).get("longitude").toString())); + log.info(geolocation.get("latitude") + " != " + + Double.parseDouble(((Map<String, Object>) userNode.get("location")).get("latitude").toString())); + log.info(geolocation.get("longitude") + " != " + + Double.parseDouble(((Map<String, Object>) userNode.get("location")).get("longitude").toString())); assertNotSame(geolocation.get("latitude"), Double.parseDouble(((Map<String, Object>) userNode.get("location")).get("latitude").toString())); assertEquals(geolocation.get("latitude").doubleValue(), http://git-wip-us.apache.org/repos/asf/usergrid/blob/31bacc8d/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 e70d1b2..a278358 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 @@ -60,7 +60,8 @@ public class SystemResourceIT extends AbstractRestIT { queryParameters.addParam( "access_token", clientSetup.getSuperuserToken().getAccessToken() ); queryParameters.addParam("confirmApplicationName", this.clientSetup.getAppName()); - org.apache.usergrid.rest.test.resource.model.ApiResponse result = clientSetup.getRestClient().system().applications(this.clientSetup.getAppUuid()).delete( queryParameters); + org.apache.usergrid.rest.test.resource.model.ApiResponse result = + clientSetup.getRestClient().system().applications(this.clientSetup.getAppUuid()).delete( queryParameters); assertNotNull( result ); assertNotNull( "ok",result.getStatus() ); http://git-wip-us.apache.org/repos/asf/usergrid/blob/31bacc8d/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/ClientSetup.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/ClientSetup.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/ClientSetup.java index f13e215..57cb7e8 100644 --- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/ClientSetup.java +++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/ClientSetup.java @@ -94,8 +94,9 @@ public class ClientSetup implements TestRule { String name = testClass + "." + methodName; try { + restClient.superuserSetup(); - superuserToken = restClient.management().token().get(superuserName, superuserPassword); + } catch ( BadRequestException e ) { if ( logger.isDebugEnabled() ) { logger.debug( "Error creating superuser, may already exist", e ); @@ -104,6 +105,8 @@ public class ClientSetup implements TestRule { } } + superuserToken = restClient.management().token().get(superuserName, superuserPassword); + username = "user_"+name + UUIDUtils.newTimeUUID(); password = username; orgName = "org_"+name+UUIDUtils.newTimeUUID(); http://git-wip-us.apache.org/repos/asf/usergrid/blob/31bacc8d/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/SetupResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/SetupResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/SetupResource.java index 2b2b1b4..6897e86 100644 --- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/SetupResource.java +++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/SetupResource.java @@ -43,6 +43,6 @@ public class SetupResource extends NamedResource { .credentials( "superuser", "superpassword" ).build(); return resource.register( feature ).request() - .accept( MediaType.APPLICATION_JSON ).get( Entity.class ); + .accept( MediaType.APPLICATION_JSON ).put( javax.ws.rs.client.Entity.json(""), Entity.class ); } } http://git-wip-us.apache.org/repos/asf/usergrid/blob/31bacc8d/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/SystemResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/SystemResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/SystemResource.java index 4dd6dbc..6d89fa9 100644 --- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/SystemResource.java +++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/endpoints/SystemResource.java @@ -70,7 +70,7 @@ public class SystemResource extends NamedResource { response = getTarget(true) .request() .accept(MediaType.APPLICATION_JSON) - .put( javax.ws.rs.client.Entity.json(null), ApiResponse.class); + .put( javax.ws.rs.client.Entity.json(""), ApiResponse.class); return response; } }
