From 3cbd29cfe20c801ba3cba2a4e6dad3ac7c1b86fc Mon Sep 17 00:00:00 2001
From: Edward Capriolo <edlinuxguru@gmail.com>
Date: Tue, 29 Mar 2016 15:37:05 -0400
Subject: [PATCH] Merge master

---
 .../teknek/gossip/ShutdownDeadtimeTest.java   |  1 -
 .../io/teknek/gossip/StartupSettingsTest.java | 39 +++++++++----------
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/src/test/java/io/teknek/gossip/ShutdownDeadtimeTest.java b/src/test/java/io/teknek/gossip/ShutdownDeadtimeTest.java
index 4e73482..33887dd 100644
--- a/src/test/java/io/teknek/gossip/ShutdownDeadtimeTest.java
+++ b/src/test/java/io/teknek/gossip/ShutdownDeadtimeTest.java
@@ -11,7 +11,6 @@ import java.util.concurrent.TimeUnit;
 
 
 import org.apache.log4j.Logger;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import com.google.code.gossip.GossipMember;
diff --git a/src/test/java/io/teknek/gossip/StartupSettingsTest.java b/src/test/java/io/teknek/gossip/StartupSettingsTest.java
index 7fd8487..38c0a25 100644
--- a/src/test/java/io/teknek/gossip/StartupSettingsTest.java
+++ b/src/test/java/io/teknek/gossip/StartupSettingsTest.java
@@ -8,11 +8,14 @@ import org.apache.log4j.Logger;
 import org.json.JSONException;
 import org.junit.Test;
 
+import io.teknek.tunit.TUnit;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.UUID;
+import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;
 
 import static org.junit.Assert.assertEquals;
@@ -31,30 +34,24 @@ public class StartupSettingsTest {
     log.debug( "Using settings file: " + settingsFile.getAbsolutePath() );
     settingsFile.deleteOnExit();
     writeSettingsFile(settingsFile);
-
-    // Start the other simple node that the settings file points to
-    GossipService firstService = new GossipService(
+    final GossipService firstService = new GossipService(
       "127.0.0.1", 50000, UUID.randomUUID().toString(),
-      new ArrayList<GossipMember>(), new GossipSettings(), null
-    );
+      new ArrayList<GossipMember>(), new GossipSettings(), null);
+    
     firstService.start();
-
-    // Start a node with the settings file
-    GossipService serviceUnderTest = new GossipService(
-      StartupSettings.fromJSONFile( settingsFile )
-    );
+    
+    TUnit.assertThat(new Callable<Integer> (){
+      public Integer call() throws Exception {
+          return firstService.get_gossipManager().getMemberList().size();
+      }}).afterWaitingAtMost(10, TimeUnit.SECONDS).isEqualTo(0);
+    final GossipService serviceUnderTest = new GossipService(
+            StartupSettings.fromJSONFile( settingsFile )
+          );
     serviceUnderTest.start();
-
-    // Let the sync up
-    TimeUnit.SECONDS.sleep(2);
-
-    // Check the results
-    assertEquals(1, firstService.get_gossipManager().getMemberList().size() );
-    assertEquals(1, serviceUnderTest.get_gossipManager().getMemberList().size() );
-    assertTrue(
-      firstService.get_gossipManager().getMemberList().size() ==
-      serviceUnderTest.get_gossipManager().getMemberList().size() );
-
+    TUnit.assertThat(new Callable<Integer> (){
+      public Integer call() throws Exception {
+          return serviceUnderTest.get_gossipManager().getMemberList().size();
+      }}).afterWaitingAtMost(10, TimeUnit.SECONDS).isEqualTo(1);
     firstService.shutdown();
     serviceUnderTest.shutdown();
   }