Repository: usergrid Updated Branches: refs/heads/two-dot-o-dev 912c78ea1 -> fd18f1f14
Mock the migration version to 0 for index mapping migration test to ensure it won't be skipped. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/230abf34 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/230abf34 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/230abf34 Branch: refs/heads/two-dot-o-dev Commit: 230abf34858f7a592f9afc7a3a143e83d12c0221 Parents: 912c78e Author: Michael Russo <[email protected]> Authored: Thu Aug 27 17:16:51 2015 -0700 Committer: Michael Russo <[email protected]> Committed: Thu Aug 27 17:16:51 2015 -0700 ---------------------------------------------------------------------- .../index/impl/EsIndexMappingMigrationPluginTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/230abf34/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EsIndexMappingMigrationPluginTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EsIndexMappingMigrationPluginTest.java b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EsIndexMappingMigrationPluginTest.java index e5d9380..6d61cb1 100644 --- a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EsIndexMappingMigrationPluginTest.java +++ b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EsIndexMappingMigrationPluginTest.java @@ -21,7 +21,6 @@ package org.apache.usergrid.persistence.index.impl; import com.google.inject.Inject; import org.apache.usergrid.persistence.core.migration.data.MigrationInfoSerialization; -import org.apache.usergrid.persistence.core.migration.data.ProgressObserver; import org.apache.usergrid.persistence.core.migration.data.TestProgressObserver; import org.apache.usergrid.persistence.core.test.UseModules; import org.apache.usergrid.persistence.index.EntityIndexFactory; @@ -29,6 +28,7 @@ import org.apache.usergrid.persistence.index.guice.TestIndexModule; import org.apache.usergrid.persistence.index.migration.EsIndexMappingMigrationPlugin; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Mockito; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -48,6 +48,8 @@ public class EsIndexMappingMigrationPluginTest extends BaseIT { EsProvider provider; @Test public void runMigration(){ + MigrationInfoSerialization serialization = Mockito.mock(MigrationInfoSerialization.class); + Mockito.when(serialization.getVersion(Mockito.any())).thenReturn(0); EsIndexMappingMigrationPlugin plugin = new EsIndexMappingMigrationPlugin(serialization,provider); TestProgressObserver progressObserver = new TestProgressObserver(); plugin.run(progressObserver);
