Removed concurrent from services and REST
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/79f6bb62 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/79f6bb62 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/79f6bb62 Branch: refs/heads/USERGRID-273 Commit: 79f6bb6236955779cb664b72738153439fab6d0b Parents: 1fbe3e5 Author: Todd Nine <tn...@apigee.com> Authored: Thu Jan 22 17:29:00 2015 -0700 Committer: Todd Nine <tn...@apigee.com> Committed: Thu Jan 22 17:29:00 2015 -0700 ---------------------------------------------------------------------- .../apache/usergrid/rest/AbstractRestIT.java | 18 +++--- .../usergrid/rest/ConcurrentRestITSuite.java | 67 -------------------- .../org/apache/usergrid/rest/RestITSuite.java | 64 ------------------- .../applications/ApplicationResourceIT.java | 6 +- .../applications/assets/AssetResourceIT.java | 4 +- .../collection/BrowserCompatibilityTest.java | 4 +- .../collection/CollectionsResourceIT.java | 4 +- .../activities/ActivityResourceIT.java | 4 +- .../collection/devices/DevicesResourceIT.java | 4 +- .../collection/groups/GroupResourceIT.java | 6 +- .../collection/paging/PagingResourceIT.java | 4 +- .../collection/users/OwnershipResourceIT.java | 4 +- .../collection/users/PermissionsResourceIT.java | 4 +- .../collection/users/UserResourceIT.java | 4 +- .../events/ApplicationRequestCounterIT.java | 4 +- .../applications/events/EventsResourceIT.java | 7 +- .../queues/QueueResourceLong1IT.java | 4 +- .../queues/QueueResourceLong2IT.java | 4 +- .../queues/QueueResourceLong3IT.java | 4 +- .../queues/QueueResourceShortIT.java | 4 +- .../rest/filters/ContentTypeResourceIT.java | 3 +- .../rest/management/ExportResourceIT.java | 3 +- .../rest/management/ManagementResourceIT.java | 4 +- .../organizations/AdminEmailEncodingIT.java | 4 +- .../usergrid/management/OrganizationIT.java | 4 +- .../org/apache/usergrid/management/RoleIT.java | 4 +- .../cassandra/ApplicationCreatorIT.java | 4 +- .../management/cassandra/ExportServiceIT.java | 3 +- .../cassandra/ManagementServiceIT.java | 4 +- .../security/providers/FacebookProviderIT.java | 4 +- .../providers/PingIdentityProviderIT.java | 4 +- .../security/tokens/TokenServiceIT.java | 4 +- .../usergrid/services/AbstractServiceIT.java | 4 +- .../usergrid/services/ActivitiesServiceIT.java | 4 +- .../services/ApplicationsServiceIT.java | 4 +- .../usergrid/services/CollectionServiceIT.java | 4 +- .../usergrid/services/ConnectionsServiceIT.java | 6 +- .../usergrid/services/GroupServiceIT.java | 4 +- .../usergrid/services/RolesServiceIT.java | 8 +-- .../usergrid/services/ServiceFactoryIT.java | 4 +- .../usergrid/services/ServiceRequestIT.java | 4 +- 41 files changed, 87 insertions(+), 224 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79f6bb62/stack/rest/src/test/java/org/apache/usergrid/rest/AbstractRestIT.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/AbstractRestIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/AbstractRestIT.java index 3231cc6..caf8ad2 100644 --- a/stack/rest/src/test/java/org/apache/usergrid/rest/AbstractRestIT.java +++ b/stack/rest/src/test/java/org/apache/usergrid/rest/AbstractRestIT.java @@ -49,13 +49,13 @@ import org.slf4j.LoggerFactory; /** - * Base class for testing Usergrid Jersey-based REST API. Implementations should model the - * paths mapped, not the method names. For example, to test the the "password" mapping on - * applications.users.UserResource for a PUT method, the test method(s) should following the + * Base class for testing Usergrid Jersey-based REST API. Implementations should model the + * paths mapped, not the method names. For example, to test the the "password" mapping on + * applications.users.UserResource for a PUT method, the test method(s) should following the * following naming convention: test_[HTTP verb]_[action mapping]_[ok|fail][_[specific * failure condition if multiple] */ -//@Concurrent() +// public abstract class AbstractRestIT extends JerseyTest { private static final Logger LOG = LoggerFactory.getLogger( AbstractRestIT.class ); private static boolean usersSetup = false; @@ -166,7 +166,7 @@ public abstract class AbstractRestIT extends JerseyTest { client = new Client( "test-organization", "test-app" ).withApiUrl( UriBuilder.fromUri( "http://localhost/"; ).port( setup.getTomcatPort() ).build().toString() ); - org.apache.usergrid.java.client.response.ApiResponse response = + org.apache.usergrid.java.client.response.ApiResponse response = client.authorizeAppUser( "e...@anuff.com", "sesame" ); assertTrue( response != null && response.getError() == null ); @@ -258,7 +258,7 @@ public abstract class AbstractRestIT extends JerseyTest { adminToken(); // change the password as admin. The old password isn't required - JsonNode node = mapper.readTree( resource().path( + JsonNode node = mapper.readTree( resource().path( String.format( "/test-organization/test-app/users/%s/password", username ) ) .queryParam( "access_token", adminAccessToken ).accept( MediaType.APPLICATION_JSON ) .type( MediaType.APPLICATION_JSON_TYPE ).post( String.class, data )); @@ -296,7 +296,7 @@ public abstract class AbstractRestIT extends JerseyTest { } catch (IOException ex) { throw new RuntimeException("Unable to parse response", ex); - } + } String mgmToken = node.get( "access_token" ).textValue(); LOG.info( "got mgmt token: {}", mgmToken ); @@ -421,7 +421,7 @@ public abstract class AbstractRestIT extends JerseyTest { .queryParam( "app_id", appId.toString() ) .accept( MediaType.APPLICATION_JSON ) .post(); - + } catch ( Exception e) { LOG.debug("Error refreshing index", e); return; @@ -443,7 +443,7 @@ public abstract class AbstractRestIT extends JerseyTest { .queryParam( "app_name", appName ) .accept( MediaType.APPLICATION_JSON ) .post(); - + } catch ( Exception e) { LOG.debug("Error refreshing index", e); return; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79f6bb62/stack/rest/src/test/java/org/apache/usergrid/rest/ConcurrentRestITSuite.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/ConcurrentRestITSuite.java b/stack/rest/src/test/java/org/apache/usergrid/rest/ConcurrentRestITSuite.java deleted file mode 100644 index 7005277..0000000 --- a/stack/rest/src/test/java/org/apache/usergrid/rest/ConcurrentRestITSuite.java +++ /dev/null @@ -1,67 +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.ClassRule; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.apache.usergrid.cassandra.SpringResource; -import org.apache.usergrid.cassandra.Concurrent; -import org.apache.usergrid.cassandra.ConcurrentSuite; -import org.apache.usergrid.rest.applications.events.ApplicationRequestCounterIT; -import org.apache.usergrid.rest.applications.ApplicationResourceIT; -import org.apache.usergrid.rest.applications.collection.devices.DevicesResourceIT; -import org.apache.usergrid.rest.applications.assets.AssetResourceIT; -import org.apache.usergrid.rest.applications.collection.paging.PagingResourceIT; -import org.apache.usergrid.rest.applications.events.EventsResourceIT; -import org.apache.usergrid.rest.applications.collection.activities.ActivityResourceIT; -import org.apache.usergrid.rest.applications.collection.CollectionsResourceIT; -import org.apache.usergrid.rest.applications.collection.groups.GroupResourceIT; -import org.apache.usergrid.rest.applications.collection.users.OwnershipResourceIT; -import org.apache.usergrid.rest.applications.collection.users.PermissionsResourceIT; -import org.apache.usergrid.rest.applications.collection.users.UserResourceIT; -import org.apache.usergrid.rest.filters.ContentTypeResourceIT; -import org.apache.usergrid.rest.management.ManagementResourceIT; -import org.apache.usergrid.rest.management.RegistrationIT; -import org.apache.usergrid.rest.management.organizations.AdminEmailEncodingIT; - -@RunWith(ConcurrentSuite.class) -@Suite.SuiteClasses({ - ActivityResourceIT.class, - AdminEmailEncodingIT.class, - ApplicationRequestCounterIT.class, - ApplicationResourceIT.class, - AssetResourceIT.class, - BasicIT.class, - CollectionsResourceIT.class, - ContentTypeResourceIT.class, - DevicesResourceIT.class, - EventsResourceIT.class, - GroupResourceIT.class, - ManagementResourceIT.class, - OwnershipResourceIT.class, - PagingResourceIT.class, - PermissionsResourceIT.class, - RegistrationIT.class, - UserResourceIT.class -}) -@Concurrent() -public class ConcurrentRestITSuite { - - @ClassRule - public static SpringResource springResource = SpringResource.getInstance(); -} http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79f6bb62/stack/rest/src/test/java/org/apache/usergrid/rest/RestITSuite.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/RestITSuite.java b/stack/rest/src/test/java/org/apache/usergrid/rest/RestITSuite.java deleted file mode 100644 index ddc8b03..0000000 --- a/stack/rest/src/test/java/org/apache/usergrid/rest/RestITSuite.java +++ /dev/null @@ -1,64 +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.ClassRule; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.apache.usergrid.cassandra.SpringResource; -import org.apache.usergrid.cassandra.Concurrent; -import org.apache.usergrid.persistence.index.impl.ElasticSearchResource; -import org.apache.usergrid.rest.applications.events.ApplicationRequestCounterIT; -import org.apache.usergrid.rest.applications.collection.devices.DevicesResourceIT; -import org.apache.usergrid.rest.applications.assets.AssetResourceIT; -import org.apache.usergrid.rest.applications.collection.paging.PagingResourceIT; -import org.apache.usergrid.rest.applications.events.EventsResourceIT; -import org.apache.usergrid.rest.applications.collection.activities.ActivityResourceIT; -import org.apache.usergrid.rest.applications.collection.CollectionsResourceIT; -import org.apache.usergrid.rest.applications.collection.groups.GroupResourceIT; -import org.apache.usergrid.rest.applications.collection.users.OwnershipResourceIT; -import org.apache.usergrid.rest.applications.collection.users.PermissionsResourceIT; -import org.apache.usergrid.rest.applications.collection.users.UserResourceIT; -import org.apache.usergrid.rest.filters.ContentTypeResourceIT; -import org.apache.usergrid.rest.management.organizations.AdminEmailEncodingIT; - -@RunWith(Suite.class) -@Suite.SuiteClasses({ - ActivityResourceIT.class, - AdminEmailEncodingIT.class, - ApplicationRequestCounterIT.class, - AssetResourceIT.class, - BasicIT.class, - CollectionsResourceIT.class, - ContentTypeResourceIT.class, - DevicesResourceIT.class, - EventsResourceIT.class, - GroupResourceIT.class, - OwnershipResourceIT.class, - PagingResourceIT.class, - PermissionsResourceIT.class, - UserResourceIT.class -}) -@Concurrent() -public class RestITSuite { - - @ClassRule - public static ElasticSearchResource elasticSearchResource = new ElasticSearchResource(); - - @ClassRule - public static SpringResource springResource = SpringResource.getInstance(); -} http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79f6bb62/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 a370252..ea4ab39 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 @@ -24,7 +24,7 @@ import javax.ws.rs.core.MediaType; import com.fasterxml.jackson.databind.JsonNode; import org.junit.Ignore; import org.junit.Test; -import org.apache.usergrid.cassandra.Concurrent; + import org.apache.usergrid.management.ApplicationInfo; import org.apache.usergrid.management.OrganizationInfo; import org.apache.usergrid.rest.AbstractRestIT; @@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory; * * @author zznate */ -@Concurrent() + public class ApplicationResourceIT extends AbstractRestIT { private static final Logger logger = LoggerFactory.getLogger( ApplicationResourceIT.class ); @@ -114,7 +114,7 @@ public class ApplicationResourceIT extends AbstractRestIT { } /** - * Verifies that we return JSON even when text/html is requested. + * Verifies that we return JSON even when text/html is requested. * (for backwards compatibility) */ @Test http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79f6bb62/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 6875a13..e6c5eae 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 @@ -32,7 +32,7 @@ import org.junit.Ignore; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.usergrid.cassandra.Concurrent; + import org.apache.usergrid.rest.applications.utils.UserRepo; import org.apache.usergrid.services.assets.data.AssetUtils; @@ -45,7 +45,7 @@ import static org.junit.Assert.assertNotNull; import static org.apache.usergrid.utils.MapUtils.hashMap; -@Concurrent() + public class AssetResourceIT extends AbstractRestIT { private String access_token; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79f6bb62/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 3bca666..dfdbdd8 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 @@ -24,7 +24,7 @@ import com.fasterxml.jackson.databind.JsonNode; import java.io.IOException; import org.junit.Rule; import org.junit.Test; -import org.apache.usergrid.cassandra.Concurrent; + import org.apache.usergrid.rest.AbstractRestIT; import org.apache.usergrid.rest.TestContextSetup; import org.apache.usergrid.rest.test.resource.CustomCollection; @@ -37,7 +37,7 @@ import static org.apache.usergrid.utils.MapUtils.hashMap; /** * Simple tests to test querying at the REST tier */ -@Concurrent() + public class BrowserCompatibilityTest extends AbstractRestIT { http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79f6bb62/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 72639ca..115c9af 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 @@ -28,7 +28,7 @@ import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.usergrid.cassandra.Concurrent; + import org.apache.usergrid.rest.AbstractRestIT; import org.apache.usergrid.utils.UUIDUtils; @@ -45,7 +45,7 @@ import static org.apache.usergrid.utils.MapUtils.hashMap; * @author zznate * @author tnine */ -@Concurrent() + public class CollectionsResourceIT extends AbstractRestIT { private static Logger log = LoggerFactory.getLogger( CollectionsResourceIT.class ); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79f6bb62/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 af6cdbc..f7737b9 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 @@ -26,7 +26,7 @@ import org.junit.Before; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.usergrid.cassandra.Concurrent; + import org.apache.usergrid.utils.UUIDUtils; import static org.junit.Assert.assertEquals; @@ -34,7 +34,7 @@ import static org.junit.Assert.assertTrue; /** @author tnine */ -@Concurrent() + public class ActivityResourceIT extends AbstractRestIT { private static Logger log = LoggerFactory.getLogger( ActivityResourceIT.class ); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79f6bb62/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 8010c56..d23014d 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 @@ -27,7 +27,7 @@ import org.apache.usergrid.rest.test.resource2point0.endpoints.CollectionEndpoin import org.apache.usergrid.rest.test.resource2point0.model.ApiResponse; import org.apache.usergrid.rest.test.resource2point0.model.Entity; import org.junit.Test; -import org.apache.usergrid.cassandra.Concurrent; + import com.sun.jersey.api.client.UniformInterfaceException; import java.io.IOException; @@ -38,7 +38,7 @@ import static org.junit.Assert.fail; import org.junit.Ignore; -@Concurrent() + public class DevicesResourceIT extends AbstractRestIT { @Test http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79f6bb62/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 ed6876b..ecdbf2f 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 @@ -29,7 +29,7 @@ import org.junit.Ignore; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.usergrid.cassandra.Concurrent; + import static org.junit.Assert.*; @@ -39,7 +39,7 @@ import static org.junit.Assert.*; * REST tests for /groups endpoint * * */ -@Concurrent() + public class GroupResourceIT extends AbstractRestIT { public GroupResourceIT() throws Exception { } @@ -542,4 +542,4 @@ public class GroupResourceIT extends AbstractRestIT { } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79f6bb62/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 fb45e6e..0dd9532 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 @@ -26,7 +26,7 @@ import java.util.Map; import org.junit.Ignore; import org.junit.Test; -import org.apache.usergrid.cassandra.Concurrent; + 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; @@ -41,7 +41,7 @@ import static org.junit.Assert.assertNull; /** * Tests paging with respect to entities. Also tests cursors and queries with respect to paging. */ -@Concurrent() + public class PagingResourceIT extends AbstractRestIT { /** http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79f6bb62/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 b335a1f..f898cd6 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 @@ -27,7 +27,7 @@ import org.apache.usergrid.rest.test.resource2point0.model.*; import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import org.apache.usergrid.cassandra.Concurrent; + import org.apache.usergrid.utils.MapUtils; @@ -41,7 +41,7 @@ import static org.junit.Assert.fail; /** * Take in tests that handle owner permissions relating to a specific user. */ -@Concurrent() + public class OwnershipResourceIT extends AbstractRestIT { private CollectionEndpoint usersResource; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79f6bb62/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 c72d906..4fa8ab0 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 @@ -32,7 +32,7 @@ import org.elasticsearch.common.collect.HppcMaps; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import org.apache.usergrid.cassandra.Concurrent; + import org.apache.usergrid.java.client.entities.Group; import org.apache.usergrid.management.ApplicationInfo; import org.apache.usergrid.management.OrganizationOwnerInfo; @@ -51,7 +51,7 @@ import static org.junit.Assert.*; * Tests permissions of adding and removing users from roles as well as groups * */ -@Concurrent() + public class PermissionsResourceIT extends AbstractRestIT { private static final String ROLE = "permtestrole"; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79f6bb62/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 8ded00c..8761dd3 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 @@ -39,7 +39,7 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.usergrid.cassandra.Concurrent; + import org.apache.usergrid.management.ApplicationInfo; import org.apache.usergrid.management.OrganizationInfo; import org.apache.usergrid.rest.applications.utils.UserRepo; @@ -62,7 +62,7 @@ import static org.junit.Assert.fail; * @author zznate * @author tnine */ -@Concurrent() + public class UserResourceIT extends AbstractRestIT { private static Logger log = LoggerFactory.getLogger(UserResourceIT.class); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79f6bb62/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 bf63844..61b313c 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 @@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.JsonNode; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.usergrid.cassandra.Concurrent; + import org.apache.usergrid.persistence.EntityManager; import org.apache.usergrid.persistence.EntityManagerFactory; import org.apache.usergrid.persistence.index.query.Query; @@ -44,7 +44,7 @@ import static org.junit.Assert.assertNotNull; * * @author realbeast */ -@Concurrent() + public class ApplicationRequestCounterIT extends AbstractRestIT { private static final Logger log = LoggerFactory.getLogger( ApplicationRequestCounterIT.class ); long ts = System.currentTimeMillis() - ( 24 * 60 * 60 * 1000 ); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79f6bb62/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 0ef7238..4eca687 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 @@ -27,7 +27,7 @@ import java.io.IOException; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.usergrid.cassandra.Concurrent; + import org.apache.usergrid.rest.AbstractRestIT; import static org.junit.Assert.assertEquals; @@ -35,7 +35,6 @@ import static org.junit.Assert.assertNotNull; import org.junit.Ignore; -@Concurrent public class EventsResourceIT extends AbstractRestIT { private static Logger log = LoggerFactory.getLogger( EventsResourceIT.class ); @@ -73,7 +72,7 @@ public class EventsResourceIT extends AbstractRestIT { put( "ad_sales", 20 ); } } ); - + node = mapper.readTree( resource().path( "/test-organization/test-app/events" ) .queryParam( "access_token", access_token ) .accept( MediaType.APPLICATION_JSON ) @@ -114,7 +113,7 @@ public class EventsResourceIT extends AbstractRestIT { .queryParam( "access_token", access_token ) .accept( MediaType.APPLICATION_JSON ) .type( MediaType.APPLICATION_JSON_TYPE ) - .get( String.class )); + .get( String.class )); logNode( node ); assertEquals( "Expected Advertising", advertising, node.get( "messages" ).get( 0 ).get( "uuid" ).asText() ); lastId = node.get( "last" ).asText(); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79f6bb62/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queues/QueueResourceLong1IT.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queues/QueueResourceLong1IT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queues/QueueResourceLong1IT.java index 636dad7..069bb9d 100644 --- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queues/QueueResourceLong1IT.java +++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queues/QueueResourceLong1IT.java @@ -21,7 +21,7 @@ import java.util.List; import org.junit.Rule; import org.junit.Test; -import org.apache.usergrid.cassandra.Concurrent; + import org.apache.usergrid.rest.TestContextSetup; import org.apache.usergrid.rest.test.resource.app.queue.Queue; import org.apache.usergrid.rest.test.resource.app.queue.Transaction; @@ -35,7 +35,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -@Concurrent() + public class QueueResourceLong1IT extends AbstractQueueResourceIT { @Rule http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79f6bb62/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queues/QueueResourceLong2IT.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queues/QueueResourceLong2IT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queues/QueueResourceLong2IT.java index 2f2527c..873ba12 100644 --- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queues/QueueResourceLong2IT.java +++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queues/QueueResourceLong2IT.java @@ -22,7 +22,7 @@ import java.util.Map; import org.junit.Rule; import org.junit.Test; -import org.apache.usergrid.cassandra.Concurrent; + import org.apache.usergrid.rest.TestContextSetup; import org.apache.usergrid.rest.test.resource.app.queue.Queue; import org.apache.usergrid.rest.test.resource.app.queue.Transaction; @@ -35,7 +35,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -@Concurrent() + public class QueueResourceLong2IT extends AbstractQueueResourceIT { @Rule http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79f6bb62/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queues/QueueResourceLong3IT.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queues/QueueResourceLong3IT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queues/QueueResourceLong3IT.java index c35e56b..feaf77e 100644 --- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queues/QueueResourceLong3IT.java +++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queues/QueueResourceLong3IT.java @@ -22,7 +22,7 @@ import java.util.Map; import org.junit.Rule; import org.junit.Test; -import org.apache.usergrid.cassandra.Concurrent; + import org.apache.usergrid.rest.TestContextSetup; import org.apache.usergrid.rest.test.resource.app.queue.Queue; import org.apache.usergrid.rest.test.resource.app.queue.Transaction; @@ -38,7 +38,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -@Concurrent() + public class QueueResourceLong3IT extends AbstractQueueResourceIT { @Rule http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79f6bb62/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queues/QueueResourceShortIT.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queues/QueueResourceShortIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queues/QueueResourceShortIT.java index f2869ed..ccb762a 100644 --- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queues/QueueResourceShortIT.java +++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/queues/QueueResourceShortIT.java @@ -30,7 +30,7 @@ import com.fasterxml.jackson.databind.JsonNode; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; -import org.apache.usergrid.cassandra.Concurrent; + import org.apache.usergrid.mq.QueuePosition; import org.apache.usergrid.rest.TestContextSetup; import org.apache.usergrid.rest.test.resource.app.queue.Queue; @@ -44,7 +44,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; -@Concurrent() + public class QueueResourceShortIT extends AbstractQueueResourceIT { @Rule http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79f6bb62/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 b76f1c0..5671249 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 @@ -28,7 +28,7 @@ import javax.ws.rs.core.MediaType; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; -import org.apache.usergrid.cassandra.Concurrent; + import org.apache.usergrid.rest.AbstractRestIT; import org.apache.usergrid.rest.TestContextSetup; import org.apache.usergrid.utils.JsonUtils; @@ -57,7 +57,6 @@ import static org.apache.usergrid.utils.MapUtils.hashMap; // @Ignore("Client login is causing tests to fail due to socket closure by grizzly. Need to re-enable once we're not // using grizzly to test") -@Concurrent() public class ContentTypeResourceIT extends AbstractRestIT { @Rule http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79f6bb62/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 d002f18..b6e1274 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 @@ -28,7 +28,7 @@ import java.util.UUID; import javax.ws.rs.core.MediaType; -import org.apache.usergrid.cassandra.Concurrent; + import org.apache.usergrid.rest.AbstractRestIT; import org.apache.usergrid.rest.TestContextSetup; @@ -41,7 +41,6 @@ import org.junit.Rule; import org.junit.Test; -@Concurrent public class ExportResourceIT extends AbstractRestIT { @Rule http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79f6bb62/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 5e6c100..9b6e842 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 @@ -33,7 +33,7 @@ import org.junit.Test; import org.apache.commons.lang.StringUtils; -import org.apache.usergrid.cassandra.Concurrent; + import org.apache.usergrid.management.OrganizationInfo; import org.apache.usergrid.management.OrganizationOwnerInfo; import org.apache.usergrid.persistence.index.utils.UUIDUtils; @@ -57,7 +57,7 @@ import static org.junit.Assert.assertTrue; /** * @author tnine */ -@Concurrent() + public class ManagementResourceIT extends AbstractRestIT { @Rule http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79f6bb62/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 145ccd3..e9ebe60 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 @@ -21,7 +21,7 @@ import com.fasterxml.jackson.databind.JsonNode; import java.io.IOException; import org.junit.Rule; import org.junit.Test; -import org.apache.usergrid.cassandra.Concurrent; + import org.apache.usergrid.rest.AbstractRestIT; import org.apache.usergrid.rest.TestContextSetup; import org.apache.usergrid.rest.test.security.TestAdminUser; @@ -36,7 +36,7 @@ import static org.junit.Assert.assertNotNull; * * @author tnine */ -@Concurrent() + public class AdminEmailEncodingIT extends AbstractRestIT { @Rule http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79f6bb62/stack/services/src/test/java/org/apache/usergrid/management/OrganizationIT.java ---------------------------------------------------------------------- diff --git a/stack/services/src/test/java/org/apache/usergrid/management/OrganizationIT.java b/stack/services/src/test/java/org/apache/usergrid/management/OrganizationIT.java index 21f00e3..797ade4 100644 --- a/stack/services/src/test/java/org/apache/usergrid/management/OrganizationIT.java +++ b/stack/services/src/test/java/org/apache/usergrid/management/OrganizationIT.java @@ -31,7 +31,7 @@ import org.apache.usergrid.ServiceITSetup; import org.apache.usergrid.ServiceITSetupImpl; import org.apache.usergrid.cassandra.SpringResource; import org.apache.usergrid.cassandra.ClearShiroSubject; -import org.apache.usergrid.cassandra.Concurrent; + import org.apache.usergrid.management.cassandra.ManagementServiceImpl; import org.apache.usergrid.management.exceptions.RecentlyUsedPasswordException; import org.apache.usergrid.persistence.index.impl.ElasticSearchResource; @@ -46,7 +46,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -@Concurrent() + public class OrganizationIT { @Rule http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79f6bb62/stack/services/src/test/java/org/apache/usergrid/management/RoleIT.java ---------------------------------------------------------------------- diff --git a/stack/services/src/test/java/org/apache/usergrid/management/RoleIT.java b/stack/services/src/test/java/org/apache/usergrid/management/RoleIT.java index 56c392c..05cc7c3 100644 --- a/stack/services/src/test/java/org/apache/usergrid/management/RoleIT.java +++ b/stack/services/src/test/java/org/apache/usergrid/management/RoleIT.java @@ -33,7 +33,7 @@ import org.apache.usergrid.ServiceITSetup; import org.apache.usergrid.ServiceITSetupImpl; import org.apache.usergrid.cassandra.SpringResource; import org.apache.usergrid.cassandra.ClearShiroSubject; -import org.apache.usergrid.cassandra.Concurrent; + import org.apache.usergrid.persistence.EntityManager; import org.apache.usergrid.persistence.entities.User; import org.apache.usergrid.persistence.index.impl.ElasticSearchResource; @@ -43,7 +43,7 @@ import org.apache.usergrid.security.shiro.utils.SubjectUtils; import static org.junit.Assert.assertFalse; -@Concurrent() + public class RoleIT { private static final Logger LOG = LoggerFactory.getLogger( RoleIT.class ); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79f6bb62/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ApplicationCreatorIT.java ---------------------------------------------------------------------- diff --git a/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ApplicationCreatorIT.java b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ApplicationCreatorIT.java index cb67efc..71fbf9c 100644 --- a/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ApplicationCreatorIT.java +++ b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ApplicationCreatorIT.java @@ -27,7 +27,7 @@ import org.apache.usergrid.ServiceITSetup; import org.apache.usergrid.ServiceITSetupImpl; import org.apache.usergrid.cassandra.SpringResource; import org.apache.usergrid.cassandra.ClearShiroSubject; -import org.apache.usergrid.cassandra.Concurrent; + import org.apache.usergrid.management.ApplicationInfo; import org.apache.usergrid.management.OrganizationOwnerInfo; import org.apache.usergrid.persistence.index.impl.ElasticSearchResource; @@ -42,7 +42,7 @@ import static org.junit.Assert.assertTrue; /** @author zznate */ -@Concurrent() + public class ApplicationCreatorIT { @Rule public ClearShiroSubject clearShiroSubject = new ClearShiroSubject(); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79f6bb62/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ExportServiceIT.java ---------------------------------------------------------------------- diff --git a/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ExportServiceIT.java b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ExportServiceIT.java index 6cd6fef..f4ca966 100644 --- a/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ExportServiceIT.java +++ b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ExportServiceIT.java @@ -49,7 +49,7 @@ import org.apache.usergrid.ServiceITSetupImpl; import org.apache.usergrid.batch.JobExecution; import org.apache.usergrid.cassandra.SpringResource; import org.apache.usergrid.cassandra.ClearShiroSubject; -import org.apache.usergrid.cassandra.Concurrent; + import org.apache.usergrid.management.ApplicationInfo; import org.apache.usergrid.management.OrganizationInfo; import org.apache.usergrid.management.UserInfo; @@ -81,7 +81,6 @@ import static org.mockito.Mockito.when; * * */ -@Concurrent public class ExportServiceIT { private static final Logger LOG = LoggerFactory.getLogger( ExportServiceIT.class ); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79f6bb62/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java ---------------------------------------------------------------------- diff --git a/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java index da70064..8d551cf 100644 --- a/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java +++ b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java @@ -35,7 +35,7 @@ import org.apache.usergrid.ServiceITSetup; import org.apache.usergrid.ServiceITSetupImpl; import org.apache.usergrid.cassandra.SpringResource; import org.apache.usergrid.cassandra.ClearShiroSubject; -import org.apache.usergrid.cassandra.Concurrent; + import org.apache.usergrid.count.SimpleBatcher; import org.apache.usergrid.management.OrganizationInfo; import org.apache.usergrid.management.UserInfo; @@ -68,7 +68,7 @@ import static org.junit.Assert.assertTrue; /** * @author zznate */ -@Concurrent() + public class ManagementServiceIT { private static final Logger LOG = LoggerFactory.getLogger( ManagementServiceIT.class ); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79f6bb62/stack/services/src/test/java/org/apache/usergrid/security/providers/FacebookProviderIT.java ---------------------------------------------------------------------- diff --git a/stack/services/src/test/java/org/apache/usergrid/security/providers/FacebookProviderIT.java b/stack/services/src/test/java/org/apache/usergrid/security/providers/FacebookProviderIT.java index 40bc5e8..d22647f 100644 --- a/stack/services/src/test/java/org/apache/usergrid/security/providers/FacebookProviderIT.java +++ b/stack/services/src/test/java/org/apache/usergrid/security/providers/FacebookProviderIT.java @@ -30,7 +30,7 @@ import org.apache.usergrid.ServiceITSetup; import org.apache.usergrid.ServiceITSetupImpl; import org.apache.usergrid.cassandra.SpringResource; import org.apache.usergrid.cassandra.ClearShiroSubject; -import org.apache.usergrid.cassandra.Concurrent; + import org.apache.usergrid.management.OrganizationInfo; import org.apache.usergrid.management.UserInfo; import org.apache.usergrid.persistence.entities.Application; @@ -46,7 +46,7 @@ import static org.junit.Assert.assertNotNull; /** @author zznate */ -@Concurrent() + public class FacebookProviderIT { private static SignInProviderFactory providerFactory; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79f6bb62/stack/services/src/test/java/org/apache/usergrid/security/providers/PingIdentityProviderIT.java ---------------------------------------------------------------------- diff --git a/stack/services/src/test/java/org/apache/usergrid/security/providers/PingIdentityProviderIT.java b/stack/services/src/test/java/org/apache/usergrid/security/providers/PingIdentityProviderIT.java index d756049..c47b954 100644 --- a/stack/services/src/test/java/org/apache/usergrid/security/providers/PingIdentityProviderIT.java +++ b/stack/services/src/test/java/org/apache/usergrid/security/providers/PingIdentityProviderIT.java @@ -30,7 +30,7 @@ import org.apache.usergrid.ServiceITSetup; import org.apache.usergrid.ServiceITSetupImpl; import org.apache.usergrid.cassandra.SpringResource; import org.apache.usergrid.cassandra.ClearShiroSubject; -import org.apache.usergrid.cassandra.Concurrent; + import org.apache.usergrid.management.OrganizationInfo; import org.apache.usergrid.management.UserInfo; import org.apache.usergrid.persistence.entities.Application; @@ -43,7 +43,7 @@ import static junit.framework.Assert.assertNotNull; /** @author zznate */ @Ignore("Experimental Ping Indentiyy test") -@Concurrent() + public class PingIdentityProviderIT { private static UserInfo adminUser; private static OrganizationInfo organization; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79f6bb62/stack/services/src/test/java/org/apache/usergrid/security/tokens/TokenServiceIT.java ---------------------------------------------------------------------- diff --git a/stack/services/src/test/java/org/apache/usergrid/security/tokens/TokenServiceIT.java b/stack/services/src/test/java/org/apache/usergrid/security/tokens/TokenServiceIT.java index c18cc69..69bb0e2 100644 --- a/stack/services/src/test/java/org/apache/usergrid/security/tokens/TokenServiceIT.java +++ b/stack/services/src/test/java/org/apache/usergrid/security/tokens/TokenServiceIT.java @@ -32,7 +32,7 @@ import org.apache.usergrid.ServiceITSetup; import org.apache.usergrid.ServiceITSetupImpl; import org.apache.usergrid.cassandra.SpringResource; import org.apache.usergrid.cassandra.ClearShiroSubject; -import org.apache.usergrid.cassandra.Concurrent; + import org.apache.usergrid.management.ApplicationInfo; import org.apache.usergrid.management.UserInfo; import org.apache.usergrid.persistence.EntityManager; @@ -51,7 +51,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -@Concurrent() + public class TokenServiceIT { static Logger log = LoggerFactory.getLogger( TokenServiceIT.class ); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79f6bb62/stack/services/src/test/java/org/apache/usergrid/services/AbstractServiceIT.java ---------------------------------------------------------------------- diff --git a/stack/services/src/test/java/org/apache/usergrid/services/AbstractServiceIT.java b/stack/services/src/test/java/org/apache/usergrid/services/AbstractServiceIT.java index 03f8043..7f074b5 100644 --- a/stack/services/src/test/java/org/apache/usergrid/services/AbstractServiceIT.java +++ b/stack/services/src/test/java/org/apache/usergrid/services/AbstractServiceIT.java @@ -25,11 +25,11 @@ import org.apache.usergrid.ServiceITSetup; import org.apache.usergrid.ServiceITSetupImpl; import org.apache.usergrid.cassandra.SpringResource; import org.apache.usergrid.cassandra.ClearShiroSubject; -import org.apache.usergrid.cassandra.Concurrent; + import org.apache.usergrid.persistence.index.impl.ElasticSearchResource; -@Concurrent() + public abstract class AbstractServiceIT { @Rule public ClearShiroSubject clearShiroSubject = new ClearShiroSubject(); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79f6bb62/stack/services/src/test/java/org/apache/usergrid/services/ActivitiesServiceIT.java ---------------------------------------------------------------------- diff --git a/stack/services/src/test/java/org/apache/usergrid/services/ActivitiesServiceIT.java b/stack/services/src/test/java/org/apache/usergrid/services/ActivitiesServiceIT.java index c6cb42e..d31fe16 100644 --- a/stack/services/src/test/java/org/apache/usergrid/services/ActivitiesServiceIT.java +++ b/stack/services/src/test/java/org/apache/usergrid/services/ActivitiesServiceIT.java @@ -20,7 +20,7 @@ package org.apache.usergrid.services; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.usergrid.cassandra.Concurrent; + import org.apache.usergrid.persistence.Entity; import org.apache.usergrid.persistence.index.query.Query; import org.apache.usergrid.persistence.entities.Activity; @@ -28,7 +28,7 @@ import org.apache.usergrid.persistence.entities.Activity; import static org.junit.Assert.assertNotNull; -@Concurrent() + public class ActivitiesServiceIT extends AbstractServiceIT { @SuppressWarnings("unused") private static final Logger LOG = LoggerFactory.getLogger( ActivitiesServiceIT.class ); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79f6bb62/stack/services/src/test/java/org/apache/usergrid/services/ApplicationsServiceIT.java ---------------------------------------------------------------------- diff --git a/stack/services/src/test/java/org/apache/usergrid/services/ApplicationsServiceIT.java b/stack/services/src/test/java/org/apache/usergrid/services/ApplicationsServiceIT.java index b110946..a8b54bb 100644 --- a/stack/services/src/test/java/org/apache/usergrid/services/ApplicationsServiceIT.java +++ b/stack/services/src/test/java/org/apache/usergrid/services/ApplicationsServiceIT.java @@ -18,10 +18,10 @@ package org.apache.usergrid.services; import org.junit.Test; -import org.apache.usergrid.cassandra.Concurrent; -@Concurrent() + + public class ApplicationsServiceIT extends AbstractServiceIT { @Test public void testPermissions() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79f6bb62/stack/services/src/test/java/org/apache/usergrid/services/CollectionServiceIT.java ---------------------------------------------------------------------- diff --git a/stack/services/src/test/java/org/apache/usergrid/services/CollectionServiceIT.java b/stack/services/src/test/java/org/apache/usergrid/services/CollectionServiceIT.java index 07a42b5..bc77fab 100644 --- a/stack/services/src/test/java/org/apache/usergrid/services/CollectionServiceIT.java +++ b/stack/services/src/test/java/org/apache/usergrid/services/CollectionServiceIT.java @@ -19,7 +19,7 @@ package org.apache.usergrid.services; import org.junit.Assert; import org.junit.Test; -import org.apache.usergrid.cassandra.Concurrent; + import org.apache.usergrid.persistence.Entity; import org.apache.usergrid.persistence.Schema; import org.apache.usergrid.persistence.exceptions.RequiredPropertyNotFoundException; @@ -33,7 +33,7 @@ import static org.junit.Assert.assertNull; import static org.apache.usergrid.persistence.Schema.TYPE_APPLICATION; -@Concurrent() + public class CollectionServiceIT extends AbstractServiceIT { public static final String CST_TEST_GROUP = "cst-test-group"; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79f6bb62/stack/services/src/test/java/org/apache/usergrid/services/ConnectionsServiceIT.java ---------------------------------------------------------------------- diff --git a/stack/services/src/test/java/org/apache/usergrid/services/ConnectionsServiceIT.java b/stack/services/src/test/java/org/apache/usergrid/services/ConnectionsServiceIT.java index 436f231..eb8e2dd 100644 --- a/stack/services/src/test/java/org/apache/usergrid/services/ConnectionsServiceIT.java +++ b/stack/services/src/test/java/org/apache/usergrid/services/ConnectionsServiceIT.java @@ -21,7 +21,7 @@ import java.util.Map; import org.junit.Assert; import org.junit.Test; -import org.apache.usergrid.cassandra.Concurrent; + import org.apache.usergrid.persistence.Entity; import static org.junit.Assert.assertFalse; @@ -31,10 +31,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@Concurrent() + public class ConnectionsServiceIT extends AbstractServiceIT { private static final Logger logger = LoggerFactory.getLogger( ConnectionsServiceIT.class ); - + @SuppressWarnings("rawtypes") @Test public void testUserConnections() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79f6bb62/stack/services/src/test/java/org/apache/usergrid/services/GroupServiceIT.java ---------------------------------------------------------------------- diff --git a/stack/services/src/test/java/org/apache/usergrid/services/GroupServiceIT.java b/stack/services/src/test/java/org/apache/usergrid/services/GroupServiceIT.java index 1044e13..49ce433 100644 --- a/stack/services/src/test/java/org/apache/usergrid/services/GroupServiceIT.java +++ b/stack/services/src/test/java/org/apache/usergrid/services/GroupServiceIT.java @@ -18,13 +18,11 @@ package org.apache.usergrid.services; import org.junit.Test; -import org.apache.usergrid.cassandra.Concurrent; + import org.apache.usergrid.persistence.Entity; import static org.junit.Assert.assertNotNull; - -@Concurrent() public class GroupServiceIT extends AbstractServiceIT { @Test public void testGroups() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79f6bb62/stack/services/src/test/java/org/apache/usergrid/services/RolesServiceIT.java ---------------------------------------------------------------------- diff --git a/stack/services/src/test/java/org/apache/usergrid/services/RolesServiceIT.java b/stack/services/src/test/java/org/apache/usergrid/services/RolesServiceIT.java index 04a900d..46731d6 100644 --- a/stack/services/src/test/java/org/apache/usergrid/services/RolesServiceIT.java +++ b/stack/services/src/test/java/org/apache/usergrid/services/RolesServiceIT.java @@ -23,7 +23,7 @@ import java.util.Set; import org.junit.Test; -import org.apache.usergrid.cassandra.Concurrent; + import org.apache.usergrid.persistence.Entity; import org.apache.usergrid.persistence.entities.Role; import org.apache.usergrid.persistence.exceptions.RequiredPropertyNotFoundException; @@ -37,7 +37,7 @@ import static org.junit.Assert.assertTrue; /** @author tnine */ -@Concurrent() + public class RolesServiceIT extends AbstractServiceIT { /** Happy path test */ @@ -200,12 +200,12 @@ public class RolesServiceIT extends AbstractServiceIT { assertEquals( 1, results.size() ); app.getEntityManager().refreshIndex(); - + // check role is gone Role role = app.get( app.getAlias( "role", "manager" ), Role.class ); assertNull( role ); - // check permissions are gone + // check permissions are gone Set<String> permissions = app.getRolePermissions( "manager" ); assertEquals( 0, permissions.size() ); } http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79f6bb62/stack/services/src/test/java/org/apache/usergrid/services/ServiceFactoryIT.java ---------------------------------------------------------------------- diff --git a/stack/services/src/test/java/org/apache/usergrid/services/ServiceFactoryIT.java b/stack/services/src/test/java/org/apache/usergrid/services/ServiceFactoryIT.java index e4e576f..c4603ff 100644 --- a/stack/services/src/test/java/org/apache/usergrid/services/ServiceFactoryIT.java +++ b/stack/services/src/test/java/org/apache/usergrid/services/ServiceFactoryIT.java @@ -22,7 +22,7 @@ import java.util.UUID; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.usergrid.cassandra.Concurrent; + import org.apache.usergrid.services.simple.SimpleService; @@ -32,7 +32,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -@Concurrent() + public class ServiceFactoryIT extends AbstractServiceIT { private static final Logger logger = LoggerFactory.getLogger( ServiceFactoryIT.class ); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79f6bb62/stack/services/src/test/java/org/apache/usergrid/services/ServiceRequestIT.java ---------------------------------------------------------------------- diff --git a/stack/services/src/test/java/org/apache/usergrid/services/ServiceRequestIT.java b/stack/services/src/test/java/org/apache/usergrid/services/ServiceRequestIT.java index 2bad78e..c581611 100644 --- a/stack/services/src/test/java/org/apache/usergrid/services/ServiceRequestIT.java +++ b/stack/services/src/test/java/org/apache/usergrid/services/ServiceRequestIT.java @@ -33,14 +33,14 @@ import org.apache.usergrid.ServiceITSetup; import org.apache.usergrid.ServiceITSetupImpl; import org.apache.usergrid.cassandra.SpringResource; import org.apache.usergrid.cassandra.ClearShiroSubject; -import org.apache.usergrid.cassandra.Concurrent; + import org.apache.usergrid.persistence.index.impl.ElasticSearchResource; import static org.apache.usergrid.services.ServiceParameter.filter; import static org.apache.usergrid.services.ServiceParameter.parameters; -@Concurrent() + public class ServiceRequestIT { private static final Logger logger = LoggerFactory.getLogger( ServiceRequestIT.class );
