Merge pull request #248 from amcp/externalizeLogTestTimeout

Externalize TIMEOUT_MS so that backends can change the timeout

Author: Alexander Patrikalakis

janusgraph-test/src/main/java/org/janusgraph/diskstorage/log/LogTest.java

@@ -85,22 +85,22 @@ public void close() throws Exception {
 
     @Test
     public void smallSendReceiveSerial() throws Exception {
-        simpleSendReceive(100, 50);
+        simpleSendReceive(100, 50, TIMEOUT_MS);
     }
 
     @Test
     public void mediumSendReceiveSerial() throws Exception {
-        simpleSendReceive(2000,1);
+        simpleSendReceive(2000,1, TIMEOUT_MS);
     }
 
     @Test
     public void testMultipleReadersOnSingleLogSerial() throws Exception {
-        sendReceive(4, 2000, 5, true);
+        sendReceive(4, 2000, 5, true, TIMEOUT_MS);
     }
 
     @Test
     public void testMultipleReadersOnSingleLog() throws Exception {
-        sendReceive(4, 2000, 5, false);
+        sendReceive(4, 2000, 5, false, TIMEOUT_MS);
     }
 
     @Test
@@ -252,11 +252,11 @@ public void testUnregisterReaderSerial() throws Exception {
         assertEquals(3, reader2.totalValue.get());
     }
 
-    private void simpleSendReceive(int numMessages, int delayMS) throws Exception {
-        sendReceive(1, numMessages, delayMS, true);
+    protected void simpleSendReceive(int numMessages, int delayMS, long timeoutMS) throws Exception {
+        sendReceive(1, numMessages, delayMS, true, timeoutMS);
     }
 
-    public void sendReceive(int readers, int numMessages, int delayMS, boolean expectMessageOrder) throws Exception {
+    public void sendReceive(int readers, int numMessages, int delayMS, boolean expectMessageOrder, long timeoutMS) throws Exception {
         Preconditions.checkState(0 < readers);
         Log log1 = manager.openLog("test1");
         assertEquals("test1",log1.getName());
@@ -272,7 +272,7 @@ public void sendReceive(int readers, int numMessages, int delayMS, boolean expec
         }
         for (int i = 0; i < counts.length; i++) {
             CountingReader count = counts[i];
-            count.await(TIMEOUT_MS);
+            count.await(timeoutMS);
             assertEquals("counter index " + i + " message count mismatch", numMessages, count.totalMsg.get());
             assertEquals("counter index " + i + " value mismatch", numMessages*(numMessages+1)/2,count.totalValue.get());
             assertTrue(log1.unregisterReader(count));
@@ -285,7 +285,7 @@ public void sendReceive(int readers, int numMessages, int delayMS, boolean expec
      * Test MessageReader implementation. Allows waiting until an expected number of messages have
      * been read.
      */
-    private static class LatchMessageReader implements MessageReader {
+    protected static class LatchMessageReader implements MessageReader {
         private final CountDownLatch latch;
 
         LatchMessageReader(int expectedMessageCount) {
@@ -326,7 +326,7 @@ public void await(long timeoutMillis) throws InterruptedException {
         }
     }
 
-    private static class CountingReader extends LatchMessageReader {
+    protected static class CountingReader extends LatchMessageReader {
 
         private static final Logger log =
                 LoggerFactory.getLogger(CountingReader.class);
@@ -357,9 +357,9 @@ public void processMessage(Message message) {
         }
     }
 
-    private static class StoringReader extends LatchMessageReader {
+    protected static class StoringReader extends LatchMessageReader {
 
-        private List<StaticBuffer> msgs = new ArrayList<StaticBuffer>(64);
+        private List<StaticBuffer> msgs = new ArrayList<>(64);
         private volatile int msgCount = 0;
 
         StoringReader(int expectedMessageCount) {