You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/02/16 19:18:38 UTC
[3/4] incubator-usergrid git commit: test fix
test fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/dab3ee0f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/dab3ee0f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/dab3ee0f
Branch: refs/heads/USERGRID-365
Commit: dab3ee0f39ca5214c04647953a0783f4fdd692ba
Parents: 79ec978
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon Feb 16 10:18:04 2015 -0800
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon Feb 16 10:18:04 2015 -0800
----------------------------------------------------------------------
.../migration/EntityTypeMappingMigrationIT.java | 12 +--------
.../migration/GraphShardVersionMigrationIT.java | 26 ++++++--------------
2 files changed, 9 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dab3ee0f/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 91bda00..421b875 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
@@ -130,17 +130,7 @@ public class EntityTypeMappingMigrationIT extends AbstractCoreIT {
final TestProgressObserver progressObserver = new TestProgressObserver();
- allEntitiesInSystemObservable.getAllEntitiesInSystem( 1000)
- .doOnNext(new Action1<ApplicationEntityGroup>() {
- @Override
- public void call(final ApplicationEntityGroup entity) {
- try {
- entityTypeMappingMigration.migrate(entity, progressObserver).toBlocking().last();
- }catch (Throwable e ){
- throw new RuntimeException(e);
- }
- }
- });
+ entityTypeMappingMigration.migrate(allEntitiesInSystemObservable.getAllEntitiesInSystem(1000), progressObserver).toBlocking().last();
allEntitiesInSystemObservable.getAllEntitiesInSystem(1000)
.doOnNext(new Action1<ApplicationEntityGroup<CollectionScope>>() {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dab3ee0f/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 169815f..f390723 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
@@ -25,8 +25,9 @@ import java.util.Set;
import org.apache.usergrid.corepersistence.CpSetup;
import org.apache.usergrid.persistence.collection.CollectionScope;
-import org.apache.usergrid.persistence.core.migration.data.DataMigration;
+import org.apache.usergrid.persistence.core.migration.data.*;
import org.apache.usergrid.persistence.core.rx.AllEntitiesInSystemObservable;
+import org.apache.usergrid.persistence.core.rx.ApplicationObservable;
import org.apache.usergrid.persistence.core.scope.ApplicationEntityGroup;
import org.apache.usergrid.persistence.core.scope.EntityIdScope;
import org.apache.usergrid.persistence.graph.serialization.impl.EdgeDataMigrationImpl;
@@ -42,9 +43,6 @@ import org.apache.usergrid.corepersistence.EntityWriteHelper;
import org.apache.usergrid.corepersistence.ManagerCache;
import org.apache.usergrid.corepersistence.rx.impl.AllEntitiesInSystemObservableImpl;
import org.apache.usergrid.persistence.EntityManager;
-import org.apache.usergrid.persistence.core.migration.data.DataMigrationManager;
-import org.apache.usergrid.persistence.core.migration.data.DataMigrationManagerImpl;
-import org.apache.usergrid.persistence.core.migration.data.MigrationInfoSerialization;
import org.apache.usergrid.persistence.graph.GraphManager;
import org.apache.usergrid.persistence.graph.impl.SimpleSearchEdgeType;
import org.apache.usergrid.persistence.model.entity.Id;
@@ -66,7 +64,7 @@ import static org.junit.Assert.assertTrue;
public class GraphShardVersionMigrationIT extends AbstractCoreIT {
private Injector injector;
- private DataMigration graphShardVersionMigration;
+ private ApplicationDataMigration graphShardVersionMigration;
private ManagerCache managerCache;
private DataMigrationManager dataMigrationManager;
private MigrationInfoSerialization migrationInfoSerialization;
@@ -78,7 +76,7 @@ public class GraphShardVersionMigrationIT extends AbstractCoreIT {
@Rule
public MigrationTestRule migrationTestRule = new MigrationTestRule( app, SpringResource.getInstance().getBean(Injector.class) ,EdgeDataMigrationImpl.class );
private AllEntitiesInSystemObservable allEntitiesInSystemObservable;
-
+ private ApplicationObservable applicationObservable;
@Before
@@ -90,6 +88,8 @@ public class GraphShardVersionMigrationIT extends AbstractCoreIT {
dataMigrationManager = injector.getInstance( DataMigrationManager.class );
migrationInfoSerialization = injector.getInstance( MigrationInfoSerialization.class );
allEntitiesInSystemObservable = injector.getInstance(AllEntitiesInSystemObservable.class);
+ applicationObservable = injector.getInstance(ApplicationObservable.class);
+
}
@@ -167,18 +167,8 @@ public class GraphShardVersionMigrationIT extends AbstractCoreIT {
//perform the migration
- allEntitiesInSystemObservable.getAllEntitiesInSystem( 1000)
- .doOnNext( new Action1<ApplicationEntityGroup>() {
- @Override
- public void call(
- final ApplicationEntityGroup entity) {
- try {
- graphShardVersionMigration.migrate(entity, progressObserver).toBlocking().last();
- }catch (Throwable e){
- throw new RuntimeException(e);
- }
- }
- }).toBlocking().last();
+
+ graphShardVersionMigration.migrate(applicationObservable.getAllApplicationScopes(), progressObserver).toBlocking().last();
assertEquals( "Newly saved entities encounterd", 0, allEntities.size() );
assertFalse( "Progress observer should not have failed", progressObserver.getFailed() );