You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/02/16 23:01:49 UTC
[42/50] incubator-usergrid git commit: Updated name generation to be
unique in tests.
Updated name generation to be unique in tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/04db7bee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/04db7bee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/04db7bee
Branch: refs/heads/USERGRID-365
Commit: 04db7beea909242269406c9639b43fee6c309745
Parents: 7abf3b7
Author: Todd Nine <tn...@apigee.com>
Authored: Mon Feb 16 12:47:59 2015 -0800
Committer: Todd Nine <tn...@apigee.com>
Committed: Mon Feb 16 12:47:59 2015 -0800
----------------------------------------------------------------------
.../apache/usergrid/persistence/CounterIT.java | 3 ++-
.../usergrid/persistence/CountingMutatorIT.java | 3 ++-
.../persistence/EntityDictionaryIT.java | 12 +++++----
.../usergrid/persistence/EntityManagerIT.java | 27 ++++++++++----------
.../persistence/GeoQueryBooleanTest.java | 5 ++--
.../apache/usergrid/persistence/IndexIT.java | 13 ++++------
.../usergrid/persistence/PathQueryIT.java | 5 ++--
.../usergrid/persistence/PermissionsIT.java | 6 +++--
.../cassandra/EntityManagerFactoryImplIT.java | 5 ++--
9 files changed, 43 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/04db7bee/stack/core/src/test/java/org/apache/usergrid/persistence/CounterIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/CounterIT.java b/stack/core/src/test/java/org/apache/usergrid/persistence/CounterIT.java
index f85b3ad..4223007 100644
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/CounterIT.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/CounterIT.java
@@ -36,6 +36,7 @@ import org.apache.usergrid.persistence.entities.Group;
import org.apache.usergrid.persistence.entities.User;
import org.apache.usergrid.persistence.index.query.CounterResolution;
import org.apache.usergrid.persistence.index.query.Query;
+import org.apache.usergrid.persistence.model.util.UUIDGenerator;
import org.apache.usergrid.utils.ImmediateCounterRule;
import org.apache.usergrid.utils.JsonUtils;
import org.apache.usergrid.utils.UUIDUtils;
@@ -206,7 +207,7 @@ public class CounterIT extends AbstractCoreIT {
originalAdminLoginsCount = counts.get( "admin.logins" );
}
- String randomSuffix = RandomStringUtils.randomAlphabetic(20);
+ String randomSuffix = UUIDGenerator.newTimeUUID().toString();
String orgName = "testCounter" + randomSuffix;
String appName = "testEntityCounters" + randomSuffix;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/04db7bee/stack/core/src/test/java/org/apache/usergrid/persistence/CountingMutatorIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/CountingMutatorIT.java b/stack/core/src/test/java/org/apache/usergrid/persistence/CountingMutatorIT.java
index 4411074..68afbb9 100644
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/CountingMutatorIT.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/CountingMutatorIT.java
@@ -32,6 +32,7 @@ import org.apache.commons.lang3.RandomStringUtils;
import org.apache.usergrid.AbstractCoreIT;
import org.apache.usergrid.persistence.hector.CountingMutator;
import org.apache.usergrid.persistence.index.query.Query.Level;
+import org.apache.usergrid.persistence.model.util.UUIDGenerator;
import org.apache.usergrid.utils.UUIDUtils;
import static org.junit.Assert.assertEquals;
@@ -65,7 +66,7 @@ public class CountingMutatorIT extends AbstractCoreIT {
CountingMutator.MAX_SIZE = 10;
UUID applicationId = setup.createApplication(
- "testOrganization", "testFlushingMutator-" + RandomStringUtils.randomAlphabetic(20) );
+ "testOrganization", "testFlushingMutator-" + UUIDGenerator.newTimeUUID() );
EntityManager em = setup.getEmf().getEntityManager( applicationId );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/04db7bee/stack/core/src/test/java/org/apache/usergrid/persistence/EntityDictionaryIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/EntityDictionaryIT.java b/stack/core/src/test/java/org/apache/usergrid/persistence/EntityDictionaryIT.java
index 1128c05..ced7e78 100644
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/EntityDictionaryIT.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/EntityDictionaryIT.java
@@ -31,6 +31,7 @@ import org.apache.commons.lang3.RandomStringUtils;
import org.apache.usergrid.AbstractCoreIT;
import org.apache.usergrid.persistence.entities.Application;
+import org.apache.usergrid.persistence.model.util.UUIDGenerator;
import org.apache.usergrid.utils.JsonUtils;
import static org.junit.Assert.assertArrayEquals;
@@ -63,7 +64,7 @@ public class EntityDictionaryIT extends AbstractCoreIT {
LOG.info( "EntityDictionaryIT.testApplicationDictionaries" );
- UUID applicationId = setup.createApplication( "testOrganization", "testApplicationDictionaries" + RandomStringUtils.randomAlphabetic(20) );
+ UUID applicationId = setup.createApplication( "testOrganization", "testApplicationDictionaries" + UUIDGenerator.newTimeUUID() );
assertNotNull( applicationId );
EntityManager em = setup.getEmf().getEntityManager( applicationId );
@@ -80,7 +81,7 @@ public class EntityDictionaryIT extends AbstractCoreIT {
public void testUserDictionaries() throws Exception {
LOG.info( "EntityDictionaryIT.testUserDictionaries" );
- UUID applicationId = setup.createApplication( "testOrganization", "testUserDictionaries" + RandomStringUtils.randomAlphabetic(20) );
+ UUID applicationId = setup.createApplication( "testOrganization", "testUserDictionaries" + UUIDGenerator.newTimeUUID() );
assertNotNull( applicationId );
EntityManager em = setup.getEmf().getEntityManager( applicationId );
@@ -153,7 +154,7 @@ public class EntityDictionaryIT extends AbstractCoreIT {
LOG.info( "EntityDictionaryIT.testApplicationDictionaries" );
- UUID applicationId = setup.createApplication( "testOrganization", "testRemoveFromDictionary" + RandomStringUtils.randomAlphabetic(20) );
+ UUID applicationId = setup.createApplication( "testOrganization", "testRemoveFromDictionary" + UUIDGenerator.newTimeUUID() );
assertNotNull( applicationId );
EntityManager em = setup.getEmf().getEntityManager( applicationId );
@@ -187,7 +188,7 @@ public class EntityDictionaryIT extends AbstractCoreIT {
provider.setAccessTokenEndpointUrl( "https://accounts.google.com/o/oauth2/token" );
provider.setVersion( "2.0" );
- UUID applicationId = setup.createApplication( "testOrganization", "testGetDictionaries" + RandomStringUtils.randomAlphabetic(20) );
+ UUID applicationId = setup.createApplication( "testOrganization", "testGetDictionaries" + UUIDGenerator.newTimeUUID() );
assertNotNull( applicationId );
EntityManager em = setup.getEmf().getEntityManager( applicationId );
@@ -208,7 +209,8 @@ public class EntityDictionaryIT extends AbstractCoreIT {
LOG.info( "EntityDictionaryIT.testAddMapToDictionaries" );
Map<String,Object> testMap = new HashMap<String,Object>();
- UUID applicationId = setup.createApplication( "testOrganization", "testAddMapToDictionaries" + RandomStringUtils.randomAlphabetic(20) );
+ UUID applicationId = setup.createApplication( "testOrganization", "testAddMapToDictionaries" + UUIDGenerator
+ .newTimeUUID() );
assertNotNull( applicationId );
EntityManager em = setup.getEmf().getEntityManager( applicationId );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/04db7bee/stack/core/src/test/java/org/apache/usergrid/persistence/EntityManagerIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/EntityManagerIT.java b/stack/core/src/test/java/org/apache/usergrid/persistence/EntityManagerIT.java
index 93e0716..02721be 100644
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/EntityManagerIT.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/EntityManagerIT.java
@@ -38,6 +38,7 @@ import org.apache.usergrid.persistence.entities.Group;
import org.apache.usergrid.persistence.entities.User;
import org.apache.usergrid.persistence.index.query.Query;
import org.apache.usergrid.persistence.index.query.Query.Level;
+import org.apache.usergrid.persistence.model.util.UUIDGenerator;
import org.apache.usergrid.utils.UUIDUtils;
import static org.junit.Assert.assertEquals;
@@ -61,7 +62,7 @@ public class EntityManagerIT extends AbstractCoreIT {
LOG.info( "EntityManagerIT.testEntityManagerTest" );
UUID applicationId = setup.createApplication(
- "testOrganization", "testEntityManagerTest" + RandomStringUtils.randomAlphabetic(20) );
+ "testOrganization", "testEntityManagerTest" + UUIDGenerator.newTimeUUID() );
assertNotNull( applicationId );
EntityManager em = setup.getEmf().getEntityManager( applicationId );
@@ -122,7 +123,7 @@ public class EntityManagerIT extends AbstractCoreIT {
LOG.info( "EntityDaoTest.testCreateAndGet" );
UUID applicationId = setup.createApplication(
- "testOrganization", "testCreateAndGet" + RandomStringUtils.randomAlphabetic(20) );
+ "testOrganization", "testCreateAndGet" + UUIDGenerator.newTimeUUID() );
EntityManager em = setup.getEmf().getEntityManager( applicationId );
@@ -193,7 +194,7 @@ public class EntityManagerIT extends AbstractCoreIT {
LOG.info( "EntityDaoTest.testDictionaries" );
UUID applicationId = setup.createApplication(
- "testOrganization", "testDictionaries" + RandomStringUtils.randomAlphabetic(20) );
+ "testOrganization", "testDictionaries" + UUIDGenerator.newTimeUUID() );
EntityManager em = setup.getEmf().getEntityManager( applicationId );
@@ -237,7 +238,7 @@ public class EntityManagerIT extends AbstractCoreIT {
LOG.info( "EntityDaoTest.testProperties" );
UUID applicationId = setup.createApplication(
- "testOrganization", "testProperties" + RandomStringUtils.randomAlphabetic(20) );
+ "testOrganization", "testProperties" + UUIDGenerator.newTimeUUID() );
EntityManager em = setup.getEmf().getEntityManager( applicationId );
@@ -276,7 +277,7 @@ public class EntityManagerIT extends AbstractCoreIT {
LOG.info( "EntityDaoTest.testCreateAndDelete" );
UUID applicationId = setup.createApplication(
- "testOrganization", "testCreateAndDelete" + RandomStringUtils.randomAlphabetic(20) );
+ "testOrganization", "testCreateAndDelete" + UUIDGenerator.newTimeUUID() );
EntityManager em = setup.getEmf().getEntityManager( applicationId );
@@ -310,7 +311,7 @@ public class EntityManagerIT extends AbstractCoreIT {
LOG.info( "EntityDaoTest.testCreateAndDeleteUser" );
UUID applicationId = setup.createApplication(
- "testOrganization", "testCreateAndDeleteUser" + RandomStringUtils.randomAlphabetic(20) );
+ "testOrganization", "testCreateAndDeleteUser" + UUIDGenerator.newTimeUUID() );
EntityManager em = setup.getEmf().getEntityManager( applicationId );
@@ -366,7 +367,7 @@ public class EntityManagerIT extends AbstractCoreIT {
LOG.info( "EntityDaoTest.testProperties" );
UUID applicationId = setup.createApplication(
- "testOrganization", "testJson" + RandomStringUtils.randomAlphabetic(20) );
+ "testOrganization", "testJson" + UUIDGenerator.newTimeUUID() );
EntityManager em = setup.getEmf().getEntityManager( applicationId );
@@ -408,7 +409,7 @@ public class EntityManagerIT extends AbstractCoreIT {
organizationEntity = em.create( organizationEntity );
UUID applicationId = setup.getEmf().createApplication(
- "testCounterOrg", "testEntityCounters" + RandomStringUtils.randomAlphabetic(20) );
+ "testCounterOrg", "testEntityCounters" + UUIDGenerator.newTimeUUID() );
Map<String, Object> properties = new LinkedHashMap<String, Object>();
properties.put( "name", "testEntityCounters" );
@@ -445,7 +446,7 @@ public class EntityManagerIT extends AbstractCoreIT {
LOG.info( "EntityDaoTest.testCreateAndDelete" );
UUID applicationId = setup.createApplication(
- "testOrganization", "testCreateAndList" + RandomStringUtils.randomAlphabetic(20) );
+ "testOrganization", "testCreateAndList" + UUIDGenerator.newTimeUUID() );
EntityManager em = setup.getEmf().getEntityManager( applicationId );
@@ -488,7 +489,7 @@ public class EntityManagerIT extends AbstractCoreIT {
public void testCorrectType() throws Exception {
UUID applicationId = setup.createApplication(
- "testOrganization", "testCorrectType" + RandomStringUtils.randomAlphabetic(20) );
+ "testOrganization", "testCorrectType" + UUIDGenerator.newTimeUUID() );
EntityManager em = setup.getEmf().getEntityManager( applicationId );
@@ -515,7 +516,7 @@ public class EntityManagerIT extends AbstractCoreIT {
LOG.info( "EntityDaoTest.testProperties" );
UUID applicationId = setup.createApplication(
- "testOrganization", "testNamePropChanges" + RandomStringUtils.randomAlphabetic(20) );
+ "testOrganization", "testNamePropChanges" + UUIDGenerator.newTimeUUID() );
EntityManager em = setup.getEmf().getEntityManager( applicationId );
@@ -539,7 +540,7 @@ public class EntityManagerIT extends AbstractCoreIT {
public void ownershipScopeCorrect() throws Exception {
UUID applicationId = setup.createApplication(
- "testOrganization", "ownershipScopeCorrect" + RandomStringUtils.randomAlphabetic(20) );
+ "testOrganization", "ownershipScopeCorrect" + UUIDGenerator.newTimeUUID() );
EntityManager em = setup.getEmf().getEntityManager( applicationId );
@@ -598,7 +599,7 @@ public class EntityManagerIT extends AbstractCoreIT {
LOG.info( "EntityManagerIT.testDeprecatedGet" );
UUID applicationId = setup.createApplication(
- "testOrganization", "testDeprecatedGet" + RandomStringUtils.randomAlphabetic(20) );
+ "testOrganization", "testDeprecatedGet" + UUIDGenerator.newTimeUUID() );
assertNotNull( applicationId );
EntityManager em = setup.getEmf().getEntityManager( applicationId );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/04db7bee/stack/core/src/test/java/org/apache/usergrid/persistence/GeoQueryBooleanTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/GeoQueryBooleanTest.java b/stack/core/src/test/java/org/apache/usergrid/persistence/GeoQueryBooleanTest.java
index 3effeca..87edac3 100644
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/GeoQueryBooleanTest.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/GeoQueryBooleanTest.java
@@ -31,6 +31,7 @@ import org.apache.commons.lang3.RandomStringUtils;
import org.apache.usergrid.AbstractCoreIT;
import org.apache.usergrid.persistence.geo.model.Point;
import org.apache.usergrid.persistence.index.query.Query;
+import org.apache.usergrid.persistence.model.util.UUIDGenerator;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -52,7 +53,7 @@ public class GeoQueryBooleanTest extends AbstractCoreIT {
log.info( "GeoQueryBooleanTest.testGeoQueryWithOr" );
UUID applicationId = setup.createApplication(
- "testOrganization", "testGeoQueryWithOr-" + RandomStringUtils.randomAlphabetic(20));
+ "testOrganization", "testGeoQueryWithOr-" + UUIDGenerator.newTimeUUID());
assertNotNull( applicationId );
EntityManager em = setup.getEmf().getEntityManager( applicationId );
@@ -119,7 +120,7 @@ public class GeoQueryBooleanTest extends AbstractCoreIT {
log.info( "GeoQueryBooleanTest.testGeoQueryWithOr" );
UUID applicationId = setup.createApplication(
- "testOrganization", "testGeoQueryWithNot-" + RandomStringUtils.randomAlphabetic(20) );
+ "testOrganization", "testGeoQueryWithNot-" + UUIDGenerator.newTimeUUID() );
assertNotNull( applicationId );
EntityManager em = setup.getEmf().getEntityManager( applicationId );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/04db7bee/stack/core/src/test/java/org/apache/usergrid/persistence/IndexIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/IndexIT.java b/stack/core/src/test/java/org/apache/usergrid/persistence/IndexIT.java
index 5e02852..66d9276 100644
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/IndexIT.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/IndexIT.java
@@ -26,8 +26,6 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.commons.lang3.RandomStringUtils;
-
import org.apache.usergrid.AbstractCoreIT;
import org.apache.usergrid.cassandra.SpringResource;
import org.apache.usergrid.persistence.cassandra.CassandraService;
@@ -63,8 +61,7 @@ public class IndexIT extends AbstractCoreIT {
public void testCollectionOrdering() throws Exception {
LOG.info( "testCollectionOrdering" );
- UUID applicationId = setup.createApplication( "testOrganization", "testCollectionOrdering" + RandomStringUtils.randomAlphabetic(20) );
- assertNotNull( applicationId );
+ UUID applicationId = app.getId();
EntityManager em = setup.getEmf().getEntityManager( applicationId );
assertNotNull( em );
@@ -136,7 +133,7 @@ public class IndexIT extends AbstractCoreIT {
public void testCollectionFilters() throws Exception {
LOG.info( "testCollectionFilters" );
- UUID applicationId = setup.createApplication( "testOrganization", "testCollectionFilters" + RandomStringUtils.randomAlphabetic(20) );
+ UUID applicationId = app.getId();
assertNotNull( applicationId );
EntityManager em = setup.getEmf().getEntityManager( applicationId );
@@ -262,7 +259,7 @@ public class IndexIT extends AbstractCoreIT {
public void testSecondarySorts() throws Exception {
LOG.info( "testSecondarySorts" );
- UUID applicationId = setup.createApplication( "testOrganization", "testSecondarySorts" + RandomStringUtils.randomAlphabetic(20) );
+ UUID applicationId = app.getId();
assertNotNull( applicationId );
EntityManager em = setup.getEmf().getEntityManager( applicationId );
@@ -296,7 +293,7 @@ public class IndexIT extends AbstractCoreIT {
@Test
public void testPropertyUpdateWithConnection() throws Exception {
- UUID applicationId = setup.createApplication( "testOrganization", "testPropertyUpdateWithConnection" + RandomStringUtils.randomAlphabetic(20) );
+ UUID applicationId = app.getId();
EntityManager em = setup.getEmf().getEntityManager( applicationId );
@@ -371,7 +368,7 @@ public class IndexIT extends AbstractCoreIT {
public void testPropertyUpdateWithConnectionEntityIndexEntryAudit() throws Exception {
UUID applicationId =
- setup.createApplication( "testOrganization", "testPropertyUpdateWithConnectionEntityIndexEntryAudit" + RandomStringUtils.randomAlphabetic(20) );
+ app.getId();
EntityManager em = setup.getEmf().getEntityManager( applicationId );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/04db7bee/stack/core/src/test/java/org/apache/usergrid/persistence/PathQueryIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/PathQueryIT.java b/stack/core/src/test/java/org/apache/usergrid/persistence/PathQueryIT.java
index c72b4ea..c56c07f 100644
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/PathQueryIT.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/PathQueryIT.java
@@ -32,6 +32,7 @@ import org.apache.commons.lang3.RandomStringUtils;
import org.apache.usergrid.AbstractCoreIT;
import org.apache.usergrid.persistence.index.query.Query;
import org.apache.usergrid.persistence.index.query.Query.Level;
+import org.apache.usergrid.persistence.model.util.UUIDGenerator;
import static org.junit.Assert.assertEquals;
@@ -41,7 +42,7 @@ public class PathQueryIT extends AbstractCoreIT {
@Test
public void testUserDevicePathQuery() throws Exception {
UUID applicationId = setup.createApplication(
- "testOrganization", "testUserDevicePathQuery" + RandomStringUtils.randomAlphabetic(20) );
+ "testOrganization"+ UUIDGenerator.newTimeUUID(), "testUserDevicePathQuery" + UUIDGenerator.newTimeUUID() );
EntityManager em = setup.getEmf().getEntityManager( applicationId );
List<Entity> users = new ArrayList<Entity>();
@@ -112,7 +113,7 @@ public class PathQueryIT extends AbstractCoreIT {
public void testGroupUserDevicePathQuery() throws Exception {
UUID applicationId = setup.createApplication(
- "testOrganization", "testGroupUserDevicePathQuery" + RandomStringUtils.randomAlphabetic(20) );
+ "testOrganization"+ UUIDGenerator.newTimeUUID(), "testGroupUserDevicePathQuery" + UUIDGenerator.newTimeUUID() );
EntityManager em = setup.getEmf().getEntityManager( applicationId );
List<Entity> groups = new ArrayList<Entity>();
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/04db7bee/stack/core/src/test/java/org/apache/usergrid/persistence/PermissionsIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/PermissionsIT.java b/stack/core/src/test/java/org/apache/usergrid/persistence/PermissionsIT.java
index 23931e2..5e83a34 100644
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/PermissionsIT.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/PermissionsIT.java
@@ -32,6 +32,7 @@ import org.apache.commons.lang3.RandomStringUtils;
import org.apache.usergrid.AbstractCoreIT;
import org.apache.usergrid.persistence.entities.Role;
import org.apache.usergrid.persistence.index.query.Query.Level;
+import org.apache.usergrid.persistence.model.util.UUIDGenerator;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -51,7 +52,7 @@ public class PermissionsIT extends AbstractCoreIT {
@Test
public void testPermissionTimeout() throws Exception {
- UUID applicationId = setup.createApplication( "permissionsTest", "testPermissionTimeout" + RandomStringUtils.randomAlphabetic(20) );
+ UUID applicationId = setup.createApplication( "permissionsTest", "testPermissionTimeout" + UUIDGenerator.newTimeUUID() );
assertNotNull( applicationId );
@@ -101,7 +102,8 @@ public class PermissionsIT extends AbstractCoreIT {
public void testPermissions() throws Exception {
logger.info( "PermissionsIT.testPermissions" );
- UUID applicationId = setup.createApplication( "testOrganization", "testPermissions" + RandomStringUtils.randomAlphabetic(20) );
+ UUID applicationId = setup.createApplication( "testOrganization"+ UUIDGenerator.newTimeUUID(), "testPermissions" + UUIDGenerator
+ .newTimeUUID() );
assertNotNull( applicationId );
EntityManager em = setup.getEmf().getEntityManager( applicationId );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/04db7bee/stack/core/src/test/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java b/stack/core/src/test/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java
index 3ffc4e0..09e7ce1 100644
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java
@@ -41,6 +41,7 @@ import org.apache.usergrid.persistence.SimpleEntityRef;
import org.apache.usergrid.persistence.cassandra.util.TraceTag;
import org.apache.usergrid.persistence.cassandra.util.TraceTagManager;
import org.apache.usergrid.persistence.cassandra.util.TraceTagReporter;
+import org.apache.usergrid.persistence.model.util.UUIDGenerator;
import org.apache.usergrid.setup.ConcurrentProcessSingleton;
import static org.junit.Assert.assertEquals;
@@ -102,7 +103,7 @@ public class EntityManagerFactoryImplIT extends AbstractCoreIT {
@Test
public void testDeleteApplication() throws Exception {
- String rand = RandomStringUtils.randomAlphabetic(20);
+ String rand = UUIDGenerator.newTimeUUID().toString();
// create an application with a collection and an entity
@@ -147,7 +148,7 @@ public class EntityManagerFactoryImplIT extends AbstractCoreIT {
logger.info( "EntityDaoTest.testCreateAndGet" );
UUID applicationId = createApplication( "EntityManagerFactoryImplIT", "testCreateAndGet"
- + RandomStringUtils.randomAlphabetic(20) );
+ + UUIDGenerator.newTimeUUID() );
logger.info( "Application id " + applicationId );
EntityManager em = emf.getEntityManager( applicationId );