Repository: usergrid Updated Branches: refs/heads/master 58c1d09fb -> e83b54e83
Use one injector in tests and, at most, one Akka cluster per test class. For real this time ;-) Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/e83b54e8 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/e83b54e8 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/e83b54e8 Branch: refs/heads/master Commit: e83b54e8332aa09800e90d12528169ed90b30a13 Parents: 58c1d09 Author: Dave Johnson <[email protected]> Authored: Tue Nov 15 10:46:39 2016 -0800 Committer: Dave Johnson <[email protected]> Committed: Tue Nov 15 10:46:39 2016 -0800 ---------------------------------------------------------------------- .../actorsystem/ActorSystemManagerImpl.java | 4 +- .../MultiShardMessageIterator.java | 2 +- .../persistence/qakka/AbstractAkkaTest.java | 50 ++++---------------- .../persistence/qakka/AbstractTest.java | 35 ++++---------- .../qakka/core/QueueMessageManagerTest.java | 25 +++++----- .../distributed/QueueActorServiceTest.java | 22 ++++----- .../actors/QueueActorHelperTest.java | 29 +++++------- .../distributed/actors/ShardAllocatorTest.java | 22 ++------- .../queue/LegacyQueueManagerTest.java | 22 ++++----- 9 files changed, 67 insertions(+), 144 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/e83b54e8/stack/corepersistence/actorsystem/src/main/java/org/apache/usergrid/persistence/actorsystem/ActorSystemManagerImpl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/actorsystem/src/main/java/org/apache/usergrid/persistence/actorsystem/ActorSystemManagerImpl.java b/stack/corepersistence/actorsystem/src/main/java/org/apache/usergrid/persistence/actorsystem/ActorSystemManagerImpl.java index c2f96af..f43b6e9 100644 --- a/stack/corepersistence/actorsystem/src/main/java/org/apache/usergrid/persistence/actorsystem/ActorSystemManagerImpl.java +++ b/stack/corepersistence/actorsystem/src/main/java/org/apache/usergrid/persistence/actorsystem/ActorSystemManagerImpl.java @@ -196,7 +196,7 @@ public class ActorSystemManagerImpl implements ActorSystemManager { // register our cluster listener clusterSystem.actorOf(Props.create(ClusterListener.class, getSeedsByRegion(), getCurrentRegion()), - "clusterListener"); + "clusterListener_" + port ); createClientActors( clusterSystem ); @@ -408,7 +408,7 @@ public class ActorSystemManagerImpl implements ActorSystemManager { // Each clientActor needs to know path to ClusterSingletonProxy and region clientActor = system.actorOf( - Props.create( ClientActor.class, routersByMessageType ), "clientActor" ); + Props.create( ClientActor.class, routersByMessageType ), "clientActor_" + port ); ClusterClientReceptionist.get(system).registerService( clientActor ); http://git-wip-us.apache.org/repos/asf/usergrid/blob/e83b54e8/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/qakka/serialization/MultiShardMessageIterator.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/qakka/serialization/MultiShardMessageIterator.java b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/qakka/serialization/MultiShardMessageIterator.java index c521cef..7a28006 100644 --- a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/qakka/serialization/MultiShardMessageIterator.java +++ b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/qakka/serialization/MultiShardMessageIterator.java @@ -92,7 +92,7 @@ public class MultiShardMessageIterator implements Iterator<DatabaseQueueMessage> advance(); } - return currentIterator.hasNext(); + return currentIterator == null ? false : currentIterator.hasNext(); } catch ( NoSuchElementException e ) { return false; http://git-wip-us.apache.org/repos/asf/usergrid/blob/e83b54e8/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/AbstractAkkaTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/AbstractAkkaTest.java b/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/AbstractAkkaTest.java index 3c57da9..22a6327 100644 --- a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/AbstractAkkaTest.java +++ b/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/AbstractAkkaTest.java @@ -19,65 +19,31 @@ package org.apache.usergrid.persistence.qakka; -import com.google.inject.Injector; -import org.apache.usergrid.persistence.core.migration.schema.MigrationException; -import org.apache.usergrid.persistence.core.migration.schema.MigrationManager; +import org.apache.usergrid.persistence.actorsystem.ActorSystemFig; import org.junit.BeforeClass; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -public abstract class AbstractAkkaTest { +public abstract class AbstractAkkaTest extends AbstractTest { private static final Logger logger = LoggerFactory.getLogger( AbstractAkkaTest.class ); static AtomicInteger nextPort = new AtomicInteger(3551); -// protected static Injector sharedInjector; - - static AtomicBoolean migrated = new AtomicBoolean( false ); - - static { new KeyspaceDropper(); } - - - public AbstractAkkaTest() { - if ( !migrated.getAndSet( true ) ) { - //setInjector( Guice.createInjector( new TestModule() ) ); - MigrationManager migrationManager = getInjector().getInstance( MigrationManager.class ); - try { - migrationManager.migrate(); - } catch (MigrationException e) { - logger.error("Error in migration", e); - } - } - } - - protected abstract Injector getInjector(); - - -// protected Injector getInjector() { -// return sharedInjector; -// } -// -// protected static void setInjector(Injector injector) { -// AbstractTest.sharedInjector = injector; -// } - - protected static int getNextAkkaPort() { int ret = nextPort.getAndIncrement(); logger.info("Returning port {}", ret); return ret; } - @BeforeClass - public static void startCassandra() throws Exception { - //EmbeddedCassandraServerHelper.startEmbeddedCassandra("/cassandra.yaml"); - } - - + public static void startAkkaCluster() { + ActorSystemFig actorSystemFig = getInjector().getInstance( ActorSystemFig.class ); + String region = actorSystemFig.getRegionLocal(); + App app = getInjector().getInstance( App.class ); + app.start( "localhost", getNextAkkaPort(), region ); + } } http://git-wip-us.apache.org/repos/asf/usergrid/blob/e83b54e8/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/AbstractTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/AbstractTest.java b/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/AbstractTest.java index c90db2e..83939b2 100644 --- a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/AbstractTest.java +++ b/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/AbstractTest.java @@ -24,30 +24,23 @@ import com.google.inject.Injector; import org.apache.usergrid.persistence.core.migration.schema.MigrationException; import org.apache.usergrid.persistence.core.migration.schema.MigrationManager; import org.apache.usergrid.persistence.queue.TestModule; -import org.apache.usergrid.persistence.queue.guice.QueueModule; -import org.junit.BeforeClass; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; -public class AbstractTest { +public abstract class AbstractTest { private static final Logger logger = LoggerFactory.getLogger( AbstractTest.class ); - static AtomicInteger nextPort = new AtomicInteger(3551); - - protected static Injector sharedInjector; - static AtomicBoolean migrated = new AtomicBoolean( false ); static { new KeyspaceDropper(); } + static Injector sharedInjector = null; public AbstractTest() { if ( !migrated.getAndSet( true ) ) { - setInjector( Guice.createInjector( new TestModule() ) ); MigrationManager migrationManager = getInjector().getInstance( MigrationManager.class ); try { migrationManager.migrate(); @@ -57,27 +50,15 @@ public class AbstractTest { } } - protected Injector getInjector() { + protected static Injector getInjector() { + if ( sharedInjector == null ) { + sharedInjector = Guice.createInjector( new TestModule() ); + } return sharedInjector; } - protected static void setInjector(Injector injector) { - AbstractTest.sharedInjector = injector; - } - - - protected int getNextAkkaPort() { - int ret = nextPort.getAndIncrement(); - logger.info("Returning port {} for this {}", ret, this.hashCode()); - return ret; + protected static void setInjector( Injector injector ) { + sharedInjector = injector; } - - @BeforeClass - public static void startCassandra() throws Exception { - //EmbeddedCassandraServerHelper.startEmbeddedCassandra("/cassandra.yaml"); - } - - - } http://git-wip-us.apache.org/repos/asf/usergrid/blob/e83b54e8/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/core/QueueMessageManagerTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/core/QueueMessageManagerTest.java b/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/core/QueueMessageManagerTest.java index 5bb89c4..a61eb10 100644 --- a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/core/QueueMessageManagerTest.java +++ b/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/core/QueueMessageManagerTest.java @@ -28,6 +28,7 @@ import net.jcip.annotations.NotThreadSafe; import org.apache.commons.lang.RandomStringUtils; import org.apache.usergrid.persistence.actorsystem.ActorSystemFig; import org.apache.usergrid.persistence.core.datastax.DataStaxCluster; +import org.apache.usergrid.persistence.qakka.AbstractAkkaTest; import org.apache.usergrid.persistence.qakka.AbstractTest; import org.apache.usergrid.persistence.qakka.App; import org.apache.usergrid.persistence.qakka.QakkaFig; @@ -49,6 +50,7 @@ import org.apache.usergrid.persistence.qakka.serialization.transferlog.TransferL import org.apache.usergrid.persistence.queue.TestModule; import org.junit.After; import org.junit.Assert; +import org.junit.BeforeClass; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -59,20 +61,17 @@ import java.util.stream.Collectors; @NotThreadSafe -public class QueueMessageManagerTest extends AbstractTest { +public class QueueMessageManagerTest extends AbstractAkkaTest { private static final Logger logger = LoggerFactory.getLogger( QueueMessageManagerTest.class ); // TODO: test that multiple threads pulling from same queue will never pop same item - @Override - protected Injector getInjector() { - return Guice.createInjector( new TestModule() ); - } public void shutdown(Injector injector){ injector.getInstance(DataStaxCluster.class).shutdown(); } + @Test public void testBasicOperation() throws Exception { @@ -84,8 +83,8 @@ public class QueueMessageManagerTest extends AbstractTest { ActorSystemFig actorSystemFig = injector.getInstance( ActorSystemFig.class ); String region = actorSystemFig.getRegionLocal(); - App app = injector.getInstance( App.class ); - app.start( "localhost", getNextAkkaPort(), region ); +// App app = injector.getInstance( App.class ); +// app.start( "localhost", getNextAkkaPort(), region ); // create queue and send one message to it QueueManager queueManager = injector.getInstance( QueueManager.class ); @@ -156,8 +155,8 @@ public class QueueMessageManagerTest extends AbstractTest { InMemoryQueue inMemoryQueue = injector.getInstance( InMemoryQueue.class ); String region = actorSystemFig.getRegionLocal(); - App app = injector.getInstance( App.class ); - app.start( "localhost", getNextAkkaPort(), region ); +// App app = injector.getInstance( App.class ); +// app.start( "localhost", getNextAkkaPort(), region ); // create some number of queue messages @@ -255,8 +254,8 @@ public class QueueMessageManagerTest extends AbstractTest { QueueMessageSerialization qms = injector.getInstance( QueueMessageSerialization.class ); String region = actorSystemFig.getRegionLocal(); - App app = injector.getInstance( App.class ); - app.start( "localhost", getNextAkkaPort(), region ); +// App app = injector.getInstance( App.class ); +// app.start( "localhost", getNextAkkaPort(), region ); // create queue messages, every other one with missing data @@ -314,8 +313,8 @@ public class QueueMessageManagerTest extends AbstractTest { ActorSystemFig actorSystemFig = injector.getInstance( ActorSystemFig.class ); String region = actorSystemFig.getRegionLocal(); - App app = injector.getInstance( App.class ); - app.start( "localhost", getNextAkkaPort(), region ); +// App app = injector.getInstance( App.class ); +// app.start( "localhost", getNextAkkaPort(), region ); // create some number of queue messages http://git-wip-us.apache.org/repos/asf/usergrid/blob/e83b54e8/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/distributed/QueueActorServiceTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/distributed/QueueActorServiceTest.java b/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/distributed/QueueActorServiceTest.java index da5d166..166581e 100644 --- a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/distributed/QueueActorServiceTest.java +++ b/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/distributed/QueueActorServiceTest.java @@ -26,6 +26,7 @@ import com.google.inject.Injector; import net.jcip.annotations.NotThreadSafe; import org.apache.cassandra.utils.UUIDGen; import org.apache.usergrid.persistence.actorsystem.ActorSystemFig; +import org.apache.usergrid.persistence.qakka.AbstractAkkaTest; import org.apache.usergrid.persistence.qakka.AbstractTest; import org.apache.usergrid.persistence.qakka.App; import org.apache.usergrid.persistence.qakka.QakkaModule; @@ -37,6 +38,7 @@ import org.apache.usergrid.persistence.qakka.serialization.queuemessages.QueueMe import org.apache.usergrid.persistence.qakka.serialization.transferlog.TransferLogSerialization; import org.apache.usergrid.persistence.queue.TestModule; import org.junit.Assert; +import org.junit.BeforeClass; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,16 +49,10 @@ import java.util.UUID; @NotThreadSafe -public class QueueActorServiceTest extends AbstractTest { +public class QueueActorServiceTest extends AbstractAkkaTest { private static final Logger logger = LoggerFactory.getLogger( QueueActorServiceTest.class ); - @Override - protected Injector getInjector() { - return Guice.createInjector( new TestModule() ); - } - - @Test public void testBasicOperation() throws Exception { @@ -65,8 +61,8 @@ public class QueueActorServiceTest extends AbstractTest { ActorSystemFig actorSystemFig = injector.getInstance( ActorSystemFig.class ); String region = actorSystemFig.getRegionLocal(); - App app = injector.getInstance( App.class ); - app.start( "localhost", getNextAkkaPort(), region ); +// App app = injector.getInstance( App.class ); +// app.start( "localhost", getNextAkkaPort(), region ); DistributedQueueService distributedQueueService = injector.getInstance( DistributedQueueService.class ); QueueMessageSerialization serialization = injector.getInstance( QueueMessageSerialization.class ); @@ -119,8 +115,8 @@ public class QueueActorServiceTest extends AbstractTest { ActorSystemFig actorSystemFig = injector.getInstance( ActorSystemFig.class ); String region = actorSystemFig.getRegionLocal(); - App app = injector.getInstance( App.class ); - app.start("localhost", getNextAkkaPort(), region); +// App app = injector.getInstance( App.class ); +// app.start("localhost", getNextAkkaPort(), region); DistributedQueueService distributedQueueService = injector.getInstance( DistributedQueueService.class ); QueueMessageSerialization serialization = injector.getInstance( QueueMessageSerialization.class ); @@ -195,8 +191,8 @@ public class QueueActorServiceTest extends AbstractTest { ActorSystemFig actorSystemFig = injector.getInstance( ActorSystemFig.class ); String region = actorSystemFig.getRegionLocal(); - App app = injector.getInstance( App.class ); - app.start("localhost", getNextAkkaPort(), region); +// App app = injector.getInstance( App.class ); +// app.start("localhost", getNextAkkaPort(), region); DistributedQueueService distributedQueueService = injector.getInstance( DistributedQueueService.class ); QueueMessageSerialization serialization = injector.getInstance( QueueMessageSerialization.class ); http://git-wip-us.apache.org/repos/asf/usergrid/blob/e83b54e8/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/distributed/actors/QueueActorHelperTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/distributed/actors/QueueActorHelperTest.java b/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/distributed/actors/QueueActorHelperTest.java index 0f5b46f..deb29c8 100644 --- a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/distributed/actors/QueueActorHelperTest.java +++ b/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/distributed/actors/QueueActorHelperTest.java @@ -24,6 +24,7 @@ import com.google.inject.Injector; import net.jcip.annotations.NotThreadSafe; import org.apache.commons.lang.RandomStringUtils; import org.apache.usergrid.persistence.actorsystem.ActorSystemFig; +import org.apache.usergrid.persistence.qakka.AbstractAkkaTest; import org.apache.usergrid.persistence.qakka.AbstractTest; import org.apache.usergrid.persistence.qakka.App; import org.apache.usergrid.persistence.qakka.core.*; @@ -35,20 +36,16 @@ import org.apache.usergrid.persistence.qakka.serialization.queuemessages.Databas import org.apache.usergrid.persistence.qakka.serialization.queuemessages.QueueMessageSerialization; import org.apache.usergrid.persistence.queue.TestModule; import org.junit.Assert; +import org.junit.BeforeClass; import org.junit.Test; import java.util.UUID; @NotThreadSafe -public class QueueActorHelperTest extends AbstractTest { +public class QueueActorHelperTest extends AbstractAkkaTest { - @Override - protected Injector getInjector() { - return Guice.createInjector( new TestModule() ); - } - @Test public void loadDatabaseQueueMessage() throws Exception { @@ -61,8 +58,8 @@ public class QueueActorHelperTest extends AbstractTest { QueueManager queueManager = injector.getInstance( QueueManager.class ); String region = actorSystemFig.getRegionLocal(); - App app = injector.getInstance( App.class ); - app.start( "localhost", getNextAkkaPort(), region ); +// App app = injector.getInstance( App.class ); +// app.start( "localhost", getNextAkkaPort(), region ); String queueName = "qat_queue_" + RandomStringUtils.randomAlphanumeric( 10 ); @@ -111,8 +108,8 @@ public class QueueActorHelperTest extends AbstractTest { ActorSystemFig actorSystemFig = injector.getInstance( ActorSystemFig.class ); String region = actorSystemFig.getRegionLocal(); - App app = injector.getInstance( App.class ); - app.start( "localhost", getNextAkkaPort(), region ); +// App app = injector.getInstance( App.class ); +// app.start( "localhost", getNextAkkaPort(), region ); String queueName = "qat_queue_" + RandomStringUtils.randomAlphanumeric( 10 ); @@ -151,8 +148,8 @@ public class QueueActorHelperTest extends AbstractTest { QueueManager queueManager = injector.getInstance( QueueManager.class ); String region = actorSystemFig.getRegionLocal(); - App app = injector.getInstance( App.class ); - app.start( "localhost", getNextAkkaPort(), region ); +// App app = injector.getInstance( App.class ); +// app.start( "localhost", getNextAkkaPort(), region ); // write message to messages_available table @@ -228,8 +225,8 @@ public class QueueActorHelperTest extends AbstractTest { QueueManager queueManager = injector.getInstance( QueueManager.class ); String region = actorSystemFig.getRegionLocal(); - App app = injector.getInstance( App.class ); - app.start( "localhost", getNextAkkaPort(), region ); +// App app = injector.getInstance( App.class ); +// app.start( "localhost", getNextAkkaPort(), region ); UUID queueMessageId = QakkaUtils.getTimeUuid(); @@ -293,8 +290,8 @@ public class QueueActorHelperTest extends AbstractTest { ActorSystemFig actorSystemFig = injector.getInstance( ActorSystemFig.class ); String region = actorSystemFig.getRegionLocal(); - App app = injector.getInstance( App.class ); - app.start( "localhost", getNextAkkaPort(), region ); +// App app = injector.getInstance( App.class ); +// app.start( "localhost", getNextAkkaPort(), region ); String queueName = "qat_queue_" + RandomStringUtils.randomAlphanumeric( 10 ); queueManager.createQueue( new Queue( queueName ) ); http://git-wip-us.apache.org/repos/asf/usergrid/blob/e83b54e8/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/distributed/actors/ShardAllocatorTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/distributed/actors/ShardAllocatorTest.java b/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/distributed/actors/ShardAllocatorTest.java index cd8fbd6..11f3d08 100644 --- a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/distributed/actors/ShardAllocatorTest.java +++ b/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/distributed/actors/ShardAllocatorTest.java @@ -29,10 +29,7 @@ import com.google.inject.Injector; import org.apache.commons.lang.RandomStringUtils; import org.apache.usergrid.persistence.actorsystem.ActorSystemFig; import org.apache.usergrid.persistence.actorsystem.GuiceActorProducer; -import org.apache.usergrid.persistence.qakka.AbstractTest; -import org.apache.usergrid.persistence.qakka.App; -import org.apache.usergrid.persistence.qakka.QakkaModule; -import org.apache.usergrid.persistence.qakka.QakkaFig; +import org.apache.usergrid.persistence.qakka.*; import org.apache.usergrid.persistence.qakka.core.*; import org.apache.usergrid.persistence.qakka.distributed.messages.ShardCheckRequest; import org.apache.usergrid.persistence.qakka.serialization.sharding.Shard; @@ -41,10 +38,7 @@ import org.apache.usergrid.persistence.qakka.serialization.sharding.ShardIterato import org.apache.usergrid.persistence.qakka.serialization.sharding.ShardSerialization; import org.apache.usergrid.persistence.qakka.distributed.DistributedQueueService; import org.apache.usergrid.persistence.queue.TestModule; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -52,16 +46,10 @@ import java.util.Collections; import java.util.Optional; -public class ShardAllocatorTest extends AbstractTest { +public class ShardAllocatorTest extends AbstractAkkaTest { private static final Logger logger = LoggerFactory.getLogger( ShardAllocatorTest.class ); - @Override - protected Injector getInjector() { - return Guice.createInjector( new TestModule() ); - } - - @Test public void testBasicOperation() throws InterruptedException { @@ -183,8 +171,8 @@ public class ShardAllocatorTest extends AbstractTest { Assert.assertEquals( "test assumes 'queue.shard.max.size' is 10 ", 10, qakkaFig.getMaxShardSize() ); String region = actorSystemFig.getRegionLocal(); - App app = injector.getInstance( App.class ); - app.start( "localhost", getNextAkkaPort(), region ); +// App app = injector.getInstance( App.class ); +// app.start( "localhost", getNextAkkaPort(), region ); String rando = RandomStringUtils.randomAlphanumeric( 20 ); String queueName = "queue_" + rando; http://git-wip-us.apache.org/repos/asf/usergrid/blob/e83b54e8/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/queue/LegacyQueueManagerTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/queue/LegacyQueueManagerTest.java b/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/queue/LegacyQueueManagerTest.java index 535c30c..ad73dd7 100644 --- a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/queue/LegacyQueueManagerTest.java +++ b/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/queue/LegacyQueueManagerTest.java @@ -23,10 +23,12 @@ package org.apache.usergrid.persistence.queue; import com.google.inject.Guice; import com.google.inject.Injector; import org.apache.usergrid.persistence.actorsystem.ActorSystemFig; +import org.apache.usergrid.persistence.qakka.AbstractAkkaTest; import org.apache.usergrid.persistence.qakka.AbstractTest; import org.apache.usergrid.persistence.qakka.App; import org.apache.usergrid.persistence.qakka.distributed.DistributedQueueService; import org.apache.usergrid.persistence.queue.impl.LegacyQueueScopeImpl; +import org.junit.BeforeClass; import org.junit.Test; import java.util.ArrayList; @@ -38,16 +40,10 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -public class LegacyQueueManagerTest extends AbstractTest { +public class LegacyQueueManagerTest extends AbstractAkkaTest { public static long queueSeed = System.currentTimeMillis(); - // give each test its own injector - @Override - protected Injector getInjector() { - return Guice.createInjector( new TestModule() ); - } - @Test public void send() throws Exception{ @@ -57,8 +53,8 @@ public class LegacyQueueManagerTest extends AbstractTest { ActorSystemFig actorSystemFig = myInjector.getInstance( ActorSystemFig.class ); String region = actorSystemFig.getRegionLocal(); - App app = myInjector.getInstance( App.class ); - app.start( "localhost", getNextAkkaPort(), region ); +// App app = myInjector.getInstance( App.class ); +// app.start( "localhost", getNextAkkaPort(), region ); final LegacyQueueScopeImpl scope = new LegacyQueueScopeImpl( "testQueue" + queueSeed++, LegacyQueueScope.RegionImplementation.LOCAL ); @@ -93,8 +89,8 @@ public class LegacyQueueManagerTest extends AbstractTest { ActorSystemFig actorSystemFig = myInjector.getInstance( ActorSystemFig.class ); String region = actorSystemFig.getRegionLocal(); - App app = myInjector.getInstance( App.class ); - app.start( "localhost", getNextAkkaPort(), region ); +// App app = myInjector.getInstance( App.class ); +// app.start( "localhost", getNextAkkaPort(), region ); final LegacyQueueScopeImpl scope = new LegacyQueueScopeImpl( "testQueue" + queueSeed++, LegacyQueueScope.RegionImplementation.LOCAL ); @@ -132,8 +128,8 @@ public class LegacyQueueManagerTest extends AbstractTest { ActorSystemFig actorSystemFig = myInjector.getInstance( ActorSystemFig.class ); String region = actorSystemFig.getRegionLocal(); - App app = myInjector.getInstance( App.class ); - app.start( "localhost", getNextAkkaPort(), region ); +// App app = myInjector.getInstance( App.class ); +// app.start( "localhost", getNextAkkaPort(), region ); final LegacyQueueScopeImpl scope = new LegacyQueueScopeImpl( "testQueue" + queueSeed++, LegacyQueueScope.RegionImplementation.LOCAL );
