http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1fbe3e54/stack/core/src/test/java/org/apache/usergrid/corepersistence/CpEntityMapUtilsTest.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/corepersistence/CpEntityMapUtilsTest.java b/stack/core/src/test/java/org/apache/usergrid/corepersistence/CpEntityMapUtilsTest.java index a75b9fd..5d492a0 100644 --- a/stack/core/src/test/java/org/apache/usergrid/corepersistence/CpEntityMapUtilsTest.java +++ b/stack/core/src/test/java/org/apache/usergrid/corepersistence/CpEntityMapUtilsTest.java @@ -16,26 +16,30 @@ package org.apache.usergrid.corepersistence; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; + import java.io.IOException; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.usergrid.corepersistence.util.CpEntityMapUtils; import org.apache.usergrid.persistence.model.entity.Entity; import org.apache.usergrid.persistence.model.entity.SimpleId; import org.apache.usergrid.persistence.model.field.ListField; import org.apache.usergrid.persistence.model.field.value.EntityObject; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class CpEntityMapUtilsTest { @@ -51,21 +55,21 @@ public class CpEntityMapUtilsTest { add( new LinkedHashMap<String, Object>() {{ put("name", "fred"); }}); add( new LinkedHashMap<String, Object>() {{ put("name", "gertrude"); }}); add( new LinkedHashMap<String, Object>() {{ put("name", "mina"); }}); - }}); + }}); put( "blockedBy", new ArrayList<Object>() {{ add( new LinkedHashMap<String, Object>() {{ put("name", "isabell"); }}); }}); put( "location", new LinkedHashMap<String, Object>() {{ put("latitude", 37.776753 ); put("longitude", -122.407846 ); - }}); + }}); }}; Entity cpEntity = CpEntityMapUtils.fromMap( properties, "user", true ); assertUserWithBlocks( cpEntity ); } - + @Test public void testSerialization() throws JsonProcessingException, IOException { @@ -76,17 +80,17 @@ public class CpEntityMapUtilsTest { add( new LinkedHashMap<String, Object>() {{ put("name", "fred"); }}); add( new LinkedHashMap<String, Object>() {{ put("name", "gertrude"); }}); add( new LinkedHashMap<String, Object>() {{ put("name", "mina"); }}); - }}); + }}); put( "blockedBy", new ArrayList<Object>() {{ add( new LinkedHashMap<String, Object>() {{ put("name", "isabell"); }}); }}); put( "location", new LinkedHashMap<String, Object>() {{ put("latitude", 37.776753 ); put("longitude", -122.407846 ); - }}); + }}); }}; - org.apache.usergrid.persistence.model.entity.Entity entity = + org.apache.usergrid.persistence.model.entity.Entity entity = new org.apache.usergrid.persistence.model.entity.Entity( new SimpleId( "user" ) ); entity = CpEntityMapUtils.fromMap( entity, properties, null, true ); @@ -109,7 +113,7 @@ public class CpEntityMapUtilsTest { private void assertUserWithBlocks( org.apache.usergrid.persistence.model.entity.Entity e ) { - + assertTrue( e.getField("block") instanceof ListField ); assertTrue( e.getField("block").getValue() instanceof List ); List blockList = (List)e.getField("block").getValue();
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1fbe3e54/stack/core/src/test/java/org/apache/usergrid/corepersistence/StaleIndexCleanupTest.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/corepersistence/StaleIndexCleanupTest.java b/stack/core/src/test/java/org/apache/usergrid/corepersistence/StaleIndexCleanupTest.java index 5b9db6e..267bd0b 100644 --- a/stack/core/src/test/java/org/apache/usergrid/corepersistence/StaleIndexCleanupTest.java +++ b/stack/core/src/test/java/org/apache/usergrid/corepersistence/StaleIndexCleanupTest.java @@ -21,8 +21,12 @@ import java.util.HashMap; import java.util.List; import java.util.UUID; import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; +import org.junit.After; import org.junit.Assert; +import org.junit.Before; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,6 +34,7 @@ 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.corepersistence.util.CpNamingUtils; import org.apache.usergrid.persistence.Entity; import org.apache.usergrid.persistence.EntityManager; @@ -50,21 +55,21 @@ import org.apache.usergrid.persistence.index.query.Query; import org.apache.usergrid.persistence.model.entity.SimpleId; import com.fasterxml.uuid.UUIDComparator; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; -import static org.apache.usergrid.corepersistence.GuiceModule.EVENTS_DISABLED; +import com.google.inject.Injector; + +import net.jcip.annotations.NotThreadSafe; +import static org.apache.usergrid.corepersistence.GuiceModule.EVENTS_DISABLED; import static org.apache.usergrid.corepersistence.util.CpNamingUtils.getCollectionScopeNameFromEntityType; import static org.apache.usergrid.persistence.Schema.TYPE_APPLICATION; -import org.junit.After; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import org.junit.Before; /** * Test on read style clean-up of stale ElasticSearch indexes. */ +@NotThreadSafe public class StaleIndexCleanupTest extends AbstractCoreIT { private static final Logger logger = LoggerFactory.getLogger( StaleIndexCleanupTest.class ); @@ -76,7 +81,6 @@ public class StaleIndexCleanupTest extends AbstractCoreIT { @Before public void before() { - // if tests run in parallel there will likely be a conflict over the allow.stale.entities sequential.lock(); } @@ -84,7 +88,6 @@ public class StaleIndexCleanupTest extends AbstractCoreIT { @After public void after() { System.clearProperty( EVENTS_DISABLED ); - } /** @@ -93,7 +96,7 @@ public class StaleIndexCleanupTest extends AbstractCoreIT { @Test public void testUpdateVersioning() throws Exception { - // turn off post processing stuff that cleans up stale entities + // turn off post processing stuff that cleans up stale entities System.setProperty( EVENTS_DISABLED, "true" ); final EntityManager em = app.getEntityManager(); @@ -117,7 +120,7 @@ public class StaleIndexCleanupTest extends AbstractCoreIT { assertEquals( "widget", cpUpdated.getField( "stuff" ).getValue() ); UUID newVersion = cpUpdated.getVersion(); - assertTrue( "New version is greater than old", + assertTrue( "New version is greater than old", UUIDComparator.staticCompare( newVersion, oldVersion ) > 0 ); assertEquals( 2, queryCollectionCp( "things", "thing", "select *" ).size() ); @@ -125,7 +128,7 @@ public class StaleIndexCleanupTest extends AbstractCoreIT { /** - * Test that the CpRelationManager cleans up and stale indexes that it finds when + * Test that the CpRelationManager cleans up and stale indexes that it finds when * it is building search results. */ @Test @@ -133,7 +136,7 @@ public class StaleIndexCleanupTest extends AbstractCoreIT { logger.info( "Started testStaleIndexCleanup()" ); - // turn off post processing stuff that cleans up stale entities + // turn off post processing stuff that cleans up stale entities System.setProperty( EVENTS_DISABLED, "true" ); final EntityManager em = app.getEntityManager(); @@ -193,7 +196,7 @@ public class StaleIndexCleanupTest extends AbstractCoreIT { // should return numEntities becuase it filters out the stale entities final int limit = 8; - // we order by updateCount asc, this forces old versions to appear first, otherwise, + // we order by updateCount asc, this forces old versions to appear first, otherwise, // we don't clean them up in our versions Query q = Query.fromQL( "select * order by updateCount asc" ); q.setLimit( limit ); @@ -239,7 +242,7 @@ public class StaleIndexCleanupTest extends AbstractCoreIT { /** - * Test that the EntityDeleteImpl cleans up stale indexes on delete. Ensures that when an + * Test that the EntityDeleteImpl cleans up stale indexes on delete. Ensures that when an * entity is deleted its old indexes are cleared from ElasticSearch. */ @Test(timeout=10000) @@ -247,7 +250,7 @@ public class StaleIndexCleanupTest extends AbstractCoreIT { logger.info("Started testStaleIndexCleanup()"); - // turn off post processing stuff that cleans up stale entities + // turn off post processing stuff that cleans up stale entities System.setProperty( EVENTS_DISABLED, "true" ); final EntityManager em = app.getEntityManager(); @@ -298,7 +301,7 @@ public class StaleIndexCleanupTest extends AbstractCoreIT { crs = queryCollectionCp("things", "thing", "select *"); Assert.assertEquals( "Expect stale candidates", numEntities * (numUpdates + 1), crs.size()); - // turn ON post processing stuff that cleans up stale entities + // turn ON post processing stuff that cleans up stale entities System.setProperty( EVENTS_DISABLED, "false" ); // delete all entities @@ -317,9 +320,9 @@ public class StaleIndexCleanupTest extends AbstractCoreIT { Assert.assertEquals( "Expect no candidates", 0, crs.size() ); } - + /** - * Test that the EntityDeleteImpl cleans up stale indexes on update. Ensures that when an + * Test that the EntityDeleteImpl cleans up stale indexes on update. Ensures that when an * entity is updated its old indexes are cleared from ElasticSearch. */ @Test(timeout=10000) @@ -327,7 +330,7 @@ public class StaleIndexCleanupTest extends AbstractCoreIT { logger.info( "Started testCleanupOnUpdate()" ); - // turn off post processing stuff that cleans up stale entities + // turn off post processing stuff that cleans up stale entities System.setProperty( EVENTS_DISABLED, "true" ); final EntityManager em = app.getEntityManager(); @@ -349,7 +352,7 @@ public class StaleIndexCleanupTest extends AbstractCoreIT { CandidateResults crs = queryCollectionCp( "things", "thing", "select *"); Assert.assertEquals( "Expect no stale candidates yet", numEntities, crs.size() ); - // turn off post processing stuff that cleans up stale entities + // turn off post processing stuff that cleans up stale entities System.setProperty( EVENTS_DISABLED, "false" ); // update each one a bunch of times @@ -390,8 +393,8 @@ public class StaleIndexCleanupTest extends AbstractCoreIT { Assert.assertEquals( "Expect candidates without earlier stale entities", numEntities, crs.size() ); } - - /** + + /** /** * Go around EntityManager and get directly from Core Persistence. */ @@ -399,11 +402,11 @@ public class StaleIndexCleanupTest extends AbstractCoreIT { EntityManager em = app.getEntityManager(); - CollectionScope cs = getCollectionScopeNameFromEntityType( + CollectionScope cs = getCollectionScopeNameFromEntityType( new SimpleId( em.getApplicationId(), TYPE_APPLICATION ), eref.getType() ); - EntityCollectionManagerFactory ecmf = - CpSetup.getInjector().getInstance( EntityCollectionManagerFactory.class ); + EntityCollectionManagerFactory ecmf = + SpringResource.getInstance().getBean( Injector.class ).getInstance( EntityCollectionManagerFactory.class ); EntityCollectionManager ecm = ecmf.createCollectionManager( cs ); @@ -413,17 +416,17 @@ public class StaleIndexCleanupTest extends AbstractCoreIT { /** - * Go around EntityManager and execute query directly against Core Persistence. + * Go around EntityManager and execute query directly against Core Persistence. * Results may include stale index entries. */ - private CandidateResults queryCollectionCp( + private CandidateResults queryCollectionCp( final String collName, final String type, final String query ) { EntityManager em = app.getEntityManager(); - EntityIndexFactory eif = CpSetup.getInjector().getInstance( EntityIndexFactory.class ); + EntityIndexFactory eif = SpringResource.getInstance().getBean( Injector.class ).getInstance( EntityIndexFactory.class ); - ApplicationScope as = new ApplicationScopeImpl( + ApplicationScope as = new ApplicationScopeImpl( new SimpleId( em.getApplicationId(), TYPE_APPLICATION ) ); EntityIndex ei = eif.createEntityIndex( as ); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1fbe3e54/stack/core/src/test/java/org/apache/usergrid/corepersistence/migration/EntityDataMigrationIT.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/corepersistence/migration/EntityDataMigrationIT.java b/stack/core/src/test/java/org/apache/usergrid/corepersistence/migration/EntityDataMigrationIT.java index c1d1fb7..c673334 100644 --- a/stack/core/src/test/java/org/apache/usergrid/corepersistence/migration/EntityDataMigrationIT.java +++ b/stack/core/src/test/java/org/apache/usergrid/corepersistence/migration/EntityDataMigrationIT.java @@ -25,11 +25,12 @@ import java.util.Iterator; import java.util.Set; import org.junit.Before; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.apache.usergrid.AbstractCoreIT; -import org.apache.usergrid.corepersistence.CpSetup; +import org.apache.usergrid.cassandra.SpringResource; import org.apache.usergrid.corepersistence.EntityWriteHelper; import org.apache.usergrid.corepersistence.ManagerCache; import org.apache.usergrid.corepersistence.rx.AllEntitiesInSystemObservable; @@ -52,14 +53,13 @@ import org.apache.usergrid.persistence.model.util.UUIDGenerator; import com.google.inject.Injector; import com.google.inject.Key; +import net.jcip.annotations.NotThreadSafe; + import rx.functions.Action1; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import org.junit.Ignore; - -import net.jcip.annotations.NotThreadSafe; @NotThreadSafe @@ -83,13 +83,13 @@ public class EntityDataMigrationIT extends AbstractCoreIT { * Rule to do the resets we need */ @Rule - public MigrationTestRule migrationTestRule = - new MigrationTestRule( app, CpSetup.getInjector() ,EntityDataMigration.class ); + public MigrationTestRule migrationTestRule = + new MigrationTestRule( app, SpringResource.getInstance().getBean( Injector.class ) ,EntityDataMigration.class ); @Before public void setup() { emf = setup.getEmf(); - injector = CpSetup.getInjector(); + injector = SpringResource.getInstance().getBean( Injector.class ); entityDataMigration = injector.getInstance( EntityDataMigration.class ); managerCache = injector.getInstance( ManagerCache.class ); dataMigrationManager = injector.getInstance( DataMigrationManager.class ); @@ -221,7 +221,7 @@ public class EntityDataMigrationIT extends AbstractCoreIT { assertEquals( "All entities migrated", 0, savedEntities.size() ); - //now visit all entities in the system again, and load them from the EM, + //now visit all entities in the system again, and load them from the EM, // ensure we see everything we did in the v1 traversal AllEntitiesInSystemObservable.getAllEntitiesInSystem( managerCache, 1000 ) .doOnNext( new Action1<AllEntitiesInSystemObservable.ApplicationEntityGroup>() { @@ -230,7 +230,7 @@ public class EntityDataMigrationIT extends AbstractCoreIT { final AllEntitiesInSystemObservable .ApplicationEntityGroup entity ) { - final EntityManager em = emf.getEntityManager( + final EntityManager em = emf.getEntityManager( entity.applicationScope.getApplication().getUuid() ); //add all versions from history to our comparison http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1fbe3e54/stack/core/src/test/java/org/apache/usergrid/corepersistence/migration/EntityTypeMappingMigrationIT.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/corepersistence/migration/EntityTypeMappingMigrationIT.java b/stack/core/src/test/java/org/apache/usergrid/corepersistence/migration/EntityTypeMappingMigrationIT.java index 4bd048b..e117925 100644 --- a/stack/core/src/test/java/org/apache/usergrid/corepersistence/migration/EntityTypeMappingMigrationIT.java +++ b/stack/core/src/test/java/org/apache/usergrid/corepersistence/migration/EntityTypeMappingMigrationIT.java @@ -24,11 +24,12 @@ import java.util.HashSet; import java.util.Set; import org.junit.Before; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.apache.usergrid.AbstractCoreIT; -import org.apache.usergrid.corepersistence.CpSetup; +import org.apache.usergrid.cassandra.SpringResource; import org.apache.usergrid.corepersistence.EntityWriteHelper; import org.apache.usergrid.corepersistence.ManagerCache; import org.apache.usergrid.corepersistence.rx.AllEntitiesInSystemObservable; @@ -44,14 +45,13 @@ import org.apache.usergrid.persistence.model.util.UUIDGenerator; import com.google.inject.Injector; import com.netflix.astyanax.Keyspace; +import net.jcip.annotations.NotThreadSafe; + import rx.functions.Action1; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import org.junit.Ignore; - -import net.jcip.annotations.NotThreadSafe; @NotThreadSafe @@ -72,14 +72,14 @@ public class EntityTypeMappingMigrationIT extends AbstractCoreIT { * Rule to do the resets we need */ @Rule - public MigrationTestRule migrationTestRule = new MigrationTestRule( - app, CpSetup.getInjector() ,EntityTypeMappingMigration.class ); + public MigrationTestRule migrationTestRule = new MigrationTestRule( + app, SpringResource.getInstance().getBean( Injector.class ) ,EntityTypeMappingMigration.class ); @Before public void setup() { - injector = CpSetup.getInjector(); + injector = SpringResource.getInstance().getBean( Injector.class ); emf = setup.getEmf(); entityTypeMappingMigration = injector.getInstance( EntityTypeMappingMigration.class ); keyspace = injector.getInstance( Keyspace.class ); @@ -117,8 +117,8 @@ public class EntityTypeMappingMigrationIT extends AbstractCoreIT { keyspace.truncateColumnFamily( MapSerializationImpl.MAP_ENTRIES ); keyspace.truncateColumnFamily( MapSerializationImpl.MAP_KEYS ); - app.createApplication( - GraphShardVersionMigrationIT.class.getSimpleName()+ UUIDGenerator.newTimeUUID(), + app.createApplication( + GraphShardVersionMigrationIT.class.getSimpleName()+ UUIDGenerator.newTimeUUID(), "migrationTest" ); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1fbe3e54/stack/core/src/test/java/org/apache/usergrid/corepersistence/migration/GraphShardVersionMigrationIT.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/corepersistence/migration/GraphShardVersionMigrationIT.java b/stack/core/src/test/java/org/apache/usergrid/corepersistence/migration/GraphShardVersionMigrationIT.java index fdde80b..53a7ac9 100644 --- a/stack/core/src/test/java/org/apache/usergrid/corepersistence/migration/GraphShardVersionMigrationIT.java +++ b/stack/core/src/test/java/org/apache/usergrid/corepersistence/migration/GraphShardVersionMigrationIT.java @@ -24,11 +24,12 @@ import java.util.HashSet; import java.util.Set; import org.junit.Before; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.apache.usergrid.AbstractCoreIT; -import org.apache.usergrid.corepersistence.CpSetup; +import org.apache.usergrid.cassandra.SpringResource; import org.apache.usergrid.corepersistence.EntityWriteHelper; import org.apache.usergrid.corepersistence.ManagerCache; import org.apache.usergrid.corepersistence.rx.AllEntitiesInSystemObservable; @@ -51,7 +52,6 @@ import rx.functions.Action1; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import org.junit.Ignore; @NotThreadSafe @@ -68,13 +68,14 @@ public class GraphShardVersionMigrationIT extends AbstractCoreIT { * Rule to do the resets we need */ @Rule - public MigrationTestRule migrationTestRule = new MigrationTestRule( app, CpSetup.getInjector() ,GraphShardVersionMigration.class ); + public MigrationTestRule migrationTestRule = new MigrationTestRule( app, SpringResource + .getInstance().getBean( Injector.class ) ,GraphShardVersionMigration.class ); @Before public void setup() { - injector = CpSetup.getInjector(); + injector = SpringResource.getInstance().getBean( Injector.class ); graphShardVersionMigration = injector.getInstance( GraphShardVersionMigration.class ); managerCache = injector.getInstance( ManagerCache.class ); dataMigrationManager = injector.getInstance( DataMigrationManager.class ); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1fbe3e54/stack/core/src/test/java/org/apache/usergrid/corepersistence/migration/MigrationTestRule.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/corepersistence/migration/MigrationTestRule.java b/stack/core/src/test/java/org/apache/usergrid/corepersistence/migration/MigrationTestRule.java index 116d67f..3071b72 100644 --- a/stack/core/src/test/java/org/apache/usergrid/corepersistence/migration/MigrationTestRule.java +++ b/stack/core/src/test/java/org/apache/usergrid/corepersistence/migration/MigrationTestRule.java @@ -21,7 +21,6 @@ package org.apache.usergrid.corepersistence.migration; import org.junit.rules.ExternalResource; -import org.junit.rules.TestRule; import org.junit.runner.Description; import org.junit.runners.model.Statement; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1fbe3e54/stack/core/src/test/java/org/apache/usergrid/corepersistence/rx/AllEntitiesInSystemObservableIT.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/corepersistence/rx/AllEntitiesInSystemObservableIT.java b/stack/core/src/test/java/org/apache/usergrid/corepersistence/rx/AllEntitiesInSystemObservableIT.java index 4d1c6c9..1be03e3 100644 --- a/stack/core/src/test/java/org/apache/usergrid/corepersistence/rx/AllEntitiesInSystemObservableIT.java +++ b/stack/core/src/test/java/org/apache/usergrid/corepersistence/rx/AllEntitiesInSystemObservableIT.java @@ -28,7 +28,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.usergrid.AbstractCoreIT; -import org.apache.usergrid.corepersistence.CpSetup; +import org.apache.usergrid.cassandra.SpringResource; import org.apache.usergrid.corepersistence.EntityWriteHelper; import org.apache.usergrid.corepersistence.ManagerCache; import org.apache.usergrid.corepersistence.util.CpNamingUtils; @@ -38,6 +38,8 @@ import org.apache.usergrid.persistence.core.scope.ApplicationScope; import org.apache.usergrid.persistence.graph.GraphManager; import org.apache.usergrid.persistence.model.entity.Id; +import com.google.inject.Injector; + import rx.functions.Action1; import static org.junit.Assert.assertEquals; @@ -83,7 +85,7 @@ public class AllEntitiesInSystemObservableIT extends AbstractCoreIT { //this is hacky, but our context integration b/t guice and spring is a mess. We need to clean this up when we //clean up our wiring // - ManagerCache managerCache = CpSetup.getInjector().getInstance( ManagerCache.class ); + ManagerCache managerCache = SpringResource.getInstance().getBean( Injector.class ).getInstance( ManagerCache.class ); final ApplicationScope scope = CpNamingUtils.getApplicationScope( app.getId() ); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1fbe3e54/stack/core/src/test/java/org/apache/usergrid/corepersistence/rx/ApplicationObservableTestIT.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/corepersistence/rx/ApplicationObservableTestIT.java b/stack/core/src/test/java/org/apache/usergrid/corepersistence/rx/ApplicationObservableTestIT.java index f8f3c50..f7b1b28 100644 --- a/stack/core/src/test/java/org/apache/usergrid/corepersistence/rx/ApplicationObservableTestIT.java +++ b/stack/core/src/test/java/org/apache/usergrid/corepersistence/rx/ApplicationObservableTestIT.java @@ -27,18 +27,17 @@ import java.util.UUID; import org.junit.Test; import org.apache.usergrid.AbstractCoreIT; -import org.apache.usergrid.corepersistence.CpSetup; +import org.apache.usergrid.cassandra.SpringResource; import org.apache.usergrid.corepersistence.ManagerCache; import org.apache.usergrid.corepersistence.util.CpNamingUtils; -import org.apache.usergrid.persistence.collection.EntityCollectionManagerFactory; import org.apache.usergrid.persistence.entities.Application; -import org.apache.usergrid.persistence.graph.GraphManagerFactory; import org.apache.usergrid.persistence.model.entity.Id; +import com.google.inject.Injector; + import rx.Observable; import rx.functions.Action1; -import static junit.framework.Assert.assertNotNull; import static org.junit.Assert.assertEquals; @@ -64,7 +63,7 @@ public class ApplicationObservableTestIT extends AbstractCoreIT { //this is hacky, but our context integration b/t guice and spring is a mess. We need to clean this up when we //clean up our wiring - ManagerCache managerCache = CpSetup.getInjector().getInstance( ManagerCache.class ); + ManagerCache managerCache = SpringResource.getInstance().getBean( Injector.class ).getInstance( ManagerCache.class ); Observable<Id> appObservable = ApplicationObservable.getAllApplicationIds( managerCache ); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1fbe3e54/stack/core/src/test/java/org/apache/usergrid/corepersistence/rx/EdgesFromSourceObservableIT.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/corepersistence/rx/EdgesFromSourceObservableIT.java b/stack/core/src/test/java/org/apache/usergrid/corepersistence/rx/EdgesFromSourceObservableIT.java index 2aa7fbc..e05195e 100644 --- a/stack/core/src/test/java/org/apache/usergrid/corepersistence/rx/EdgesFromSourceObservableIT.java +++ b/stack/core/src/test/java/org/apache/usergrid/corepersistence/rx/EdgesFromSourceObservableIT.java @@ -21,14 +21,12 @@ package org.apache.usergrid.corepersistence.rx; import java.util.HashMap; -import java.util.HashSet; import java.util.Set; -import java.util.UUID; import org.junit.Test; import org.apache.usergrid.AbstractCoreIT; -import org.apache.usergrid.corepersistence.CpSetup; +import org.apache.usergrid.cassandra.SpringResource; import org.apache.usergrid.corepersistence.EntityWriteHelper; import org.apache.usergrid.corepersistence.ManagerCache; import org.apache.usergrid.corepersistence.util.CpNamingUtils; @@ -40,10 +38,11 @@ import org.apache.usergrid.persistence.core.scope.ApplicationScope; import org.apache.usergrid.persistence.entities.Application; import org.apache.usergrid.persistence.graph.Edge; import org.apache.usergrid.persistence.graph.GraphManager; -import org.apache.usergrid.persistence.graph.GraphManagerFactory; import org.apache.usergrid.persistence.model.entity.Id; import org.apache.usergrid.persistence.model.entity.SimpleId; +import com.google.inject.Injector; + import rx.functions.Action1; import static org.junit.Assert.assertEquals; @@ -88,7 +87,7 @@ public class EdgesFromSourceObservableIT extends AbstractCoreIT { //this is hacky, but our context integration b/t guice and spring is a mess. We need to clean this up when we //clean up our wiring // - ManagerCache managerCache = CpSetup.getInjector().getInstance( ManagerCache.class ); + ManagerCache managerCache = SpringResource.getInstance().getBean( Injector.class ).getInstance( ManagerCache.class ); final ApplicationScope scope = CpNamingUtils.getApplicationScope( app.getId() ); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1fbe3e54/stack/core/src/test/java/org/apache/usergrid/corepersistence/rx/EdgesToTargetObservableIT.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/corepersistence/rx/EdgesToTargetObservableIT.java b/stack/core/src/test/java/org/apache/usergrid/corepersistence/rx/EdgesToTargetObservableIT.java index ef0d953..f0ca2b7 100644 --- a/stack/core/src/test/java/org/apache/usergrid/corepersistence/rx/EdgesToTargetObservableIT.java +++ b/stack/core/src/test/java/org/apache/usergrid/corepersistence/rx/EdgesToTargetObservableIT.java @@ -20,28 +20,24 @@ package org.apache.usergrid.corepersistence.rx; -import java.util.HashMap; import java.util.HashSet; import java.util.Set; -import java.util.UUID; import org.junit.Test; import org.apache.usergrid.AbstractCoreIT; -import org.apache.usergrid.corepersistence.CpSetup; +import org.apache.usergrid.cassandra.SpringResource; import org.apache.usergrid.corepersistence.EntityWriteHelper; import org.apache.usergrid.corepersistence.ManagerCache; import org.apache.usergrid.corepersistence.util.CpNamingUtils; -import org.apache.usergrid.persistence.Entity; import org.apache.usergrid.persistence.EntityManager; import org.apache.usergrid.persistence.SimpleEntityRef; import org.apache.usergrid.persistence.core.scope.ApplicationScope; -import org.apache.usergrid.persistence.entities.Application; import org.apache.usergrid.persistence.graph.Edge; import org.apache.usergrid.persistence.graph.GraphManager; -import org.apache.usergrid.persistence.graph.GraphManagerFactory; import org.apache.usergrid.persistence.model.entity.Id; -import org.apache.usergrid.persistence.model.entity.SimpleId; + +import com.google.inject.Injector; import rx.functions.Action1; @@ -83,7 +79,7 @@ public class EdgesToTargetObservableIT extends AbstractCoreIT { //this is hacky, but our context integration b/t guice and spring is a mess. We need to clean this up when we //clean up our wiring // - ManagerCache managerCache = CpSetup.getInjector().getInstance( ManagerCache.class ); + ManagerCache managerCache = SpringResource.getInstance().getBean( Injector.class ).getInstance( ManagerCache.class ); final ApplicationScope scope = CpNamingUtils.getApplicationScope( app.getId() ); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1fbe3e54/stack/core/src/test/java/org/apache/usergrid/corepersistence/rx/TargetIdObservableTestIT.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/corepersistence/rx/TargetIdObservableTestIT.java b/stack/core/src/test/java/org/apache/usergrid/corepersistence/rx/TargetIdObservableTestIT.java index cde8866..acdac9a 100644 --- a/stack/core/src/test/java/org/apache/usergrid/corepersistence/rx/TargetIdObservableTestIT.java +++ b/stack/core/src/test/java/org/apache/usergrid/corepersistence/rx/TargetIdObservableTestIT.java @@ -20,34 +20,28 @@ package org.apache.usergrid.corepersistence.rx; -import java.util.HashMap; import java.util.HashSet; import java.util.Set; -import java.util.UUID; import org.junit.Test; import org.apache.usergrid.AbstractCoreIT; -import org.apache.usergrid.corepersistence.CpSetup; +import org.apache.usergrid.cassandra.SpringResource; import org.apache.usergrid.corepersistence.EntityWriteHelper; import org.apache.usergrid.corepersistence.ManagerCache; import org.apache.usergrid.corepersistence.util.CpNamingUtils; -import org.apache.usergrid.persistence.Entity; import org.apache.usergrid.persistence.EntityManager; import org.apache.usergrid.persistence.SimpleEntityRef; import org.apache.usergrid.persistence.core.scope.ApplicationScope; -import org.apache.usergrid.persistence.entities.Application; -import org.apache.usergrid.persistence.graph.Edge; import org.apache.usergrid.persistence.graph.GraphManager; -import org.apache.usergrid.persistence.graph.GraphManagerFactory; import org.apache.usergrid.persistence.model.entity.Id; -import org.apache.usergrid.persistence.model.entity.SimpleId; + +import com.google.inject.Injector; import rx.functions.Action1; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; /** @@ -84,7 +78,7 @@ public class TargetIdObservableTestIT extends AbstractCoreIT { //this is hacky, but our context integration b/t guice and spring is a mess. We need to clean this up when we //clean up our wiring // - ManagerCache managerCache = CpSetup.getInjector().getInstance( ManagerCache.class ); + ManagerCache managerCache = SpringResource.getInstance().getBean( Injector.class ).getInstance( ManagerCache.class ); final ApplicationScope scope = CpNamingUtils.getApplicationScope( app.getId() ); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1fbe3e54/stack/core/src/test/java/org/apache/usergrid/count/BatchCountParallelismTest.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/count/BatchCountParallelismTest.java b/stack/core/src/test/java/org/apache/usergrid/count/BatchCountParallelismTest.java index 5009f60..c5b46b2 100644 --- a/stack/core/src/test/java/org/apache/usergrid/count/BatchCountParallelismTest.java +++ b/stack/core/src/test/java/org/apache/usergrid/count/BatchCountParallelismTest.java @@ -17,8 +17,6 @@ package org.apache.usergrid.count; -import static org.junit.Assert.assertEquals; - import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -34,13 +32,16 @@ import org.junit.Before; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.apache.usergrid.count.common.Count; +import static org.junit.Assert.assertEquals; + /** @author zznate */ @net.jcip.annotations.NotThreadSafe public class BatchCountParallelismTest { - + private static final Logger LOG = LoggerFactory.getLogger( BatchCountParallelismTest.class ); private ExecutorService exec = Executors.newFixedThreadPool( 24 ); private SimpleBatcher batcher; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1fbe3e54/stack/core/src/test/java/org/apache/usergrid/count/SimpleBatcherTest.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/count/SimpleBatcherTest.java b/stack/core/src/test/java/org/apache/usergrid/count/SimpleBatcherTest.java index b4aca80..331ba95 100644 --- a/stack/core/src/test/java/org/apache/usergrid/count/SimpleBatcherTest.java +++ b/stack/core/src/test/java/org/apache/usergrid/count/SimpleBatcherTest.java @@ -19,6 +19,7 @@ package org.apache.usergrid.count; import org.junit.Before; import org.junit.Test; + import org.apache.usergrid.count.common.Count; import static junit.framework.Assert.assertEquals; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1fbe3e54/stack/core/src/test/java/org/apache/usergrid/locking/cassandra/HectorLockManagerIT.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/locking/cassandra/HectorLockManagerIT.java b/stack/core/src/test/java/org/apache/usergrid/locking/cassandra/HectorLockManagerIT.java index d5bc276..8351cb2 100644 --- a/stack/core/src/test/java/org/apache/usergrid/locking/cassandra/HectorLockManagerIT.java +++ b/stack/core/src/test/java/org/apache/usergrid/locking/cassandra/HectorLockManagerIT.java @@ -25,27 +25,26 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import me.prettyprint.cassandra.model.ConfigurableConsistencyLevel; -import me.prettyprint.hector.api.ConsistencyLevelPolicy; -import me.prettyprint.hector.api.HConsistencyLevel; - import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.apache.usergrid.AbstractCoreIT; -import org.apache.usergrid.cassandra.Concurrent; import org.apache.usergrid.locking.Lock; import org.apache.usergrid.locking.LockManager; import org.apache.usergrid.locking.exception.UGLockException; +import me.prettyprint.cassandra.model.ConfigurableConsistencyLevel; +import me.prettyprint.hector.api.ConsistencyLevelPolicy; +import me.prettyprint.hector.api.HConsistencyLevel; + import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -@Concurrent() public class HectorLockManagerIT extends AbstractCoreIT { private static final Logger LOG = LoggerFactory.getLogger( HectorLockManagerIT.class ); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1fbe3e54/stack/core/src/test/java/org/apache/usergrid/locking/singlenode/SingleNodeLockTestSingleNode.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/locking/singlenode/SingleNodeLockTestSingleNode.java b/stack/core/src/test/java/org/apache/usergrid/locking/singlenode/SingleNodeLockTestSingleNode.java index cd7c1dc..b6d58d7 100644 --- a/stack/core/src/test/java/org/apache/usergrid/locking/singlenode/SingleNodeLockTestSingleNode.java +++ b/stack/core/src/test/java/org/apache/usergrid/locking/singlenode/SingleNodeLockTestSingleNode.java @@ -31,6 +31,7 @@ import org.junit.Before; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.apache.usergrid.locking.Lock; import org.apache.usergrid.locking.LockManager; import org.apache.usergrid.locking.exception.UGLockException; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1fbe3e54/stack/core/src/test/java/org/apache/usergrid/locking/zookeeper/ZookeeperLockManagerTest.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/locking/zookeeper/ZookeeperLockManagerTest.java b/stack/core/src/test/java/org/apache/usergrid/locking/zookeeper/ZookeeperLockManagerTest.java index 05041b2..e12a91b 100644 --- a/stack/core/src/test/java/org/apache/usergrid/locking/zookeeper/ZookeeperLockManagerTest.java +++ b/stack/core/src/test/java/org/apache/usergrid/locking/zookeeper/ZookeeperLockManagerTest.java @@ -32,6 +32,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.apache.usergrid.locking.Lock; import org.apache.usergrid.locking.LockManager; import org.apache.usergrid.locking.exception.UGLockException; @@ -136,7 +137,6 @@ public class ZookeeperLockManagerTest extends AbstractZooKeeperTest { logger.info( "Cleaning up locks for current thread..." ); lock.unlock(); lock.unlock(); - second.unlock(); boolean locked = lockInDifferentThread( application, entity ); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1fbe3e54/stack/core/src/test/java/org/apache/usergrid/mq/MessagesIT.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/mq/MessagesIT.java b/stack/core/src/test/java/org/apache/usergrid/mq/MessagesIT.java index 1a57148..3699839 100644 --- a/stack/core/src/test/java/org/apache/usergrid/mq/MessagesIT.java +++ b/stack/core/src/test/java/org/apache/usergrid/mq/MessagesIT.java @@ -26,7 +26,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.usergrid.AbstractCoreIT; -import org.apache.usergrid.cassandra.Concurrent; import org.apache.usergrid.utils.ImmediateCounterRule; import org.apache.usergrid.utils.JsonUtils; @@ -36,12 +35,11 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -@Concurrent() public class MessagesIT extends AbstractCoreIT { private static final Logger LOG = LoggerFactory.getLogger( MessagesIT.class ); @Rule - public ImmediateCounterRule counterRule = new ImmediateCounterRule( springResource ); + public ImmediateCounterRule counterRule = new ImmediateCounterRule( ); public MessagesIT() { super(); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1fbe3e54/stack/core/src/test/java/org/apache/usergrid/mq/QueuePathsTest.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/mq/QueuePathsTest.java b/stack/core/src/test/java/org/apache/usergrid/mq/QueuePathsTest.java index 1c25092..a53576e 100644 --- a/stack/core/src/test/java/org/apache/usergrid/mq/QueuePathsTest.java +++ b/stack/core/src/test/java/org/apache/usergrid/mq/QueuePathsTest.java @@ -20,14 +20,13 @@ package org.apache.usergrid.mq; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.usergrid.cassandra.Concurrent; import static org.apache.usergrid.mq.Queue.getQueueParentPaths; import static org.apache.usergrid.mq.Queue.normalizeQueuePath; import static org.apache.usergrid.utils.JsonUtils.mapToFormattedJsonString; -@Concurrent() + public class QueuePathsTest { private static final Logger LOG = LoggerFactory.getLogger( QueuePathsTest.class ); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1fbe3e54/stack/core/src/test/java/org/apache/usergrid/persistence/CollectionIT.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/CollectionIT.java b/stack/core/src/test/java/org/apache/usergrid/persistence/CollectionIT.java index b24bd31..1881fff 100644 --- a/stack/core/src/test/java/org/apache/usergrid/persistence/CollectionIT.java +++ b/stack/core/src/test/java/org/apache/usergrid/persistence/CollectionIT.java @@ -32,7 +32,6 @@ import org.slf4j.LoggerFactory; import org.apache.usergrid.AbstractCoreIT; import org.apache.usergrid.Application; import org.apache.usergrid.CoreApplication; -import org.apache.usergrid.cassandra.Concurrent; import org.apache.usergrid.persistence.entities.User; import org.apache.usergrid.persistence.exceptions.DuplicateUniquePropertyExistsException; import org.apache.usergrid.persistence.index.query.Identifier; @@ -48,12 +47,10 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; - //@RunWith(JukitoRunner.class) //@UseModules({ GuiceModule.class }) -@Concurrent() -public class - CollectionIT extends AbstractCoreIT { +public class CollectionIT extends AbstractCoreIT { + private static final Logger LOG = LoggerFactory.getLogger( CollectionIT.class ); @Rule @@ -67,7 +64,7 @@ public class app.put( "username", "edanuff" ); app.put( "email", "e...@anuff.com" ); Entity user = app.create( "user" ); - assertNotNull( user ); + assertNotNull( user ); user = app.get( user.getUuid(), "user" ); assertNotNull( user ); @@ -374,7 +371,7 @@ public class em.refreshIndex(); - Results r = em.searchCollection( group, "users", + Results r = em.searchCollection( group, "users", new Query().addEqualityFilter( "nickname", "ed" ) .withResultsLevel(Level.LINKED_PROPERTIES ) ); @@ -930,7 +927,7 @@ public class public void pagingAfterDelete() throws Exception { LOG.debug( "pagingAfterDelete" ); - + EntityManager em = app.getEntityManager(); assertNotNull( em ); @@ -1497,7 +1494,7 @@ public class em.refreshIndex(); location = new LinkedHashMap<String, Object>(); - location.put( "Place", + location.put( "Place", "Via Pietro Maroncelli, 48, 62012 Santa Maria Apparente Province of Macerata, Italy" ); location.put( "Longitude", 13.693080199999999 ); location.put( "Latitude", 43.2985019 ); @@ -1516,7 +1513,7 @@ public class em.refreshIndex(); // String s = "select * where Flag = 'requested'"; - // String s = "select * where Flag = 'requested' and NOT Recipient.Username = + // String s = "select * where Flag = 'requested' and NOT Recipient.Username = // 'fb_536692245' order by created asc"; String s = "select * where Flag = 'requested' and NOT Recipient.Username " http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1fbe3e54/stack/core/src/test/java/org/apache/usergrid/persistence/CoreSchemaManager.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/CoreSchemaManager.java b/stack/core/src/test/java/org/apache/usergrid/persistence/CoreSchemaManager.java index 307cdff..5b9adb8 100644 --- a/stack/core/src/test/java/org/apache/usergrid/persistence/CoreSchemaManager.java +++ b/stack/core/src/test/java/org/apache/usergrid/persistence/CoreSchemaManager.java @@ -20,15 +20,20 @@ package org.apache.usergrid.persistence; import org.junit.Ignore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.apache.usergrid.cassandra.SchemaManager; +import org.apache.usergrid.cassandra.SpringResource; import org.apache.usergrid.persistence.cassandra.CassandraService; +import org.apache.usergrid.persistence.cassandra.Setup; +import org.apache.usergrid.persistence.index.impl.EsProvider; + +import com.google.inject.Injector; import me.prettyprint.hector.api.Cluster; -import org.apache.usergrid.persistence.cassandra.Setup; /** @author zznate */ -@Ignore("Not a test") +@Ignore( "Not a test" ) public class CoreSchemaManager implements SchemaManager { private static final Logger LOG = LoggerFactory.getLogger( CoreSchemaManager.class ); @@ -36,7 +41,7 @@ public class CoreSchemaManager implements SchemaManager { private final Cluster cluster; - public CoreSchemaManager( Setup setup, Cluster cluster ) { + public CoreSchemaManager( final Setup setup, final Cluster cluster ) { this.setup = setup; this.cluster = cluster; } @@ -49,6 +54,7 @@ public class CoreSchemaManager implements SchemaManager { } catch ( Exception ex ) { LOG.error( "Could not setup usergrid core schema", ex ); + throw new RuntimeException( "Could not setup usergrid core schema", ex ); } } @@ -62,11 +68,15 @@ public class CoreSchemaManager implements SchemaManager { @Override public void populateBaseData() { try { + + setup.setupStaticKeyspace(); + setup.setupSystemKeyspace(); setup.createDefaultApplications(); } catch ( Exception ex ) { LOG.error( "Could not create default applications", ex ); + throw new RuntimeException("Could not create default applications", ex ); } } @@ -74,8 +84,27 @@ public class CoreSchemaManager implements SchemaManager { @Override public void destroy() { LOG.info( "dropping keyspaces" ); - cluster.dropKeyspace( CassandraService.SYSTEM_KEYSPACE ); - cluster.dropKeyspace( CassandraService.STATIC_APPLICATION_KEYSPACE ); + try { + cluster.dropKeyspace( CassandraService.SYSTEM_KEYSPACE ); + } + catch ( RuntimeException ire ) { + //swallow if it just doesn't exist + } + + + try { + cluster.dropKeyspace( CassandraService.STATIC_APPLICATION_KEYSPACE ); + } + catch ( RuntimeException ire ) { + //swallow if it just doesn't exist + } + LOG.info( "keyspaces dropped" ); + + + final EsProvider provider = + SpringResource.getInstance().getBean( Injector.class ).getInstance( EsProvider.class ); + + provider.getClient().admin().indices().prepareDelete( "_all" ).execute().actionGet(); } } http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1fbe3e54/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 88686bc..f85b3ad 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 @@ -31,7 +31,6 @@ import org.slf4j.LoggerFactory; import org.apache.commons.lang3.RandomStringUtils; import org.apache.usergrid.AbstractCoreIT; -import org.apache.usergrid.cassandra.Concurrent; import org.apache.usergrid.persistence.entities.Event; import org.apache.usergrid.persistence.entities.Group; import org.apache.usergrid.persistence.entities.User; @@ -41,17 +40,19 @@ import org.apache.usergrid.utils.ImmediateCounterRule; import org.apache.usergrid.utils.JsonUtils; import org.apache.usergrid.utils.UUIDUtils; +import net.jcip.annotations.NotThreadSafe; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -@Concurrent() +@NotThreadSafe public class CounterIT extends AbstractCoreIT { private static final Logger LOG = LoggerFactory.getLogger( CounterIT.class ); @Rule - public ImmediateCounterRule counterRule = new ImmediateCounterRule( springResource ); + public ImmediateCounterRule counterRule = new ImmediateCounterRule( ); long ts = System.currentTimeMillis() - ( 24 * 60 * 60 * 1000 ); @@ -67,8 +68,9 @@ public class CounterIT extends AbstractCoreIT { LOG.info( "CounterIT.testIncrementAndDecrement" ); - UUID applicationId = setup.createApplication( - "testOrganization", "testCountersIandD" + RandomStringUtils.randomAlphabetic(20) ); + + + UUID applicationId = app.getId(); assertNotNull( applicationId ); EntityManager em = setup.getEmf().getEntityManager( applicationId ); @@ -99,8 +101,7 @@ public class CounterIT extends AbstractCoreIT { public void testCounters() throws Exception { LOG.info( "CounterIT.testCounters" ); - UUID applicationId = setup.createApplication( - "testOrganization", "testCounters" + RandomStringUtils.randomAlphabetic(20) ); + UUID applicationId = app.getId(); assertNotNull( applicationId ); EntityManager em = setup.getEmf().getEntityManager( applicationId ); @@ -139,7 +140,7 @@ public class CounterIT extends AbstractCoreIT { System.currentTimeMillis(), true ); LOG.info( JsonUtils.mapToJsonString( r.getCounters() ) ); - r = em.getAggregateCounters( user1, null, null, "visits", CounterResolution.ALL, ts, + r = em.getAggregateCounters( user1, null, null, "visits", CounterResolution.ALL, ts, System.currentTimeMillis(), false ); LOG.info( JsonUtils.mapToJsonString( r.getCounters() ) ); @@ -205,7 +206,7 @@ public class CounterIT extends AbstractCoreIT { originalAdminLoginsCount = counts.get( "admin.logins" ); } - String randomSuffix = RandomStringUtils.randomAlphabetic(20); + String randomSuffix = RandomStringUtils.randomAlphabetic(20); String orgName = "testCounter" + randomSuffix; String appName = "testEntityCounters" + randomSuffix; @@ -214,7 +215,7 @@ public class CounterIT extends AbstractCoreIT { organizationEntity.setProperty( "name", orgName ); organizationEntity = em.create( organizationEntity ); - UUID applicationId = setup.getEmf().createApplication( orgName, appName ); + UUID applicationId = setup.getEmf().createApplication( orgName, appName ); Map<String, Object> properties = new LinkedHashMap<String, Object>(); properties.put( "name", orgName + "/" + appName ); @@ -248,16 +249,16 @@ public class CounterIT extends AbstractCoreIT { // how to "count" a login to a specific application? // when org is provided, why is it returning 8? Is it 4 with one 'event'? - Results r = em.getAggregateCounters( null, null, null, "admin.logins", + Results r = em.getAggregateCounters( null, null, null, "admin.logins", CounterResolution.ALL, ts, System.currentTimeMillis(), false ); LOG.info( JsonUtils.mapToJsonString( r.getCounters() ) ); - assertEquals( 1, + assertEquals( 1, r.getCounters().get( 0 ).getValues().get( 0 ).getValue() - originalAdminLoginsCount ); r = em.getAggregateCounters( query ); LOG.info( JsonUtils.mapToJsonString( r.getCounters() ) ); - assertEquals( 1, + assertEquals( 1, r.getCounters().get( 0 ).getValues().get( 0 ).getValue() - originalCount ); } } http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1fbe3e54/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 0d029dd..4411074 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 @@ -20,7 +20,6 @@ package org.apache.usergrid.persistence; import java.util.LinkedHashMap; import java.util.Map; import java.util.UUID; -import org.apache.commons.lang3.RandomStringUtils; import org.junit.After; import org.junit.Before; @@ -28,16 +27,15 @@ 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.Concurrent; import org.apache.usergrid.persistence.hector.CountingMutator; +import org.apache.usergrid.persistence.index.query.Query.Level; import org.apache.usergrid.utils.UUIDUtils; -import org.apache.usergrid.persistence.index.query.Query.Level; import static org.junit.Assert.assertEquals; - -@Concurrent() public class CountingMutatorIT extends AbstractCoreIT { private static final Logger LOG = LoggerFactory.getLogger( CountingMutatorIT.class ); @@ -66,7 +64,7 @@ public class CountingMutatorIT extends AbstractCoreIT { //temporarily set our max size to 10 for testing CountingMutator.MAX_SIZE = 10; - UUID applicationId = setup.createApplication( + UUID applicationId = setup.createApplication( "testOrganization", "testFlushingMutator-" + RandomStringUtils.randomAlphabetic(20) ); EntityManager em = setup.getEmf().getEntityManager( applicationId ); @@ -100,7 +98,7 @@ public class CountingMutatorIT extends AbstractCoreIT { //now verify our connections were created properly - PagingResultsIterator itr = new PagingResultsIterator(em.getConnectingEntities( + PagingResultsIterator itr = new PagingResultsIterator(em.getConnectingEntities( returned, "following", "user", Level.ALL_PROPERTIES, 1000 )); int count = 0; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1fbe3e54/stack/core/src/test/java/org/apache/usergrid/persistence/EntityConnectionsIT.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/EntityConnectionsIT.java b/stack/core/src/test/java/org/apache/usergrid/persistence/EntityConnectionsIT.java index e52e7f9..59ec88a 100644 --- a/stack/core/src/test/java/org/apache/usergrid/persistence/EntityConnectionsIT.java +++ b/stack/core/src/test/java/org/apache/usergrid/persistence/EntityConnectionsIT.java @@ -26,8 +26,8 @@ import java.util.UUID; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.apache.usergrid.AbstractCoreIT; -import org.apache.usergrid.cassandra.Concurrent; import org.apache.usergrid.persistence.entities.User; import org.apache.usergrid.persistence.index.query.Query.Level; @@ -36,8 +36,6 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; - -@Concurrent() public class EntityConnectionsIT extends AbstractCoreIT { private static final Logger LOG = LoggerFactory.getLogger( EntityConnectionsIT.class ); @@ -177,7 +175,7 @@ public class EntityConnectionsIT extends AbstractCoreIT { } - public Map<String, Map<String, List<UUID>>> testEntityConnections( + public Map<String, Map<String, List<UUID>>> testEntityConnections( UUID applicationId, UUID entityId, String connectionType, String entityType, int expectedCount ) throws Exception { LOG.info( "----------------------------------------------------" ); @@ -189,22 +187,22 @@ public class EntityConnectionsIT extends AbstractCoreIT { Results results = em.getConnectedEntities( en, connectionType, null, Level.REFS ); LOG.info( "----------------------------------------------------" ); - assertEquals( "Expected " + expectedCount + " connections", + assertEquals( "Expected " + expectedCount + " connections", expectedCount, results.getConnections().size() ); // return connections; return null; } - public List<UUID> testApplicationCollections( + public List<UUID> testApplicationCollections( UUID applicationId, String collectionName, int expectedCount ) throws Exception { - return testEntityCollections( + return testEntityCollections( applicationId, applicationId, "application", collectionName, expectedCount ); } - public List<UUID> testEntityCollections( UUID applicationId, UUID entityId, String entityType, + public List<UUID> testEntityCollections( UUID applicationId, UUID entityId, String entityType, String collectionName, int expectedCount ) throws Exception { LOG.info( "----------------------------------------------------" ); @@ -292,7 +290,7 @@ public class EntityConnectionsIT extends AbstractCoreIT { assertFalse( em.isConnectionMember( secondUserEntity, "likes", fourpeaks ) ); } - + @Test public void testGetConnectingEntities() throws Exception { @@ -319,19 +317,19 @@ public class EntityConnectionsIT extends AbstractCoreIT { em.refreshIndex(); // // search for "likes" edges from fred -// assertEquals( 1, +// assertEquals( 1, // em.getConnectedEntities( fredEntity, "likes", null, Level.IDS ).size()); // // // search for any type of edges from fred -// assertEquals( 1, +// assertEquals( 1, // em.getConnectedEntities( fredEntity, null, null, Level.IDS ).size()); // search for "likes" edges to wilman from any type of object Results res = em.getConnectingEntities( wilmaEntity, "likes", null, Level.ALL_PROPERTIES); - assertEquals( 1, res.size() ); + assertEquals( 1, res.size() ); assertEquals( "user", res.getEntity().getType() ); // fred is a user - // search for "likes" edges to wilman from user type object + // search for "likes" edges to wilman from user type object res = em.getConnectingEntities( wilmaEntity, "likes", "user", Level.ALL_PROPERTIES); assertEquals( 1, res.size() ); assertEquals( "user", res.getEntity().getType() ); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1fbe3e54/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 d38c50c..1128c05 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 @@ -22,13 +22,14 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; import java.util.UUID; -import org.apache.commons.lang3.RandomStringUtils; 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.Concurrent; import org.apache.usergrid.persistence.entities.Application; import org.apache.usergrid.utils.JsonUtils; @@ -39,7 +40,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -@Concurrent() + public class EntityDictionaryIT extends AbstractCoreIT { private static final Logger LOG = LoggerFactory.getLogger( EntityDictionaryIT.class ); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1fbe3e54/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 427c168..93e0716 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 @@ -17,7 +17,6 @@ package org.apache.usergrid.persistence; -import org.apache.usergrid.persistence.index.query.Query; import java.util.ArrayList; import java.util.Iterator; import java.util.LinkedHashMap; @@ -26,17 +25,18 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; import java.util.UUID; -import org.apache.commons.lang3.RandomStringUtils; import org.junit.Ignore; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + +import org.apache.commons.lang3.RandomStringUtils; + import org.apache.usergrid.AbstractCoreIT; -import static org.apache.usergrid.AbstractCoreIT.setup; -import org.apache.usergrid.cassandra.Concurrent; 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.utils.UUIDUtils; @@ -46,7 +46,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -@Concurrent() + public class EntityManagerIT extends AbstractCoreIT { private static final Logger LOG = LoggerFactory.getLogger( EntityManagerIT.class ); @@ -60,7 +60,7 @@ public class EntityManagerIT extends AbstractCoreIT { public void testEntityManager() throws Exception { LOG.info( "EntityManagerIT.testEntityManagerTest" ); - UUID applicationId = setup.createApplication( + UUID applicationId = setup.createApplication( "testOrganization", "testEntityManagerTest" + RandomStringUtils.randomAlphabetic(20) ); assertNotNull( applicationId ); @@ -81,7 +81,7 @@ public class EntityManagerIT extends AbstractCoreIT { em.refreshIndex(); - EntityRef userRef = em.getAlias( + EntityRef userRef = em.getAlias( new SimpleEntityRef("application", applicationId), "users", "edanuff" ); assertNotNull( userRef ); @@ -121,7 +121,7 @@ public class EntityManagerIT extends AbstractCoreIT { public void testCreateAndGet() throws Exception { LOG.info( "EntityDaoTest.testCreateAndGet" ); - UUID applicationId = setup.createApplication( + UUID applicationId = setup.createApplication( "testOrganization", "testCreateAndGet" + RandomStringUtils.randomAlphabetic(20) ); EntityManager em = setup.getEmf().getEntityManager( applicationId ); @@ -192,7 +192,7 @@ public class EntityManagerIT extends AbstractCoreIT { public void testDictionaries() throws Exception { LOG.info( "EntityDaoTest.testDictionaries" ); - UUID applicationId = setup.createApplication( + UUID applicationId = setup.createApplication( "testOrganization", "testDictionaries" + RandomStringUtils.randomAlphabetic(20) ); EntityManager em = setup.getEmf().getEntityManager( applicationId ); @@ -236,7 +236,7 @@ public class EntityManagerIT extends AbstractCoreIT { public void testProperties() throws Exception { LOG.info( "EntityDaoTest.testProperties" ); - UUID applicationId = setup.createApplication( + UUID applicationId = setup.createApplication( "testOrganization", "testProperties" + RandomStringUtils.randomAlphabetic(20) ); EntityManager em = setup.getEmf().getEntityManager( applicationId ); @@ -275,7 +275,7 @@ public class EntityManagerIT extends AbstractCoreIT { public void testCreateAndDelete() throws Exception { LOG.info( "EntityDaoTest.testCreateAndDelete" ); - UUID applicationId = setup.createApplication( + UUID applicationId = setup.createApplication( "testOrganization", "testCreateAndDelete" + RandomStringUtils.randomAlphabetic(20) ); EntityManager em = setup.getEmf().getEntityManager( applicationId ); @@ -298,7 +298,7 @@ public class EntityManagerIT extends AbstractCoreIT { // now search by username, no results should be returned - Results r = em.searchCollection( em.getApplicationRef(), "thing", + Results r = em.searchCollection( em.getApplicationRef(), "thing", new Query().addEqualityFilter( "name", name ) ); assertEquals( 0, r.size() ); @@ -309,7 +309,7 @@ public class EntityManagerIT extends AbstractCoreIT { public void testCreateAndDeleteUser() throws Exception { LOG.info( "EntityDaoTest.testCreateAndDeleteUser" ); - UUID applicationId = setup.createApplication( + UUID applicationId = setup.createApplication( "testOrganization", "testCreateAndDeleteUser" + RandomStringUtils.randomAlphabetic(20) ); EntityManager em = setup.getEmf().getEntityManager( applicationId ); @@ -351,7 +351,7 @@ public class EntityManagerIT extends AbstractCoreIT { em.refreshIndex(); - r = em.searchCollection( em.getApplicationRef(), "users", + r = em.searchCollection( em.getApplicationRef(), "users", new Query().addEqualityFilter( "username", name ) ); assertEquals( 1, r.size() ); @@ -365,7 +365,7 @@ public class EntityManagerIT extends AbstractCoreIT { public void testJson() throws Exception { LOG.info( "EntityDaoTest.testProperties" ); - UUID applicationId = setup.createApplication( + UUID applicationId = setup.createApplication( "testOrganization", "testJson" + RandomStringUtils.randomAlphabetic(20) ); EntityManager em = setup.getEmf().getEntityManager( applicationId ); @@ -407,7 +407,7 @@ public class EntityManagerIT extends AbstractCoreIT { organizationEntity.setProperty( "name", "testCounterOrg" ); organizationEntity = em.create( organizationEntity ); - UUID applicationId = setup.getEmf().createApplication( + UUID applicationId = setup.getEmf().createApplication( "testCounterOrg", "testEntityCounters" + RandomStringUtils.randomAlphabetic(20) ); Map<String, Object> properties = new LinkedHashMap<String, Object>(); @@ -444,7 +444,7 @@ public class EntityManagerIT extends AbstractCoreIT { public void testCreateAndList() throws Exception { LOG.info( "EntityDaoTest.testCreateAndDelete" ); - UUID applicationId = setup.createApplication( + UUID applicationId = setup.createApplication( "testOrganization", "testCreateAndList" + RandomStringUtils.randomAlphabetic(20) ); EntityManager em = setup.getEmf().getEntityManager( applicationId ); @@ -487,7 +487,7 @@ public class EntityManagerIT extends AbstractCoreIT { @Test public void testCorrectType() throws Exception { - UUID applicationId = setup.createApplication( + UUID applicationId = setup.createApplication( "testOrganization", "testCorrectType" + RandomStringUtils.randomAlphabetic(20) ); EntityManager em = setup.getEmf().getEntityManager( applicationId ); @@ -514,7 +514,7 @@ public class EntityManagerIT extends AbstractCoreIT { public void testImmutableForcedPropChange() throws Exception { LOG.info( "EntityDaoTest.testProperties" ); - UUID applicationId = setup.createApplication( + UUID applicationId = setup.createApplication( "testOrganization", "testNamePropChanges" + RandomStringUtils.randomAlphabetic(20) ); EntityManager em = setup.getEmf().getEntityManager( applicationId ); @@ -538,7 +538,7 @@ public class EntityManagerIT extends AbstractCoreIT { @Test public void ownershipScopeCorrect() throws Exception { - UUID applicationId = setup.createApplication( + UUID applicationId = setup.createApplication( "testOrganization", "ownershipScopeCorrect" + RandomStringUtils.randomAlphabetic(20) ); EntityManager em = setup.getEmf().getEntityManager( applicationId ); @@ -597,7 +597,7 @@ public class EntityManagerIT extends AbstractCoreIT { public void testDeprecatedGet() throws Exception { LOG.info( "EntityManagerIT.testDeprecatedGet" ); - UUID applicationId = setup.createApplication( + UUID applicationId = setup.createApplication( "testOrganization", "testDeprecatedGet" + RandomStringUtils.randomAlphabetic(20) ); assertNotNull( applicationId ); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1fbe3e54/stack/core/src/test/java/org/apache/usergrid/persistence/EntityTest.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/EntityTest.java b/stack/core/src/test/java/org/apache/usergrid/persistence/EntityTest.java index b1e8239..e9e6163 100644 --- a/stack/core/src/test/java/org/apache/usergrid/persistence/EntityTest.java +++ b/stack/core/src/test/java/org/apache/usergrid/persistence/EntityTest.java @@ -24,7 +24,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.persistence.entities.Group; import org.apache.usergrid.persistence.entities.User; import org.apache.usergrid.utils.JsonUtils; @@ -33,7 +33,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -@Concurrent() + public class EntityTest { private static final Logger logger = LoggerFactory.getLogger( EntityTest.class ); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1fbe3e54/stack/core/src/test/java/org/apache/usergrid/persistence/GeoIT.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/GeoIT.java b/stack/core/src/test/java/org/apache/usergrid/persistence/GeoIT.java index 4100cfd..a1ac4ff 100644 --- a/stack/core/src/test/java/org/apache/usergrid/persistence/GeoIT.java +++ b/stack/core/src/test/java/org/apache/usergrid/persistence/GeoIT.java @@ -22,20 +22,22 @@ import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; + +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.usergrid.AbstractCoreIT; -import org.apache.usergrid.cassandra.Concurrent; import org.apache.usergrid.persistence.geo.model.Point; import org.apache.usergrid.persistence.index.query.Query; import org.apache.usergrid.persistence.model.field.value.Location; import org.apache.usergrid.utils.MapUtils; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -@Concurrent() + public class GeoIT extends AbstractCoreIT { private static final Logger LOG = LoggerFactory.getLogger(GeoIT.class); @@ -46,7 +48,7 @@ public class GeoIT extends AbstractCoreIT { A list of concrete entities with locations to be used for geoQuery tests NOTE: Adding or removing items from this list could affect test outcome!!! */ - private static List<Map<String, Object>> LOCATION_PROPERTIES = + private static List<Map<String, Object>> LOCATION_PROPERTIES = new ArrayList<Map<String, Object>>(); static { @@ -198,16 +200,16 @@ public class GeoIT extends AbstractCoreIT { em.refreshIndex(); //4. Test that the user is within 2000m of the entity Results emSearchResults = em.searchConnectedEntities(user, - Query.fromQL("location within 2000 of " - + ((LinkedHashMap<String, Object>) userProperties.get("location")).get("latitude") - + ", " + ((LinkedHashMap<String, Object>) + Query.fromQL("location within 2000 of " + + ((LinkedHashMap<String, Object>) userProperties.get("location")).get("latitude") + + ", " + ((LinkedHashMap<String, Object>) userProperties.get("location")).get("longitude")).setConnectionType("likes")); assertEquals(1, emSearchResults.size()); //5. Test that the user is NOT within 1000m of the entity emSearchResults = em.searchConnectedEntities(user, - Query.fromQL("location within 1000 of " - + ((LinkedHashMap<String, Object>) userProperties.get("location")).get("latitude") - + ", " + ((LinkedHashMap<String, Object>) + Query.fromQL("location within 1000 of " + + ((LinkedHashMap<String, Object>) userProperties.get("location")).get("latitude") + + ", " + ((LinkedHashMap<String, Object>) userProperties.get("location")).get("longitude")).setConnectionType("likes")); assertEquals(0, emSearchResults.size()); //cleanup @@ -273,7 +275,7 @@ public class GeoIT extends AbstractCoreIT { + center.getLat() + "," + center.getLon()); listResults = em.searchCollection(em.getApplicationRef(), "stores", query2); - assertEquals("Results within " + CIRCUMFERENCE_OF_THE_EARTH + assertEquals("Results within " + CIRCUMFERENCE_OF_THE_EARTH + "m from center", LOCATION_PROPERTIES.size(), listResults.size()); } @@ -308,7 +310,7 @@ public class GeoIT extends AbstractCoreIT { query = Query.fromQL("select * where location within " + CIRCUMFERENCE_OF_THE_EARTH + " of " + center.getLat() + "," + center.getLon()); listResults = em.searchCollection(em.getApplicationRef(), "stores", query); - assertEquals("Results within " + CIRCUMFERENCE_OF_THE_EARTH + assertEquals("Results within " + CIRCUMFERENCE_OF_THE_EARTH + "m from center", LOCATION_PROPERTIES.size(), listResults.size()); } @@ -350,7 +352,7 @@ public class GeoIT extends AbstractCoreIT { Query query2 = Query.fromQL("select * where location within 40000000 of " + center.getLat() + "," + center.getLon()); listResults = em.searchCollection(em.getApplicationRef(), "stores", query2); - assertEquals("Results from center point to ridiculously far", + assertEquals("Results from center point to ridiculously far", LOCATION_PROPERTIES.size(), listResults.size()); } } @@ -602,7 +604,7 @@ public class GeoIT extends AbstractCoreIT { float latitude = minLatitude + latitudeDelta * i; float longitude = minLongitude + longitudeDelta * i; - Map<String, Float> location = + Map<String, Float> location = MapUtils.hashMap("latitude", latitude).map("longitude", longitude); Map<String, Object> data = new HashMap<String, Object>(2); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1fbe3e54/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 a13f242..3effeca 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 @@ -21,14 +21,14 @@ import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.Map; import java.util.UUID; -import org.apache.commons.lang3.RandomStringUtils; 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.Concurrent; import org.apache.usergrid.persistence.geo.model.Point; import org.apache.usergrid.persistence.index.query.Query; @@ -36,7 +36,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -@Concurrent() + public class GeoQueryBooleanTest extends AbstractCoreIT { private static final Logger log = LoggerFactory.getLogger( GeoQueryBooleanTest.class ); @@ -51,7 +51,7 @@ public class GeoQueryBooleanTest extends AbstractCoreIT { log.info( "GeoQueryBooleanTest.testGeoQueryWithOr" ); - UUID applicationId = setup.createApplication( + UUID applicationId = setup.createApplication( "testOrganization", "testGeoQueryWithOr-" + RandomStringUtils.randomAlphabetic(20)); assertNotNull( applicationId ); @@ -67,7 +67,7 @@ public class GeoQueryBooleanTest extends AbstractCoreIT { put( "location", new LinkedHashMap<String, Object>() {{ put("latitude", 37.776753 ); put("longitude", -122.407846 ); - }} ); + }} ); }}; Entity user1 = em.create( "user", properties ); @@ -80,7 +80,7 @@ public class GeoQueryBooleanTest extends AbstractCoreIT { put( "location", new LinkedHashMap<String, Object>() {{ put("latitude", 37.776753 ); put("longitude", -122.407846 ); - }} ); + }} ); }}; Entity user2 = em.create( "user", properties ); @@ -91,19 +91,19 @@ public class GeoQueryBooleanTest extends AbstractCoreIT { // define center point about 300m from that location Point center = new Point( 37.774277, -122.404744 ); - Query query = Query.fromQL( "select * where location within 400 of " + Query query = Query.fromQL( "select * where location within 400 of " + center.getLat() + "," + center.getLon()); Results listResults = em.searchCollection( em.getApplicationRef(), "users", query ); assertEquals( 2, listResults.size() ); - query = Query.fromQL( "select * where employer='Apigee' or location within 100 of " + query = Query.fromQL( "select * where employer='Apigee' or location within 100 of " + center.getLat() + "," + center.getLon()); listResults = em.searchCollection( em.getApplicationRef(), "users", query ); // no results because geo filter applied after query even in the case or 'or' assertEquals( 0, listResults.size() ); - query = Query.fromQL( "select * where employer='Apigee' or location within 400 of " + query = Query.fromQL( "select * where employer='Apigee' or location within 400 of " + center.getLat() + "," + center.getLon()); listResults = em.searchCollection( em.getApplicationRef(), "users", query ); @@ -118,14 +118,14 @@ public class GeoQueryBooleanTest extends AbstractCoreIT { log.info( "GeoQueryBooleanTest.testGeoQueryWithOr" ); - UUID applicationId = setup.createApplication( + UUID applicationId = setup.createApplication( "testOrganization", "testGeoQueryWithNot-" + RandomStringUtils.randomAlphabetic(20) ); assertNotNull( applicationId ); EntityManager em = setup.getEmf().getEntityManager( applicationId ); assertNotNull( em ); - // define two users at a location + // define two users at a location Map<String, Object> properties = new LinkedHashMap<String, Object>() {{ put( "username", "bart" ); @@ -134,7 +134,7 @@ public class GeoQueryBooleanTest extends AbstractCoreIT { add( new LinkedHashMap<String, Object>() {{ put("name", "fred"); }}); add( new LinkedHashMap<String, Object>() {{ put("name", "gertrude"); }}); add( new LinkedHashMap<String, Object>() {{ put("name", "mina"); }}); - }}); + }}); put( "blockedBy", new ArrayList<Object>() {{ add( new LinkedHashMap<String, Object>() {{ put("name", "gertrude"); }}); add( new LinkedHashMap<String, Object>() {{ put("name", "isabell"); }}); @@ -142,7 +142,7 @@ public class GeoQueryBooleanTest extends AbstractCoreIT { put( "location", new LinkedHashMap<String, Object>() {{ put("latitude", 37.776753 ); put("longitude", -122.407846 ); - }}); + }}); }}; Entity userBart = em.create( "user", properties ); @@ -162,7 +162,7 @@ public class GeoQueryBooleanTest extends AbstractCoreIT { put( "location", new LinkedHashMap<String, Object>() {{ put("latitude", 37.776753 ); put("longitude", -122.407846 ); - }} ); + }} ); }}; Entity userFred = em.create( "user", properties ); @@ -174,15 +174,15 @@ public class GeoQueryBooleanTest extends AbstractCoreIT { Point center = new Point( 37.774277, -122.404744 ); // one user within 400 meters IS NOT blocked by bart - Query query = Query.fromQL( - "select * where NOT blockedBy.name='bart' and location within 400 of " + Query query = Query.fromQL( + "select * where NOT blockedBy.name='bart' and location within 400 of " + center.getLat() + "," + center.getLon()); Results listResults = em.searchCollection( em.getApplicationRef(), "users", query ); assertEquals( 1, listResults.size() ); // one user within 400 meters IS blocked by bart - query = Query.fromQL( - "select * where blockedBy.name='bart' and location within 400 of " + query = Query.fromQL( + "select * where blockedBy.name='bart' and location within 400 of " + center.getLat() + "," + center.getLon()); listResults = em.searchCollection( em.getApplicationRef(), "users", query ); assertEquals( 1, listResults.size() ); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1fbe3e54/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 a146d3a..5e02852 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 @@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory; import org.apache.commons.lang3.RandomStringUtils; import org.apache.usergrid.AbstractCoreIT; -import org.apache.usergrid.cassandra.Concurrent; +import org.apache.usergrid.cassandra.SpringResource; import org.apache.usergrid.persistence.cassandra.CassandraService; import org.apache.usergrid.persistence.cassandra.IndexUpdate; import org.apache.usergrid.persistence.cassandra.IndexUpdate.IndexEntry; @@ -48,13 +48,13 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; -@Concurrent() + public class IndexIT extends AbstractCoreIT { private static final Logger LOG = LoggerFactory.getLogger( IndexIT.class ); public static final String[] alphabet = { - "Alpha", "Bravo", "Charlie", "Delta", "Echo", "Foxtrot", "Golf", "Hotel", "India", - "Juliet", "Kilo", "Lima", "Mike", "November", "Oscar", "Papa", "Quebec", "Romeo", "Sierra", + "Alpha", "Bravo", "Charlie", "Delta", "Echo", "Foxtrot", "Golf", "Hotel", "India", + "Juliet", "Kilo", "Lima", "Mike", "November", "Oscar", "Papa", "Quebec", "Romeo", "Sierra", "Tango", "Uniform", "Victor", "Whiskey", "X-ray", "Yankee", "Zulu" }; @@ -448,14 +448,14 @@ public class IndexIT extends AbstractCoreIT { RelationManagerImpl impl = (RelationManagerImpl)rm; - CassandraService cass = springResource.getBean( CassandraService.class ); + CassandraService cass = SpringResource.getInstance().getBean( CassandraService.class ); ByteBufferSerializer buf = ByteBufferSerializer.get(); Keyspace ko = cass.getApplicationKeyspace( applicationId ); Mutator<ByteBuffer> m = createMutator( ko, buf ); - IndexUpdate update = impl.batchStartIndexUpdate( m, entity1Ref, + IndexUpdate update = impl.batchStartIndexUpdate( m, entity1Ref, "status", "ignore", UUIDUtils.newTimeUUID(), false, false, true, false ); int count = 0;
