Repository: incubator-usergrid Updated Branches: refs/heads/USERGRID-509 [created] a849912b4
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/adf19ed6/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/AbstractEntityStageTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/AbstractEntityStageTest.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/AbstractEntityStageTest.java index 2546790..35a069d 100644 --- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/AbstractEntityStageTest.java +++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/AbstractEntityStageTest.java @@ -70,7 +70,7 @@ public abstract class AbstractEntityStageTest { //run the stage - validateStage( new CollectionIoEvent<Entity>( context, entity ) ); + validateStage( new CollectionIoEvent<Entity>( applicationScope, context, entity ) ); } http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/adf19ed6/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/AbstractIdStageTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/AbstractIdStageTest.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/AbstractIdStageTest.java index ea071ac..5543548 100644 --- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/AbstractIdStageTest.java +++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/AbstractIdStageTest.java @@ -68,7 +68,7 @@ public abstract class AbstractIdStageTest { //run the stage - validateStage( new CollectionIoEvent<Id>( context, id ) ); + validateStage( new CollectionIoEvent<Id>( applicationScope, context, id ) ); } http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/adf19ed6/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/AbstractMvccEntityStageTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/AbstractMvccEntityStageTest.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/AbstractMvccEntityStageTest.java index dff0a83..eae2176 100644 --- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/AbstractMvccEntityStageTest.java +++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/AbstractMvccEntityStageTest.java @@ -89,7 +89,7 @@ public abstract class AbstractMvccEntityStageTest { when( mvccEntity.getId() ).thenReturn( id ); } - validateStage( new CollectionIoEvent<MvccEntity>( context, mvccEntity ) ); + validateStage( new CollectionIoEvent<MvccEntity>( applicationScope, context, mvccEntity ) ); } /** http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/adf19ed6/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/delete/MarkCommitTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/delete/MarkCommitTest.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/delete/MarkCommitTest.java index bbc791d..8ffb007 100644 --- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/delete/MarkCommitTest.java +++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/delete/MarkCommitTest.java @@ -75,7 +75,7 @@ public class MarkCommitTest extends AbstractMvccEntityStageTest { //verify the observable is correct - Entity result = newStage.call( new CollectionIoEvent<MvccEntity>( context, mvccEntityInput ) ); + Entity result = newStage.call( new CollectionIoEvent<MvccEntity>( applicationScope, context, mvccEntityInput ) ); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/adf19ed6/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/delete/MarkStartTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/delete/MarkStartTest.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/delete/MarkStartTest.java index 6c13dd5..cdd4666 100644 --- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/delete/MarkStartTest.java +++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/delete/MarkStartTest.java @@ -62,7 +62,7 @@ public class MarkStartTest extends AbstractIdStageTest { //verify the observable is correct - CollectionIoEvent<MvccEntity> result = newStage.call( new CollectionIoEvent<Id>( context, id ) ); + CollectionIoEvent<MvccEntity> result = newStage.call( new CollectionIoEvent<Id>( applicationScope, context, id ) ); //verify the log entry is correct http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/adf19ed6/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteCommitTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteCommitTest.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteCommitTest.java index 2b49478..b2c9d21 100644 --- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteCommitTest.java +++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteCommitTest.java @@ -87,7 +87,7 @@ public class WriteCommitTest extends AbstractMvccEntityStageTest { WriteCommit newStage = new WriteCommit( logStrategy, mvccEntityStrategy, uniqueValueStrategy ); - Entity result = newStage.call( new CollectionIoEvent<MvccEntity>( context, mvccEntityInput ) ); + Entity result = newStage.call( new CollectionIoEvent<MvccEntity>( applicationScope, context, mvccEntityInput ) ); //verify the log entry is correct http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/adf19ed6/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteOptimisticVerifyTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteOptimisticVerifyTest.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteOptimisticVerifyTest.java index 8f64b38..810032c 100644 --- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteOptimisticVerifyTest.java +++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteOptimisticVerifyTest.java @@ -83,12 +83,12 @@ public class WriteOptimisticVerifyTest extends AbstractMvccEntityStageTest { final MvccEntity mvccEntity = fromEntity( entity ); List<MvccLogEntry> logEntries = new ArrayList<MvccLogEntry>(); - logEntries.add( new MvccLogEntryImpl( + logEntries.add( new MvccLogEntryImpl( entity.getId(), UUIDGenerator.newTimeUUID(), Stage.ACTIVE, MvccLogEntry.State.COMPLETE )); - logEntries.add( new MvccLogEntryImpl( + logEntries.add( new MvccLogEntryImpl( entity.getId(), UUIDGenerator.newTimeUUID(), Stage.COMMITTED, MvccLogEntry.State.COMPLETE )); - MvccLogEntrySerializationStrategy noConflictLog = + MvccLogEntrySerializationStrategy noConflictLog = mock( MvccLogEntrySerializationStrategy.class ); when( noConflictLog.load( collectionScope, entity.getId(), entity.getVersion(), 2) ) @@ -100,7 +100,7 @@ public class WriteOptimisticVerifyTest extends AbstractMvccEntityStageTest { WriteOptimisticVerify newStage = new WriteOptimisticVerify( noConflictLog ); - newStage.call( new CollectionIoEvent<>( collectionScope, mvccEntity ) ); + newStage.call( new CollectionIoEvent<>( applicationScope, collectionScope, mvccEntity ) ); } @@ -121,15 +121,15 @@ public class WriteOptimisticVerifyTest extends AbstractMvccEntityStageTest { // log that one operation is active on entity List<MvccLogEntry> logEntries = new ArrayList<MvccLogEntry>(); - logEntries.add( new MvccLogEntryImpl( + logEntries.add( new MvccLogEntryImpl( entity.getId(), UUIDGenerator.newTimeUUID(), Stage.ACTIVE, MvccLogEntry.State.COMPLETE )); // log another operation as active on entity - logEntries.add( new MvccLogEntryImpl( + logEntries.add( new MvccLogEntryImpl( entity.getId(), UUIDGenerator.newTimeUUID(), Stage.ACTIVE, MvccLogEntry.State.COMPLETE )); // mock up the log - MvccLogEntrySerializationStrategy mvccLog = + MvccLogEntrySerializationStrategy mvccLog = mock( MvccLogEntrySerializationStrategy.class ); when( mvccLog.load( scope, entity.getId(), entity.getVersion(), 2) ) .thenReturn( logEntries ); @@ -150,7 +150,7 @@ public class WriteOptimisticVerifyTest extends AbstractMvccEntityStageTest { RollbackAction rollbackAction = new RollbackAction( mvccLog, uvstrat ); try { - newStage.call( new CollectionIoEvent<>(scope, mvccEntity)); + newStage.call( new CollectionIoEvent<>( applicationScope, scope, mvccEntity)); } catch (WriteOptimisticVerifyException e) { log.info("Error", e); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/adf19ed6/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteStartTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteStartTest.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteStartTest.java index c00c82a..eef8e35 100644 --- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteStartTest.java +++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteStartTest.java @@ -72,7 +72,7 @@ public class WriteStartTest extends AbstractEntityStageTest { //verify the observable is correct - CollectionIoEvent<MvccEntity> result = newStage.call( new CollectionIoEvent<Entity>( context, entity ) ); + CollectionIoEvent<MvccEntity> result = newStage.call( new CollectionIoEvent<Entity>( applicationScope, context, entity ) ); //verify the log entry is correct @@ -116,7 +116,7 @@ public class WriteStartTest extends AbstractEntityStageTest { WriteStart newStage = new WriteStart( logStrategy ); //verify the observable is correct - CollectionIoEvent<MvccEntity> result = newStage.call( new CollectionIoEvent<Entity>( context, entity ) ); + CollectionIoEvent<MvccEntity> result = newStage.call( new CollectionIoEvent<Entity>( applicationScope, context, entity ) ); verify(mutation,times(0)).execute(); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/adf19ed6/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteUniqueVerifyTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteUniqueVerifyTest.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteUniqueVerifyTest.java index 51cb198..a565610 100644 --- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteUniqueVerifyTest.java +++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteUniqueVerifyTest.java @@ -86,7 +86,7 @@ public class WriteUniqueVerifyTest { WriteUniqueVerify newStage = new WriteUniqueVerify( uvstrat, fig, keyspace,cassandraConfig ); newStage.call( - new CollectionIoEvent<>( collectionScope, mvccEntity ) ) ; + new CollectionIoEvent<>( applicationScope, collectionScope, mvccEntity ) ) ; //if we get here, it's a success. We want to test no exceptions are thrown http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/adf19ed6/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/migration/AbstractMvccEntityDataMigrationV1ToV3ImplTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/migration/AbstractMvccEntityDataMigrationV1ToV3ImplTest.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/migration/AbstractMvccEntityDataMigrationV1ToV3ImplTest.java index 9938caf..f10efb5 100644 --- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/migration/AbstractMvccEntityDataMigrationV1ToV3ImplTest.java +++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/migration/AbstractMvccEntityDataMigrationV1ToV3ImplTest.java @@ -119,7 +119,8 @@ public abstract class AbstractMvccEntityDataMigrationV1ToV3ImplTest implements D assertEquals( "Same entity", entity2, returned2 ); final Observable<EntityIdScope> entityIdScope = - Observable.just( new EntityIdScope( scope, entity1.getId() ), new EntityIdScope( scope, entity2.getId() ) ); + Observable.just( new EntityIdScope( applicationScope, scope, entity1.getId() ), new EntityIdScope( + applicationScope, scope, entity2.getId() ) ); final MigrationDataProvider<EntityIdScope> migrationProvider = new MigrationDataProvider<EntityIdScope>() {
