Prefer time-bound awaits for tests

Author: cpettitt-linkedin

test/com/linkedin/parseq/TestContext.java

@@ -74,7 +74,7 @@ protected Promise<Object> run(final Context context) throws Exception
 
     getEngine().run(task);
 
-    contextSetLatch.await();
+    assertTrue(contextSetLatch.await(5, TimeUnit.SECONDS));
 
     final Context context = contextRef.get();
 

test/com/linkedin/parseq/TestParTask.java

@@ -48,7 +48,7 @@ public void testIterableParWithSingletonList() throws InterruptedException
 
     getEngine().run(par);
 
-    par.await();
+    assertTrue(par.await(5, TimeUnit.SECONDS));
 
     assertEquals(1, par.get().size());
     assertEquals(valueStr, par.get().get(0));
@@ -80,7 +80,7 @@ public void run()
     final ParTask<?> par = par(Arrays.asList(tasks));
     getEngine().run(par);
 
-    par.await();
+    assertTrue(par.await(5, TimeUnit.SECONDS));
 
     assertEquals(500, par.getSuccessful().size());
     assertEquals(500, par.getTasks().size());
@@ -211,7 +211,7 @@ public Promise<String> run(final Context context) throws Exception
     assertTrue("Par task did not finish in a reasonable amount of time",
         par.await(100, TimeUnit.MILLISECONDS));
 
-    par.await();
+    assertTrue(par.await(5, TimeUnit.SECONDS));
     List<String> result = par.get();
     assertEquals(3, par.getTasks().size());
     assertEquals("Count should only be 3.", 3, result.size());
@@ -233,7 +233,7 @@ public void testParWithGeneralType() throws InterruptedException
 
     getEngine().run(par);
 
-    par.await();
+    assertTrue(par.await(5, TimeUnit.SECONDS));
     assertEquals(2, par.get().size());
     assertEquals(intVal, par.get().get(0));
     assertEquals(dblVal, par.get().get(1));
@@ -255,7 +255,7 @@ public void testTypedParWithGeneralType() throws InterruptedException
 
     getEngine().run(par);
 
-    par.await();
+    assertTrue(par.await(5, TimeUnit.SECONDS));
     assertEquals(2, par.get().size());
     assertEquals(intVal, par.get().get(0));
     assertEquals(dblVal, par.get().get(1));
@@ -293,7 +293,7 @@ public Promise<String> run(final Context context) throws Exception
 
     promise1.fail(new Exception());
     promise2.fail(new Exception());
-    par.await();
+    assertTrue(par.await(5, TimeUnit.SECONDS));
     if (!par.isFailed())
     {
       fail("par should have failed.");
@@ -353,7 +353,7 @@ public Promise<String> run(final Context context) throws Exception
     promise1.done("done1");
     promise2.fail(new Exception());
     promise3.done("done3");
-    par.await();
+    assertTrue(par.await(5, TimeUnit.SECONDS));
     if (!par.isFailed())
     {
       fail("par should have failed.");
@@ -418,7 +418,7 @@ public Promise<String> run(final Context context) throws Exception
     promise1.done("done1");
     promise2.fail(new EarlyFinishException());
     promise3.fail(new EarlyFinishException());
-    par.await();
+    assertTrue(par.await(5, TimeUnit.SECONDS));
 
     if (!par.isFailed())
     {
@@ -479,7 +479,7 @@ public Promise<String> run(final Context context) throws Exception
     promise1.done("done1");
     promise2.fail(new EarlyFinishException());
     promise3.fail(new Exception());
-    par.await();
+    assertTrue(par.await(5, TimeUnit.SECONDS));
 
     if (!par.isFailed())
     {
@@ -503,7 +503,7 @@ public void testPar2() throws InterruptedException
     final Task<List<Integer>> par = par(value(1),
         value(2));
     getEngine().run(par);
-    par.await();
+    assertTrue(par.await(5, TimeUnit.SECONDS));
     assertEquals(Arrays.asList(1, 2), par.get());
   }
 
@@ -514,7 +514,7 @@ public void testPar3() throws InterruptedException
         value(2),
         value(3));
     getEngine().run(par);
-    par.await();
+    assertTrue(par.await(5, TimeUnit.SECONDS));
     assertEquals(Arrays.asList(1, 2, 3), par.get());
   }
 
@@ -526,7 +526,7 @@ public void testPar4() throws InterruptedException
         value(3),
         value(4));
     getEngine().run(par);
-    par.await();
+    assertTrue(par.await(5, TimeUnit.SECONDS));
     assertEquals(Arrays.asList(1, 2, 3, 4), par.get());
   }
 
@@ -539,7 +539,7 @@ public void testPar5() throws InterruptedException
         value(4),
         value(5));
     getEngine().run(par);
-    par.await();
+    assertTrue(par.await(5, TimeUnit.SECONDS));
     assertEquals(Arrays.asList(1, 2, 3, 4, 5), par.get());
   }
 
@@ -553,7 +553,7 @@ public void testPar6() throws InterruptedException
         value(5),
         value(6));
     getEngine().run(par);
-    par.await();
+    assertTrue(par.await(5, TimeUnit.SECONDS));
     assertEquals(Arrays.asList(1, 2, 3, 4, 5, 6), par.get());
   }
 
@@ -568,7 +568,7 @@ public void testPar7() throws InterruptedException
         value(6),
         value(7));
     getEngine().run(par);
-    par.await();
+    assertTrue(par.await(5, TimeUnit.SECONDS));
     assertEquals(Arrays.asList(1, 2, 3, 4, 5, 6, 7), par.get());
   }
 
@@ -584,7 +584,7 @@ public void testPar8() throws InterruptedException
         value(7),
         value(8));
     getEngine().run(par);
-    par.await();
+    assertTrue(par.await(5, TimeUnit.SECONDS));
     assertEquals(Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8), par.get());
   }
 
@@ -601,7 +601,7 @@ public void testPar9() throws InterruptedException
         value(8),
         value(9));
     getEngine().run(par);
-    par.await();
+    assertTrue(par.await(5, TimeUnit.SECONDS));
     assertEquals(Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9), par.get());
   }
 
@@ -619,7 +619,7 @@ public void testPar10() throws InterruptedException
         value(9),
         value(10));
     getEngine().run(par);
-    par.await();
+    assertTrue(par.await(5, TimeUnit.SECONDS));
     assertEquals(Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10), par.get());
   }
 }

test/com/linkedin/parseq/TestSeqTask.java

@@ -6,11 +6,13 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
 
 import static com.linkedin.parseq.Tasks.callable;
 import static com.linkedin.parseq.Tasks.seq;
 import static com.linkedin.parseq.TestUtil.value;
 import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertTrue;
 import static org.testng.AssertJUnit.fail;
 
 /**
@@ -41,7 +43,7 @@ public void testIterableSeqWithSingletonList() throws InterruptedException
 
     getEngine().run(seq);
 
-    seq.await();
+    assertTrue(seq.await(5, TimeUnit.SECONDS));
 
     assertEquals(valueStr, seq.get());
   }
@@ -80,7 +82,7 @@ public Integer call() throws Exception
     final Task<Integer> seq = seq(Arrays.asList(tasks));
     getEngine().run(seq);
 
-    seq.await();
+    assertTrue(seq.await(5, TimeUnit.SECONDS));
 
     assertEquals(iters, (int)seq.get());
   }
@@ -94,7 +96,7 @@ public void testSeq2() throws InterruptedException
     final Task<String> seq = seq(value(1),
         value("result"));
     getEngine().run(seq);
-    seq.await();
+    assertTrue(seq.await(5, TimeUnit.SECONDS));
     assertEquals("result", seq.get());
   }
 
@@ -105,7 +107,7 @@ public void testSeq3() throws InterruptedException
         value(2),
         value("result"));
     getEngine().run(seq);
-    seq.await();
+    assertTrue(seq.await(5, TimeUnit.SECONDS));
     assertEquals("result", seq.get());
   }
 
@@ -117,7 +119,7 @@ public void testSeq4() throws InterruptedException
         value(3),
         value("result"));
     getEngine().run(seq);
-    seq.await();
+    assertTrue(seq.await(5, TimeUnit.SECONDS));
     assertEquals("result", seq.get());
   }
 
@@ -130,7 +132,7 @@ public void testSeq5() throws InterruptedException
         value(4),
         value("result"));
     getEngine().run(seq);
-    seq.await();
+    assertTrue(seq.await(5, TimeUnit.SECONDS));
     assertEquals("result", seq.get());
   }
 
@@ -144,7 +146,7 @@ public void testSeq6() throws InterruptedException
         value(5),
         value("result"));
     getEngine().run(seq);
-    seq.await();
+    assertTrue(seq.await(5, TimeUnit.SECONDS));
     assertEquals("result", seq.get());
   }
 
@@ -159,7 +161,7 @@ public void testSeq7() throws InterruptedException
         value(6),
         value("result"));
     getEngine().run(seq);
-    seq.await();
+    assertTrue(seq.await(5, TimeUnit.SECONDS));
     assertEquals("result", seq.get());
   }
 
@@ -175,7 +177,7 @@ public void testSeq8() throws InterruptedException
         value(7),
         value("result"));
     getEngine().run(seq);
-    seq.await();
+    assertTrue(seq.await(5, TimeUnit.SECONDS));
     assertEquals("result", seq.get());
   }
 
@@ -192,7 +194,7 @@ public void testSeq9() throws InterruptedException
         value(8),
         value("result"));
     getEngine().run(seq);
-    seq.await();
+    assertTrue(seq.await(5, TimeUnit.SECONDS));
     assertEquals("result", seq.get());
   }
 
@@ -210,7 +212,7 @@ public void testSeq10() throws InterruptedException
         value(9),
         value("result"));
     getEngine().run(seq);
-    seq.await();
+    assertTrue(seq.await(5, TimeUnit.SECONDS));
     assertEquals("result", seq.get());
   }
 }

test/com/linkedin/parseq/TestTaskLogging.java

@@ -21,6 +21,7 @@
 
 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertTrue;
@@ -40,7 +41,7 @@ public void testSingleTaskWithDefaultLogging() throws InterruptedException
   {
     final Task<?> task = TestUtil.noop();
     getEngine().run(task);
-    task.await();
+    assertTrue(task.await(5, TimeUnit.SECONDS));
 
     assertEquals(0, getLogEntries(ALL_LOGGER).size());
     assertEquals(0, getLogEntries(ROOT_LOGGER).size());
@@ -66,7 +67,7 @@ ALL_LOGGER, ROOT_LOGGER, planClassLogger(TestUtil.value("dummy", "dummy"))
         final Task<?> task = TestUtil.value("t1", taskValue);
         setLogLevel(logger, level);
         getEngine().run(task);
-        task.await();
+        assertTrue(task.await(5, TimeUnit.SECONDS));
 
         for (String checkLogger : loggers)
         {
@@ -103,7 +104,7 @@ ALL_LOGGER, ROOT_LOGGER, planClassLogger(TestUtil.errorTask("dummy", exception))
         final Task<?> task = TestUtil.errorTask("t1", exception);
         setLogLevel(logger, level);
         getEngine().run(task);
-        task.await();
+        assertTrue(task.await(5, TimeUnit.SECONDS));
 
         for (String checkLogger : loggers)
         {
@@ -129,7 +130,7 @@ public void testCompositeTaskWithAllLoggerTrace() throws InterruptedException
 
     setLogLevel(ALL_LOGGER, ListLogger.LEVEL_TRACE);
     getEngine().run(parent);
-    parent.await();
+    assertTrue(parent.await(5, TimeUnit.SECONDS));
 
     assertTaskLogged(parent, "null", ALL_LOGGER, ListLogger.LEVEL_TRACE);
     assertTaskLogged(child1, "value", ALL_LOGGER, ListLogger.LEVEL_TRACE);
@@ -145,7 +146,7 @@ public void testCompositeTaskWithRootLoggerTrace() throws InterruptedException
 
     setLogLevel(ROOT_LOGGER, ListLogger.LEVEL_TRACE);
     getEngine().run(parent);
-    parent.await();
+    assertTrue(parent.await(5, TimeUnit.SECONDS));
 
     assertTaskLogged(parent, "null", ROOT_LOGGER, ListLogger.LEVEL_TRACE);
 
@@ -164,7 +165,7 @@ public void testCompositeTaskWithPlanClassLoggerTrace() throws InterruptedExcept
 
     setLogLevel(planClassLogger, ListLogger.LEVEL_TRACE);
     getEngine().run(parent);
-    parent.await();
+    assertTrue(parent.await(5, TimeUnit.SECONDS));
 
     assertTaskLogged(parent, "null", planClassLogger, ListLogger.LEVEL_TRACE);
     assertTaskLogged(child1, "value", planClassLogger, ListLogger.LEVEL_TRACE);