You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2016/10/10 21:45:23 UTC
[5/6] usergrid git commit: Minor test improvements
Minor test improvements
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/63561ee0
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/63561ee0
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/63561ee0
Branch: refs/heads/usergrid-1318-queue
Commit: 63561ee03d078f738e1dba33a26555b7cbd27064
Parents: 7f3b2da
Author: Dave Johnson <sn...@apache.org>
Authored: Mon Oct 10 16:35:16 2016 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Mon Oct 10 16:35:16 2016 -0400
----------------------------------------------------------------------
.../persistence/qakka/core/QueueMessageManagerTest.java | 2 --
.../persistence/qakka/distributed/QueueActorServiceTest.java | 8 +++-----
.../qakka/distributed/actors/ShardAllocatorTest.java | 8 ++++----
3 files changed, 7 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/63561ee0/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 f77f31b..5f0216f 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
@@ -212,8 +212,6 @@ public class QueueMessageManagerTest extends AbstractTest {
distributedQueueService.processTimeouts();
- Thread.sleep( qakkaFig.getQueueTimeoutSeconds() * 1000 );
-
// attempt to ack other half of messages
for (QueueMessage message : messages) {
http://git-wip-us.apache.org/repos/asf/usergrid/blob/63561ee0/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 5bd2b05..7fe8b16 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
@@ -29,10 +29,7 @@ import org.apache.usergrid.persistence.actorsystem.ActorSystemFig;
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.core.CassandraClient;
-import org.apache.usergrid.persistence.qakka.core.CassandraClientImpl;
-import org.apache.usergrid.persistence.qakka.core.Queue;
-import org.apache.usergrid.persistence.qakka.core.QueueManager;
+import org.apache.usergrid.persistence.qakka.core.*;
import org.apache.usergrid.persistence.qakka.core.impl.InMemoryQueue;
import org.apache.usergrid.persistence.qakka.serialization.queuemessages.DatabaseQueueMessage;
import org.apache.usergrid.persistence.qakka.serialization.queuemessages.DatabaseQueueMessageBody;
@@ -129,6 +126,7 @@ public class QueueActorServiceTest extends AbstractTest {
QueueMessageSerialization serialization = injector.getInstance( QueueMessageSerialization.class );
TransferLogSerialization xferLogSerialization = injector.getInstance( TransferLogSerialization.class );
InMemoryQueue inMemoryQueue = injector.getInstance( InMemoryQueue.class );
+ QueueMessageManager queueMessageManager = injector.getInstance( QueueMessageManager.class );
String queueName = "queue_testGetMultipleQueueMessages_" + UUID.randomUUID();
QueueManager queueManager = injector.getInstance( QueueManager.class );
@@ -159,7 +157,7 @@ public class QueueActorServiceTest extends AbstractTest {
int count = 0;
while (retries++ < maxRetries) {
distributedQueueService.refresh();
- if (inMemoryQueue.size( queueName ) == 100) {
+ if ( queueMessageManager.getQueueDepth( queueName ) == 100 ) {
count = 100;
break;
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/63561ee0/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 aae5f44..ecacccc 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
@@ -180,7 +180,7 @@ public class ShardAllocatorTest extends AbstractTest {
DistributedQueueService distributedQueueService = injector.getInstance( DistributedQueueService.class );
ShardCounterSerialization shardCounterSer = injector.getInstance( ShardCounterSerialization.class );
- Assert.assertEquals( "test assumes 'queue.shard.max.size' is 15 ", 15, qakkaFig.getMaxShardSize() );
+ Assert.assertEquals( "test assumes 'queue.shard.max.size' is 10 ", 10, qakkaFig.getMaxShardSize() );
String region = actorSystemFig.getRegionLocal();
App app = injector.getInstance( App.class );
@@ -210,10 +210,10 @@ public class ShardAllocatorTest extends AbstractTest {
distributedQueueService.refresh();
- // Test that right number of shards created
+ // Test that approximately right number of shards created
int shardCount = countShards( cassandraClient, shardCounterSer, queueName, region, Shard.Type.DEFAULT );
- Assert.assertTrue( "shards > 10", shardCount > 10 );
- Assert.assertTrue( "shards < 20", shardCount < 20 );
+ Assert.assertTrue( "shards > 7", shardCount > 7 );
+ Assert.assertTrue( "shards < 17", shardCount < 17 );
} finally {
queueManager.deleteQueue( queueName );