Cleaned up obscelete external resources
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/12b50286 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/12b50286 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/12b50286 Branch: refs/heads/two-dot-o Commit: 12b502865fcd144a231ac3cf2d10b9f93c2248e8 Parents: 4164734 Author: Todd Nine <[email protected]> Authored: Tue Nov 11 15:24:29 2014 -0700 Committer: Todd Nine <[email protected]> Committed: Tue Nov 11 15:24:29 2014 -0700 ---------------------------------------------------------------------- .../src/test/resources/usergrid-test.properties | 2 +- .../usergrid/ConcurrentCoreIteratorITSuite.java | 2 +- .../org/apache/usergrid/CoreITSetupImpl.java | 1 - .../java/org/apache/usergrid/CoreITSuite.java | 2 +- .../batch/job/AbstractSchedulerRuntimeIT.java | 6 +- .../core/astyanax/ColumnNameIteratorTest.java | 21 ++-- .../MultiKeyColumnNameIteratorTest.java | 20 ++-- .../astyanax/MultiRowColumnIteratorTest.java | 20 ++-- .../core/cassandra/CassandraRule.java | 114 ------------------ .../persistence/core/test/ITRunner.java | 20 +--- .../graph/CommittedGraphManagerIT.java | 2 +- .../persistence/graph/GraphManagerLoadTest.java | 4 +- .../graph/GraphManagerShardConsistencyIT.java | 6 - .../graph/GraphManagerShardingIT.java | 4 +- .../graph/GraphManagerStressTest.java | 4 +- .../graph/StorageGraphManagerIT.java | 2 +- .../graph/guice/TestGraphModule.java | 2 +- .../graph/impl/EdgeDeleteListenerTest.java | 6 +- .../graph/impl/NodeDeleteListenerTest.java | 6 +- .../graph/impl/stage/EdgeDeleteRepairTest.java | 4 +- .../graph/impl/stage/EdgeMetaRepairTest.java | 6 +- .../EdgeMetaDataSerializationProxyV2Test.java | 7 +- .../EdgeMetaDataSerializationV1Test.java | 4 +- .../EdgeMetaDataSerializationV2Test.java | 4 +- .../EdgeSerializationChopTest.java | 4 +- .../serialization/EdgeSerializationTest.java | 7 +- .../serialization/NodeSerializationTest.java | 4 +- .../PermanentSerializationTest.java | 2 +- .../impl/shard/EdgeShardSerializationTest.java | 9 +- .../NodeShardCounterSerializationTest.java | 8 +- .../index/impl/CorePerformanceIT.java | 4 - .../index/impl/ElasticSearchResource.java | 118 +------------------ .../impl/EntityConnectionIndexImplTest.java | 4 - .../persistence/index/impl/EntityIndexTest.java | 6 +- .../usergrid/launcher/EmbeddedServerHelper.java | 4 +- 35 files changed, 92 insertions(+), 347 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/12b50286/stack/config/src/test/resources/usergrid-test.properties ---------------------------------------------------------------------- diff --git a/stack/config/src/test/resources/usergrid-test.properties b/stack/config/src/test/resources/usergrid-test.properties index cfa1f2f..5889625 100644 --- a/stack/config/src/test/resources/usergrid-test.properties +++ b/stack/config/src/test/resources/usergrid-test.properties @@ -59,7 +59,7 @@ cassandra.writecl=QUORUM cassandra.lock.keyspace=Locks elasticsearch.startup=external -elasticsearch.cluster_name=test_cluster +elasticsearch.cluster_name=usergrid #Properties to control the number of buckets in the index. usergrid.index.defaultbucketsize=20 http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/12b50286/stack/core/src/test/java/org/apache/usergrid/ConcurrentCoreIteratorITSuite.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/ConcurrentCoreIteratorITSuite.java b/stack/core/src/test/java/org/apache/usergrid/ConcurrentCoreIteratorITSuite.java index 273c6df..1312950 100644 --- a/stack/core/src/test/java/org/apache/usergrid/ConcurrentCoreIteratorITSuite.java +++ b/stack/core/src/test/java/org/apache/usergrid/ConcurrentCoreIteratorITSuite.java @@ -79,5 +79,5 @@ public class ConcurrentCoreIteratorITSuite { public static CassandraResource cassandraResource = CassandraResource.newWithAvailablePorts( ); @ClassRule - public static ElasticSearchResource elasticSearchResource = new ElasticSearchResource().startEs(); + public static ElasticSearchResource elasticSearchResource = new ElasticSearchResource(); } http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/12b50286/stack/core/src/test/java/org/apache/usergrid/CoreITSetupImpl.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/CoreITSetupImpl.java b/stack/core/src/test/java/org/apache/usergrid/CoreITSetupImpl.java index fbff413..b3cc046 100644 --- a/stack/core/src/test/java/org/apache/usergrid/CoreITSetupImpl.java +++ b/stack/core/src/test/java/org/apache/usergrid/CoreITSetupImpl.java @@ -80,7 +80,6 @@ public class CoreITSetupImpl implements CoreITSetup { */ protected void before( Description description ) throws Throwable { LOG.info( "Setting up for {}", description.getDisplayName() ); - elasticSearchResource.startEs(); initialize(); } http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/12b50286/stack/core/src/test/java/org/apache/usergrid/CoreITSuite.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/CoreITSuite.java b/stack/core/src/test/java/org/apache/usergrid/CoreITSuite.java index ccdcd98..ff06a80 100644 --- a/stack/core/src/test/java/org/apache/usergrid/CoreITSuite.java +++ b/stack/core/src/test/java/org/apache/usergrid/CoreITSuite.java @@ -51,7 +51,7 @@ public class CoreITSuite { public static CassandraResource cassandraResource = CassandraResource.newWithAvailablePorts( ); @ClassRule - public static ElasticSearchResource elasticSearchResource = new ElasticSearchResource().startEs(); + public static ElasticSearchResource elasticSearchResource = new ElasticSearchResource(); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/12b50286/stack/core/src/test/java/org/apache/usergrid/batch/job/AbstractSchedulerRuntimeIT.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/batch/job/AbstractSchedulerRuntimeIT.java b/stack/core/src/test/java/org/apache/usergrid/batch/job/AbstractSchedulerRuntimeIT.java index 5e7288b..cc31d2d 100644 --- a/stack/core/src/test/java/org/apache/usergrid/batch/job/AbstractSchedulerRuntimeIT.java +++ b/stack/core/src/test/java/org/apache/usergrid/batch/job/AbstractSchedulerRuntimeIT.java @@ -29,6 +29,7 @@ import org.apache.usergrid.persistence.index.impl.ElasticSearchResource; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; +import org.junit.ClassRule; /** @@ -42,8 +43,11 @@ public class AbstractSchedulerRuntimeIT { protected static final String RUNLOOP_PROP = "usergrid.scheduler.job.interval"; protected static final String FAIL_PROP = "usergrid.scheduler.job.maxfail"; + @ClassRule public static CassandraResource cassandraResource = SchedulerITSuite.cassandraResource; - public static ElasticSearchResource elasticSearchResource = new ElasticSearchResource().startEs(); + + @ClassRule + public static ElasticSearchResource elasticSearchResource = new ElasticSearchResource(); private TestJobListener listener = new TestJobListener(); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/12b50286/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/ColumnNameIteratorTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/ColumnNameIteratorTest.java b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/ColumnNameIteratorTest.java index 2522f33..547c504 100644 --- a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/ColumnNameIteratorTest.java +++ b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/ColumnNameIteratorTest.java @@ -24,14 +24,18 @@ package org.apache.usergrid.persistence.core.astyanax; import java.util.HashMap; +import org.junit.Before; import org.junit.BeforeClass; -import org.junit.ClassRule; import org.junit.Test; +import org.junit.runner.RunWith; -import org.apache.usergrid.persistence.core.cassandra.CassandraRule; +import org.apache.usergrid.persistence.core.guice.TestCommonModule; import org.apache.usergrid.persistence.core.scope.ApplicationScope; +import org.apache.usergrid.persistence.core.test.ITRunner; +import org.apache.usergrid.persistence.core.test.UseModules; import org.apache.usergrid.persistence.model.util.UUIDGenerator; +import com.google.inject.Inject; import com.netflix.astyanax.Keyspace; import com.netflix.astyanax.MutationBatch; import com.netflix.astyanax.connectionpool.exceptions.ConnectionException; @@ -46,11 +50,14 @@ import com.netflix.astyanax.util.RangeBuilder; import static org.junit.Assert.assertEquals; + +@RunWith( ITRunner.class ) +@UseModules( TestCommonModule.class ) public class ColumnNameIteratorTest { - @ClassRule - public static CassandraRule rule = new CassandraRule(); + @Inject + public CassandraFig cassandraFig; protected static Keyspace keyspace; @@ -62,8 +69,8 @@ public class ColumnNameIteratorTest { protected static final boolean TRUE = true; - @BeforeClass - public static void setup() throws ConnectionException { + @Before + public void setup() throws ConnectionException { final CassandraConfig cassandraConfig = new CassandraConfig() { @@ -87,7 +94,7 @@ public class ColumnNameIteratorTest { AstyanaxKeyspaceProvider astyanaxKeyspaceProvider = - new AstyanaxKeyspaceProvider( rule.getCassandraFig(), cassandraConfig ); + new AstyanaxKeyspaceProvider( cassandraFig, cassandraConfig ); keyspace = astyanaxKeyspaceProvider.get(); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/12b50286/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/MultiKeyColumnNameIteratorTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/MultiKeyColumnNameIteratorTest.java b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/MultiKeyColumnNameIteratorTest.java index 61b9e54..a96db39 100644 --- a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/MultiKeyColumnNameIteratorTest.java +++ b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/MultiKeyColumnNameIteratorTest.java @@ -26,14 +26,18 @@ import java.util.Arrays; import java.util.Comparator; import java.util.HashMap; +import org.junit.Before; import org.junit.BeforeClass; -import org.junit.ClassRule; import org.junit.Test; +import org.junit.runner.RunWith; -import org.apache.usergrid.persistence.core.cassandra.CassandraRule; +import org.apache.usergrid.persistence.core.guice.TestCommonModule; import org.apache.usergrid.persistence.core.scope.ApplicationScope; +import org.apache.usergrid.persistence.core.test.ITRunner; +import org.apache.usergrid.persistence.core.test.UseModules; import org.apache.usergrid.persistence.model.util.UUIDGenerator; +import com.google.inject.Inject; import com.netflix.astyanax.Keyspace; import com.netflix.astyanax.MutationBatch; import com.netflix.astyanax.connectionpool.exceptions.ConnectionException; @@ -52,10 +56,12 @@ import rx.functions.Func1; import static org.junit.Assert.assertEquals; +@RunWith( ITRunner.class ) +@UseModules( TestCommonModule.class ) public class MultiKeyColumnNameIteratorTest { - @ClassRule - public static CassandraRule rule = new CassandraRule(); + @Inject + public CassandraFig cassandraFig; protected static Keyspace keyspace; @@ -67,8 +73,8 @@ public class MultiKeyColumnNameIteratorTest { protected static final boolean TRUE = true; - @BeforeClass - public static void setup() throws ConnectionException { + @Before + public void setup() throws ConnectionException { final CassandraConfig cassandraConfig = new CassandraConfig() { @@ -92,7 +98,7 @@ public class MultiKeyColumnNameIteratorTest { AstyanaxKeyspaceProvider astyanaxKeyspaceProvider = - new AstyanaxKeyspaceProvider( rule.getCassandraFig(), cassandraConfig ); + new AstyanaxKeyspaceProvider( cassandraFig, cassandraConfig ); keyspace = astyanaxKeyspaceProvider.get(); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/12b50286/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/MultiRowColumnIteratorTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/MultiRowColumnIteratorTest.java b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/MultiRowColumnIteratorTest.java index 04039e4..4530d4b 100644 --- a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/MultiRowColumnIteratorTest.java +++ b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/MultiRowColumnIteratorTest.java @@ -28,14 +28,18 @@ import java.util.Comparator; import java.util.HashMap; import java.util.concurrent.CountDownLatch; +import org.junit.Before; import org.junit.BeforeClass; -import org.junit.ClassRule; import org.junit.Test; +import org.junit.runner.RunWith; -import org.apache.usergrid.persistence.core.cassandra.CassandraRule; +import org.apache.usergrid.persistence.core.guice.TestCommonModule; import org.apache.usergrid.persistence.core.scope.ApplicationScope; +import org.apache.usergrid.persistence.core.test.ITRunner; +import org.apache.usergrid.persistence.core.test.UseModules; import org.apache.usergrid.persistence.model.util.UUIDGenerator; +import com.google.inject.Inject; import com.netflix.astyanax.Keyspace; import com.netflix.astyanax.MutationBatch; import com.netflix.astyanax.connectionpool.exceptions.ConnectionException; @@ -55,10 +59,12 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +@RunWith( ITRunner.class ) +@UseModules( TestCommonModule.class ) public class MultiRowColumnIteratorTest { - @ClassRule - public static CassandraRule rule = new CassandraRule(); + @Inject + public CassandraFig cassandraFig; protected static Keyspace keyspace; @@ -70,8 +76,8 @@ public class MultiRowColumnIteratorTest { protected static final boolean TRUE = true; - @BeforeClass - public static void setup() throws ConnectionException { + @Before + public void setup() throws ConnectionException { final CassandraConfig cassandraConfig = new CassandraConfig() { @@ -95,7 +101,7 @@ public class MultiRowColumnIteratorTest { AstyanaxKeyspaceProvider astyanaxKeyspaceProvider = - new AstyanaxKeyspaceProvider( rule.getCassandraFig(), cassandraConfig ); + new AstyanaxKeyspaceProvider( cassandraFig, cassandraConfig ); keyspace = astyanaxKeyspaceProvider.get(); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/12b50286/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 deleted file mode 100644 index 68a56e4..0000000 --- a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/cassandra/CassandraRule.java +++ /dev/null @@ -1,114 +0,0 @@ -package org.apache.usergrid.persistence.core.cassandra; - - -import com.google.common.io.Files; -import com.google.inject.Guice; -import com.google.inject.Injector; -import com.netflix.astyanax.test.EmbeddedCassandra; -import com.netflix.config.ConfigurationManager; - -import java.io.File; -import java.io.IOException; -import org.apache.cassandra.io.util.FileUtils; -import org.apache.usergrid.persistence.core.astyanax.CassandraFig; -import org.apache.usergrid.persistence.core.util.AvailablePortFinder; -import org.safehaus.guicyfig.Env; -import org.safehaus.guicyfig.EnvironResource; -import org.safehaus.guicyfig.GuicyFigModule; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - - -/** - * @TODO - I wanted this in the test module but unfortunately that will create a circular dep - * due to the inclusion of the MigrationManager - */ -public class CassandraRule extends EnvironResource { - private static final Logger LOG = LoggerFactory.getLogger( CassandraRule.class ); - - private static final Object mutex = new Object(); - - private static EmbeddedCassandra cass; - - private static boolean started = false; - - private final CassandraFig cassandraFig; - - static{ - ConfigurationManager.getDeploymentContext().setDeploymentEnvironment( "UNIT" ); - try { - ConfigurationManager.loadCascadedPropertiesFromResources( "usergrid" ); - } - catch ( IOException e ) { - throw new RuntimeException(e); - } - } - - public CassandraRule() { - super( Env.UNIT ); - - Injector injector = Guice.createInjector( new GuicyFigModule( CassandraFig.class ) ); - cassandraFig = injector.getInstance( CassandraFig.class ); - } - - - /** - * Get the cassandra fig - * @return - */ - public CassandraFig getCassandraFig(){ - return cassandraFig; - } - - @Override - public void before() throws Throwable { - - if ( !cassandraFig.isEmbedded()) { - LOG.info("Using external Cassandra"); - return; - } - - if ( started ) { - return; - } - - synchronized ( mutex ) { - - //second into mutex - if(started){ - return; - } - - File dataDir = Files.createTempDir(); - dataDir.deleteOnExit(); - - //cleanup before we run, shouldn't be necessary, but had the directory exist during JVM kill - if( dataDir.exists() ) { - FileUtils.deleteRecursive( dataDir ); - } - - try { - LOG.info( "Starting cassandra" ); - - cass = new EmbeddedCassandra( dataDir, "Usergrid", 9160, - AvailablePortFinder.getNextAvailable() ); - cass.start(); - - LOG.info( "Cassandra boostrapped" ); - - started = true; - } - catch ( IOException e ) { - throw new RuntimeException( "Unable to start cassandra", e ); - } - } - } - - - @Override - protected void after() { - - //TODO TN. this should only really happen when we shut down -// cass.stop(); - } -} http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/12b50286/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 index 1a800ad..82587fd 100644 --- 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 @@ -27,8 +27,6 @@ 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; @@ -36,25 +34,11 @@ import com.google.inject.Module; /** - * Run jukito with cassandra + * Run guice and inject it into our tests */ -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 ); - } +public class ITRunner extends BlockJUnit4ClassRunner { - } private Injector injector; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/12b50286/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 fa366ad..b471119 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.apache.usergrid.persistence.core.test.UseModules; import org.junit.runner.RunWith; 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.model.entity.Id; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/12b50286/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 c312714..916bdaa 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,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; -import org.apache.usergrid.persistence.core.test.UseModules; import org.junit.Before; import org.junit.Ignore; import org.junit.Rule; @@ -41,9 +40,10 @@ 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.test.ITRunner; import org.apache.usergrid.persistence.core.scope.ApplicationScope; import org.apache.usergrid.persistence.core.scope.ApplicationScopeImpl; +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.impl.SimpleSearchByEdgeType; import org.apache.usergrid.persistence.model.entity.Id; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/12b50286/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerShardConsistencyIT.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerShardConsistencyIT.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerShardConsistencyIT.java index a748c05..0f25537 100644 --- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerShardConsistencyIT.java +++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerShardConsistencyIT.java @@ -41,13 +41,11 @@ import javax.annotation.Nullable; import org.junit.After; import org.junit.Before; -import org.junit.ClassRule; import org.junit.Ignore; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.usergrid.persistence.core.cassandra.CassandraRule; import org.apache.usergrid.persistence.core.migration.schema.MigrationException; import org.apache.usergrid.persistence.core.migration.schema.MigrationManager; import org.apache.usergrid.persistence.core.scope.ApplicationScope; @@ -85,10 +83,6 @@ import static org.junit.Assert.fail; public class GraphManagerShardConsistencyIT { private static final Logger log = LoggerFactory.getLogger( GraphManagerShardConsistencyIT.class ); - - @ClassRule - public static CassandraRule rule = new CassandraRule(); - private static final MetricRegistry registry = new MetricRegistry(); private static final Meter writeMeter = registry.meter( "writeThroughput" ); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/12b50286/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 e6231e0..dfda4b1 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,6 @@ package org.apache.usergrid.persistence.graph; import java.util.concurrent.TimeoutException; -import org.apache.usergrid.persistence.core.test.UseModules; import org.junit.Before; import org.junit.Ignore; import org.junit.Rule; @@ -31,9 +30,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.apache.usergrid.persistence.collection.guice.MigrationManagerRule; -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.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.shard.DirectedEdgeMeta; import org.apache.usergrid.persistence.graph.serialization.impl.shard.NodeShardApproximation; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/12b50286/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 0ed0492..7b912a0 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,6 @@ import java.util.HashSet; import java.util.Set; import java.util.concurrent.CountDownLatch; -import org.apache.usergrid.persistence.core.test.UseModules; import org.junit.Before; import org.junit.Ignore; import org.junit.Rule; @@ -35,8 +34,9 @@ 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.test.ITRunner; import org.apache.usergrid.persistence.core.scope.ApplicationScope; +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.impl.SimpleSearchByEdgeType; import org.apache.usergrid.persistence.model.entity.Id; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/12b50286/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 cb9726d..6f3d388 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.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.test.ITRunner; +import org.apache.usergrid.persistence.core.test.UseModules; 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/12b50286/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 index bbcfa6e..87a0f6c 100644 --- 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 @@ -19,8 +19,8 @@ package org.apache.usergrid.persistence.graph.guice; -import org.apache.usergrid.persistence.core.guice.TestModule; import org.apache.usergrid.persistence.core.guice.CommonModule; +import org.apache.usergrid.persistence.core.guice.TestModule; /** http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/12b50286/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 0a1fe52..f5e9dc8 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,8 +24,6 @@ package org.apache.usergrid.persistence.graph.impl; import java.util.Iterator; import java.util.UUID; -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; @@ -34,8 +32,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.usergrid.persistence.collection.guice.MigrationManagerRule; -import org.apache.usergrid.persistence.core.test.ITRunner; +import org.apache.usergrid.persistence.core.guice.ProxyImpl; import org.apache.usergrid.persistence.core.scope.ApplicationScope; +import org.apache.usergrid.persistence.core.test.ITRunner; +import org.apache.usergrid.persistence.core.test.UseModules; import org.apache.usergrid.persistence.graph.GraphFig; import org.apache.usergrid.persistence.graph.GraphManagerFactory; import org.apache.usergrid.persistence.graph.MarkedEdge; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/12b50286/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 f325620..aa5ae5f 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,8 +22,6 @@ package org.apache.usergrid.persistence.graph.impl; import java.util.Iterator; import java.util.UUID; -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; @@ -33,8 +31,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.usergrid.persistence.collection.guice.MigrationManagerRule; -import org.apache.usergrid.persistence.core.test.ITRunner; +import org.apache.usergrid.persistence.core.guice.ProxyImpl; import org.apache.usergrid.persistence.core.scope.ApplicationScope; +import org.apache.usergrid.persistence.core.test.ITRunner; +import org.apache.usergrid.persistence.core.test.UseModules; import org.apache.usergrid.persistence.graph.Edge; import org.apache.usergrid.persistence.graph.GraphFig; import org.apache.usergrid.persistence.graph.GraphManager; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/12b50286/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 1f300b1..d27aca7 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,6 @@ package org.apache.usergrid.persistence.graph.impl.stage; import java.util.Iterator; -import org.apache.usergrid.persistence.core.test.UseModules; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -31,8 +30,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.usergrid.persistence.collection.guice.MigrationManagerRule; -import org.apache.usergrid.persistence.core.test.ITRunner; import org.apache.usergrid.persistence.core.scope.ApplicationScope; +import org.apache.usergrid.persistence.core.test.ITRunner; +import org.apache.usergrid.persistence.core.test.UseModules; import org.apache.usergrid.persistence.graph.MarkedEdge; import org.apache.usergrid.persistence.graph.SearchByEdgeType; import org.apache.usergrid.persistence.graph.guice.TestGraphModule; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/12b50286/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 f4711d3..156d1d0 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,16 +24,16 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; -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.test.ITRunner; +import org.apache.usergrid.persistence.core.guice.ProxyImpl; import org.apache.usergrid.persistence.core.scope.ApplicationScope; +import org.apache.usergrid.persistence.core.test.ITRunner; +import org.apache.usergrid.persistence.core.test.UseModules; import org.apache.usergrid.persistence.graph.GraphFig; 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/12b50286/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 2661c19..ea03b44 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,15 +22,14 @@ package org.apache.usergrid.persistence.graph.serialization; -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.test.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; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/12b50286/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 66a0902..068b27a 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,11 +39,11 @@ package org.apache.usergrid.persistence.graph.serialization;/* */ -import org.apache.usergrid.persistence.core.test.UseModules; import org.junit.runner.RunWith; -import org.apache.usergrid.persistence.core.test.ITRunner; import org.apache.usergrid.persistence.core.guice.PreviousImpl; +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.EdgeMetadataSerializationV1Impl; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/12b50286/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 db41059..1fba055 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,11 +22,11 @@ package org.apache.usergrid.persistence.graph.serialization; -import org.apache.usergrid.persistence.core.test.UseModules; import org.junit.runner.RunWith; -import org.apache.usergrid.persistence.core.test.ITRunner; import org.apache.usergrid.persistence.core.guice.CurrentImpl; +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.EdgeMetadataSerializationV2Impl; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/12b50286/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 b4e5241..9dd362f 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,15 +22,15 @@ package org.apache.usergrid.persistence.graph.serialization; import java.util.Iterator; import java.util.UUID; -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.test.ITRunner; import org.apache.usergrid.persistence.core.scope.ApplicationScope; +import org.apache.usergrid.persistence.core.test.ITRunner; +import org.apache.usergrid.persistence.core.test.UseModules; import org.apache.usergrid.persistence.graph.MarkedEdge; 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/12b50286/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 161df44..69d0a20 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 @@ -26,7 +26,6 @@ import java.util.Set; import java.util.UUID; import org.junit.Before; -import org.junit.ClassRule; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; @@ -34,7 +33,6 @@ import org.slf4j.Logger; 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.scope.ApplicationScope; import org.apache.usergrid.persistence.graph.Edge; import org.apache.usergrid.persistence.graph.GraphFig; @@ -72,14 +70,11 @@ import static org.mockito.Mockito.when; * * */ + public abstract class EdgeSerializationTest { private static final Logger log = LoggerFactory.getLogger( EdgeSerializationTest.class ); - @ClassRule - public static CassandraRule rule = new CassandraRule(); - - @Inject @Rule public MigrationManagerRule migrationManagerRule; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/12b50286/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 0736209..2391192 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,15 +22,15 @@ package org.apache.usergrid.persistence.graph.serialization; import java.util.Arrays; import java.util.Map; -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.test.ITRunner; import org.apache.usergrid.persistence.core.scope.ApplicationScope; +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.model.entity.Id; import org.apache.usergrid.persistence.model.util.UUIDGenerator; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/12b50286/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 9fb40ca..d850f76 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.apache.usergrid.persistence.core.test.UseModules; import org.junit.runner.RunWith; 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 com.google.inject.Inject; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/12b50286/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 133571a..cdac709 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,17 +22,15 @@ package org.apache.usergrid.persistence.graph.serialization.impl.shard; import java.util.Iterator; -import org.apache.usergrid.persistence.core.test.UseModules; import org.junit.Before; -import org.junit.ClassRule; 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.CassandraRule; -import org.apache.usergrid.persistence.core.test.ITRunner; import org.apache.usergrid.persistence.core.scope.ApplicationScope; +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.model.entity.Id; import org.apache.usergrid.persistence.model.util.UUIDGenerator; @@ -53,9 +51,6 @@ import static org.mockito.Mockito.when; @UseModules({ TestGraphModule.class }) public class EdgeShardSerializationTest { - @ClassRule - public static CassandraRule rule = new CassandraRule(); - @Inject @Rule http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/12b50286/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 a7a281c..a443086 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,6 @@ package org.apache.usergrid.persistence.graph.serialization.impl.shard.count; -import org.apache.usergrid.persistence.core.test.UseModules; import org.junit.Before; import org.junit.ClassRule; import org.junit.Rule; @@ -29,9 +28,9 @@ import org.slf4j.Logger; 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.test.ITRunner; import org.apache.usergrid.persistence.core.scope.ApplicationScope; +import org.apache.usergrid.persistence.core.test.ITRunner; +import org.apache.usergrid.persistence.core.test.UseModules; import org.apache.usergrid.persistence.graph.GraphFig; import org.apache.usergrid.persistence.graph.guice.TestGraphModule; import org.apache.usergrid.persistence.graph.serialization.EdgeSerialization; @@ -56,9 +55,6 @@ public class NodeShardCounterSerializationTest { private static final Logger log = LoggerFactory.getLogger( NodeShardCounterSerializationTest.class ); - @ClassRule - public static CassandraRule rule = new CassandraRule(); - @Inject @Rule http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/12b50286/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/CorePerformanceIT.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/CorePerformanceIT.java b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/CorePerformanceIT.java index 2f71e2e..6d09ccb 100644 --- a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/CorePerformanceIT.java +++ b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/CorePerformanceIT.java @@ -38,7 +38,6 @@ import org.apache.usergrid.persistence.collection.CollectionScope; import org.apache.usergrid.persistence.collection.EntityCollectionManager; import org.apache.usergrid.persistence.collection.EntityCollectionManagerFactory; import org.apache.usergrid.persistence.collection.impl.CollectionScopeImpl; -import org.apache.usergrid.persistence.core.cassandra.CassandraRule; import org.apache.usergrid.persistence.core.scope.ApplicationScope; import org.apache.usergrid.persistence.core.scope.ApplicationScopeImpl; import org.apache.usergrid.persistence.index.EntityIndex; @@ -72,9 +71,6 @@ public class CorePerformanceIT extends BaseIT { @ClassRule public static ElasticSearchResource es = new ElasticSearchResource(); - @ClassRule - public static CassandraRule cass = new CassandraRule(); - // max entities we will write and read static int maxEntities = 10; // TODO: make this configurable when you add Chop http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/12b50286/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/ElasticSearchResource.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/ElasticSearchResource.java b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/ElasticSearchResource.java index 661547a..1f04303 100644 --- a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/ElasticSearchResource.java +++ b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/ElasticSearchResource.java @@ -45,14 +45,10 @@ import com.google.inject.Injector; public class ElasticSearchResource extends EnvironResource { - private static final Logger log = LoggerFactory.getLogger( ElasticSearchResource.class ); - - private static Node node; private static int port; private static String host; - - private static boolean externalElasticSearch = false; + @@ -64,8 +60,6 @@ public class ElasticSearchResource extends EnvironResource { host=(String)props.getProperty( "elasticsearch.host", "127.0.0.1" ); port=Integer.valueOf(props.getProperty( "elasticsearch.port", "9300" )).intValue(); String forkString = props.getProperty("elasticsearch.startup", "external"); - externalElasticSearch = "external".equals( forkString ); - } catch (Exception ex) { throw new RuntimeException("Error getting properties", ex); } @@ -74,14 +68,8 @@ public class ElasticSearchResource extends EnvironResource { @Override protected void before() throws Throwable { - if(externalElasticSearch){ System.setProperty( IndexFig.ELASTICSEARCH_HOSTS, host ); - System.setProperty( IndexFig.ELASTICSEARCH_PORT, port+"" ); - - }else{ - startEs(); - } - } + System.setProperty( IndexFig.ELASTICSEARCH_PORT, port+"" ); } @@ -91,106 +79,4 @@ public class ElasticSearchResource extends EnvironResource { } - public synchronized ElasticSearchResource startEs(){ - -// -// if ( node != null ) { -// return this; -// } -// -// -// //override the system properties in the Archiaus env -// port = AvailablePortFinder.getNextAvailable( 9300 ); -// -// final String host = "127.0.0.1"; -// System.setProperty( IndexFig.ELASTICSEARCH_HOSTS, host ); -// System.setProperty( IndexFig.ELASTICSEARCH_PORT, port + "" ); -// -// //we have to create this AFTER we set our system properties, or they won't get picked upt -// Injector injector = Guice.createInjector( new GuicyFigModule( IndexFig.class ) ); -// IndexFig indexFig = injector.getInstance( IndexFig.class ); -// -// -// final String clusterName = indexFig.getClusterName(); -// -// File tempDir; -// try { -// tempDir = getTempDirectory(); -// } -// catch ( Exception ex ) { -// throw new RuntimeException( "Fatal error unable to create temp dir, start embedded ElasticSearch", ex ); -// } -// -// -// Settings settings = ImmutableSettings.settingsBuilder() -// .put("cluster.name", clusterName) -// .put("network.publish_host", host) -// .put("transport.tcp.port", port) -// .put("discovery.zen.ping.multicast.enabled", "false") -// .put("node.http.enabled", false) -// .put("path.logs", tempDir.toString()) -// .put("path.data", tempDir.toString()) -// .put("index.store.type", "default") -// .put("index.number_of_shards", 1) -// .put("index.number_of_replicas", 1) -// .build(); -// -// -// log.info( "-----------------------------------------------------------------------" ); -// log.info( "Starting ElasticSearch embedded server settings: \n" + settings.getAsMap() ); -// log.info( "-----------------------------------------------------------------------" ); -// -// -// node = NodeBuilder.nodeBuilder().settings( settings ).clusterName( indexFig.getClusterName() ).client( false ).data( true ).build().start(); -// -// Runtime.getRuntime().addShutdownHook( new Thread() { -// @Override -// public void run() { -// shutdown(); -// } -// } ); -// -// return this; - return this; - } - - - public static void shutdown() { - if(!externalElasticSearch){ - node.stop(); - } - } - - - - - /** - * Uses a project.properties file that Maven does substitution on to to replace the value of a property with the - * path to the Maven build directory (a.k.a. target). It then uses this path to generate a random String which it - * uses to append a path component to so a unique directory is selected. If already present it's deleted, then the - * directory is created. - * - * @return a unique temporary directory - * - * @throws java.io.IOException if we cannot access the properties file - */ - public static File getTempDirectory() throws IOException { - File tmpdir; - Properties props = new Properties(); - props.load( ClassLoader.getSystemResourceAsStream( "project.properties" ) ); - File basedir = new File( ( String ) props.get( "target.directory" ) ); - String comp = RandomStringUtils.randomAlphanumeric( 7 ); - tmpdir = new File( basedir, comp ); - - if ( tmpdir.exists() ) { - log.info( "Deleting directory: {}", tmpdir ); - FileUtils.forceDelete( tmpdir ); - } - else { - log.info( "Creating temporary directory: {}", tmpdir ); - FileUtils.forceMkdir( tmpdir ); - } - - return tmpdir; - } } http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/12b50286/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 d2423bb..20dcbde 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,16 +21,12 @@ package org.apache.usergrid.persistence.index.impl; import java.io.IOException; import java.util.HashMap; -import org.junit.ClassRule; -import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.usergrid.persistence.collection.guice.MigrationManagerRule; import org.apache.usergrid.persistence.collection.util.EntityUtils; -import org.apache.usergrid.persistence.core.cassandra.CassandraRule; import org.apache.usergrid.persistence.core.scope.ApplicationScope; import org.apache.usergrid.persistence.core.scope.ApplicationScopeImpl; import org.apache.usergrid.persistence.core.test.UseModules; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/12b50286/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 72058ff..2b9ea62 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,9 +25,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.apache.usergrid.persistence.core.test.UseModules; -import org.junit.ClassRule; -import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.slf4j.Logger; @@ -35,11 +32,10 @@ import org.slf4j.LoggerFactory; import org.apache.commons.lang3.time.StopWatch; -import org.apache.usergrid.persistence.collection.guice.MigrationManagerRule; import org.apache.usergrid.persistence.collection.util.EntityUtils; -import org.apache.usergrid.persistence.core.cassandra.CassandraRule; import org.apache.usergrid.persistence.core.scope.ApplicationScope; import org.apache.usergrid.persistence.core.scope.ApplicationScopeImpl; +import org.apache.usergrid.persistence.core.test.UseModules; import org.apache.usergrid.persistence.core.util.Health; import org.apache.usergrid.persistence.index.EntityIndex; import org.apache.usergrid.persistence.index.EntityIndexBatch; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/12b50286/stack/launcher/src/main/java/org/apache/usergrid/launcher/EmbeddedServerHelper.java ---------------------------------------------------------------------- diff --git a/stack/launcher/src/main/java/org/apache/usergrid/launcher/EmbeddedServerHelper.java b/stack/launcher/src/main/java/org/apache/usergrid/launcher/EmbeddedServerHelper.java index c7669d8..b3b72c2 100644 --- a/stack/launcher/src/main/java/org/apache/usergrid/launcher/EmbeddedServerHelper.java +++ b/stack/launcher/src/main/java/org/apache/usergrid/launcher/EmbeddedServerHelper.java @@ -68,7 +68,7 @@ public class EmbeddedServerHelper { log.info( "Starting executor" ); - executor.execute( new CassandraRunner() ); + executor.execute( new ITRunner() ); log.info( "Started executor" ); } else { @@ -180,7 +180,7 @@ public class EmbeddedServerHelper { } - class CassandraRunner implements Runnable { + class ITRunner implements Runnable { @Override public void run() {
