Refactored some testing stuff to base classes.

Added timeouts for numerous await calls in tests.
atomix · Dec 15, 2015 · 7cccfb8 · 7cccfb8
1 parent b606485
commit 7cccfb8
Show file tree

Hide file tree

Showing 30 changed files with 519 additions and 568 deletions.
diff --git a/all/src/test/java/io/atomix/AbstractAtomixTest.java b/all/src/test/java/io/atomix/AbstractAtomixTest.java
diff --git a/...ava/io/atomix/AtomixClientServerTest.java → ...ava/io/atomix/AtomixClientServerTest.java b/...ava/io/atomix/AtomixClientServerTest.java → ...ava/io/atomix/AtomixClientServerTest.java
@@ -17,8 +17,11 @@
 
 import java.util.concurrent.CompletableFuture;
 
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import io.atomix.atomix.testing.AbstractAtomixTest;
 import io.atomix.copycat.client.Command;
 import io.atomix.copycat.client.CopycatClient;
 import io.atomix.copycat.client.Query;
@@ -35,7 +38,16 @@
  * @author <a href="http://github.com/kuujo>Jordan Halterman</a>
  */
 @Test
-public class AtomixClientServerTest extends AbstractServerTest {
+public class AtomixClientServerTest extends AbstractAtomixTest {
+  @BeforeMethod
+  protected void beforeMethod() {
+    init();
+  }
+
+  @AfterMethod
+  protected void afterMethod() {
+    cleanup();
+  }
 
   /**
    * Tests submitting a command.
@@ -235,7 +247,7 @@ public void testGetResourceKeys() throws Throwable {
   /**
    * Test resource.
    */
-  @ResourceTypeInfo(id=1, stateMachine=TestStateMachine.class)
+  @ResourceTypeInfo(id = 1, stateMachine = TestStateMachine.class)
   public static class TestResource extends Resource {
     public static final ResourceType<TestResource> TYPE = new ResourceType<>(TestResource.class);
 
@@ -309,7 +321,7 @@ public String value() {
   /**
    * Value resource.
    */
-  @ResourceTypeInfo(id=2, stateMachine=ValueStateMachine.class)
+  @ResourceTypeInfo(id = 2, stateMachine = ValueStateMachine.class)
   public static class ValueResource extends Resource {
     public static final ResourceType<ValueResource> TYPE = new ResourceType<ValueResource>(ValueResource.class);
 

diff --git a/all/src/test/java/io/atomix/AtomixLeaderElectionTest.java b/all/src/test/java/io/atomix/AtomixLeaderElectionTest.java
@@ -15,20 +15,27 @@
  */
 package io.atomix;
 
-import io.atomix.coordination.DistributedLeaderElection;
-import org.testng.annotations.Test;
-
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Function;
 
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import io.atomix.atomix.testing.AbstractAtomixTest;
+import io.atomix.coordination.DistributedLeaderElection;
+
 /**
  * Atomix leader election test.
  *
  * @author <a href="http://github.com/kuujo>Jordan Halterman</a>
  */
 @Test
 public class AtomixLeaderElectionTest extends AbstractAtomixTest {
-
+  @BeforeClass
+  protected void setupCluster() throws Throwable {
+     createReplicas(5);
+  }
+
   public void testClientLeaderElectionGet() throws Throwable {
     Atomix client1 = createClient();
     Atomix client2 = createClient();
@@ -63,7 +70,7 @@ private void testLeaderElection(Atomix client1, Atomix client2, Function<Atomix,
       resume();
     }).join();
 
-    await();
+    await(10000);
 
     election2.onElection(epoch -> {
       threadAssertTrue(epoch > lastEpoch.get());
@@ -73,7 +80,7 @@ private void testLeaderElection(Atomix client1, Atomix client2, Function<Atomix,
 
     client1.close();
 
-    await();
+    await(10000);
   }
 
 }
diff --git a/all/src/test/java/io/atomix/AtomixLockTest.java b/all/src/test/java/io/atomix/AtomixLockTest.java
@@ -15,10 +15,13 @@
  */
 package io.atomix;
 
-import io.atomix.coordination.DistributedLock;
+import java.util.function.Function;
+
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import java.util.function.Function;
+import io.atomix.atomix.testing.AbstractAtomixTest;
+import io.atomix.coordination.DistributedLock;
 
 /**
  * Atomix lock test.
@@ -27,7 +30,11 @@
  */
 @Test
 public class AtomixLockTest extends AbstractAtomixTest {
-
+  @BeforeClass
+  protected void setupCluster() throws Throwable {
+     createReplicas(5);
+  }
+
   public void testClientLockGet() throws Throwable {
     Atomix client1 = createClient();
     Atomix client2 = createClient();

diff --git a/all/src/test/java/io/atomix/AtomixLongTest.java b/all/src/test/java/io/atomix/AtomixLongTest.java
@@ -15,10 +15,13 @@
  */
 package io.atomix;
 
-import io.atomix.variables.DistributedLong;
+import java.util.function.Function;
+
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import java.util.function.Function;
+import io.atomix.atomix.testing.AbstractAtomixTest;
+import io.atomix.variables.DistributedLong;
 
 /**
  * Atomix long test.
@@ -27,7 +30,11 @@
  */
 @Test
 public class AtomixLongTest extends AbstractAtomixTest {
-
+  @BeforeClass
+  protected void setupCluster() throws Throwable {
+     createReplicas(5);
+  }
+
   public void testClientLongGet() throws Throwable {
     Atomix client1 = createClient();
     Atomix client2 = createClient();

diff --git a/all/src/test/java/io/atomix/AtomixMapTest.java b/all/src/test/java/io/atomix/AtomixMapTest.java
@@ -15,10 +15,13 @@
  */
 package io.atomix;
 
-import io.atomix.collections.DistributedMap;
+import java.util.function.Function;
+
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import java.util.function.Function;
+import io.atomix.atomix.testing.AbstractAtomixTest;
+import io.atomix.collections.DistributedMap;
 
 /**
  * Atomix map test.
@@ -27,7 +30,11 @@
  */
 @Test
 public class AtomixMapTest extends AbstractAtomixTest {
-
+  @BeforeClass
+  protected void setupCluster() throws Throwable {
+     createReplicas(5);
+  }
+
   public void testClientMapGet() throws Throwable {
     Atomix client1 = createClient();
     Atomix client2 = createClient();

diff --git a/all/src/test/java/io/atomix/AtomixMembershipGroupTest.java b/all/src/test/java/io/atomix/AtomixMembershipGroupTest.java
@@ -15,10 +15,13 @@
  */
 package io.atomix;
 
-import io.atomix.coordination.DistributedMembershipGroup;
+import java.util.function.Function;
+
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import java.util.function.Function;
+import io.atomix.atomix.testing.AbstractAtomixTest;
+import io.atomix.coordination.DistributedMembershipGroup;
 
 /**
  * Atomix membership group test.
@@ -27,7 +30,11 @@
  */
 @Test
 public class AtomixMembershipGroupTest extends AbstractAtomixTest {
-
+  @BeforeClass
+  protected void setupCluster() throws Throwable {
+     createReplicas(5);
+  }
+
   public void testClientMembershipGroupGet() throws Throwable {
     Atomix client1 = createClient();
     Atomix client2 = createClient();

diff --git a/all/src/test/java/io/atomix/AtomixMessageBusTest.java b/all/src/test/java/io/atomix/AtomixMessageBusTest.java
@@ -15,11 +15,14 @@
  */
 package io.atomix;
 
-import io.atomix.catalyst.transport.Address;
+import java.util.function.Function;
-import io.atomix.coordination.DistributedMessageBus;
+
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import java.util.function.Function;
+import io.atomix.atomix.testing.AbstractAtomixTest;
+import io.atomix.catalyst.transport.Address;
+import io.atomix.coordination.DistributedMessageBus;
 
 /**
  * Atomix message bus test.
@@ -28,7 +31,11 @@
  */
 @Test
 public class AtomixMessageBusTest extends AbstractAtomixTest {
-
+  @BeforeClass
+  protected void setupCluster() throws Throwable {
+     createReplicas(5);
+  }
+
   public void testClientMessageBusGet() throws Throwable {
     Atomix client1 = createClient();
     Atomix client2 = createClient();