You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/10/30 03:46:18 UTC
[1/2] Removes Jukito completely from test framework. We now
explicitly mock or integration tests,
no more silent errors due to auto mocking incorrectly wired guice modules.
Repository: incubator-usergrid
Updated Branches:
refs/heads/key-row-sharding 09151ea0e -> 00ae4031b
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/queryindex/pom.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/pom.xml b/stack/corepersistence/queryindex/pom.xml
index 730fbfc..8604316 100644
--- a/stack/corepersistence/queryindex/pom.xml
+++ b/stack/corepersistence/queryindex/pom.xml
@@ -123,18 +123,7 @@
<classifier>tests</classifier>
</dependency>
-<!-- <dependency>
- <groupId>org.safehaus.chop</groupId>
- <artifactId>chop-api</artifactId>
- <version>${chop.version}</version>
- </dependency>-->
- <dependency>
- <groupId>org.jukito</groupId>
- <artifactId>jukito</artifactId>
- <version>${jukito.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityConnectionIndexImplTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityConnectionIndexImplTest.java b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityConnectionIndexImplTest.java
index 62910bc..31523bc 100644
--- a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityConnectionIndexImplTest.java
+++ b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityConnectionIndexImplTest.java
@@ -21,7 +21,7 @@ package org.apache.usergrid.persistence.index.impl;
import java.io.IOException;
import java.util.HashMap;
-import org.jukito.UseModules;
+import org.apache.usergrid.persistence.core.test.UseModules;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
@@ -34,7 +34,7 @@ import org.apache.usergrid.persistence.collection.guice.MigrationManagerRule;
import org.apache.usergrid.persistence.collection.impl.CollectionScopeImpl;
import org.apache.usergrid.persistence.collection.util.EntityUtils;
import org.apache.usergrid.persistence.core.cassandra.CassandraRule;
-import org.apache.usergrid.persistence.core.cassandra.ITRunner;
+import org.apache.usergrid.persistence.core.test.ITRunner;
import org.apache.usergrid.persistence.core.scope.ApplicationScope;
import org.apache.usergrid.persistence.core.scope.ApplicationScopeImpl;
import org.apache.usergrid.persistence.index.EntityIndex;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java
index 6a82c65..00e1147 100644
--- a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java
+++ b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java
@@ -25,7 +25,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import org.jukito.UseModules;
+import org.apache.usergrid.persistence.core.test.UseModules;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
@@ -35,12 +35,10 @@ import org.slf4j.LoggerFactory;
import org.apache.commons.lang3.time.StopWatch;
-import org.apache.usergrid.persistence.collection.CollectionScope;
import org.apache.usergrid.persistence.collection.guice.MigrationManagerRule;
-import org.apache.usergrid.persistence.collection.impl.CollectionScopeImpl;
import org.apache.usergrid.persistence.collection.util.EntityUtils;
import org.apache.usergrid.persistence.core.cassandra.CassandraRule;
-import org.apache.usergrid.persistence.core.cassandra.ITRunner;
+import org.apache.usergrid.persistence.core.test.ITRunner;
import org.apache.usergrid.persistence.core.scope.ApplicationScope;
import org.apache.usergrid.persistence.core.scope.ApplicationScopeImpl;
import org.apache.usergrid.persistence.index.EntityIndex;
@@ -61,7 +59,6 @@ import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Maps;
import com.google.inject.Inject;
-import java.util.ArrayList;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/queue/pom.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queue/pom.xml b/stack/corepersistence/queue/pom.xml
index a2e3c2d..7343393 100644
--- a/stack/corepersistence/queue/pom.xml
+++ b/stack/corepersistence/queue/pom.xml
@@ -62,15 +62,6 @@
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>org.jukito</groupId>
- <artifactId>jukito</artifactId>
- <version>${jukito.version}</version>
- <scope>test</scope>
- </dependency>
-
-
<dependency>
<groupId>org.apache.usergrid</groupId>
<artifactId>collection</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/queue/QueueManagerTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/queue/QueueManagerTest.java b/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/queue/QueueManagerTest.java
index 26a350c..85db87d 100644
--- a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/queue/QueueManagerTest.java
+++ b/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/queue/QueueManagerTest.java
@@ -19,17 +19,15 @@
package org.apache.usergrid.persistence.queue;
-import com.amazonaws.services.glacier.TreeHashGenerator;
-import org.apache.usergrid.persistence.collection.util.InvalidEntityGenerator;
import org.apache.usergrid.persistence.queue.guice.TestQueueModule;
import org.apache.usergrid.persistence.queue.impl.QueueScopeImpl;
-import org.jukito.UseModules;
+import org.apache.usergrid.persistence.core.test.UseModules;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.usergrid.persistence.core.cassandra.ITRunner;
+import org.apache.usergrid.persistence.core.test.ITRunner;
import org.apache.usergrid.persistence.model.entity.SimpleId;
import com.google.inject.Inject;
[2/2] git commit: Removes Jukito completely from test framework. We
now explicitly mock or integration tests,
no more silent errors due to auto mocking incorrectly wired guice modules.
Posted by to...@apache.org.
Removes Jukito completely from test framework. We now explicitly mock or integration tests, no more silent errors due to auto mocking incorrectly wired guice modules.
Updates tests to pass with automocking removed
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/00ae4031
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/00ae4031
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/00ae4031
Branch: refs/heads/key-row-sharding
Commit: 00ae4031b732049dd80b373d2c9a17510019e4ba
Parents: 09151ea
Author: Todd Nine <tn...@apigee.com>
Authored: Wed Oct 29 20:46:13 2014 -0600
Committer: Todd Nine <tn...@apigee.com>
Committed: Wed Oct 29 20:46:13 2014 -0600
----------------------------------------------------------------------
stack/corepersistence/collection/pom.xml | 7 +-
.../collection/CollectionContextImplTest.java | 3 -
.../EntityCollectionManagerFactoryTest.java | 6 +-
.../collection/EntityCollectionManagerIT.java | 4 +-
.../EntityCollectionManagerStressTest.java | 6 +-
.../EntityCollectionManagerSyncIT.java | 4 +-
...niqueValueSerializationStrategyImplTest.java | 4 +-
.../stage/write/WriteOptimisticVerifyTest.java | 2 +-
.../mvcc/stage/write/WriteUniqueVerifyIT.java | 4 +-
.../mvcc/stage/write/WriteUniqueVerifyTest.java | 4 +-
...MvccEntitySerializationStrategyImplTest.java | 12 +-
.../impl/MvccLESSTransientTest.java | 78 +++++++++++--
...ccLogEntrySerializationStrategyImplTest.java | 4 +-
stack/corepersistence/common/pom.xml | 9 +-
.../persistence/core/guice/CommonModule.java | 7 +-
.../data/DataMigrationManagerImpl.java | 36 +++---
.../core/cassandra/CassandraRule.java | 2 +-
.../persistence/core/cassandra/ITRunner.java | 60 ----------
.../data/MigrationInfoSerializationTest.java | 5 +-
.../persistence/core/test/ITRunner.java | 116 +++++++++++++++++++
.../persistence/core/test/UseModules.java | 69 +++++++++++
stack/corepersistence/graph/pom.xml | 15 ++-
.../EdgeMetadataSerializationProxyImpl.java | 8 +-
.../impl/shard/impl/EdgeSearcher.java | 4 +-
.../graph/CommittedGraphManagerIT.java | 4 +-
.../persistence/graph/GraphManagerIT.java | 9 +-
.../persistence/graph/GraphManagerLoadTest.java | 4 +-
.../graph/GraphManagerShardingIT.java | 4 +-
.../graph/GraphManagerStressTest.java | 4 +-
.../usergrid/persistence/graph/SimpleTest.java | 4 +-
.../graph/StorageGraphManagerIT.java | 4 +-
.../graph/impl/EdgeDeleteListenerTest.java | 6 +-
.../graph/impl/NodeDeleteListenerTest.java | 6 +-
.../graph/impl/stage/EdgeDeleteRepairTest.java | 4 +-
.../graph/impl/stage/EdgeMetaRepairTest.java | 6 +-
.../EdgeMetaDataSerializationProxyV1Test.java | 37 +++++-
.../EdgeMetaDataSerializationProxyV2Test.java | 30 ++++-
.../EdgeMetaDataSerializationV1Test.java | 4 +-
.../EdgeMetaDataSerializationV2Test.java | 4 +-
.../EdgeSerializationChopTest.java | 4 +-
.../serialization/EdgeSerializationTest.java | 4 +-
.../serialization/NodeSerializationTest.java | 4 +-
.../PermanentSerializationTest.java | 4 +-
.../impl/shard/EdgeShardSerializationTest.java | 4 +-
.../NodeShardCounterSerializationTest.java | 4 +-
stack/corepersistence/map/pom.xml | 6 -
.../persistence/map/MapManagerTest.java | 4 +-
stack/corepersistence/pom.xml | 4 +-
stack/corepersistence/queryindex/pom.xml | 11 --
.../impl/EntityConnectionIndexImplTest.java | 4 +-
.../persistence/index/impl/EntityIndexTest.java | 7 +-
stack/corepersistence/queue/pom.xml | 9 --
.../persistence/queue/QueueManagerTest.java | 6 +-
53 files changed, 441 insertions(+), 233 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/collection/pom.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/pom.xml b/stack/corepersistence/collection/pom.xml
index 8060dee..3a89a8e 100644
--- a/stack/corepersistence/collection/pom.xml
+++ b/stack/corepersistence/collection/pom.xml
@@ -101,11 +101,12 @@
<dependency>
- <groupId>org.jukito</groupId>
- <artifactId>jukito</artifactId>
- <version>${jukito.version}</version>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>${mockito.version}</version>
<scope>test</scope>
</dependency>
+
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/CollectionContextImplTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/CollectionContextImplTest.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/CollectionContextImplTest.java
index 4c1bf0d..cab9a6c 100644
--- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/CollectionContextImplTest.java
+++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/CollectionContextImplTest.java
@@ -1,11 +1,8 @@
package org.apache.usergrid.persistence.collection;
-import org.jukito.UseModules;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.apache.usergrid.persistence.collection.guice.TestCollectionModule;
import org.apache.usergrid.persistence.collection.impl.CollectionScopeImpl;
import org.apache.usergrid.persistence.model.entity.SimpleId;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/EntityCollectionManagerFactoryTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/EntityCollectionManagerFactoryTest.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/EntityCollectionManagerFactoryTest.java
index 0e02e30..f2deb3e 100644
--- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/EntityCollectionManagerFactoryTest.java
+++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/EntityCollectionManagerFactoryTest.java
@@ -1,8 +1,7 @@
package org.apache.usergrid.persistence.collection;
-import org.jukito.UseModules;
-import org.junit.ClassRule;
+import org.apache.usergrid.persistence.core.test.UseModules;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -10,8 +9,7 @@ import org.junit.runner.RunWith;
import org.apache.usergrid.persistence.collection.guice.MigrationManagerRule;
import org.apache.usergrid.persistence.collection.guice.TestCollectionModule;
import org.apache.usergrid.persistence.collection.impl.CollectionScopeImpl;
-import org.apache.usergrid.persistence.core.cassandra.CassandraRule;
-import org.apache.usergrid.persistence.core.cassandra.ITRunner;
+import org.apache.usergrid.persistence.core.test.ITRunner;
import org.apache.usergrid.persistence.model.entity.SimpleId;
import com.google.inject.Inject;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/EntityCollectionManagerIT.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/EntityCollectionManagerIT.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/EntityCollectionManagerIT.java
index 93f4a7d..605dd80 100644
--- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/EntityCollectionManagerIT.java
+++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/EntityCollectionManagerIT.java
@@ -23,7 +23,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.UUID;
-import org.jukito.UseModules;
+import org.apache.usergrid.persistence.core.test.UseModules;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -34,7 +34,7 @@ import org.apache.usergrid.persistence.collection.guice.TestCollectionModule;
import org.apache.usergrid.persistence.collection.impl.CollectionScopeImpl;
import org.apache.usergrid.persistence.collection.mvcc.entity.Stage;
import org.apache.usergrid.persistence.collection.serialization.SerializationFig;
-import org.apache.usergrid.persistence.core.cassandra.ITRunner;
+import org.apache.usergrid.persistence.core.test.ITRunner;
import org.apache.usergrid.persistence.model.entity.Entity;
import org.apache.usergrid.persistence.model.entity.Id;
import org.apache.usergrid.persistence.model.entity.SimpleId;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/EntityCollectionManagerStressTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/EntityCollectionManagerStressTest.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/EntityCollectionManagerStressTest.java
index 3f5b071..d4f4d81 100644
--- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/EntityCollectionManagerStressTest.java
+++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/EntityCollectionManagerStressTest.java
@@ -21,8 +21,7 @@ package org.apache.usergrid.persistence.collection;
import java.util.HashSet;
import java.util.Set;
-import org.jukito.UseModules;
-import org.junit.ClassRule;
+import org.apache.usergrid.persistence.core.test.UseModules;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
@@ -35,8 +34,7 @@ import org.apache.commons.lang3.time.StopWatch;
import org.apache.usergrid.persistence.collection.guice.MigrationManagerRule;
import org.apache.usergrid.persistence.collection.guice.TestCollectionModule;
import org.apache.usergrid.persistence.collection.impl.CollectionScopeImpl;
-import org.apache.usergrid.persistence.core.cassandra.CassandraRule;
-import org.apache.usergrid.persistence.core.cassandra.ITRunner;
+import org.apache.usergrid.persistence.core.test.ITRunner;
import org.apache.usergrid.persistence.model.entity.Entity;
import org.apache.usergrid.persistence.model.entity.Id;
import org.apache.usergrid.persistence.model.entity.SimpleId;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/EntityCollectionManagerSyncIT.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/EntityCollectionManagerSyncIT.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/EntityCollectionManagerSyncIT.java
index 87c7e8e..ec35ed2 100644
--- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/EntityCollectionManagerSyncIT.java
+++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/EntityCollectionManagerSyncIT.java
@@ -1,7 +1,7 @@
package org.apache.usergrid.persistence.collection;
-import org.jukito.UseModules;
+import org.apache.usergrid.persistence.core.test.UseModules;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -9,7 +9,7 @@ import org.junit.runner.RunWith;
import org.apache.usergrid.persistence.collection.guice.MigrationManagerRule;
import org.apache.usergrid.persistence.collection.guice.TestCollectionModule;
import org.apache.usergrid.persistence.collection.impl.CollectionScopeImpl;
-import org.apache.usergrid.persistence.core.cassandra.ITRunner;
+import org.apache.usergrid.persistence.core.test.ITRunner;
import org.apache.usergrid.persistence.model.entity.Entity;
import org.apache.usergrid.persistence.model.entity.SimpleId;
import org.apache.usergrid.persistence.model.field.IntegerField;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/UniqueValueSerializationStrategyImplTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/UniqueValueSerializationStrategyImplTest.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/UniqueValueSerializationStrategyImplTest.java
index 5b1c8ea..9323520 100644
--- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/UniqueValueSerializationStrategyImplTest.java
+++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/UniqueValueSerializationStrategyImplTest.java
@@ -21,7 +21,7 @@ package org.apache.usergrid.persistence.collection.mvcc.stage.write;
import java.util.Collections;
import java.util.UUID;
-import org.jukito.UseModules;
+import org.apache.usergrid.persistence.core.test.UseModules;
import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
@@ -37,7 +37,7 @@ import org.apache.usergrid.persistence.collection.serialization.UniqueValue;
import org.apache.usergrid.persistence.collection.serialization.UniqueValueSerializationStrategy;
import org.apache.usergrid.persistence.collection.serialization.UniqueValueSet;
import org.apache.usergrid.persistence.collection.serialization.impl.UniqueValueImpl;
-import org.apache.usergrid.persistence.core.cassandra.ITRunner;
+import org.apache.usergrid.persistence.core.test.ITRunner;
import org.apache.usergrid.persistence.model.entity.Id;
import org.apache.usergrid.persistence.model.entity.SimpleId;
import org.apache.usergrid.persistence.model.field.Field;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/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 85fce69..8f64b38 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
@@ -21,7 +21,7 @@ package org.apache.usergrid.persistence.collection.mvcc.stage.write;
import java.util.ArrayList;
import java.util.List;
-import org.jukito.UseModules;
+import org.apache.usergrid.persistence.core.test.UseModules;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteUniqueVerifyIT.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteUniqueVerifyIT.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteUniqueVerifyIT.java
index 04f55a7..b18a957 100644
--- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteUniqueVerifyIT.java
+++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteUniqueVerifyIT.java
@@ -28,13 +28,13 @@ import org.apache.usergrid.persistence.collection.guice.TestCollectionModule;
import org.apache.usergrid.persistence.collection.impl.CollectionScopeImpl;
import org.apache.usergrid.persistence.collection.mvcc.stage.TestEntityGenerator;
import org.apache.usergrid.persistence.collection.serialization.SerializationFig;
-import org.apache.usergrid.persistence.core.cassandra.ITRunner;
+import org.apache.usergrid.persistence.core.test.ITRunner;
import org.apache.usergrid.persistence.model.entity.Entity;
import org.apache.usergrid.persistence.model.entity.Id;
import org.apache.usergrid.persistence.model.entity.SimpleId;
import org.apache.usergrid.persistence.model.field.IntegerField;
import org.apache.usergrid.persistence.model.field.StringField;
-import org.jukito.UseModules;
+import org.apache.usergrid.persistence.core.test.UseModules;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import org.junit.Rule;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/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 6551716..2830867 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
@@ -18,7 +18,7 @@
package org.apache.usergrid.persistence.collection.mvcc.stage.write;
-import org.jukito.UseModules;
+import org.apache.usergrid.persistence.core.test.UseModules;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -30,7 +30,7 @@ import org.apache.usergrid.persistence.collection.MvccEntity;
import org.apache.usergrid.persistence.collection.mvcc.stage.CollectionIoEvent;
import org.apache.usergrid.persistence.collection.serialization.SerializationFig;
import org.apache.usergrid.persistence.collection.serialization.UniqueValueSerializationStrategy;
-import org.apache.usergrid.persistence.core.cassandra.ITRunner;
+import org.apache.usergrid.persistence.core.test.ITRunner;
import org.apache.usergrid.persistence.model.entity.Entity;
import com.google.inject.Inject;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java
index b298768..e3c4cd4 100644
--- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java
+++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java
@@ -23,7 +23,7 @@ package org.apache.usergrid.persistence.collection.serialization.impl;
import java.util.*;
import junit.framework.Assert;
-import org.jukito.UseModules;
+import org.apache.usergrid.persistence.core.test.UseModules;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -44,7 +44,7 @@ import org.apache.usergrid.persistence.collection.serialization.SerializationFig
import org.apache.usergrid.persistence.collection.util.EntityUtils;
import org.apache.usergrid.persistence.core.astyanax.AstyanaxKeyspaceProvider;
import org.apache.usergrid.persistence.core.astyanax.CassandraFig;
-import org.apache.usergrid.persistence.core.cassandra.ITRunner;
+import org.apache.usergrid.persistence.core.test.ITRunner;
import org.apache.usergrid.persistence.core.migration.schema.MigrationManagerFig;
import org.apache.usergrid.persistence.model.entity.Entity;
import org.apache.usergrid.persistence.model.entity.Id;
@@ -91,14 +91,6 @@ public class MvccEntitySerializationStrategyImplTest {
public MigrationManagerRule migrationManagerRule;
@Inject
- @Overrides(
- name = "unit-test",
- environments = Env.UNIT,
- options = {
- @Option( method = "getHosts", override = "localhost" ),
- @Option( method = "getConnections", override = CONNECTION_COUNT )
- }
- )
public CassandraFig cassandraFig;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLESSTransientTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLESSTransientTest.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLESSTransientTest.java
index fa80ca4..a9cf3a0 100644
--- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLESSTransientTest.java
+++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLESSTransientTest.java
@@ -20,10 +20,11 @@
package org.apache.usergrid.persistence.collection.serialization.impl;
+import java.lang.annotation.Annotation;
import java.util.Collections;
import java.util.UUID;
-import org.jukito.UseModules;
+import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -32,15 +33,16 @@ import org.safehaus.guicyfig.Env;
import org.safehaus.guicyfig.Option;
import org.apache.usergrid.persistence.collection.CollectionScope;
+import org.apache.usergrid.persistence.collection.MvccLogEntry;
import org.apache.usergrid.persistence.collection.guice.MigrationManagerRule;
import org.apache.usergrid.persistence.collection.guice.TestCollectionModule;
import org.apache.usergrid.persistence.collection.impl.CollectionScopeImpl;
import org.apache.usergrid.persistence.collection.mvcc.MvccLogEntrySerializationStrategy;
-import org.apache.usergrid.persistence.collection.MvccLogEntry;
import org.apache.usergrid.persistence.collection.mvcc.entity.Stage;
import org.apache.usergrid.persistence.collection.mvcc.entity.impl.MvccLogEntryImpl;
import org.apache.usergrid.persistence.collection.serialization.SerializationFig;
-import org.apache.usergrid.persistence.core.cassandra.ITRunner;
+import org.apache.usergrid.persistence.core.test.ITRunner;
+import org.apache.usergrid.persistence.core.test.UseModules;
import org.apache.usergrid.persistence.model.entity.Id;
import org.apache.usergrid.persistence.model.entity.SimpleId;
import org.apache.usergrid.persistence.model.util.UUIDGenerator;
@@ -57,9 +59,9 @@ import static org.junit.Assert.assertNull;
@RunWith( ITRunner.class )
@UseModules( TestCollectionModule.class )
public class MvccLESSTransientTest {
-
+
@Inject
- @Bypass( environments = { Env.ALL, Env.UNIT }, options = @Option( method = "getTimeout", override = "1" ) )
+
public SerializationFig serializationFig;
@@ -71,6 +73,66 @@ public class MvccLESSTransientTest {
@Rule
public MigrationManagerRule migrationManagerRule;
+ private int originalTimeout;
+
+
+ @Before
+ public void setTimeout() {
+ originalTimeout = serializationFig.getTimeout();
+ //set the bypass options
+ serializationFig.setBypass( new TestByPass() );
+ }
+
+
+ /**
+ * Test bypass that sets all environments to use the timeout of 1 second
+ */
+ public class TestByPass implements Bypass {
+
+
+ @Override
+ public Option[] options() {
+ return new Option[] { new TestOption() };
+ }
+
+
+ @Override
+ public Env[] environments() {
+ return new Env[] { Env.ALL, Env.UNIT };
+ }
+
+
+ @Override
+ public Class<? extends Annotation> annotationType() {
+ return Bypass.class;
+ }
+ }
+
+
+ /**
+ * TestOption
+ */
+ public class TestOption implements Option {
+
+
+ @Override
+ public Class<? extends Annotation> annotationType() {
+ return Bypass.class;
+ }
+
+
+ @Override
+ public String method() {
+ return "getTimeout";
+ }
+
+
+ @Override
+ public String override() {
+ return "1";
+ }
+ }
+
@Test
public void transientTimeout() throws ConnectionException, InterruptedException {
@@ -85,8 +147,7 @@ public class MvccLESSTransientTest {
final UUID version = UUIDGenerator.newTimeUUID();
for ( Stage stage : Stage.values() ) {
- MvccLogEntry saved = new MvccLogEntryImpl(
- id, version, stage, MvccLogEntry.State.COMPLETE );
+ MvccLogEntry saved = new MvccLogEntryImpl( id, version, stage, MvccLogEntry.State.COMPLETE );
logEntryStrategy.write( context, saved ).execute();
//Read it back after the timeout
@@ -94,7 +155,8 @@ public class MvccLESSTransientTest {
//noinspection PointlessArithmeticExpression
Thread.sleep( 1000 );
- MvccLogEntry returned = logEntryStrategy.load( context, Collections.singleton(id), version ).getMaxVersion( id );
+ MvccLogEntry returned =
+ logEntryStrategy.load( context, Collections.singleton( id ), version ).getMaxVersion( id );
if ( stage.isTransient() ) {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationStrategyImplTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationStrategyImplTest.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationStrategyImplTest.java
index 629dd83..fb0794f 100644
--- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationStrategyImplTest.java
+++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationStrategyImplTest.java
@@ -24,7 +24,7 @@ import java.util.Collections;
import java.util.List;
import java.util.UUID;
-import org.jukito.UseModules;
+import org.apache.usergrid.persistence.core.test.UseModules;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -37,7 +37,7 @@ import org.apache.usergrid.persistence.collection.mvcc.MvccLogEntrySerialization
import org.apache.usergrid.persistence.collection.MvccLogEntry;
import org.apache.usergrid.persistence.collection.mvcc.entity.Stage;
import org.apache.usergrid.persistence.collection.mvcc.entity.impl.MvccLogEntryImpl;
-import org.apache.usergrid.persistence.core.cassandra.ITRunner;
+import org.apache.usergrid.persistence.core.test.ITRunner;
import org.apache.usergrid.persistence.model.entity.Id;
import org.apache.usergrid.persistence.model.entity.SimpleId;
import org.apache.usergrid.persistence.model.util.UUIDGenerator;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/common/pom.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/pom.xml b/stack/corepersistence/common/pom.xml
index 671aefa..42b2996 100644
--- a/stack/corepersistence/common/pom.xml
+++ b/stack/corepersistence/common/pom.xml
@@ -145,15 +145,12 @@
</dependency>
<dependency>
- <groupId>org.jukito</groupId>
- <artifactId>jukito</artifactId>
- <version>${jukito.version}</version>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>${mockito.version}</version>
<scope>test</scope>
</dependency>
-
-
-
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/guice/CommonModule.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/guice/CommonModule.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/guice/CommonModule.java
index e37067f..faa4e39 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/guice/CommonModule.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/guice/CommonModule.java
@@ -27,6 +27,7 @@ import org.apache.usergrid.persistence.core.astyanax.CassandraConfigImpl;
import org.apache.usergrid.persistence.core.astyanax.CassandraFig;
import org.apache.usergrid.persistence.core.consistency.TimeService;
import org.apache.usergrid.persistence.core.consistency.TimeServiceImpl;
+import org.apache.usergrid.persistence.core.migration.data.DataMigration;
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;
@@ -81,8 +82,12 @@ public class CommonModule extends AbstractModule {
//do multibindings for migrations
- Multibinder<DataMigrationManager> dataMigrationManagerMultibinder = Multibinder.newSetBinder( binder(), DataMigrationManager.class );
+ Multibinder<DataMigration> dataMigrationMultibinder = Multibinder.newSetBinder( binder(), DataMigration.class );
+// dataMigrationMultibinder.addBinding();
+// dataMigrationManagerMultibinder.addBinding().to( DataMigrationManagerImpl.class );
// migrationBinding.addBinding().to( Key.get( MigrationInfoSerialization.class ) );
}
+
+
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/DataMigrationManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/DataMigrationManagerImpl.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/DataMigrationManagerImpl.java
index 4cc98df..e739648 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/DataMigrationManagerImpl.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/DataMigrationManagerImpl.java
@@ -1,21 +1,21 @@
/*
*
- * * Licensed to the Apache Software Foundation (ASF) under one
- * * or more contributor license agreements. See the NOTICE file
- * * distributed with this work for additional information
- * * regarding copyright ownership. The ASF licenses this file
- * * to you under the Apache License, Version 2.0 (the
- * * "License"); you may not use this file except in compliance
- * * with the License. You may obtain a copy of the License at
- * *
- * * http://www.apache.org/licenses/LICENSE-2.0
- * *
- * * Unless required by applicable law or agreed to in writing,
- * * software distributed under the License is distributed on an
- * * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * * KIND, either express or implied. See the License for the
- * * specific language governing permissions and limitations
- * * under the License.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*
*/
@@ -74,10 +74,10 @@ public class DataMigrationManagerImpl implements DataMigrationManager {
this.migrationInfoSerialization = migrationInfoSerialization;
-
for ( DataMigration migration : migrations ) {
- Preconditions.checkNotNull( migration, "A migration instance in the set of migrations was null. This is not allowed" );
+ Preconditions.checkNotNull( migration,
+ "A migration instance in the set of migrations was null. This is not allowed" );
final int version = migration.getVersion();
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/cassandra/CassandraRule.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/cassandra/CassandraRule.java b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/cassandra/CassandraRule.java
index 43f5a0c..68a56e4 100644
--- a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/cassandra/CassandraRule.java
+++ b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/cassandra/CassandraRule.java
@@ -61,7 +61,7 @@ public class CassandraRule extends EnvironResource {
}
@Override
- protected void before() throws Throwable {
+ public void before() throws Throwable {
if ( !cassandraFig.isEmbedded()) {
LOG.info("Using external Cassandra");
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/cassandra/ITRunner.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/cassandra/ITRunner.java b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/cassandra/ITRunner.java
deleted file mode 100644
index 7e33d48..0000000
--- a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/cassandra/ITRunner.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *
- * * Licensed to the Apache Software Foundation (ASF) under one
- * * or more contributor license agreements. See the NOTICE file
- * * distributed with this work for additional information
- * * regarding copyright ownership. The ASF licenses this file
- * * to you under the Apache License, Version 2.0 (the
- * * "License"); you may not use this file except in compliance
- * * with the License. You may obtain a copy of the License at
- * *
- * * http://www.apache.org/licenses/LICENSE-2.0
- * *
- * * Unless required by applicable law or agreed to in writing,
- * * software distributed under the License is distributed on an
- * * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * * KIND, either express or implied. See the License for the
- * * specific language governing permissions and limitations
- * * under the License.
- *
- */
-package org.apache.usergrid.persistence.core.cassandra;
-
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.jukito.JukitoRunner;
-import org.junit.runners.model.InitializationError;
-
-import com.google.inject.Injector;
-
-
-/**
- * Run jukito with cassandra
- */
-public class ITRunner extends JukitoRunner {
-
- //this is fugly, but we have no other way to start cassandra before the jukito runner
- static{
- CassandraRule rule = new CassandraRule();
- try {
- rule.before();
- }
- catch ( Throwable throwable ) {
- //super nasty, but we need to bail if this happens
- throwable.printStackTrace();
- System.exit( -1 );
- }
- }
-
- public ITRunner( final Class<?> klass )
- throws InitializationError, InvocationTargetException, InstantiationException, IllegalAccessException {
- super( klass );
- }
-
-
- public ITRunner( final Class<?> klass, final Injector injector )
- throws InitializationError, InvocationTargetException, InstantiationException, IllegalAccessException {
- super( klass, injector );
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/migration/data/MigrationInfoSerializationTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/migration/data/MigrationInfoSerializationTest.java b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/migration/data/MigrationInfoSerializationTest.java
index d1de9c2..4742496 100644
--- a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/migration/data/MigrationInfoSerializationTest.java
+++ b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/migration/data/MigrationInfoSerializationTest.java
@@ -22,15 +22,16 @@
package org.apache.usergrid.persistence.core.migration.data;
-import org.jukito.UseModules;
+
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.usergrid.persistence.core.cassandra.ITRunner;
+import org.apache.usergrid.persistence.core.test.ITRunner;
import org.apache.usergrid.persistence.core.guice.MigrationManagerRule;
import org.apache.usergrid.persistence.core.guice.TestCommonModule;
import org.apache.usergrid.persistence.core.scope.ApplicationScope;
+import org.apache.usergrid.persistence.core.test.UseModules;
import com.google.inject.Inject;
import com.netflix.astyanax.Keyspace;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/test/ITRunner.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/test/ITRunner.java b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/test/ITRunner.java
new file mode 100644
index 0000000..eeeaf84
--- /dev/null
+++ b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/test/ITRunner.java
@@ -0,0 +1,116 @@
+/*
+ *
+ * * Licensed to the Apache Software Foundation (ASF) under one
+ * * or more contributor license agreements. See the NOTICE file
+ * * distributed with this work for additional information
+ * * regarding copyright ownership. The ASF licenses this file
+ * * to you under the Apache License, Version 2.0 (the
+ * * "License"); you may not use this file except in compliance
+ * * with the License. You may obtain a copy of the License at
+ * *
+ * * http://www.apache.org/licenses/LICENSE-2.0
+ * *
+ * * Unless required by applicable law or agreed to in writing,
+ * * software distributed under the License is distributed on an
+ * * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * * KIND, either express or implied. See the License for the
+ * * specific language governing permissions and limitations
+ * * under the License.
+ *
+ */
+package org.apache.usergrid.persistence.core.test;
+
+
+import java.lang.reflect.InvocationTargetException;
+import org.junit.runners.BlockJUnit4ClassRunner;
+import org.junit.runners.model.FrameworkMethod;
+import org.junit.runners.model.InitializationError;
+import org.junit.runners.model.Statement;
+
+import org.apache.usergrid.persistence.core.cassandra.CassandraRule;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import com.google.inject.Module;
+
+
+/**
+ * Run jukito with cassandra
+ */
+public class ITRunner extends BlockJUnit4ClassRunner {// extends JukitoRunner {
+
+ //this is fugly, but we have no other way to start cassandra before the jukito runner
+ static{
+ CassandraRule rule = new CassandraRule();
+ try {
+ rule.before();
+ }
+ catch ( Throwable throwable ) {
+ //super nasty, but we need to bail if this happens
+ throwable.printStackTrace();
+ System.exit( -1 );
+ }
+ }
+
+ private Injector injector;
+
+
+
+
+ public ITRunner( final Class<?> klass )
+ throws InitializationError, InvocationTargetException, InstantiationException, IllegalAccessException {
+ super( klass );
+ }
+
+
+ protected Statement methodInvoker(FrameworkMethod method, Object test)
+ {
+
+ inject(test);
+ return super.methodInvoker( method, test );
+ }
+
+
+ private synchronized void inject(Object test){
+ if(injector == null){
+ injector = createInjector( test.getClass() );
+ }
+
+ injector.injectMembers( test );
+ }
+
+ private Injector createInjector(Class<?> testClass){
+ UseModules useModules = testClass.getAnnotation( UseModules.class );
+
+ if ( useModules == null ) {
+ throw new RuntimeException(
+ String.format( "You must specify modules to including using the %s annotation", useModules ) );
+ }
+
+ final Class<? extends Module>[] moduleClasses = useModules.value();
+
+ final AbstractModule testModule = new AbstractModule() {
+
+
+ @Override
+ protected void configure() {
+ for ( Class<? extends Module> moduleClass : moduleClasses ) {
+ final Module module;
+
+ try {
+ module = moduleClass.newInstance();
+ }
+ catch ( Exception e ) {
+ throw new RuntimeException( "Unable to create instance of module", e );
+ }
+
+ install( module );
+ }
+ }
+ };
+
+
+ return Guice.createInjector( testModule );
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/test/UseModules.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/test/UseModules.java b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/test/UseModules.java
new file mode 100644
index 0000000..29efde7
--- /dev/null
+++ b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/test/UseModules.java
@@ -0,0 +1,69 @@
+/*
+ *
+ * *
+ * * Licensed to the Apache Software Foundation (ASF) under one
+ * * or more contributor license agreements. See the NOTICE file
+ * * distributed with this work for additional information
+ * * regarding copyright ownership. The ASF licenses this file
+ * * to you under the Apache License, Version 2.0 (the
+ * * "License"); you may not use this file except in compliance
+ * * with the License. You may obtain a copy of the License at
+ * *
+ * * http://www.apache.org/licenses/LICENSE-2.0
+ * *
+ * * Unless required by applicable law or agreed to in writing,
+ * * software distributed under the License is distributed on an
+ * * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * * KIND, either express or implied. See the License for the
+ * * specific language governing permissions and limitations
+ * * under the License.
+ * *
+ *
+ */
+
+package org.apache.usergrid.persistence.core.test;
+
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import com.google.inject.Module;
+
+
+/**
+ * This annotation can be used on a test class together with
+ * {@code @RunWith(JukitoRunner.class)} to use the bindings contained
+ * in the specified modules for the test.
+ * <p/>
+ * Example:
+ * <pre>
+ * {@literal @}RunWith(JukitoRunner.class)
+ * {@literal @}UseModules({ FooModule.class, BarModule.class}
+ * public class MyTest {
+ * {@literal @}Test
+ * public void someTest(TypeBoundInFooModule a, TypeBoundInBarModule b) {
+ * }
+ * }</pre>
+ *
+ * The example is equivalent to the following <i>inner static module</i>
+ * approach.
+ * <pre>
+ * {@literal @}RunWith(JukitoRunner.class)
+ * public class MyTest {
+ * static class Module extends JukitoModule {
+ * {@literal @}Override
+ * protected void configureTest() {
+ * install(new FooModule());
+ * install(new BarModule());
+ * }
+ * }
+ * // Test methods
+ * }</pre>
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface UseModules {
+ Class<? extends Module>[] value();
+}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/graph/pom.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/pom.xml b/stack/corepersistence/graph/pom.xml
index 8174a56..e448e74 100644
--- a/stack/corepersistence/graph/pom.xml
+++ b/stack/corepersistence/graph/pom.xml
@@ -65,12 +65,7 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.jukito</groupId>
- <artifactId>jukito</artifactId>
- <version>${jukito.version}</version>
- <scope>test</scope>
- </dependency>
+
<dependency>
<groupId>com.codahale.metrics</groupId>
@@ -79,6 +74,14 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>${mockito.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgeMetadataSerializationProxyImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgeMetadataSerializationProxyImpl.java b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgeMetadataSerializationProxyImpl.java
index cc51349..203fa38 100644
--- a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgeMetadataSerializationProxyImpl.java
+++ b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgeMetadataSerializationProxyImpl.java
@@ -46,7 +46,7 @@ import com.netflix.astyanax.MutationBatch;
@Singleton
public class EdgeMetadataSerializationProxyImpl implements EdgeMetadataSerialization {
- private static final int MIGRATION_VERSION = 1;
+ public static final int MIGRATION_VERSION = 1;
private final DataMigrationManager dataMigrationManager;
private final Keyspace keyspace;
@@ -193,13 +193,13 @@ public class EdgeMetadataSerializationProxyImpl implements EdgeMetadataSerializa
if ( isOldVersion() ) {
final MutationBatch aggregateBatch = keyspace.prepareMutationBatch();
- aggregateBatch.mergeShallow( previous.removeIdTypeFromSource( scope, edge ) );
- aggregateBatch.mergeShallow( current.removeIdTypeFromSource( scope, edge ) );
+ aggregateBatch.mergeShallow( previous.removeIdTypeToTarget( scope, edge ) );
+ aggregateBatch.mergeShallow( current.removeIdTypeToTarget( scope, edge ) );
return aggregateBatch;
}
- return current.removeIdTypeFromSource( scope, edge );
+ return current.removeIdTypeToTarget( scope, edge );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/EdgeSearcher.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/EdgeSearcher.java b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/EdgeSearcher.java
index 57c5814..8bcefbb 100644
--- a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/EdgeSearcher.java
+++ b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/EdgeSearcher.java
@@ -73,11 +73,11 @@ public abstract class EdgeSearcher<R, C, T> implements ColumnParser<C, T>, Colum
@Override
public boolean skipFirst( final T first ) {
- if(last == null){
+ if(!last.isPresent()){
return false;
}
- return last.equals( first );
+ return last.get().equals( first );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/CommittedGraphManagerIT.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/CommittedGraphManagerIT.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/CommittedGraphManagerIT.java
index feeb1b6..fa366ad 100644
--- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/CommittedGraphManagerIT.java
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/CommittedGraphManagerIT.java
@@ -21,10 +21,10 @@
package org.apache.usergrid.persistence.graph;
-import org.jukito.UseModules;
+import org.apache.usergrid.persistence.core.test.UseModules;
import org.junit.runner.RunWith;
-import org.apache.usergrid.persistence.core.cassandra.ITRunner;
+import org.apache.usergrid.persistence.core.test.ITRunner;
import org.apache.usergrid.persistence.graph.guice.TestGraphModule;
import org.apache.usergrid.persistence.model.entity.Id;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerIT.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerIT.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerIT.java
index 61bc7e7..da92124 100644
--- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerIT.java
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerIT.java
@@ -22,7 +22,6 @@ package org.apache.usergrid.persistence.graph;
import java.util.Iterator;
import java.util.concurrent.TimeoutException;
-import org.jukito.All;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -1625,18 +1624,18 @@ public abstract class GraphManagerIT {
@Test( expected = NullPointerException.class )
- public void invalidEdgeTypesWrite( @All Edge edge ) {
+ public void invalidEdgeTypesWrite( ) {
final GraphManager em = emf.createEdgeManager( scope );
- em.writeEdge( edge );
+ em.writeEdge( null );
}
@Test( expected = NullPointerException.class )
- public void invalidEdgeTypesDelete( @All Edge edge ) {
+ public void invalidEdgeTypesDelete( ) {
final GraphManager em = emf.createEdgeManager( scope );
- em.deleteEdge( edge );
+ em.deleteEdge( null );
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerLoadTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerLoadTest.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerLoadTest.java
index a5e5a74..c312714 100644
--- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerLoadTest.java
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerLoadTest.java
@@ -29,7 +29,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
-import org.jukito.UseModules;
+import org.apache.usergrid.persistence.core.test.UseModules;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
import org.apache.commons.lang3.time.StopWatch;
import org.apache.usergrid.persistence.collection.guice.MigrationManagerRule;
-import org.apache.usergrid.persistence.core.cassandra.ITRunner;
+import org.apache.usergrid.persistence.core.test.ITRunner;
import org.apache.usergrid.persistence.core.scope.ApplicationScope;
import org.apache.usergrid.persistence.core.scope.ApplicationScopeImpl;
import org.apache.usergrid.persistence.graph.guice.TestGraphModule;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerShardingIT.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerShardingIT.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerShardingIT.java
index ec4fcba..e6231e0 100644
--- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerShardingIT.java
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerShardingIT.java
@@ -23,7 +23,7 @@ package org.apache.usergrid.persistence.graph;
import java.util.concurrent.TimeoutException;
-import org.jukito.UseModules;
+import org.apache.usergrid.persistence.core.test.UseModules;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
@@ -31,7 +31,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.usergrid.persistence.collection.guice.MigrationManagerRule;
-import org.apache.usergrid.persistence.core.cassandra.ITRunner;
+import org.apache.usergrid.persistence.core.test.ITRunner;
import org.apache.usergrid.persistence.core.scope.ApplicationScope;
import org.apache.usergrid.persistence.core.scope.ApplicationScopeImpl;
import org.apache.usergrid.persistence.graph.guice.TestGraphModule;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerStressTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerStressTest.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerStressTest.java
index aa2d027..0ed0492 100644
--- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerStressTest.java
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerStressTest.java
@@ -23,7 +23,7 @@ import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.CountDownLatch;
-import org.jukito.UseModules;
+import org.apache.usergrid.persistence.core.test.UseModules;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
@@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory;
import org.apache.commons.lang3.time.StopWatch;
import org.apache.usergrid.persistence.collection.guice.MigrationManagerRule;
-import org.apache.usergrid.persistence.core.cassandra.ITRunner;
+import org.apache.usergrid.persistence.core.test.ITRunner;
import org.apache.usergrid.persistence.core.scope.ApplicationScope;
import org.apache.usergrid.persistence.graph.guice.TestGraphModule;
import org.apache.usergrid.persistence.graph.impl.SimpleSearchByEdgeType;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/SimpleTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/SimpleTest.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/SimpleTest.java
index 87ddc46..b840c51 100644
--- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/SimpleTest.java
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/SimpleTest.java
@@ -2,14 +2,14 @@
package org.apache.usergrid.persistence.graph;
-import org.jukito.UseModules;
+import org.apache.usergrid.persistence.core.test.UseModules;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.usergrid.persistence.collection.guice.MigrationManagerRule;
-import org.apache.usergrid.persistence.core.cassandra.ITRunner;
+import org.apache.usergrid.persistence.core.test.ITRunner;
import org.apache.usergrid.persistence.core.scope.ApplicationScope;
import org.apache.usergrid.persistence.graph.guice.TestGraphModule;
import org.apache.usergrid.persistence.graph.impl.SimpleSearchEdgeType;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/StorageGraphManagerIT.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/StorageGraphManagerIT.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/StorageGraphManagerIT.java
index 27f8479..cb9726d 100644
--- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/StorageGraphManagerIT.java
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/StorageGraphManagerIT.java
@@ -23,13 +23,13 @@ package org.apache.usergrid.persistence.graph;
import java.util.concurrent.atomic.AtomicInteger;
-import org.jukito.UseModules;
+import org.apache.usergrid.persistence.core.test.UseModules;
import org.junit.Before;
import org.junit.runner.RunWith;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.usergrid.persistence.core.cassandra.ITRunner;
+import org.apache.usergrid.persistence.core.test.ITRunner;
import org.apache.usergrid.persistence.graph.guice.TestGraphModule;
import org.apache.usergrid.persistence.graph.impl.GraphManagerImpl;
import org.apache.usergrid.persistence.model.entity.Id;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/impl/EdgeDeleteListenerTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/impl/EdgeDeleteListenerTest.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/impl/EdgeDeleteListenerTest.java
index 1f6df4c..0a1fe52 100644
--- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/impl/EdgeDeleteListenerTest.java
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/impl/EdgeDeleteListenerTest.java
@@ -24,7 +24,8 @@ package org.apache.usergrid.persistence.graph.impl;
import java.util.Iterator;
import java.util.UUID;
-import org.jukito.UseModules;
+import org.apache.usergrid.persistence.core.guice.ProxyImpl;
+import org.apache.usergrid.persistence.core.test.UseModules;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -33,7 +34,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.usergrid.persistence.collection.guice.MigrationManagerRule;
-import org.apache.usergrid.persistence.core.cassandra.ITRunner;
+import org.apache.usergrid.persistence.core.test.ITRunner;
import org.apache.usergrid.persistence.core.scope.ApplicationScope;
import org.apache.usergrid.persistence.graph.GraphFig;
import org.apache.usergrid.persistence.graph.GraphManagerFactory;
@@ -72,6 +73,7 @@ public class EdgeDeleteListenerTest {
public MigrationManagerRule migrationManagerRule;
@Inject
+ @ProxyImpl
protected EdgeMetadataSerialization edgeMetadataSerialization;
@Inject
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/impl/NodeDeleteListenerTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/impl/NodeDeleteListenerTest.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/impl/NodeDeleteListenerTest.java
index 3b66a31..f325620 100644
--- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/impl/NodeDeleteListenerTest.java
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/impl/NodeDeleteListenerTest.java
@@ -22,7 +22,8 @@ package org.apache.usergrid.persistence.graph.impl;
import java.util.Iterator;
import java.util.UUID;
-import org.jukito.UseModules;
+import org.apache.usergrid.persistence.core.guice.ProxyImpl;
+import org.apache.usergrid.persistence.core.test.UseModules;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
@@ -32,7 +33,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.usergrid.persistence.collection.guice.MigrationManagerRule;
-import org.apache.usergrid.persistence.core.cassandra.ITRunner;
+import org.apache.usergrid.persistence.core.test.ITRunner;
import org.apache.usergrid.persistence.core.scope.ApplicationScope;
import org.apache.usergrid.persistence.graph.Edge;
import org.apache.usergrid.persistence.graph.GraphFig;
@@ -85,6 +86,7 @@ public class NodeDeleteListenerTest {
protected EdgeSerialization edgeSerialization;
@Inject
+ @ProxyImpl
protected EdgeMetadataSerialization edgeMetadataSerialization;
@Inject
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/impl/stage/EdgeDeleteRepairTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/impl/stage/EdgeDeleteRepairTest.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/impl/stage/EdgeDeleteRepairTest.java
index e8af91c..1f300b1 100644
--- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/impl/stage/EdgeDeleteRepairTest.java
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/impl/stage/EdgeDeleteRepairTest.java
@@ -22,7 +22,7 @@ package org.apache.usergrid.persistence.graph.impl.stage;
import java.util.Iterator;
-import org.jukito.UseModules;
+import org.apache.usergrid.persistence.core.test.UseModules;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -31,7 +31,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.usergrid.persistence.collection.guice.MigrationManagerRule;
-import org.apache.usergrid.persistence.core.cassandra.ITRunner;
+import org.apache.usergrid.persistence.core.test.ITRunner;
import org.apache.usergrid.persistence.core.scope.ApplicationScope;
import org.apache.usergrid.persistence.graph.MarkedEdge;
import org.apache.usergrid.persistence.graph.SearchByEdgeType;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/impl/stage/EdgeMetaRepairTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/impl/stage/EdgeMetaRepairTest.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/impl/stage/EdgeMetaRepairTest.java
index f14e007..f4711d3 100644
--- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/impl/stage/EdgeMetaRepairTest.java
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/impl/stage/EdgeMetaRepairTest.java
@@ -24,14 +24,15 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import org.jukito.UseModules;
+import org.apache.usergrid.persistence.core.guice.ProxyImpl;
+import org.apache.usergrid.persistence.core.test.UseModules;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.usergrid.persistence.collection.guice.MigrationManagerRule;
-import org.apache.usergrid.persistence.core.cassandra.ITRunner;
+import org.apache.usergrid.persistence.core.test.ITRunner;
import org.apache.usergrid.persistence.core.scope.ApplicationScope;
import org.apache.usergrid.persistence.graph.GraphFig;
import org.apache.usergrid.persistence.graph.MarkedEdge;
@@ -75,6 +76,7 @@ public class EdgeMetaRepairTest {
protected EdgeSerialization storageEdgeSerialization;
@Inject
+ @ProxyImpl
protected EdgeMetadataSerialization edgeMetadataSerialization;
@Inject
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetaDataSerializationProxyV1Test.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetaDataSerializationProxyV1Test.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetaDataSerializationProxyV1Test.java
index 663a43f..50670b1 100644
--- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetaDataSerializationProxyV1Test.java
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetaDataSerializationProxyV1Test.java
@@ -22,11 +22,14 @@
package org.apache.usergrid.persistence.graph.serialization;
-import org.jukito.UseModules;
+import org.junit.After;
+import org.junit.Before;
import org.junit.runner.RunWith;
-import org.apache.usergrid.persistence.core.cassandra.ITRunner;
import org.apache.usergrid.persistence.core.guice.ProxyImpl;
+import org.apache.usergrid.persistence.core.migration.data.MigrationInfoSerialization;
+import org.apache.usergrid.persistence.core.test.ITRunner;
+import org.apache.usergrid.persistence.core.test.UseModules;
import org.apache.usergrid.persistence.graph.guice.TestGraphModule;
import org.apache.usergrid.persistence.graph.serialization.impl.EdgeMetadataSerializationProxyImpl;
@@ -38,8 +41,8 @@ import static org.junit.Assert.assertTrue;
/**
* Test for when V1 is the current version during migration
*/
-@RunWith( ITRunner.class )
-@UseModules( { TestGraphModule.class } )
+@RunWith(ITRunner.class)
+@UseModules({ TestGraphModule.class })
public class EdgeMetaDataSerializationProxyV1Test extends EdgeMetadataSerializationTest {
@@ -47,11 +50,35 @@ public class EdgeMetaDataSerializationProxyV1Test extends EdgeMetadataSerializat
@ProxyImpl
protected EdgeMetadataSerialization serialization;
+ @Inject
+ protected MigrationInfoSerialization migrationInfoSerialization;
+
+ private int existingVersion;
+
+
+ /**
+ * We need to run our migration to ensure that we are on the current version, and everything still functions
+ * correctly
+ */
+ @Before
+ public void setMigrationVersion() {
+ existingVersion = migrationInfoSerialization.getVersion();
+
+ //set our version to 0 so it uses both impls of the proxy
+ migrationInfoSerialization.setVersion( 0 );
+ }
+
+
+ @After
+ public void reSetMigrationVersion() {
+ migrationInfoSerialization.setVersion( existingVersion );
+ }
+
@Override
protected EdgeMetadataSerialization getSerializationImpl() {
- assertTrue(serialization instanceof EdgeMetadataSerializationProxyImpl );
+ assertTrue( serialization instanceof EdgeMetadataSerializationProxyImpl );
return serialization;
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetaDataSerializationProxyV2Test.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetaDataSerializationProxyV2Test.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetaDataSerializationProxyV2Test.java
index e3402e8..2661c19 100644
--- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetaDataSerializationProxyV2Test.java
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetaDataSerializationProxyV2Test.java
@@ -22,10 +22,14 @@
package org.apache.usergrid.persistence.graph.serialization;
-import org.jukito.UseModules;
+import org.apache.usergrid.persistence.core.migration.data.MigrationInfoSerialization;
+import org.apache.usergrid.persistence.core.test.UseModules;
+
+import org.junit.After;
+import org.junit.Before;
import org.junit.runner.RunWith;
-import org.apache.usergrid.persistence.core.cassandra.ITRunner;
+import org.apache.usergrid.persistence.core.test.ITRunner;
import org.apache.usergrid.persistence.core.guice.ProxyImpl;
import org.apache.usergrid.persistence.graph.guice.TestGraphModule;
import org.apache.usergrid.persistence.graph.serialization.impl.EdgeMetadataSerializationProxyImpl;
@@ -47,6 +51,28 @@ public class EdgeMetaDataSerializationProxyV2Test extends EdgeMetadataSerializat
@ProxyImpl
protected EdgeMetadataSerialization serialization;
+ @Inject
+ protected MigrationInfoSerialization migrationInfoSerialization;
+
+ private int existingVersion;
+
+
+ /**
+ * We need to run our migration to ensure that we are on the current version, and everything still functions
+ * correctly
+ */
+ @Before
+ public void setMigrationVersion(){
+ existingVersion = migrationInfoSerialization.getVersion();
+
+ //set our version equal to the new version so it only delegates to the new version
+ migrationInfoSerialization.setVersion( EdgeMetadataSerializationProxyImpl.MIGRATION_VERSION );
+ }
+
+ @After
+ public void reSetMigrationVersion(){
+ migrationInfoSerialization.setVersion( existingVersion );
+ }
@Override
protected EdgeMetadataSerialization getSerializationImpl() {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetaDataSerializationV1Test.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetaDataSerializationV1Test.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetaDataSerializationV1Test.java
index 9645ad4..66a0902 100644
--- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetaDataSerializationV1Test.java
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetaDataSerializationV1Test.java
@@ -39,10 +39,10 @@ package org.apache.usergrid.persistence.graph.serialization;/*
*/
-import org.jukito.UseModules;
+import org.apache.usergrid.persistence.core.test.UseModules;
import org.junit.runner.RunWith;
-import org.apache.usergrid.persistence.core.cassandra.ITRunner;
+import org.apache.usergrid.persistence.core.test.ITRunner;
import org.apache.usergrid.persistence.core.guice.PreviousImpl;
import org.apache.usergrid.persistence.graph.guice.TestGraphModule;
import org.apache.usergrid.persistence.graph.serialization.impl.EdgeMetadataSerializationV1Impl;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetaDataSerializationV2Test.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetaDataSerializationV2Test.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetaDataSerializationV2Test.java
index de9148f..db41059 100644
--- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetaDataSerializationV2Test.java
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetaDataSerializationV2Test.java
@@ -22,10 +22,10 @@
package org.apache.usergrid.persistence.graph.serialization;
-import org.jukito.UseModules;
+import org.apache.usergrid.persistence.core.test.UseModules;
import org.junit.runner.RunWith;
-import org.apache.usergrid.persistence.core.cassandra.ITRunner;
+import org.apache.usergrid.persistence.core.test.ITRunner;
import org.apache.usergrid.persistence.core.guice.CurrentImpl;
import org.apache.usergrid.persistence.graph.guice.TestGraphModule;
import org.apache.usergrid.persistence.graph.serialization.impl.EdgeMetadataSerializationV2Impl;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeSerializationChopTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeSerializationChopTest.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeSerializationChopTest.java
index 54eec6b..b4e5241 100644
--- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeSerializationChopTest.java
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeSerializationChopTest.java
@@ -22,14 +22,14 @@ package org.apache.usergrid.persistence.graph.serialization;
import java.util.Iterator;
import java.util.UUID;
-import org.jukito.UseModules;
+import org.apache.usergrid.persistence.core.test.UseModules;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.usergrid.persistence.collection.guice.MigrationManagerRule;
-import org.apache.usergrid.persistence.core.cassandra.ITRunner;
+import org.apache.usergrid.persistence.core.test.ITRunner;
import org.apache.usergrid.persistence.core.scope.ApplicationScope;
import org.apache.usergrid.persistence.graph.MarkedEdge;
import org.apache.usergrid.persistence.graph.guice.TestGraphModule;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeSerializationTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeSerializationTest.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeSerializationTest.java
index 6e5d324..161df44 100644
--- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeSerializationTest.java
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeSerializationTest.java
@@ -371,7 +371,9 @@ public abstract class EdgeSerializationTest {
results = serialization.getEdgesToTargetBySourceType( scope,
createSearchByEdgeAndId( targetId1, "edge", now, sourceId.getType(), edge2 ) );
- assertFalse( results.hasNext() );
+ assertTrue( results.hasNext() );
+ assertEquals(edge1, results.next());
+ assertFalse(results.hasNext());
results = serialization.getEdgesToTargetBySourceType( scope,
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/NodeSerializationTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/NodeSerializationTest.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/NodeSerializationTest.java
index e874c15..0736209 100644
--- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/NodeSerializationTest.java
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/NodeSerializationTest.java
@@ -22,14 +22,14 @@ package org.apache.usergrid.persistence.graph.serialization;
import java.util.Arrays;
import java.util.Map;
-import org.jukito.UseModules;
+import org.apache.usergrid.persistence.core.test.UseModules;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.usergrid.persistence.collection.guice.MigrationManagerRule;
-import org.apache.usergrid.persistence.core.cassandra.ITRunner;
+import org.apache.usergrid.persistence.core.test.ITRunner;
import org.apache.usergrid.persistence.core.scope.ApplicationScope;
import org.apache.usergrid.persistence.graph.guice.TestGraphModule;
import org.apache.usergrid.persistence.model.entity.Id;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/PermanentSerializationTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/PermanentSerializationTest.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/PermanentSerializationTest.java
index 42eca95..9fb40ca 100644
--- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/PermanentSerializationTest.java
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/PermanentSerializationTest.java
@@ -20,10 +20,10 @@
package org.apache.usergrid.persistence.graph.serialization;
-import org.jukito.UseModules;
+import org.apache.usergrid.persistence.core.test.UseModules;
import org.junit.runner.RunWith;
-import org.apache.usergrid.persistence.core.cassandra.ITRunner;
+import org.apache.usergrid.persistence.core.test.ITRunner;
import org.apache.usergrid.persistence.graph.guice.TestGraphModule;
import com.google.inject.Inject;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/EdgeShardSerializationTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/EdgeShardSerializationTest.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/EdgeShardSerializationTest.java
index c966605..133571a 100644
--- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/EdgeShardSerializationTest.java
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/EdgeShardSerializationTest.java
@@ -22,7 +22,7 @@ package org.apache.usergrid.persistence.graph.serialization.impl.shard;
import java.util.Iterator;
-import org.jukito.UseModules;
+import org.apache.usergrid.persistence.core.test.UseModules;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Rule;
@@ -31,7 +31,7 @@ import org.junit.runner.RunWith;
import org.apache.usergrid.persistence.collection.guice.MigrationManagerRule;
import org.apache.usergrid.persistence.core.cassandra.CassandraRule;
-import org.apache.usergrid.persistence.core.cassandra.ITRunner;
+import org.apache.usergrid.persistence.core.test.ITRunner;
import org.apache.usergrid.persistence.core.scope.ApplicationScope;
import org.apache.usergrid.persistence.graph.guice.TestGraphModule;
import org.apache.usergrid.persistence.model.entity.Id;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/count/NodeShardCounterSerializationTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/count/NodeShardCounterSerializationTest.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/count/NodeShardCounterSerializationTest.java
index a5edae5..a7a281c 100644
--- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/count/NodeShardCounterSerializationTest.java
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/count/NodeShardCounterSerializationTest.java
@@ -19,7 +19,7 @@
package org.apache.usergrid.persistence.graph.serialization.impl.shard.count;
-import org.jukito.UseModules;
+import org.apache.usergrid.persistence.core.test.UseModules;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Rule;
@@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory;
import org.apache.usergrid.persistence.collection.guice.MigrationManagerRule;
import org.apache.usergrid.persistence.core.cassandra.CassandraRule;
-import org.apache.usergrid.persistence.core.cassandra.ITRunner;
+import org.apache.usergrid.persistence.core.test.ITRunner;
import org.apache.usergrid.persistence.core.scope.ApplicationScope;
import org.apache.usergrid.persistence.graph.GraphFig;
import org.apache.usergrid.persistence.graph.guice.TestGraphModule;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/map/pom.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/map/pom.xml b/stack/corepersistence/map/pom.xml
index e9cb5ab..4a82545 100644
--- a/stack/corepersistence/map/pom.xml
+++ b/stack/corepersistence/map/pom.xml
@@ -61,12 +61,6 @@ limitations under the License.
</dependency>
- <dependency>
- <groupId>org.jukito</groupId>
- <artifactId>jukito</artifactId>
- <version>${jukito.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/map/src/test/java/org/apache/usergrid/persistence/map/MapManagerTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/map/src/test/java/org/apache/usergrid/persistence/map/MapManagerTest.java b/stack/corepersistence/map/src/test/java/org/apache/usergrid/persistence/map/MapManagerTest.java
index f1cc519..f588663 100644
--- a/stack/corepersistence/map/src/test/java/org/apache/usergrid/persistence/map/MapManagerTest.java
+++ b/stack/corepersistence/map/src/test/java/org/apache/usergrid/persistence/map/MapManagerTest.java
@@ -20,14 +20,14 @@
package org.apache.usergrid.persistence.map;
-import org.jukito.UseModules;
+import org.apache.usergrid.persistence.core.test.UseModules;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.usergrid.persistence.collection.guice.MigrationManagerRule;
-import org.apache.usergrid.persistence.core.cassandra.ITRunner;
+import org.apache.usergrid.persistence.core.test.ITRunner;
import org.apache.usergrid.persistence.map.guice.TestMapModule;
import org.apache.usergrid.persistence.map.impl.MapScopeImpl;
import org.apache.usergrid.persistence.model.entity.SimpleId;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/00ae4031/stack/corepersistence/pom.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/pom.xml b/stack/corepersistence/pom.xml
index d57b86f..9bd53fa 100644
--- a/stack/corepersistence/pom.xml
+++ b/stack/corepersistence/pom.xml
@@ -62,12 +62,12 @@ limitations under the License.
<elasticsearch.version>1.3.2</elasticsearch.version>
<fasterxml-uuid.version>3.1.3</fasterxml-uuid.version>
<guava.version>15.0</guava.version>
- <guice.version>3.0</guice.version>
+ <guice.version>4.0-beta5</guice.version>
<guicyfig.version>3.2</guicyfig.version>
<hystrix.version>1.3.16</hystrix.version>
<jackson-2-version>2.4.1</jackson-2-version>
<jackson-smile.verson>2.4.3</jackson-smile.verson>
- <jukito.version>1.4-UG</jukito.version>
+ <mockito.version>1.10.8</mockito.version>
<junit.version>4.11</junit.version>
<kryo-serializers.version>0.26</kryo-serializers.version>
<log4j.version>1.2.17</log4j.version>