From 87155a7ea1779e53922b3282d59327cc9eb7e793 Mon Sep 17 00:00:00 2001 From: Rob Austin Date: Thu, 13 Nov 2014 10:42:18 +0000 Subject: [PATCH] improved the three way repliaction tests --- .../map/TCPSocketReplication3VoidValueTest.java | 9 +++++---- .../map/TCPSocketReplication3wayPutReturnsNullTest.java | 3 ++- .../chronicle/map/TCPSocketReplication3wayTest.java | 3 ++- .../set/SetForTCPSocketReplication3wayTest.java | 3 ++- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/test/java/net/openhft/chronicle/map/TCPSocketReplication3VoidValueTest.java b/src/test/java/net/openhft/chronicle/map/TCPSocketReplication3VoidValueTest.java index 9a4dcee0a..11d741f60 100755 --- a/src/test/java/net/openhft/chronicle/map/TCPSocketReplication3VoidValueTest.java +++ b/src/test/java/net/openhft/chronicle/map/TCPSocketReplication3VoidValueTest.java @@ -82,12 +82,12 @@ public class TCPSocketReplication3VoidValueTest { assertEquals(null, map1.put(2, null)); assertEquals(null, map2.put(5, null)); - assertEquals(null, map2.put(6,null)); + assertEquals(null, map2.put(6, null)); map1.remove(2); map2.remove(3); map1.remove(3); - map2.put(5,null); + map2.put(5, null); // allow time for the recompilation to resolve assertTrue(waitTillEqual(5000)); @@ -102,7 +102,7 @@ public class TCPSocketReplication3VoidValueTest { public void testClear() throws IOException, InterruptedException { assertEquals(null, map1.put(1, null)); - assertEquals(null, map1.put(2,null)); + assertEquals(null, map1.put(2, null)); assertEquals(null, map2.put(5, null)); assertEquals(null, map2.put(6, null)); @@ -123,7 +123,8 @@ public class TCPSocketReplication3VoidValueTest { int t = 0; for (; t < timeOutMs; t++) { if (map1.equals(map2) && - map1.equals(map3)) + map1.equals(map3) && + map2.equals(map3)) return true; Thread.sleep(1); } diff --git a/src/test/java/net/openhft/chronicle/map/TCPSocketReplication3wayPutReturnsNullTest.java b/src/test/java/net/openhft/chronicle/map/TCPSocketReplication3wayPutReturnsNullTest.java index 02b00f377..3af0a9cc2 100755 --- a/src/test/java/net/openhft/chronicle/map/TCPSocketReplication3wayPutReturnsNullTest.java +++ b/src/test/java/net/openhft/chronicle/map/TCPSocketReplication3wayPutReturnsNullTest.java @@ -145,7 +145,8 @@ public class TCPSocketReplication3wayPutReturnsNullTest { int t = 0; for (; t < timeOutMs; t++) { if (map1.equals(map2) && - map1.equals(map3)) + map1.equals(map3) + && map2.equals(map3)) break; Thread.sleep(1); } diff --git a/src/test/java/net/openhft/chronicle/map/TCPSocketReplication3wayTest.java b/src/test/java/net/openhft/chronicle/map/TCPSocketReplication3wayTest.java index 7c359968b..bd5f058b1 100755 --- a/src/test/java/net/openhft/chronicle/map/TCPSocketReplication3wayTest.java +++ b/src/test/java/net/openhft/chronicle/map/TCPSocketReplication3wayTest.java @@ -154,7 +154,8 @@ public class TCPSocketReplication3wayTest { int t = 0; for (; t < timeOutMs; t++) { if (map1.equals(map2) && - map1.equals(map3)) + map1.equals(map3) + && map2.equals(map3)) break; Thread.sleep(1); } diff --git a/src/test/java/net/openhft/chronicle/set/SetForTCPSocketReplication3wayTest.java b/src/test/java/net/openhft/chronicle/set/SetForTCPSocketReplication3wayTest.java index 98b75f4dd..98f889388 100644 --- a/src/test/java/net/openhft/chronicle/set/SetForTCPSocketReplication3wayTest.java +++ b/src/test/java/net/openhft/chronicle/set/SetForTCPSocketReplication3wayTest.java @@ -148,7 +148,8 @@ public class SetForTCPSocketReplication3wayTest { int t = 0; for (; t < timeOutMs; t++) { if (set1.equals(set2) && - set1.equals(set3)) + set1.equals(set3) && + set2.equals(set3)) break; Thread.sleep(1); }