usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [2/4] git commit: Refactored tests to remove env config from module configuration. This should be left up to the deployment environment to create the guice config. Moved test config into subclass of guice module to statically allocate archiaus config
Date Wed, 05 Feb 2014 02:20:40 GMT
Refactored tests to remove env config from module configuration.  This should be left up to the deployment environment to create the guice config.  Moved test config into subclass of guice module to statically allocate archiaus config


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/1d14d477
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/1d14d477
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/1d14d477

Branch: refs/heads/two-dot-o
Commit: 1d14d477b9cc50dcba6f2fb027d7117e52f492ef
Parents: ffefd72
Author: Todd Nine <tnine@apigee.com>
Authored: Tue Feb 4 18:25:00 2014 -0700
Committer: Todd Nine <tnine@apigee.com>
Committed: Tue Feb 4 18:25:00 2014 -0700

----------------------------------------------------------------------
 .../collection/guice/CollectionModule.java      | 58 ++++++++++----------
 .../src/main/resources/usergrid.properties      |  1 -
 .../collection/CollectionContextImplTest.java   |  5 +-
 .../EntityCollectionManagerFactoryTest.java     |  5 +-
 .../collection/EntityCollectionManagerIT.java   |  9 +--
 .../EntityCollectionManagerSyncIT.java          |  5 +-
 .../collection/cassandra/CassandraRule.java     |  3 +-
 .../collection/guice/TestCollectionModule.java  | 25 +++++++++
 .../collection/guice/TestModule.java            | 39 +++++++++++++
 .../changelog/ChangeLogGeneratorImplTest.java   |  4 --
 .../mvcc/stage/AbstractMvccEntityStageTest.java | 10 ++--
 .../mvcc/stage/delete/DeleteCommitTest.java     |  2 +-
 .../write/EntityVersionSerializerTest.java      |  7 ++-
 .../mvcc/stage/write/FieldSerializerTest.java   | 14 +++--
 ...niqueValueSerializationStrategyImplTest.java | 28 ++++++----
 .../mvcc/stage/write/WriteUniqueVerifyTest.java | 12 ++--
 ...MvccEntitySerializationStrategyImplTest.java | 10 ++--
 .../impl/MvccLESSTransientTest.java             |  5 +-
 ...ccLogEntrySerializationStrategyImplTest.java |  5 +-
 .../collection/util/InvalidEntityGenerator.java |  5 +-
 .../collection/util/InvalidIdGenerator.java     |  5 +-
 .../util/InvalidMvccEntityGenerator.java        |  4 +-
 .../resources/cassandra-defaults.properties     | 12 ----
 .../src/test/resources/cassandra.properties     |  5 --
 .../resources/serialization-defaults.properties |  4 --
 .../src/test/resources/usergrid-UNIT.properties | 15 ++++-
 .../src/test/resources/usergrid.properties      |  1 +
 .../graph/guice/TestGraphModule.java            | 20 +++++++
 .../EdgeMetadataSerializationTest.java          |  3 +-
 .../serialization/EdgeSerializationTest.java    |  3 +-
 .../src/test/resources/usergrid-UNIT.properties | 15 ++++-
 .../src/test/resources/usergrid.properties      |  1 +
 32 files changed, 221 insertions(+), 119 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1d14d477/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/guice/CollectionModule.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/guice/CollectionModule.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/guice/CollectionModule.java
index 624a039..83f7d42 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/guice/CollectionModule.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/guice/CollectionModule.java
@@ -55,35 +55,35 @@ import rx.Scheduler;
  */
 public class CollectionModule extends AbstractModule {
 
-    static {
-        /*
-         * --------------------------------------------------------------------
-         * Archaius Configuration Settings
-         * --------------------------------------------------------------------
-         */
-
-        try {
-            ConfigurationManager.loadCascadedPropertiesFromResources( "usergrid" );
-        }
-        catch ( IOException e ) {
-            throw new RuntimeException( "Cannot do much without properly loading our configuration.", e );
-        }
-
-        Injector injector = Guice.createInjector( new GuicyFigModule( CassandraFig.class, RxFig.class ) );
-        CassandraFig cassandraFig = injector.getInstance( CassandraFig.class );
-        RxFig rxFig = injector.getInstance( RxFig.class );
-
-        Env env = Env.getEnvironment();
-        if ( env == Env.UNIT || env == Env.ALL ) {
-            String thriftPort = String.valueOf( AvailablePortFinder.getNextAvailable() );
-            cassandraFig.bypass( "getThriftPort", thriftPort );
-            cassandraFig.bypass( "getConnections", "20" );
-            rxFig.bypass( "getMaxThreadCount", "20" );
-            cassandraFig.bypass( "getHosts", "localhost" );
-            cassandraFig.bypass( "getClusterName", "Usergrid" );
-            cassandraFig.bypass( "getKeyspaceName", "Usergrid_Collections" );
-        }
-    }
+//    static {
+//        /*
+//         * --------------------------------------------------------------------
+//         * Archaius Configuration Settings
+//         * --------------------------------------------------------------------
+//         */
+//
+//        try {
+//            ConfigurationManager.loadCascadedPropertiesFromResources( "usergrid" );
+//        }
+//        catch ( IOException e ) {
+//            throw new RuntimeException( "Cannot do much without properly loading our configuration.", e );
+//        }
+
+//        Injector injector = Guice.createInjector( new GuicyFigModule( CassandraFig.class, RxFig.class ) );
+//        CassandraFig cassandraFig = injector.getInstance( CassandraFig.class );
+//        RxFig rxFig = injector.getInstance( RxFig.class );
+//
+//        Env env = Env.getEnvironment();
+//        if ( env == Env.UNIT || env == Env.ALL ) {
+//            String thriftPort = String.valueOf( AvailablePortFinder.getNextAvailable() );
+//            cassandraFig.bypass( "getThriftPort", thriftPort );
+//            cassandraFig.bypass( "getConnections", "20" );
+//            rxFig.bypass( "getMaxThreadCount", "20" );
+//            cassandraFig.bypass( "getHosts", "localhost" );
+//            cassandraFig.bypass( "getClusterName", "Usergrid" );
+//            cassandraFig.bypass( "getKeyspaceName", "Usergrid_Collections" );
+//        }
+//    }
 
     @Override
     protected void configure() {

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1d14d477/stack/corepersistence/collection/src/main/resources/usergrid.properties
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/resources/usergrid.properties b/stack/corepersistence/collection/src/main/resources/usergrid.properties
deleted file mode 100644
index 37a8fa8..0000000
--- a/stack/corepersistence/collection/src/main/resources/usergrid.properties
+++ /dev/null
@@ -1 +0,0 @@
-# Keep nothing but production defaults in here
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1d14d477/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 3b5105f..a98b505 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,13 +1,12 @@
 package org.apache.usergrid.persistence.collection;
 
 
-import org.jukito.JukitoModule;
 import org.jukito.JukitoRunner;
 import org.jukito.UseModules;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import org.apache.usergrid.persistence.collection.guice.CollectionModule;
+import org.apache.usergrid.persistence.collection.guice.TestCollectionModule;
 import org.apache.usergrid.persistence.collection.impl.CollectionScopeImpl;
 import org.apache.usergrid.persistence.model.entity.SimpleId;
 
@@ -16,7 +15,7 @@ import static junit.framework.TestCase.assertEquals;
 
 /** @author tnine */
 @RunWith( JukitoRunner.class )
-@UseModules( CollectionModule.class )
+@UseModules( TestCollectionModule.class )
 public class CollectionContextImplTest {
 
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1d14d477/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 8c66a4f..52d415d 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,7 +1,6 @@
 package org.apache.usergrid.persistence.collection;
 
 
-import org.jukito.JukitoModule;
 import org.jukito.JukitoRunner;
 import org.jukito.UseModules;
 import org.junit.ClassRule;
@@ -10,8 +9,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.apache.usergrid.persistence.collection.cassandra.CassandraRule;
-import org.apache.usergrid.persistence.collection.guice.CollectionModule;
 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.model.entity.SimpleId;
 
@@ -27,7 +26,7 @@ import static org.junit.Assert.assertNotNull;
  * @author tnine
  */
 @RunWith( JukitoRunner.class )
-@UseModules( CollectionModule.class )
+@UseModules( TestCollectionModule.class )
 public class EntityCollectionManagerFactoryTest {
     @Inject
     private EntityCollectionManagerFactory entityCollectionManagerFactory;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1d14d477/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 02c1ac9..7078706 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
@@ -17,16 +17,19 @@
  */
 package org.apache.usergrid.persistence.collection;
 
+
 import org.jukito.JukitoRunner;
 import org.jukito.UseModules;
+import org.junit.Assert;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.apache.usergrid.persistence.collection.cassandra.CassandraRule;
-import org.apache.usergrid.persistence.collection.guice.CollectionModule;
+import org.apache.usergrid.persistence.collection.exception.CollectionRuntimeException;
 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.model.entity.Entity;
 import org.apache.usergrid.persistence.model.entity.SimpleId;
@@ -34,8 +37,6 @@ import org.apache.usergrid.persistence.model.field.IntegerField;
 
 import com.google.common.eventbus.EventBus;
 import com.google.inject.Inject;
-import org.apache.usergrid.persistence.collection.exception.CollectionRuntimeException;
-import org.junit.Assert;
 
 import rx.Observable;
 
@@ -46,7 +47,7 @@ import static org.junit.Assert.assertNull;
 
 /** @author tnine */
 @RunWith( JukitoRunner.class )
-@UseModules( CollectionModule.class )
+@UseModules( TestCollectionModule.class )
 public class EntityCollectionManagerIT {
     @Inject
     private EntityCollectionManagerFactory factory;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1d14d477/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 e771755..988bfc2 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,6 @@
 package org.apache.usergrid.persistence.collection;
 
 
-import org.jukito.JukitoModule;
 import org.jukito.JukitoRunner;
 import org.jukito.UseModules;
 import org.junit.ClassRule;
@@ -10,8 +9,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.apache.usergrid.persistence.collection.cassandra.CassandraRule;
-import org.apache.usergrid.persistence.collection.guice.CollectionModule;
 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.model.entity.Entity;
 import org.apache.usergrid.persistence.model.entity.SimpleId;
@@ -34,7 +33,7 @@ import static org.junit.Assert.assertNull;
  *
  */
 @RunWith( JukitoRunner.class )
-@UseModules( CollectionModule.class )
+@UseModules( TestCollectionModule.class )
 public class EntityCollectionManagerSyncIT {
     @Inject
     private EntityCollectionManagerFactory factory;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1d14d477/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/cassandra/CassandraRule.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/cassandra/CassandraRule.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/cassandra/CassandraRule.java
index a9123c1..8e26834 100644
--- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/cassandra/CassandraRule.java
+++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/cassandra/CassandraRule.java
@@ -13,6 +13,7 @@ import org.slf4j.LoggerFactory;
 import org.apache.cassandra.io.util.FileUtils;
 
 import org.apache.usergrid.persistence.collection.astyanax.CassandraFig;
+
 import com.google.common.io.Files;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
@@ -72,7 +73,7 @@ public class CassandraRule extends EnvironResource {
                         AvailablePortFinder.getNextAvailable() );
                 cass.start();
 
-                LOG.info( "Cassandra started" );
+                LOG.info( "Cassandra boostrapped" );
 
                 started = true;
             }

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1d14d477/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/guice/TestCollectionModule.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/guice/TestCollectionModule.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/guice/TestCollectionModule.java
new file mode 100644
index 0000000..1736113
--- /dev/null
+++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/guice/TestCollectionModule.java
@@ -0,0 +1,25 @@
+package org.apache.usergrid.persistence.collection.guice;
+
+
+import java.io.IOException;
+
+import org.safehaus.guicyfig.Env;
+
+import com.google.inject.AbstractModule;
+import com.netflix.config.ConfigurationManager;
+import com.netflix.config.SimpleDeploymentContext;
+
+
+/**
+ *
+ *
+ */
+public class TestCollectionModule extends TestModule {
+
+
+
+    @Override
+    protected void configure() {
+        install(new CollectionModule());
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1d14d477/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/guice/TestModule.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/guice/TestModule.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/guice/TestModule.java
new file mode 100644
index 0000000..d0bee78
--- /dev/null
+++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/guice/TestModule.java
@@ -0,0 +1,39 @@
+package org.apache.usergrid.persistence.collection.guice;
+
+
+import java.io.IOException;
+
+import com.google.inject.AbstractModule;
+import com.netflix.config.ConfigurationManager;
+import com.netflix.config.SimpleDeploymentContext;
+
+
+/**
+ *
+ *
+ */
+public abstract class TestModule extends AbstractModule {
+
+
+    static {
+                  /*
+                    * --------------------------------------------------------------------
+                    * Bootstrap the config for Archaius Configuration Settings.  We don't want to
+                    * bootstrap more than once per JVM
+                    * --------------------------------------------------------------------
+                    */
+
+        try {
+            //set our deployment context to UNIT so that we load our unit tests
+            SimpleDeploymentContext ctx = new SimpleDeploymentContext();
+            ctx.setDeploymentEnvironment( "UNIT" );
+            ConfigurationManager.setDeploymentContext( ctx );
+
+            //load up the properties
+            ConfigurationManager.loadCascadedPropertiesFromResources( "usergrid" );
+        }
+        catch ( IOException e ) {
+            throw new RuntimeException( "Cannot do much without properly loading our configuration.", e );
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1d14d477/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/changelog/ChangeLogGeneratorImplTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/changelog/ChangeLogGeneratorImplTest.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/changelog/ChangeLogGeneratorImplTest.java
index c9fb131..c435eab 100644
--- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/changelog/ChangeLogGeneratorImplTest.java
+++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/changelog/ChangeLogGeneratorImplTest.java
@@ -23,11 +23,7 @@ import java.util.List;
 
 import org.jukito.JukitoModule;
 import org.jukito.JukitoRunner;
-import org.junit.After;
-import org.junit.AfterClass;
 import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.runner.RunWith;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1d14d477/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/AbstractMvccEntityStageTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/AbstractMvccEntityStageTest.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/AbstractMvccEntityStageTest.java
index 527c1de..950130a 100644
--- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/AbstractMvccEntityStageTest.java
+++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/AbstractMvccEntityStageTest.java
@@ -17,25 +17,27 @@
  */
 package org.apache.usergrid.persistence.collection.mvcc.stage;
 
-import org.apache.usergrid.persistence.collection.util.InvalidMvccEntityGenerator;
-import com.google.common.base.Optional;
+
 import org.junit.Test;
 import org.junit.experimental.theories.Theories;
 import org.junit.experimental.theories.Theory;
 import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.usergrid.persistence.collection.CollectionScope;
 import org.apache.usergrid.persistence.collection.mvcc.entity.MvccEntity;
 import org.apache.usergrid.persistence.collection.util.EntityUtils;
 import org.apache.usergrid.persistence.collection.util.InvalidEntityGenerator;
 import org.apache.usergrid.persistence.collection.util.InvalidIdGenerator;
+import org.apache.usergrid.persistence.collection.util.InvalidMvccEntityGenerator;
 import org.apache.usergrid.persistence.model.entity.Entity;
 import org.apache.usergrid.persistence.model.entity.Id;
 
+import com.google.common.base.Optional;
+
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * @author tnine

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1d14d477/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/delete/DeleteCommitTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/delete/DeleteCommitTest.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/delete/DeleteCommitTest.java
index 2fdab50..c3c245c 100644
--- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/delete/DeleteCommitTest.java
+++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/delete/DeleteCommitTest.java
@@ -13,11 +13,11 @@ import org.apache.usergrid.persistence.collection.mvcc.entity.Stage;
 import org.apache.usergrid.persistence.collection.mvcc.stage.AbstractMvccEntityStageTest;
 import org.apache.usergrid.persistence.collection.mvcc.stage.CollectionIoEvent;
 import org.apache.usergrid.persistence.collection.mvcc.stage.TestEntityGenerator;
+import org.apache.usergrid.persistence.collection.mvcc.stage.write.UniqueValueSerializationStrategy;
 import org.apache.usergrid.persistence.collection.mvcc.stage.write.WriteCommit;
 import org.apache.usergrid.persistence.model.entity.Entity;
 
 import com.netflix.astyanax.MutationBatch;
-import org.apache.usergrid.persistence.collection.mvcc.stage.write.UniqueValueSerializationStrategy;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1d14d477/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/EntityVersionSerializerTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/EntityVersionSerializerTest.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/EntityVersionSerializerTest.java
index 8b4a4f7..42e481e 100644
--- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/EntityVersionSerializerTest.java
+++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/EntityVersionSerializerTest.java
@@ -17,12 +17,15 @@
  */
 package org.apache.usergrid.persistence.collection.mvcc.stage.write;
 
+
 import java.nio.ByteBuffer;
-import org.apache.usergrid.persistence.model.entity.SimpleId;
-import org.apache.usergrid.persistence.model.util.UUIDGenerator;
+
 import org.junit.Assert;
 import org.junit.Test;
 
+import org.apache.usergrid.persistence.model.entity.SimpleId;
+import org.apache.usergrid.persistence.model.util.UUIDGenerator;
+
 public class EntityVersionSerializerTest {
     
     @Test

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1d14d477/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/FieldSerializerTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/FieldSerializerTest.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/FieldSerializerTest.java
index b7deff8..e3ec59d 100644
--- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/FieldSerializerTest.java
+++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/FieldSerializerTest.java
@@ -17,15 +17,19 @@
  */
 package org.apache.usergrid.persistence.collection.mvcc.stage.write;
 
-import com.netflix.astyanax.model.CompositeBuilder;
-import com.netflix.astyanax.model.CompositeParser;
-import com.netflix.astyanax.model.Composites;
+
 import java.nio.ByteBuffer;
-import org.apache.usergrid.persistence.model.field.Field;
-import org.apache.usergrid.persistence.model.field.IntegerField;
+
 import org.junit.Assert;
 import org.junit.Test;
 
+import org.apache.usergrid.persistence.model.field.Field;
+import org.apache.usergrid.persistence.model.field.IntegerField;
+
+import com.netflix.astyanax.model.CompositeBuilder;
+import com.netflix.astyanax.model.CompositeParser;
+import com.netflix.astyanax.model.Composites;
+
 public class FieldSerializerTest {
 
     @Test

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1d14d477/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 144e634..a5d87f4 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
@@ -17,18 +17,9 @@
  */
 package org.apache.usergrid.persistence.collection.mvcc.stage.write;
 
-import com.google.inject.Inject;
-import com.netflix.astyanax.connectionpool.exceptions.ConnectionException;
+
 import java.util.UUID;
-import org.apache.usergrid.persistence.collection.CollectionScope;
-import org.apache.usergrid.persistence.collection.cassandra.CassandraRule;
-import org.apache.usergrid.persistence.collection.guice.CollectionModule;
-import org.apache.usergrid.persistence.collection.guice.MigrationManagerRule;
-import org.apache.usergrid.persistence.collection.impl.CollectionScopeImpl;
-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.util.UUIDGenerator;
+
 import org.jukito.JukitoRunner;
 import org.jukito.UseModules;
 import org.junit.Assert;
@@ -39,8 +30,21 @@ import org.junit.runner.RunWith;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.apache.usergrid.persistence.collection.CollectionScope;
+import org.apache.usergrid.persistence.collection.cassandra.CassandraRule;
+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.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.util.UUIDGenerator;
+
+import com.google.inject.Inject;
+import com.netflix.astyanax.connectionpool.exceptions.ConnectionException;
+
 @RunWith( JukitoRunner.class )
-@UseModules( CollectionModule.class )
+@UseModules( TestCollectionModule.class )
 public class UniqueValueSerializationStrategyImplTest {
     private static final Logger LOG = LoggerFactory.getLogger( UniqueValueSerializationStrategyImplTest.class );
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1d14d477/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 91d9295..d247127 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
@@ -17,29 +17,31 @@
  */
 package org.apache.usergrid.persistence.collection.mvcc.stage.write;
 
-import com.google.inject.Inject;
+
+import org.jukito.UseModules;
+import org.junit.ClassRule;
 import org.junit.Test;
 
 import org.apache.usergrid.persistence.collection.CollectionScope;
 import org.apache.usergrid.persistence.collection.cassandra.CassandraRule;
-import org.apache.usergrid.persistence.collection.guice.CollectionModule;
+import org.apache.usergrid.persistence.collection.guice.TestCollectionModule;
 import org.apache.usergrid.persistence.collection.mvcc.entity.MvccEntity;
 import org.apache.usergrid.persistence.collection.mvcc.stage.AbstractMvccEntityStageTest;
 import org.apache.usergrid.persistence.collection.mvcc.stage.CollectionIoEvent;
 import org.apache.usergrid.persistence.model.entity.Entity;
 
+import com.google.inject.Inject;
+
 import static org.apache.usergrid.persistence.collection.mvcc.stage.TestEntityGenerator.fromEntity;
 import static org.apache.usergrid.persistence.collection.mvcc.stage.TestEntityGenerator.generateEntity;
-import org.jukito.UseModules;
 import static org.junit.Assert.assertSame;
-import org.junit.ClassRule;
 import static org.mockito.Mockito.mock;
 
 
 /** 
  * @author tnine 
  */
-@UseModules( CollectionModule.class )
+@UseModules( TestCollectionModule.class )
 public class WriteUniqueVerifyTest extends AbstractMvccEntityStageTest {
 
     @ClassRule

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1d14d477/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 63c87ce..b0ee061 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,13 +23,13 @@ import org.apache.usergrid.persistence.collection.CollectionScope;
 import org.apache.usergrid.persistence.collection.astyanax.AstyanaxKeyspaceProvider;
 import org.apache.usergrid.persistence.collection.astyanax.CassandraFig;
 import org.apache.usergrid.persistence.collection.cassandra.CassandraRule;
-import org.apache.usergrid.persistence.collection.guice.CollectionModule;
 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.migration.MigrationManagerFig;
+import org.apache.usergrid.persistence.collection.mvcc.MvccEntitySerializationStrategy;
 import org.apache.usergrid.persistence.collection.mvcc.entity.MvccEntity;
 import org.apache.usergrid.persistence.collection.mvcc.entity.impl.MvccEntityImpl;
-import org.apache.usergrid.persistence.collection.mvcc.MvccEntitySerializationStrategy;
 import org.apache.usergrid.persistence.collection.rx.RxFig;
 import org.apache.usergrid.persistence.collection.serialization.SerializationFig;
 import org.apache.usergrid.persistence.collection.util.EntityUtils;
@@ -50,10 +50,10 @@ import com.google.inject.Inject;
 import com.netflix.astyanax.connectionpool.exceptions.ConnectionException;
 
 import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertNotNull;
-import static junit.framework.TestCase.assertSame;
 import static junit.framework.TestCase.assertFalse;
+import static junit.framework.TestCase.assertNotNull;
 import static junit.framework.TestCase.assertNull;
+import static junit.framework.TestCase.assertSame;
 import static junit.framework.TestCase.assertTrue;
 import static org.mockito.Mockito.mock;
 
@@ -61,7 +61,7 @@ import static org.mockito.Mockito.mock;
 /** @author tnine */
 @IterationChop( iterations = 1000, threads = 2 )
 @RunWith( JukitoRunner.class )
-@UseModules( CollectionModule.class )
+@UseModules( TestCollectionModule.class )
 public class MvccEntitySerializationStrategyImplTest {
     /** Our RX I/O threads and this should have the same value */
     private static final String CONNECTION_COUNT = "20";

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1d14d477/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 e44ebfa..866f23e 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
@@ -3,7 +3,6 @@ package org.apache.usergrid.persistence.collection.serialization.impl;
 
 import java.util.UUID;
 
-import org.jukito.JukitoModule;
 import org.jukito.JukitoRunner;
 import org.jukito.UseModules;
 import org.junit.ClassRule;
@@ -16,8 +15,8 @@ import org.safehaus.guicyfig.Option;
 
 import org.apache.usergrid.persistence.collection.CollectionScope;
 import org.apache.usergrid.persistence.collection.cassandra.CassandraRule;
-import org.apache.usergrid.persistence.collection.guice.CollectionModule;
 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.mvcc.entity.MvccLogEntry;
@@ -38,7 +37,7 @@ import static org.junit.Assert.assertNull;
 
 /** @author tnine */
 @RunWith( JukitoRunner.class )
-@UseModules( CollectionModule.class )
+@UseModules( TestCollectionModule.class )
 public class MvccLESSTransientTest {
     @Inject
     @Bypass( environments = { Env.ALL, Env.UNIT }, options = @Option( method = "getTimeout", override = "1" ) )

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1d14d477/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 cc66059..9d5a59e 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
@@ -4,7 +4,6 @@ package org.apache.usergrid.persistence.collection.serialization.impl;
 import java.util.List;
 import java.util.UUID;
 
-import org.jukito.JukitoModule;
 import org.jukito.JukitoRunner;
 import org.jukito.UseModules;
 import org.junit.ClassRule;
@@ -14,8 +13,8 @@ import org.junit.runner.RunWith;
 
 import org.apache.usergrid.persistence.collection.CollectionScope;
 import org.apache.usergrid.persistence.collection.cassandra.CassandraRule;
-import org.apache.usergrid.persistence.collection.guice.CollectionModule;
 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.mvcc.entity.MvccLogEntry;
@@ -36,7 +35,7 @@ import static org.mockito.Mockito.mock;
 
 /** @author tnine */
 @RunWith( JukitoRunner.class )
-@UseModules( CollectionModule.class )
+@UseModules( TestCollectionModule.class )
 public class MvccLogEntrySerializationStrategyImplTest {
 
     @Inject

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1d14d477/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/util/InvalidEntityGenerator.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/util/InvalidEntityGenerator.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/util/InvalidEntityGenerator.java
index 5879d74..5b82ac8 100644
--- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/util/InvalidEntityGenerator.java
+++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/util/InvalidEntityGenerator.java
@@ -28,12 +28,13 @@ import org.junit.experimental.theories.ParameterSignature;
 import org.junit.experimental.theories.ParameterSupplier;
 import org.junit.experimental.theories.ParametersSuppliedBy;
 import org.junit.experimental.theories.PotentialAssignment;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.usergrid.persistence.model.entity.Entity;
+
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1d14d477/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/util/InvalidIdGenerator.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/util/InvalidIdGenerator.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/util/InvalidIdGenerator.java
index 5044611..98c382c 100644
--- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/util/InvalidIdGenerator.java
+++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/util/InvalidIdGenerator.java
@@ -17,6 +17,7 @@
  */
 package org.apache.usergrid.persistence.collection.util;
 
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
@@ -27,14 +28,14 @@ import org.junit.experimental.theories.ParameterSignature;
 import org.junit.experimental.theories.ParameterSupplier;
 import org.junit.experimental.theories.ParametersSuppliedBy;
 import org.junit.experimental.theories.PotentialAssignment;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.usergrid.persistence.model.entity.Id;
 import org.apache.usergrid.persistence.model.util.UUIDGenerator;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Generates a list of invalid entities for input verification. To be used with Theory testing.

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1d14d477/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/util/InvalidMvccEntityGenerator.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/util/InvalidMvccEntityGenerator.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/util/InvalidMvccEntityGenerator.java
index 8056b2d..48dc38c 100644
--- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/util/InvalidMvccEntityGenerator.java
+++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/util/InvalidMvccEntityGenerator.java
@@ -28,6 +28,8 @@ import org.junit.experimental.theories.ParameterSignature;
 import org.junit.experimental.theories.ParameterSupplier;
 import org.junit.experimental.theories.ParametersSuppliedBy;
 import org.junit.experimental.theories.PotentialAssignment;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.usergrid.persistence.collection.mvcc.entity.MvccEntity;
 import org.apache.usergrid.persistence.model.entity.Id;
@@ -35,8 +37,6 @@ import org.apache.usergrid.persistence.model.util.UUIDGenerator;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1d14d477/stack/corepersistence/collection/src/test/resources/cassandra-defaults.properties
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/resources/cassandra-defaults.properties b/stack/corepersistence/collection/src/test/resources/cassandra-defaults.properties
deleted file mode 100644
index e656ddd..0000000
--- a/stack/corepersistence/collection/src/test/resources/cassandra-defaults.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-# The properties are not the actual configuration properties but
-# safe dynamic property defaults for our testing via IDE or Maven
-cassandra.connections=10
-cassandra.port=9160
-cassandra.version=1.2
-cassandra.hosts=localhost
-cassandra.cluster_name=Usergrid
-collections.keyspace=Usergrid_Collections
-cassandra.timeout=5000
-
-
-

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1d14d477/stack/corepersistence/collection/src/test/resources/cassandra.properties
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/resources/cassandra.properties b/stack/corepersistence/collection/src/test/resources/cassandra.properties
deleted file mode 100644
index a69c771..0000000
--- a/stack/corepersistence/collection/src/test/resources/cassandra.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Purposefully left empty, we override this in our module code to KISS  The runtime requires this file however
-#Boostrapping should fail fast if it's not present
-
-
-

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1d14d477/stack/corepersistence/collection/src/test/resources/serialization-defaults.properties
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/resources/serialization-defaults.properties b/stack/corepersistence/collection/src/test/resources/serialization-defaults.properties
deleted file mode 100644
index 375c50f..0000000
--- a/stack/corepersistence/collection/src/test/resources/serialization-defaults.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-collections.keyspace.replicationfactor=1
-collections.keyspace.strategy.options=
-collection.stage.transient.timeout=60
-collections.keyspace.strategy.class=org.apache.cassandra.locator.SimpleStrategy

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1d14d477/stack/corepersistence/collection/src/test/resources/usergrid-UNIT.properties
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/resources/usergrid-UNIT.properties b/stack/corepersistence/collection/src/test/resources/usergrid-UNIT.properties
index 6a5013c..152693a 100644
--- a/stack/corepersistence/collection/src/test/resources/usergrid-UNIT.properties
+++ b/stack/corepersistence/collection/src/test/resources/usergrid-UNIT.properties
@@ -1 +1,14 @@
-# Keep nothing but overriding test defaults in here
\ No newline at end of file
+# Keep nothing but overriding test defaults in here
+cassandra.connections=10
+cassandra.port=9160
+cassandra.version=1.2
+cassandra.hosts=localhost
+cassandra.cluster_name=Usergrid
+collections.keyspace=Usergrid_Collections
+cassandra.timeout=5000
+
+
+collections.keyspace.replicationfactor=1
+collections.keyspace.strategy.options=
+collection.stage.transient.timeout=60
+collections.keyspace.strategy.class=org.apache.cassandra.locator.SimpleStrategy

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1d14d477/stack/corepersistence/collection/src/test/resources/usergrid.properties
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/resources/usergrid.properties b/stack/corepersistence/collection/src/test/resources/usergrid.properties
new file mode 100644
index 0000000..febda88
--- /dev/null
+++ b/stack/corepersistence/collection/src/test/resources/usergrid.properties
@@ -0,0 +1 @@
+# No properties in our test env

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1d14d477/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/guice/TestGraphModule.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/guice/TestGraphModule.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/guice/TestGraphModule.java
new file mode 100644
index 0000000..6b43f9d
--- /dev/null
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/guice/TestGraphModule.java
@@ -0,0 +1,20 @@
+package org.apache.usergrid.persistence.graph.guice;
+
+
+import org.apache.usergrid.persistence.collection.guice.CollectionModule;
+import org.apache.usergrid.persistence.collection.guice.TestModule;
+
+
+/**
+ * Wrapper for configuring our guice test env
+ *
+ */
+public class TestGraphModule extends TestModule {
+
+
+
+    @Override
+    protected void configure() {
+        install(new GraphModule());
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1d14d477/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetadataSerializationTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetadataSerializationTest.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetadataSerializationTest.java
index 0a91063..5194e97 100644
--- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetadataSerializationTest.java
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeMetadataSerializationTest.java
@@ -35,6 +35,7 @@ import org.apache.usergrid.persistence.collection.cassandra.CassandraRule;
 import org.apache.usergrid.persistence.collection.guice.MigrationManagerRule;
 import org.apache.usergrid.persistence.graph.Edge;
 import org.apache.usergrid.persistence.graph.guice.GraphModule;
+import org.apache.usergrid.persistence.graph.guice.TestGraphModule;
 import org.apache.usergrid.persistence.model.entity.Id;
 import org.apache.usergrid.persistence.model.util.UUIDGenerator;
 
@@ -56,7 +57,7 @@ import static org.mockito.Mockito.when;
  *
  */
 @RunWith( JukitoRunner.class )
-@UseModules( { GraphModule.class } )
+@UseModules( { TestGraphModule.class } )
 public class EdgeMetadataSerializationTest {
 
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1d14d477/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 a15dc4d..a51b2b6 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
@@ -18,6 +18,7 @@ import org.apache.usergrid.persistence.collection.guice.MigrationManagerRule;
 import org.apache.usergrid.persistence.graph.Edge;
 import org.apache.usergrid.persistence.graph.SearchByEdge;
 import org.apache.usergrid.persistence.graph.guice.GraphModule;
+import org.apache.usergrid.persistence.graph.guice.TestGraphModule;
 import org.apache.usergrid.persistence.model.entity.Id;
 import org.apache.usergrid.persistence.model.util.UUIDGenerator;
 
@@ -41,7 +42,7 @@ import static org.mockito.Mockito.when;
  *
  */
 @RunWith( JukitoRunner.class )
-@UseModules( { GraphModule.class } )
+@UseModules( { TestGraphModule.class } )
 public class EdgeSerializationTest {
 
     @ClassRule

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1d14d477/stack/corepersistence/graph/src/test/resources/usergrid-UNIT.properties
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/resources/usergrid-UNIT.properties b/stack/corepersistence/graph/src/test/resources/usergrid-UNIT.properties
index 6a5013c..152693a 100644
--- a/stack/corepersistence/graph/src/test/resources/usergrid-UNIT.properties
+++ b/stack/corepersistence/graph/src/test/resources/usergrid-UNIT.properties
@@ -1 +1,14 @@
-# Keep nothing but overriding test defaults in here
\ No newline at end of file
+# Keep nothing but overriding test defaults in here
+cassandra.connections=10
+cassandra.port=9160
+cassandra.version=1.2
+cassandra.hosts=localhost
+cassandra.cluster_name=Usergrid
+collections.keyspace=Usergrid_Collections
+cassandra.timeout=5000
+
+
+collections.keyspace.replicationfactor=1
+collections.keyspace.strategy.options=
+collection.stage.transient.timeout=60
+collections.keyspace.strategy.class=org.apache.cassandra.locator.SimpleStrategy

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1d14d477/stack/corepersistence/graph/src/test/resources/usergrid.properties
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/resources/usergrid.properties b/stack/corepersistence/graph/src/test/resources/usergrid.properties
new file mode 100644
index 0000000..febda88
--- /dev/null
+++ b/stack/corepersistence/graph/src/test/resources/usergrid.properties
@@ -0,0 +1 @@
+# No properties in our test env


Mime
View raw message