You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2015/07/15 19:51:51 UTC
[8/9] incubator-usergrid git commit: remove old test framework
remove old test framework
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/876dc8d3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/876dc8d3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/876dc8d3
Branch: refs/heads/two-dot-o-dev
Commit: 876dc8d36b164cfc39a62a22e7a20f0f1773b65a
Parents: 62b23e1
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Jul 15 11:27:52 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Jul 15 11:27:52 2015 -0600
----------------------------------------------------------------------
.../java/org/apache/usergrid/rest/BasicIT.java | 6 +-
.../apache/usergrid/rest/IndexResourceIT.java | 15 +-
.../apache/usergrid/rest/NotificationsIT.java | 10 +-
.../apache/usergrid/rest/PartialUpdateTest.java | 4 +-
.../apache/usergrid/rest/SystemResourceIT.java | 8 +-
.../apache/usergrid/rest/TestContextSetup.java | 81 -----
.../rest/applications/ApplicationCreateIT.java | 12 +-
.../rest/applications/ApplicationDeleteIT.java | 12 +-
.../applications/ApplicationResourceIT.java | 6 +-
.../applications/assets/AssetResourceIT.java | 6 +-
.../collection/BrowserCompatibilityTest.java | 11 +-
.../collection/CollectionsResourceIT.java | 16 +-
.../collection/DuplicateNameIT.java | 4 +-
.../activities/ActivityResourceIT.java | 6 +-
.../collection/activities/PutTest.java | 11 +-
.../collection/devices/DevicesResourceIT.java | 8 +-
.../collection/groups/GroupResourceIT.java | 6 +-
.../collection/paging/PagingResourceIT.java | 12 +-
.../users/ConnectionResourceTest.java | 8 +-
.../collection/users/OwnershipResourceIT.java | 6 +-
.../collection/users/PermissionsResourceIT.java | 4 +-
.../collection/users/RetrieveUsersTest.java | 10 +-
.../collection/users/UserResourceIT.java | 6 +-
.../events/ApplicationRequestCounterIT.java | 8 +-
.../applications/events/EventsResourceIT.java | 4 +-
.../applications/queries/AndOrQueryTest.java | 6 +-
.../queries/BadGrammarQueryTest.java | 6 +-
.../applications/queries/BasicGeoTests.java | 38 +-
.../applications/queries/GeoPagingTest.java | 8 +-
.../applications/queries/MatrixQueryTests.java | 10 +-
.../rest/applications/queries/OrderByTest.java | 6 +-
.../applications/queries/QueryTestBase.java | 4 +-
.../rest/applications/utils/TestUtils.java | 4 +-
.../rest/applications/utils/UserRepo.java | 4 +-
.../rest/filters/ContentTypeResourceIT.java | 8 +-
.../usergrid/rest/management/AccessTokenIT.java | 10 +-
.../usergrid/rest/management/AdminUsersIT.java | 6 +-
.../rest/management/ExportResourceIT.java | 7 +-
.../rest/management/ImportResourceIT.java | 12 +-
.../rest/management/ManagementResourceIT.java | 8 +-
.../rest/management/OrganizationsIT.java | 6 +-
.../rest/management/RegistrationIT.java | 4 +-
.../organizations/AdminEmailEncodingIT.java | 10 +-
.../applications/ApplicationsIT.java | 91 -----
.../rest/test/resource/AbstractRestIT.java | 184 ++++++++++
.../rest/test/resource/ClientSetup.java | 172 +++++++++
.../rest/test/resource/CollectionResource.java | 27 --
.../usergrid/rest/test/resource/Connection.java | 61 ----
.../rest/test/resource/CustomCollection.java | 32 --
.../usergrid/rest/test/resource/DumbClient.java | 58 +++
.../rest/test/resource/EntityResource.java | 110 ------
.../rest/test/resource/MatrixResource.java | 64 ----
.../apache/usergrid/rest/test/resource/Me.java | 36 --
.../rest/test/resource/NamedResource.java | 195 ----------
.../usergrid/rest/test/resource/README.md | 110 ++++++
.../usergrid/rest/test/resource/RestClient.java | 134 +++++++
.../rest/test/resource/RootResource.java | 65 ----
.../rest/test/resource/SetResource.java | 96 -----
.../rest/test/resource/TestContext.java | 256 -------------
.../rest/test/resource/TestOrganization.java | 55 ---
.../test/resource/TestPropertiesResource.java | 47 +++
.../rest/test/resource/ValueResource.java | 328 -----------------
.../rest/test/resource/app/Application.java | 86 -----
.../rest/test/resource/app/Collection.java | 81 -----
.../usergrid/rest/test/resource/app/Device.java | 49 ---
.../usergrid/rest/test/resource/app/Group.java | 56 ---
.../test/resource/app/GroupsCollection.java | 66 ----
.../usergrid/rest/test/resource/app/Role.java | 56 ---
.../rest/test/resource/app/RolesCollection.java | 64 ----
.../usergrid/rest/test/resource/app/User.java | 55 ---
.../rest/test/resource/app/UsersCollection.java | 86 -----
.../resource/app/queue/DevicesCollection.java | 37 --
.../rest/test/resource/app/queue/Queue.java | 193 ----------
.../resource/app/queue/QueuesCollection.java | 36 --
.../app/queue/SubscribersCollection.java | 61 ----
.../test/resource/app/queue/Transaction.java | 84 -----
.../app/queue/TransactionsCollection.java | 36 --
.../endpoints/ApplicationsResource.java | 73 ++++
.../resource/endpoints/CollectionEndpoint.java | 355 ++++++++++++++++++
.../resource/endpoints/DatabaseResource.java | 39 ++
.../test/resource/endpoints/EntityEndpoint.java | 174 +++++++++
.../test/resource/endpoints/NamedResource.java | 358 +++++++++++++++++++
.../endpoints/OrganizationResource.java | 49 +++
.../test/resource/endpoints/RootResource.java | 86 +++++
.../test/resource/endpoints/SetupResource.java | 52 +++
.../test/resource/endpoints/SystemResource.java | 57 +++
.../test/resource/endpoints/TokenResource.java | 89 +++++
.../test/resource/endpoints/UrlResource.java | 44 +++
.../endpoints/mgmt/ApplicationResource.java | 105 ++++++
.../endpoints/mgmt/ApplicationsResource.java | 65 ++++
.../endpoints/mgmt/AuthorizeResource.java | 59 +++
.../endpoints/mgmt/ConfirmResource.java | 46 +++
.../endpoints/mgmt/CredentialsResource.java | 53 +++
.../resource/endpoints/mgmt/FeedResource.java | 49 +++
.../endpoints/mgmt/ManagementResource.java | 60 ++++
.../endpoints/mgmt/ManagementResponse.java | 72 ++++
.../resource/endpoints/mgmt/MeResource.java | 36 ++
.../resource/endpoints/mgmt/OrgResource.java | 167 +++++++++
.../mgmt/OrganizationApplicationResponse.java | 60 ++++
.../endpoints/mgmt/OrganizationResource.java | 80 +++++
.../endpoints/mgmt/PasswordResource.java | 45 +++
.../endpoints/mgmt/ReactivateResource.java | 46 +++
.../resource/endpoints/mgmt/ResetResource.java | 42 +++
.../endpoints/mgmt/RevokeTokenResource.java | 32 ++
.../endpoints/mgmt/RevokeTokensResource.java | 33 ++
.../resource/endpoints/mgmt/TokenResource.java | 71 ++++
.../resource/endpoints/mgmt/UserResource.java | 88 +++++
.../resource/endpoints/mgmt/UsersResource.java | 57 +++
.../rest/test/resource/mgmt/Application.java | 49 ---
.../resource/mgmt/ApplicationsCollection.java | 53 ---
.../rest/test/resource/mgmt/Management.java | 98 -----
.../rest/test/resource/mgmt/Organization.java | 60 ----
.../resource/mgmt/OrganizationsCollection.java | 74 ----
.../test/resource/model/ActivityEntity.java | 49 +++
.../rest/test/resource/model/ApiResponse.java | 223 ++++++++++++
.../rest/test/resource/model/Application.java | 39 ++
.../resource/model/ChangePasswordEntity.java | 33 ++
.../rest/test/resource/model/Collection.java | 98 +++++
.../rest/test/resource/model/Credentials.java | 47 +++
.../rest/test/resource/model/Entity.java | 213 +++++++++++
.../rest/test/resource/model/Organization.java | 119 ++++++
.../test/resource/model/QueryParameters.java | 93 +++++
.../rest/test/resource/model/Token.java | 81 +++++
.../usergrid/rest/test/resource/model/User.java | 101 ++++++
.../rest/test/resource/state/ClientContext.java | 39 ++
.../test/resource2point0/AbstractRestIT.java | 184 ----------
.../rest/test/resource2point0/ClientSetup.java | 172 ---------
.../rest/test/resource2point0/DumbClient.java | 58 ---
.../rest/test/resource2point0/README.md | 111 ------
.../rest/test/resource2point0/RestClient.java | 134 -------
.../resource2point0/TestPropertiesResource.java | 47 ---
.../endpoints/ApplicationsResource.java | 77 ----
.../endpoints/CollectionEndpoint.java | 357 ------------------
.../endpoints/DatabaseResource.java | 39 --
.../endpoints/EntityEndpoint.java | 174 ---------
.../endpoints/NamedResource.java | 356 ------------------
.../endpoints/OrganizationResource.java | 49 ---
.../resource2point0/endpoints/RootResource.java | 86 -----
.../endpoints/SetupResource.java | 52 ---
.../endpoints/SystemResource.java | 57 ---
.../endpoints/TokenResource.java | 89 -----
.../resource2point0/endpoints/UrlResource.java | 44 ---
.../endpoints/mgmt/ApplicationResource.java | 105 ------
.../endpoints/mgmt/ApplicationsResource.java | 65 ----
.../endpoints/mgmt/AuthorizeResource.java | 59 ---
.../endpoints/mgmt/ConfirmResource.java | 46 ---
.../endpoints/mgmt/CredentialsResource.java | 53 ---
.../endpoints/mgmt/FeedResource.java | 49 ---
.../endpoints/mgmt/ManagementResource.java | 60 ----
.../endpoints/mgmt/ManagementResponse.java | 72 ----
.../endpoints/mgmt/MeResource.java | 36 --
.../endpoints/mgmt/OrgResource.java | 167 ---------
.../mgmt/OrganizationApplicationResponse.java | 60 ----
.../endpoints/mgmt/OrganizationResource.java | 80 -----
.../endpoints/mgmt/PasswordResource.java | 45 ---
.../endpoints/mgmt/ReactivateResource.java | 46 ---
.../endpoints/mgmt/ResetResource.java | 42 ---
.../endpoints/mgmt/RevokeTokenResource.java | 32 --
.../endpoints/mgmt/RevokeTokensResource.java | 33 --
.../endpoints/mgmt/TokenResource.java | 71 ----
.../endpoints/mgmt/UserResource.java | 88 -----
.../endpoints/mgmt/UsersResource.java | 57 ---
.../resource2point0/model/ActivityEntity.java | 49 ---
.../test/resource2point0/model/ApiResponse.java | 219 ------------
.../test/resource2point0/model/Application.java | 39 --
.../model/ChangePasswordEntity.java | 33 --
.../test/resource2point0/model/Collection.java | 98 -----
.../test/resource2point0/model/Credentials.java | 47 ---
.../rest/test/resource2point0/model/Entity.java | 212 -----------
.../resource2point0/model/Organization.java | 119 ------
.../resource2point0/model/QueryParameters.java | 93 -----
.../rest/test/resource2point0/model/Token.java | 81 -----
.../rest/test/resource2point0/model/User.java | 101 ------
.../resource2point0/state/ClientContext.java | 39 --
.../rest/test/security/TestAdminUser.java | 63 ----
.../rest/test/security/TestAppUser.java | 63 ----
.../usergrid/rest/test/security/TestUser.java | 132 -------
177 files changed, 4653 insertions(+), 7802 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/stack/rest/src/test/java/org/apache/usergrid/rest/BasicIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/BasicIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/BasicIT.java
index 689d852..fc20147 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/BasicIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/BasicIT.java
@@ -26,9 +26,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.usergrid.persistence.index.utils.UUIDUtils;
-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.ApiResponse;
+import org.apache.usergrid.rest.test.resource.AbstractRestIT;
+import org.apache.usergrid.rest.test.resource.model.Entity;
+import org.apache.usergrid.rest.test.resource.model.ApiResponse;
import com.sun.jersey.api.client.UniformInterfaceException;
import com.sun.jersey.api.client.WebResource;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/stack/rest/src/test/java/org/apache/usergrid/rest/IndexResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/IndexResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/IndexResourceIT.java
index d6b73e9..a84f91c 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/IndexResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/IndexResourceIT.java
@@ -22,9 +22,10 @@ package org.apache.usergrid.rest;
import com.sun.jersey.api.client.WebResource;
import com.sun.jersey.api.client.filter.HTTPBasicAuthFilter;
-import org.apache.usergrid.rest.test.resource2point0.model.ApiResponse;
-import org.apache.usergrid.rest.test.resource2point0.model.QueryParameters;
-import org.apache.usergrid.rest.test.resource2point0.model.Token;
+import org.apache.usergrid.rest.test.resource.AbstractRestIT;
+import org.apache.usergrid.rest.test.resource.model.ApiResponse;
+import org.apache.usergrid.rest.test.resource.model.QueryParameters;
+import org.apache.usergrid.rest.test.resource.model.Token;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
@@ -43,10 +44,8 @@ import static org.junit.Assert.fail;
/**
* test index creation
*/
-public class IndexResourceIT extends org.apache.usergrid.rest.test.resource2point0.AbstractRestIT {
+public class IndexResourceIT extends AbstractRestIT {
- @Rule
- public TestContextSetup context = new TestContextSetup( this );
//Used for all MUUserResourceITTests
private Logger LOG = LoggerFactory.getLogger(IndexResourceIT.class);
@@ -111,7 +110,7 @@ public class IndexResourceIT extends org.apache.usergrid.rest.test.resource2poin
String appId = this.clientSetup.getAppUuid();
// change the password as admin. The old password isn't required
- org.apache.usergrid.rest.test.resource2point0.model.ApiResponse node = null;
+ org.apache.usergrid.rest.test.resource.model.ApiResponse node = null;
try {
WebResource resource = this.clientSetup.getRestClient().pathResource("/system/index/" + appId).getResource();
@@ -121,7 +120,7 @@ public class IndexResourceIT extends org.apache.usergrid.rest.test.resource2poin
resource.addFilter( httpBasicAuthFilter );
node = resource.type( MediaType.APPLICATION_JSON_TYPE ).accept( MediaType.APPLICATION_JSON )
- .get( org.apache.usergrid.rest.test.resource2point0.model.ApiResponse.class);
+ .get( org.apache.usergrid.rest.test.resource.model.ApiResponse.class);
} catch (Exception e) {
LOG.error("failed", e);
fail(e.toString());
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/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 d5fb2db..07ec796 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
@@ -27,10 +27,10 @@ import java.util.Map;
import java.util.concurrent.TimeUnit;
import javax.ws.rs.core.MediaType;
import org.apache.commons.lang3.time.StopWatch;
-import org.apache.usergrid.rest.test.resource2point0.*;
-import org.apache.usergrid.rest.test.resource2point0.endpoints.NamedResource;
-import org.apache.usergrid.rest.test.resource2point0.model.*;
-import org.apache.usergrid.rest.test.resource2point0.model.ApiResponse;
+import org.apache.usergrid.rest.test.resource.*;
+import org.apache.usergrid.rest.test.resource.endpoints.NamedResource;
+import org.apache.usergrid.rest.test.resource.model.*;
+import org.apache.usergrid.rest.test.resource.model.ApiResponse;
import org.junit.After;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
/**
* Test creating, sending and paging through Notifications via the REST API.
*/
-public class NotificationsIT extends org.apache.usergrid.rest.test.resource2point0.AbstractRestIT {
+public class NotificationsIT extends org.apache.usergrid.rest.test.resource.AbstractRestIT {
private static final Logger logger = LoggerFactory.getLogger( NotificationsIT.class );
private static final MetricRegistry registry = new MetricRegistry();
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/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 c02e171..97a02fd 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
@@ -18,8 +18,8 @@ package org.apache.usergrid.rest;
import com.sun.jersey.api.client.UniformInterfaceException;
-import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
-import org.apache.usergrid.rest.test.resource2point0.model.Entity;
+import org.apache.usergrid.rest.test.resource.AbstractRestIT;
+import org.apache.usergrid.rest.test.resource.model.Entity;
import org.apache.usergrid.utils.MapUtils;
import org.junit.Test;
import org.slf4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/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 f379672..7f09fa5 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
@@ -19,10 +19,10 @@ package org.apache.usergrid.rest;
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 org.apache.usergrid.rest.test.resource.AbstractRestIT;
+import org.apache.usergrid.rest.test.resource.model.Entity;
+import org.apache.usergrid.rest.test.resource.model.QueryParameters;
+import org.apache.usergrid.rest.test.resource.model.Token;
import com.sun.jersey.api.client.UniformInterfaceException;
import com.sun.jersey.api.client.filter.HTTPBasicAuthFilter;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/stack/rest/src/test/java/org/apache/usergrid/rest/TestContextSetup.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/TestContextSetup.java b/stack/rest/src/test/java/org/apache/usergrid/rest/TestContextSetup.java
deleted file mode 100644
index 4b7cc69..0000000
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/TestContextSetup.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.usergrid.rest;
-
-
-import org.junit.rules.TestRule;
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
-
-import org.apache.usergrid.persistence.index.utils.UUIDUtils;
-import org.apache.usergrid.rest.test.resource.TestContext;
-import org.apache.usergrid.rest.test.security.TestAdminUser;
-
-import com.sun.jersey.test.framework.JerseyTest;
-import java.io.IOException;
-
-
-/**
- * A self configuring TestContext which sets itself up it implements TestRule. With a @Rule
- * annotation, an instance of this Class as a public member in any test class or abstract
- * test class will auto svcSetup itself before each test.
- */
-public class TestContextSetup extends TestContext implements TestRule {
-
- public TestContextSetup( JerseyTest test ) {
- super( test );
- }
-
-
- public Statement apply( Statement base, Description description ) {
- return statement( base, description );
- }
-
-
- private Statement statement( final Statement base, final Description description ) {
- return new Statement() {
- @Override
- public void evaluate() throws Throwable {
- before( description );
- try {
- base.evaluate();
- }
- finally {
- cleanup();
- }
- }
- };
- }
-
-
- protected void cleanup() {
- // might want to do something here later
- }
-
-
- protected void before( Description description ) throws IOException {
- String testClass = description.getTestClass().getName();
- String methodName = description.getMethodName();
- String name = testClass + "." + methodName;
-
- TestAdminUser testAdmin = new TestAdminUser( name+UUIDUtils.newTimeUUID(),
- name + "@usergrid.com"+UUIDUtils.newTimeUUID(),
- name + "@usergrid.com"+UUIDUtils.newTimeUUID() );
- withOrg( name+ UUIDUtils.newTimeUUID() ).withApp( methodName + UUIDUtils.newTimeUUID() ).withUser(
- testAdmin ).initAll();
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationCreateIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationCreateIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationCreateIT.java
index 7ec562d..d2ad7ba 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationCreateIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationCreateIT.java
@@ -19,12 +19,12 @@ package org.apache.usergrid.rest.applications;
import org.apache.commons.lang3.RandomStringUtils;
-import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
-import org.apache.usergrid.rest.test.resource2point0.endpoints.mgmt.ManagementResponse;
-import org.apache.usergrid.rest.test.resource2point0.model.ApiResponse;
-import org.apache.usergrid.rest.test.resource2point0.model.Application;
-import org.apache.usergrid.rest.test.resource2point0.model.Entity;
-import org.apache.usergrid.rest.test.resource2point0.model.Token;
+import org.apache.usergrid.rest.test.resource.AbstractRestIT;
+import org.apache.usergrid.rest.test.resource.endpoints.mgmt.ManagementResponse;
+import org.apache.usergrid.rest.test.resource.model.ApiResponse;
+import org.apache.usergrid.rest.test.resource.model.Application;
+import org.apache.usergrid.rest.test.resource.model.Entity;
+import org.apache.usergrid.rest.test.resource.model.Token;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationDeleteIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationDeleteIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationDeleteIT.java
index d00ae74..cad0a37 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationDeleteIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationDeleteIT.java
@@ -30,12 +30,12 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
-import org.apache.usergrid.rest.test.resource2point0.endpoints.mgmt.ManagementResponse;
-import org.apache.usergrid.rest.test.resource2point0.model.ApiResponse;
-import org.apache.usergrid.rest.test.resource2point0.model.Application;
-import org.apache.usergrid.rest.test.resource2point0.model.Entity;
-import org.apache.usergrid.rest.test.resource2point0.model.Token;
+import org.apache.usergrid.rest.test.resource.AbstractRestIT;
+import org.apache.usergrid.rest.test.resource.endpoints.mgmt.ManagementResponse;
+import org.apache.usergrid.rest.test.resource.model.ApiResponse;
+import org.apache.usergrid.rest.test.resource.model.Application;
+import org.apache.usergrid.rest.test.resource.model.Entity;
+import org.apache.usergrid.rest.test.resource.model.Token;
import com.fasterxml.jackson.databind.JsonNode;
import com.sun.jersey.api.client.UniformInterfaceException;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationResourceIT.java
index f296d06..ec858f7 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationResourceIT.java
@@ -25,9 +25,9 @@ import org.apache.commons.lang.RandomStringUtils;
import org.apache.shiro.codec.Base64;
import org.apache.usergrid.cassandra.SpringResource;
import org.apache.usergrid.management.ManagementService;
-import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
-import org.apache.usergrid.rest.test.resource2point0.endpoints.mgmt.OrganizationResource;
-import org.apache.usergrid.rest.test.resource2point0.model.*;
+import org.apache.usergrid.rest.test.resource.AbstractRestIT;
+import org.apache.usergrid.rest.test.resource.endpoints.mgmt.OrganizationResource;
+import org.apache.usergrid.rest.test.resource.model.*;
import org.apache.usergrid.setup.ConcurrentProcessSingleton;
import org.apache.usergrid.utils.MapUtils;
import org.junit.Ignore;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AssetResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AssetResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AssetResourceIT.java
index 493d140..616d163 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AssetResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AssetResourceIT.java
@@ -19,9 +19,9 @@ package org.apache.usergrid.rest.applications.assets;
import com.sun.jersey.multipart.FormDataMultiPart;
import org.apache.commons.io.IOUtils;
-import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
-import org.apache.usergrid.rest.test.resource2point0.model.ApiResponse;
-import org.apache.usergrid.rest.test.resource2point0.model.Entity;
+import org.apache.usergrid.rest.test.resource.AbstractRestIT;
+import org.apache.usergrid.rest.test.resource.model.ApiResponse;
+import org.apache.usergrid.rest.test.resource.model.Entity;
import org.apache.usergrid.services.assets.data.AssetUtils;
import org.junit.Assert;
import org.junit.Before;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/BrowserCompatibilityTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/BrowserCompatibilityTest.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/BrowserCompatibilityTest.java
index 106151c..b453ed2 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/BrowserCompatibilityTest.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/BrowserCompatibilityTest.java
@@ -19,16 +19,9 @@ package org.apache.usergrid.rest.applications.collection;
import java.io.IOException;
-import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
-import org.apache.usergrid.rest.test.resource2point0.model.Entity;
+import org.apache.usergrid.rest.test.resource.model.Entity;
import org.junit.Test;
-import org.apache.usergrid.rest.TestContextSetup;
-import org.apache.usergrid.rest.test.resource.CustomCollection;
-
-import org.apache.usergrid.rest.test.resource2point0.model.Collection;
-import org.apache.usergrid.rest.test.resource2point0.model.Entity;
-import static junit.framework.Assert.assertNotNull;
import static org.junit.Assert.assertEquals;
@@ -36,7 +29,7 @@ import static org.junit.Assert.assertEquals;
* Simple tests to test querying at the REST tier
*/
-public class BrowserCompatibilityTest extends org.apache.usergrid.rest.test.resource2point0.AbstractRestIT {
+public class BrowserCompatibilityTest extends org.apache.usergrid.rest.test.resource.AbstractRestIT {
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java
index 06e1088..2d9f126 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/CollectionsResourceIT.java
@@ -20,14 +20,14 @@ package org.apache.usergrid.rest.applications.collection;
import java.io.IOException;
import com.fasterxml.jackson.databind.JsonNode;
import com.sun.jersey.api.client.UniformInterfaceException;
-import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
-import org.apache.usergrid.rest.test.resource2point0.model.ApiResponse;
-import org.apache.usergrid.rest.test.resource2point0.model.Collection;
-
-import org.apache.usergrid.rest.test.resource2point0.model.Credentials;
-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.resource.AbstractRestIT;
+import org.apache.usergrid.rest.test.resource.model.ApiResponse;
+import org.apache.usergrid.rest.test.resource.model.Collection;
+
+import org.apache.usergrid.rest.test.resource.model.Credentials;
+import org.apache.usergrid.rest.test.resource.model.Entity;
+import org.apache.usergrid.rest.test.resource.model.QueryParameters;
+import org.apache.usergrid.rest.test.resource.model.Token;
import org.junit.Ignore;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/DuplicateNameIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/DuplicateNameIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/DuplicateNameIT.java
index d01c533..ec69405 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/DuplicateNameIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/DuplicateNameIT.java
@@ -17,8 +17,8 @@
package org.apache.usergrid.rest.applications.collection;
import com.sun.jersey.api.client.UniformInterfaceException;
-import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
-import org.apache.usergrid.rest.test.resource2point0.model.Entity;
+import org.apache.usergrid.rest.test.resource.AbstractRestIT;
+import org.apache.usergrid.rest.test.resource.model.Entity;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/activities/ActivityResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/activities/ActivityResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/activities/ActivityResourceIT.java
index f7737b9..94a1bb3 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/activities/ActivityResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/activities/ActivityResourceIT.java
@@ -19,9 +19,9 @@ package org.apache.usergrid.rest.applications.collection.activities;
import com.sun.jersey.api.client.UniformInterfaceException;
import org.apache.usergrid.persistence.index.utils.MapUtils;
-import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
-import org.apache.usergrid.rest.test.resource2point0.endpoints.CollectionEndpoint;
-import org.apache.usergrid.rest.test.resource2point0.model.*;
+import org.apache.usergrid.rest.test.resource.AbstractRestIT;
+import org.apache.usergrid.rest.test.resource.endpoints.CollectionEndpoint;
+import org.apache.usergrid.rest.test.resource.model.*;
import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/activities/PutTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/activities/PutTest.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/activities/PutTest.java
index 2df73a2..d61d363 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/activities/PutTest.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/activities/PutTest.java
@@ -24,11 +24,10 @@ import java.util.Map;
import static org.apache.usergrid.utils.MapUtils.hashMap;
import static org.junit.Assert.assertEquals;
-import org.apache.usergrid.rest.test.resource.CollectionResource;
-import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
-import org.apache.usergrid.rest.test.resource2point0.endpoints.CollectionEndpoint;
-import org.apache.usergrid.rest.test.resource2point0.model.Collection;
-import org.apache.usergrid.rest.test.resource2point0.model.Entity;
+import org.apache.usergrid.rest.test.resource.AbstractRestIT;
+import org.apache.usergrid.rest.test.resource.endpoints.CollectionEndpoint;
+import org.apache.usergrid.rest.test.resource.model.Collection;
+import org.apache.usergrid.rest.test.resource.model.Entity;
import org.junit.Rule;
import org.junit.Test;
import org.slf4j.Logger;
@@ -40,7 +39,7 @@ import org.slf4j.LoggerFactory;
*/
public class PutTest extends AbstractRestIT {
private static final Logger log= LoggerFactory.getLogger( PutTest.class );
-
+
@Test //USERGRID-545
public void putMassUpdateTest() throws IOException {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/devices/DevicesResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/devices/DevicesResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/devices/DevicesResourceIT.java
index 58d856b..ee18c62 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/devices/DevicesResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/devices/DevicesResourceIT.java
@@ -22,10 +22,10 @@ import java.util.Map;
import java.util.UUID;
import com.fasterxml.jackson.databind.JsonNode;
-import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
-import org.apache.usergrid.rest.test.resource2point0.endpoints.CollectionEndpoint;
-import org.apache.usergrid.rest.test.resource2point0.model.ApiResponse;
-import org.apache.usergrid.rest.test.resource2point0.model.Entity;
+import org.apache.usergrid.rest.test.resource.AbstractRestIT;
+import org.apache.usergrid.rest.test.resource.endpoints.CollectionEndpoint;
+import org.apache.usergrid.rest.test.resource.model.ApiResponse;
+import org.apache.usergrid.rest.test.resource.model.Entity;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/groups/GroupResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/groups/GroupResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/groups/GroupResourceIT.java
index 41e3cea..a442582 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/groups/GroupResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/groups/GroupResourceIT.java
@@ -21,9 +21,9 @@ import java.io.IOException;
import java.util.NoSuchElementException;
import com.fasterxml.jackson.databind.JsonNode;
import com.sun.jersey.api.client.UniformInterfaceException;
-import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
-import org.apache.usergrid.rest.test.resource2point0.model.Collection;
-import org.apache.usergrid.rest.test.resource2point0.model.Entity;
+import org.apache.usergrid.rest.test.resource.AbstractRestIT;
+import org.apache.usergrid.rest.test.resource.model.Collection;
+import org.apache.usergrid.rest.test.resource.model.Entity;
import org.junit.Ignore;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/paging/PagingResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/paging/PagingResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/paging/PagingResourceIT.java
index d83ba7b..aac279c 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/paging/PagingResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/paging/PagingResourceIT.java
@@ -27,11 +27,11 @@ import org.junit.Ignore;
import org.junit.Test;
-import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
-import org.apache.usergrid.rest.test.resource2point0.model.ApiResponse;
-import org.apache.usergrid.rest.test.resource2point0.model.Collection;
-import org.apache.usergrid.rest.test.resource2point0.model.Entity;
-import org.apache.usergrid.rest.test.resource2point0.model.QueryParameters;
+import org.apache.usergrid.rest.test.resource.AbstractRestIT;
+import org.apache.usergrid.rest.test.resource.model.ApiResponse;
+import org.apache.usergrid.rest.test.resource.model.Collection;
+import org.apache.usergrid.rest.test.resource.model.Entity;
+import org.apache.usergrid.rest.test.resource.model.QueryParameters;
import static org.junit.Assert.*;
@@ -158,7 +158,7 @@ public class PagingResourceIT extends AbstractRestIT {
createEntities( trinketCollectionName, numOfEntities );
//checks to make sure we don't get a cursor for just 5 entities.
- //Created a new query parameter because when generated it store the cursor token back into it.
+ //Created a new query parameter because when generated it store the cursor token back into it.
queryParameters = new QueryParameters();
queryParameters.setQuery( "select * ORDER BY created" );
pageAndVerifyEntities( trinketCollectionName,queryParameters,numOfPages, numOfEntities );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/ConnectionResourceTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/ConnectionResourceTest.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/ConnectionResourceTest.java
index de1aee7..22a6165 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/ConnectionResourceTest.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/ConnectionResourceTest.java
@@ -18,10 +18,10 @@ package org.apache.usergrid.rest.applications.collection.users;
import com.sun.jersey.api.client.UniformInterfaceException;
-import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
-import org.apache.usergrid.rest.test.resource2point0.endpoints.CollectionEndpoint;
-import org.apache.usergrid.rest.test.resource2point0.model.Collection;
-import org.apache.usergrid.rest.test.resource2point0.model.Entity;
+import org.apache.usergrid.rest.test.resource.AbstractRestIT;
+import org.apache.usergrid.rest.test.resource.endpoints.CollectionEndpoint;
+import org.apache.usergrid.rest.test.resource.model.Collection;
+import org.apache.usergrid.rest.test.resource.model.Entity;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/OwnershipResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/OwnershipResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/OwnershipResourceIT.java
index 87f2ab7..8667757 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/OwnershipResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/OwnershipResourceIT.java
@@ -21,9 +21,9 @@ import com.fasterxml.jackson.databind.JsonNode;
import java.io.IOException;
import com.sun.jersey.api.client.UniformInterfaceException;
-import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
-import org.apache.usergrid.rest.test.resource2point0.endpoints.CollectionEndpoint;
-import org.apache.usergrid.rest.test.resource2point0.model.*;
+import org.apache.usergrid.rest.test.resource.AbstractRestIT;
+import org.apache.usergrid.rest.test.resource.endpoints.CollectionEndpoint;
+import org.apache.usergrid.rest.test.resource.model.*;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/PermissionsResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/PermissionsResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/PermissionsResourceIT.java
index 8a1734f..61eb2a6 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/PermissionsResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/PermissionsResourceIT.java
@@ -20,8 +20,8 @@ package org.apache.usergrid.rest.applications.collection.users;
import java.util.List;
import java.util.UUID;
-import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
-import org.apache.usergrid.rest.test.resource2point0.model.*;
+import org.apache.usergrid.rest.test.resource.AbstractRestIT;
+import org.apache.usergrid.rest.test.resource.model.*;
import org.junit.Before;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/RetrieveUsersTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/RetrieveUsersTest.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/RetrieveUsersTest.java
index b7716ce..d5f7163 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/RetrieveUsersTest.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/RetrieveUsersTest.java
@@ -23,11 +23,11 @@ import java.util.Map;
import com.fasterxml.jackson.databind.JsonNode;
import java.io.IOException;
-import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
-import org.apache.usergrid.rest.test.resource2point0.endpoints.CollectionEndpoint;
-import org.apache.usergrid.rest.test.resource2point0.endpoints.EntityEndpoint;
-import org.apache.usergrid.rest.test.resource2point0.model.Entity;
-import org.apache.usergrid.rest.test.resource2point0.model.QueryParameters;
+import org.apache.usergrid.rest.test.resource.AbstractRestIT;
+import org.apache.usergrid.rest.test.resource.endpoints.CollectionEndpoint;
+import org.apache.usergrid.rest.test.resource.endpoints.EntityEndpoint;
+import org.apache.usergrid.rest.test.resource.model.Entity;
+import org.apache.usergrid.rest.test.resource.model.QueryParameters;
import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/UserResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/UserResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/UserResourceIT.java
index 06004bb..a387436 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/UserResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/UserResourceIT.java
@@ -24,9 +24,9 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
-import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
-import org.apache.usergrid.rest.test.resource2point0.endpoints.CollectionEndpoint;
-import org.apache.usergrid.rest.test.resource2point0.model.*;
+import org.apache.usergrid.rest.test.resource.AbstractRestIT;
+import org.apache.usergrid.rest.test.resource.endpoints.CollectionEndpoint;
+import org.apache.usergrid.rest.test.resource.model.*;
import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/stack/rest/src/test/java/org/apache/usergrid/rest/applications/events/ApplicationRequestCounterIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/events/ApplicationRequestCounterIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/events/ApplicationRequestCounterIT.java
index 0de8eb7..3c3b93d 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/events/ApplicationRequestCounterIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/events/ApplicationRequestCounterIT.java
@@ -21,10 +21,10 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
-import org.apache.usergrid.rest.test.resource2point0.model.ApiResponse;
-import org.apache.usergrid.rest.test.resource2point0.model.Collection;
-import org.apache.usergrid.rest.test.resource2point0.model.QueryParameters;
+import org.apache.usergrid.rest.test.resource.AbstractRestIT;
+import org.apache.usergrid.rest.test.resource.model.ApiResponse;
+import org.apache.usergrid.rest.test.resource.model.Collection;
+import org.apache.usergrid.rest.test.resource.model.QueryParameters;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/stack/rest/src/test/java/org/apache/usergrid/rest/applications/events/EventsResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/events/EventsResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/events/EventsResourceIT.java
index a6a473e..1384996 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/events/EventsResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/events/EventsResourceIT.java
@@ -25,8 +25,8 @@ import javax.ws.rs.core.MediaType;
import com.fasterxml.jackson.databind.JsonNode;
import java.io.IOException;
-import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
-import org.apache.usergrid.rest.test.resource2point0.model.Token;
+import org.apache.usergrid.rest.test.resource.AbstractRestIT;
+import org.apache.usergrid.rest.test.resource.model.Token;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/AndOrQueryTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/AndOrQueryTest.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/AndOrQueryTest.java
index 8deab48..3af9f09 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/AndOrQueryTest.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/AndOrQueryTest.java
@@ -17,9 +17,9 @@
package org.apache.usergrid.rest.applications.queries;
-import org.apache.usergrid.rest.test.resource2point0.model.Collection;
-import org.apache.usergrid.rest.test.resource2point0.model.Entity;
-import org.apache.usergrid.rest.test.resource2point0.model.QueryParameters;
+import org.apache.usergrid.rest.test.resource.model.Collection;
+import org.apache.usergrid.rest.test.resource.model.Entity;
+import org.apache.usergrid.rest.test.resource.model.QueryParameters;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/BadGrammarQueryTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/BadGrammarQueryTest.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/BadGrammarQueryTest.java
index fbc88c7..5a2134d 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/BadGrammarQueryTest.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/BadGrammarQueryTest.java
@@ -18,9 +18,9 @@ package org.apache.usergrid.rest.applications.queries;
import com.sun.jersey.api.client.UniformInterfaceException;
-import org.apache.usergrid.rest.test.resource2point0.model.Collection;
-import org.apache.usergrid.rest.test.resource2point0.model.Entity;
-import org.apache.usergrid.rest.test.resource2point0.model.QueryParameters;
+import org.apache.usergrid.rest.test.resource.model.Collection;
+import org.apache.usergrid.rest.test.resource.model.Entity;
+import org.apache.usergrid.rest.test.resource.model.QueryParameters;
import org.junit.Test;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/BasicGeoTests.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/BasicGeoTests.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/BasicGeoTests.java
index 232f3c3..2246e17 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/BasicGeoTests.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/BasicGeoTests.java
@@ -21,11 +21,11 @@ import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
+import org.apache.usergrid.rest.test.resource.AbstractRestIT;
+import org.apache.usergrid.rest.test.resource.model.Entity;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.usergrid.rest.TestContextSetup;
import com.fasterxml.jackson.databind.JsonNode;
import com.sun.jersey.api.client.UniformInterfaceException;
@@ -43,8 +43,6 @@ import static org.junit.Assert.fail;
*/
public class BasicGeoTests extends AbstractRestIT {
- @Rule
- public TestContextSetup context = new TestContextSetup( this );
public final String latitude = "latitude";
@@ -57,7 +55,7 @@ public class BasicGeoTests extends AbstractRestIT {
public void createEntityWithGeoLocationPoint() throws IOException {
String collectionType = "stores";
- JsonNode node = null;
+ Entity node = null;
Double lat = 37.776753;
Double lon = -122.407846;
//1. Create entity
@@ -67,7 +65,7 @@ public class BasicGeoTests extends AbstractRestIT {
entityData.put( "location", latLon );
try {
- node = context.collection( collectionType ).post( entityData );
+ node = this.app().collection( collectionType ).post( entityData ).getEntity();
}
catch ( UniformInterfaceException e ) {
JsonNode nodeError = mapper.readTree( e.getResponse().getEntity( String.class ) );
@@ -76,8 +74,8 @@ public class BasicGeoTests extends AbstractRestIT {
//2. Verify that the entity was created
assertNotNull( node );
- assertEquals( lat.toString(), node.get("location").get("latitude").asText() );
- assertEquals( lon.toString(), node.get( "location" ).get("longitude").asText() );
+ assertEquals( lat.toString(), node.getMap("location").get("latitude").toString() );
+ assertEquals( lon.toString(), node.getMap("location").get("longitude").toString() );
}
@@ -93,7 +91,7 @@ public class BasicGeoTests extends AbstractRestIT {
String collectionType = "stores";
String entityName = "cornerStore";
- JsonNode entity = null;
+ Entity entity = null;
Double lat = 37.776753;
Double lon = -122.407846;
@@ -105,7 +103,7 @@ public class BasicGeoTests extends AbstractRestIT {
entityData.put( "name", entityName );
try {
- entity = context.collection( collectionType ).post( entityData );
+ entity = this.app().collection( collectionType ).post( entityData ).getEntities().get(0);
}
catch ( UniformInterfaceException e ) {
JsonNode nodeError = mapper.readTree( e.getResponse().getEntity( String.class ) );
@@ -113,10 +111,10 @@ public class BasicGeoTests extends AbstractRestIT {
}
assertNotNull(entity);
- assertEquals( lat.toString(), entity.get("location").get("latitude").asText() );
- assertEquals( lon.toString(), entity.get( "location" ).get("longitude").asText() );
+ assertEquals( lat.toString(), entity.getMap("location").get("latitude").toString() );
+ assertEquals( lon.toString(), entity.getMap("location").get("longitude").toString() );
- context.refreshIndex();
+ this.refreshIndex();
//2. read back that entity make sure it is accurate
/*
@@ -151,7 +149,7 @@ public class BasicGeoTests extends AbstractRestIT {
assertEquals( newLon.toString(), entity.get( "location" ).get("longitude").asText() );
*/
- context.refreshIndex();
+ this.refreshIndex();
//4. read back the updated entity, make sure it is accurate
@@ -170,7 +168,7 @@ public class BasicGeoTests extends AbstractRestIT {
public void createEntitiesWithBadSpelling() throws IOException {
String collectionType = "stores";
- JsonNode node = null;
+ Entity node = null;
Double lat = 37.776753;
Double lon = -122.407846;
@@ -181,7 +179,7 @@ public class BasicGeoTests extends AbstractRestIT {
misspelledLatitudeEntityData.put( "location", misspelledLatitude );
try {
- node = context.collection( collectionType ).post( misspelledLatitudeEntityData );
+ node = this.app().collection( collectionType ).post( misspelledLatitudeEntityData ).getEntity();
fail("System allowed misspelled location property - latitudee, which it should not");
}
catch ( UniformInterfaceException e ) {
@@ -197,7 +195,7 @@ public class BasicGeoTests extends AbstractRestIT {
misspelledLongitudeEntityData.put( "location", misspelledLongitude );
try {
- node = context.collection( collectionType ).post( misspelledLongitudeEntityData );
+ node = this.app().collection( collectionType ).post( misspelledLongitudeEntityData ).getEntity();
fail("System allowed misspelled location property - longitudee, which it should not");
}
catch ( UniformInterfaceException e ) {
@@ -218,7 +216,7 @@ public class BasicGeoTests extends AbstractRestIT {
public void createEntitiesWithBadPoints() throws IOException {
String collectionType = "stores";
- JsonNode node = null;
+ Entity node = null;
Double lat = 37.776753;
Double lon = -122.407846;
@@ -228,7 +226,7 @@ public class BasicGeoTests extends AbstractRestIT {
latitudeOnlyEntityData.put( "location", latitudeOnly );
try {
- node = context.collection( collectionType ).post( latitudeOnlyEntityData );
+ node = this.app().collection( collectionType ).post( latitudeOnlyEntityData ).getEntity();
fail("System allowed location with only one point, latitude, which it should not");
}
catch ( UniformInterfaceException e ) {
@@ -244,7 +242,7 @@ public class BasicGeoTests extends AbstractRestIT {
notDoubleLatLonEntityData.put( "location", notDoubleLatLon );
try {
- node = context.collection( collectionType ).post( notDoubleLatLonEntityData );
+ node = this.app().collection( collectionType ).post( notDoubleLatLonEntityData ).getEntity();
fail("System allowed misspelled location values that are not doubles for latitude and longitude, which it should not");
}
catch ( UniformInterfaceException e ) {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/GeoPagingTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/GeoPagingTest.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/GeoPagingTest.java
index 192e270..55c95b7 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/GeoPagingTest.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/GeoPagingTest.java
@@ -28,10 +28,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.usergrid.persistence.index.utils.UUIDUtils;
-import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
-import org.apache.usergrid.rest.test.resource2point0.model.Collection;
-import org.apache.usergrid.rest.test.resource2point0.model.Entity;
-import org.apache.usergrid.rest.test.resource2point0.model.QueryParameters;
+import org.apache.usergrid.rest.test.resource.AbstractRestIT;
+import org.apache.usergrid.rest.test.resource.model.Collection;
+import org.apache.usergrid.rest.test.resource.model.Entity;
+import org.apache.usergrid.rest.test.resource.model.QueryParameters;
import org.apache.usergrid.utils.MapUtils;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/MatrixQueryTests.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/MatrixQueryTests.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/MatrixQueryTests.java
index bb15178..de21e0a 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/MatrixQueryTests.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/MatrixQueryTests.java
@@ -16,11 +16,11 @@
*/
package org.apache.usergrid.rest.applications.queries;
-import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
-import org.apache.usergrid.rest.test.resource2point0.endpoints.CollectionEndpoint;
-import org.apache.usergrid.rest.test.resource2point0.model.Collection;
-import org.apache.usergrid.rest.test.resource2point0.model.Entity;
-import org.apache.usergrid.rest.test.resource2point0.model.QueryParameters;
+import org.apache.usergrid.rest.test.resource.AbstractRestIT;
+import org.apache.usergrid.rest.test.resource.endpoints.CollectionEndpoint;
+import org.apache.usergrid.rest.test.resource.model.Collection;
+import org.apache.usergrid.rest.test.resource.model.Entity;
+import org.apache.usergrid.rest.test.resource.model.QueryParameters;
import org.junit.Ignore;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/OrderByTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/OrderByTest.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/OrderByTest.java
index 24d264d..84a8012 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/OrderByTest.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/OrderByTest.java
@@ -18,9 +18,9 @@ package org.apache.usergrid.rest.applications.queries;
import org.apache.commons.lang.ArrayUtils;
-import org.apache.usergrid.rest.test.resource2point0.model.Collection;
-import org.apache.usergrid.rest.test.resource2point0.model.Entity;
-import org.apache.usergrid.rest.test.resource2point0.model.QueryParameters;
+import org.apache.usergrid.rest.test.resource.model.Collection;
+import org.apache.usergrid.rest.test.resource.model.Entity;
+import org.apache.usergrid.rest.test.resource.model.QueryParameters;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/QueryTestBase.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/QueryTestBase.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/QueryTestBase.java
index 5871c84..abdc8b0 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/QueryTestBase.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queries/QueryTestBase.java
@@ -16,8 +16,8 @@
*/
package org.apache.usergrid.rest.applications.queries;
-import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
-import org.apache.usergrid.rest.test.resource2point0.model.Entity;
+import org.apache.usergrid.rest.test.resource.AbstractRestIT;
+import org.apache.usergrid.rest.test.resource.model.Entity;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/stack/rest/src/test/java/org/apache/usergrid/rest/applications/utils/TestUtils.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/utils/TestUtils.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/utils/TestUtils.java
index 4007e2d..fa8356d 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/utils/TestUtils.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/utils/TestUtils.java
@@ -20,8 +20,8 @@ package org.apache.usergrid.rest.applications.utils;
import java.util.UUID;
import com.fasterxml.jackson.databind.JsonNode;
-import org.apache.usergrid.rest.test.resource2point0.model.Collection;
-import org.apache.usergrid.rest.test.resource2point0.model.Entity;
+import org.apache.usergrid.rest.test.resource.model.Collection;
+import org.apache.usergrid.rest.test.resource.model.Entity;
import org.junit.Ignore;
import org.apache.usergrid.utils.UUIDUtils;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/stack/rest/src/test/java/org/apache/usergrid/rest/applications/utils/UserRepo.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/utils/UserRepo.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/utils/UserRepo.java
index fd948aa..6e9a403 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/utils/UserRepo.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/utils/UserRepo.java
@@ -17,8 +17,8 @@
package org.apache.usergrid.rest.applications.utils;
-import org.apache.usergrid.rest.test.resource2point0.ClientSetup;
-import org.apache.usergrid.rest.test.resource2point0.model.Entity;
+import org.apache.usergrid.rest.test.resource.ClientSetup;
+import org.apache.usergrid.rest.test.resource.model.Entity;
import org.apache.usergrid.utils.UUIDUtils;
import java.util.HashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/stack/rest/src/test/java/org/apache/usergrid/rest/filters/ContentTypeResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/filters/ContentTypeResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/filters/ContentTypeResourceIT.java
index 89fa922..c1dce29 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/filters/ContentTypeResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/filters/ContentTypeResourceIT.java
@@ -29,9 +29,9 @@ import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.util.EntityUtils;
-import org.apache.usergrid.rest.test.resource2point0.model.Organization;
-import org.apache.usergrid.rest.test.resource2point0.model.Token;
-import org.apache.usergrid.rest.test.resource2point0.model.User;
+import org.apache.usergrid.rest.test.resource.model.Organization;
+import org.apache.usergrid.rest.test.resource.model.Token;
+import org.apache.usergrid.rest.test.resource.model.User;
import org.apache.usergrid.utils.JsonUtils;
import org.apache.usergrid.utils.UUIDUtils;
import org.junit.Ignore;
@@ -49,7 +49,7 @@ import static org.apache.usergrid.utils.MapUtils.hashMap;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
+import org.apache.usergrid.rest.test.resource.AbstractRestIT;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/stack/rest/src/test/java/org/apache/usergrid/rest/management/AccessTokenIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/AccessTokenIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/AccessTokenIT.java
index 09b744c..d9089ca 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/AccessTokenIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/AccessTokenIT.java
@@ -21,11 +21,11 @@ import java.util.Map;
import org.junit.Test;
-import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
-import org.apache.usergrid.rest.test.resource2point0.model.ApiResponse;
-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.resource.AbstractRestIT;
+import org.apache.usergrid.rest.test.resource.model.ApiResponse;
+import org.apache.usergrid.rest.test.resource.model.Entity;
+import org.apache.usergrid.rest.test.resource.model.QueryParameters;
+import org.apache.usergrid.rest.test.resource.model.Token;
import com.sun.jersey.api.client.ClientResponse;
import com.sun.jersey.api.client.UniformInterfaceException;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java
index 1277ae2..2c086b8 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java
@@ -27,7 +27,7 @@ import javax.mail.Message;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMultipart;
-import org.apache.usergrid.rest.test.resource2point0.model.*;
+import org.apache.usergrid.rest.test.resource.model.*;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
@@ -38,8 +38,8 @@ import org.jvnet.mock_javamail.Mailbox;
import org.apache.usergrid.management.MockImapClient;
import org.apache.usergrid.persistence.core.util.StringUtils;
import org.apache.usergrid.persistence.index.utils.UUIDUtils;
-import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
-import org.apache.usergrid.rest.test.resource2point0.endpoints.mgmt.ManagementResource;
+import org.apache.usergrid.rest.test.resource.AbstractRestIT;
+import org.apache.usergrid.rest.test.resource.endpoints.mgmt.ManagementResource;
import com.sun.jersey.api.client.ClientResponse;
import com.sun.jersey.api.client.UniformInterfaceException;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/stack/rest/src/test/java/org/apache/usergrid/rest/management/ExportResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ExportResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ExportResourceIT.java
index 0874fc7..33bf360 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ExportResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ExportResourceIT.java
@@ -26,9 +26,8 @@ import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.usergrid.rest.TestContextSetup;
-import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
-import org.apache.usergrid.rest.test.resource2point0.model.ApiResponse;
+import org.apache.usergrid.rest.test.resource.AbstractRestIT;
+import org.apache.usergrid.rest.test.resource.model.ApiResponse;
import com.sun.jersey.api.client.ClientResponse;
import com.sun.jersey.api.client.UniformInterfaceException;
@@ -40,8 +39,6 @@ import static org.junit.Assert.fail;
public class ExportResourceIT extends AbstractRestIT {
- @Rule
- public TestContextSetup context = new TestContextSetup( this );
public ExportResourceIT() throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/stack/rest/src/test/java/org/apache/usergrid/rest/management/ImportResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ImportResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ImportResourceIT.java
index 34371b6..a754eb0 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ImportResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ImportResourceIT.java
@@ -30,12 +30,12 @@ import org.apache.usergrid.ServiceITSetupImpl;
import org.apache.usergrid.batch.service.JobSchedulerService;
import org.apache.usergrid.management.importer.S3Upload;
import org.apache.usergrid.persistence.index.utils.UUIDUtils;
-import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
-import org.apache.usergrid.rest.test.resource2point0.model.ApiResponse;
-import org.apache.usergrid.rest.test.resource2point0.model.Collection;
-import org.apache.usergrid.rest.test.resource2point0.model.Entity;
-import org.apache.usergrid.rest.test.resource2point0.model.Organization;
-import org.apache.usergrid.rest.test.resource2point0.model.Token;
+import org.apache.usergrid.rest.test.resource.AbstractRestIT;
+import org.apache.usergrid.rest.test.resource.model.ApiResponse;
+import org.apache.usergrid.rest.test.resource.model.Collection;
+import org.apache.usergrid.rest.test.resource.model.Entity;
+import org.apache.usergrid.rest.test.resource.model.Organization;
+import org.apache.usergrid.rest.test.resource.model.Token;
import org.apache.usergrid.setup.ConcurrentProcessSingleton;
import org.jclouds.ContextBuilder;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
index cd4d3dc..1fe4974 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java
@@ -25,9 +25,9 @@ import net.jcip.annotations.NotThreadSafe;
import org.apache.commons.lang.RandomStringUtils;
import org.apache.usergrid.persistence.index.utils.UUIDUtils;
import org.apache.usergrid.rest.management.organizations.OrganizationsResource;
-import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
-import org.apache.usergrid.rest.test.resource2point0.model.*;
-import org.apache.usergrid.rest.test.resource2point0.model.Collection;
+import org.apache.usergrid.rest.test.resource.AbstractRestIT;
+import org.apache.usergrid.rest.test.resource.model.*;
+import org.apache.usergrid.rest.test.resource.model.Collection;
import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
@@ -48,7 +48,7 @@ import static org.junit.Assert.*;
public class ManagementResourceIT extends AbstractRestIT {
private static final Logger logger = LoggerFactory.getLogger(ManagementResourceIT.class);
- private org.apache.usergrid.rest.test.resource2point0.endpoints.mgmt.ManagementResource management;
+ private org.apache.usergrid.rest.test.resource.endpoints.mgmt.ManagementResource management;
public ManagementResourceIT() throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/stack/rest/src/test/java/org/apache/usergrid/rest/management/OrganizationsIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/OrganizationsIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/OrganizationsIT.java
index 8a298f6..782c8cd 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/OrganizationsIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/OrganizationsIT.java
@@ -21,13 +21,13 @@ import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import org.apache.usergrid.rest.test.resource2point0.model.*;
+import org.apache.usergrid.rest.test.resource.model.*;
import org.junit.Ignore;
import org.junit.Test;
import org.apache.usergrid.persistence.index.utils.UUIDUtils;
-import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
-import org.apache.usergrid.rest.test.resource2point0.RestClient;
+import org.apache.usergrid.rest.test.resource.AbstractRestIT;
+import org.apache.usergrid.rest.test.resource.RestClient;
import com.sun.jersey.api.client.ClientResponse;
import com.sun.jersey.api.client.UniformInterfaceException;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/stack/rest/src/test/java/org/apache/usergrid/rest/management/RegistrationIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/RegistrationIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/RegistrationIT.java
index 4d85ade..bcaa521 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/RegistrationIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/RegistrationIT.java
@@ -21,8 +21,8 @@ import com.sun.jersey.api.client.UniformInterfaceException;
import com.sun.jersey.api.representation.Form;
import org.apache.commons.lang.StringUtils;
import org.apache.usergrid.persistence.model.util.UUIDGenerator;
-import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
-import org.apache.usergrid.rest.test.resource2point0.model.*;
+import org.apache.usergrid.rest.test.resource.AbstractRestIT;
+import org.apache.usergrid.rest.test.resource.model.*;
import org.junit.Test;
import org.jvnet.mock_javamail.Mailbox;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/stack/rest/src/test/java/org/apache/usergrid/rest/management/organizations/AdminEmailEncodingIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/organizations/AdminEmailEncodingIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/organizations/AdminEmailEncodingIT.java
index ceab55d..1392749 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/organizations/AdminEmailEncodingIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/organizations/AdminEmailEncodingIT.java
@@ -18,11 +18,11 @@ package org.apache.usergrid.rest.management.organizations;
import com.sun.jersey.api.client.UniformInterfaceException;
-import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
-import org.apache.usergrid.rest.test.resource2point0.model.Application;
-import org.apache.usergrid.rest.test.resource2point0.model.Entity;
-import org.apache.usergrid.rest.test.resource2point0.model.Organization;
-import org.apache.usergrid.rest.test.resource2point0.model.Token;
+import org.apache.usergrid.rest.test.resource.AbstractRestIT;
+import org.apache.usergrid.rest.test.resource.model.Application;
+import org.apache.usergrid.rest.test.resource.model.Entity;
+import org.apache.usergrid.rest.test.resource.model.Organization;
+import org.apache.usergrid.rest.test.resource.model.Token;
import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/876dc8d3/stack/rest/src/test/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationsIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationsIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationsIT.java
deleted file mode 100644
index 5ea556b..0000000
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/organizations/applications/ApplicationsIT.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.usergrid.rest.management.organizations.applications;
-
-
-import java.util.HashSet;
-import java.util.Set;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import java.io.IOException;
-
-import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT;
-import org.junit.Rule;
-import org.junit.Test;
-
-import org.apache.usergrid.rest.TestContextSetup;
-
-import static org.junit.Assert.assertEquals;
-import org.junit.Ignore;
-
-
-/**
- *
- *
- */
-public class ApplicationsIT extends AbstractRestIT {
-
- @Rule
- public TestContextSetup context = new TestContextSetup( this );
-
-
- @Test
- @Ignore("ignored because this test fails because it does not account for the default app "
- + "created by the TestContext and the sandbox app. "
- + "see also: https://issues.apache.org/jira/browse/USERGRID-210 ")
- public void test10AppLimit() throws IOException {
-
- int size = 11;
-
- Set<String> appNames = new HashSet<String>( size );
-
- for ( int i = 0; i < size; i++ ) {
- final String name = i + "";
-
- appNames.add( name );
-
- context.withApp( name ).createAppForOrg();
- }
-
-
- //now go through and ensure each entry is present
-
- final JsonNode apps = context.management().orgs().organization( context.getOrgName() ).apps().get();
-
- final JsonNode data = apps.get( "data" );
-
- final String orgName = context.getOrgName();
-
-
- final Set<String> copy = new HashSet<String> (appNames);
-
- for(String appName: copy){
-
- final String mapEntryName = String.format( "%s/%s", orgName.toLowerCase(), appName.toLowerCase());
-
- JsonNode orgApp = data.get( mapEntryName);
-
- if(orgApp != null){
- appNames.remove( appName );
- }
-
- }
-
- assertEquals("All elements removed", 0, appNames.size());
-
- }
-}