Repository: usergrid Updated Branches: refs/heads/release-2.1.1 5107ccf59 -> aae8fdf81
Now that ShiroCache is working well, this test is not thread-safe. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/ebcc772f Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/ebcc772f Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/ebcc772f Branch: refs/heads/release-2.1.1 Commit: ebcc772f99d8a85bd20ebd53ebbf49f900a79ce8 Parents: 7fdca3d Author: Dave Johnson <[email protected]> Authored: Fri May 20 12:01:28 2016 -0400 Committer: Dave Johnson <[email protected]> Committed: Fri May 20 12:01:28 2016 -0400 ---------------------------------------------------------------------- .../usergrid/rest/applications/ApplicationResourceIT.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/ebcc772f/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 2dd5090..06615df 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 @@ -16,19 +16,17 @@ */ package org.apache.usergrid.rest.applications; -import com.fasterxml.jackson.databind.JsonNode; import junit.framework.Assert; +import net.jcip.annotations.NotThreadSafe; 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.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.glassfish.jersey.client.ClientProperties; -import org.junit.Ignore; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -52,6 +50,7 @@ import static org.junit.Assert.*; /** * Invokes methods on ApplicationResource */ +@NotThreadSafe public class ApplicationResourceIT extends AbstractRestIT { private static final Logger logger = LoggerFactory.getLogger(ApplicationResourceIT.class);
