Skip to content

Commit 1220cc7

Browse files
cpettitt-linkedincpettitt-linkedin
committed
Prefer time-bound awaits for tests
1 parent fcbbfe0 commit 1220cc7

8 files changed

Lines changed: 69 additions & 65 deletions

File tree

‎test/com/linkedin/parseq/TestContext.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ protected Promise<Object> run(final Context context) throws Exception
7474

7575
getEngine().run(task);
7676

77-
contextSetLatch.await();
77+
assertTrue(contextSetLatch.await(5, TimeUnit.SECONDS));
7878

7979
final Context context = contextRef.get();
8080

‎test/com/linkedin/parseq/TestParTask.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public void testIterableParWithSingletonList() throws InterruptedException
4848

4949
getEngine().run(par);
5050

51-
par.await();
51+
assertTrue(par.await(5, TimeUnit.SECONDS));
5252

5353
assertEquals(1, par.get().size());
5454
assertEquals(valueStr, par.get().get(0));
@@ -80,7 +80,7 @@ public void run()
8080
final ParTask<?> par = par(Arrays.asList(tasks));
8181
getEngine().run(par);
8282

83-
par.await();
83+
assertTrue(par.await(5, TimeUnit.SECONDS));
8484

8585
assertEquals(500, par.getSuccessful().size());
8686
assertEquals(500, par.getTasks().size());
@@ -211,7 +211,7 @@ public Promise<String> run(final Context context) throws Exception
211211
assertTrue("Par task did not finish in a reasonable amount of time",
212212
par.await(100, TimeUnit.MILLISECONDS));
213213

214-
par.await();
214+
assertTrue(par.await(5, TimeUnit.SECONDS));
215215
List<String> result = par.get();
216216
assertEquals(3, par.getTasks().size());
217217
assertEquals("Count should only be 3.", 3, result.size());
@@ -233,7 +233,7 @@ public void testParWithGeneralType() throws InterruptedException
233233

234234
getEngine().run(par);
235235

236-
par.await();
236+
assertTrue(par.await(5, TimeUnit.SECONDS));
237237
assertEquals(2, par.get().size());
238238
assertEquals(intVal, par.get().get(0));
239239
assertEquals(dblVal, par.get().get(1));
@@ -255,7 +255,7 @@ public void testTypedParWithGeneralType() throws InterruptedException
255255

256256
getEngine().run(par);
257257

258-
par.await();
258+
assertTrue(par.await(5, TimeUnit.SECONDS));
259259
assertEquals(2, par.get().size());
260260
assertEquals(intVal, par.get().get(0));
261261
assertEquals(dblVal, par.get().get(1));
@@ -293,7 +293,7 @@ public Promise<String> run(final Context context) throws Exception
293293

294294
promise1.fail(new Exception());
295295
promise2.fail(new Exception());
296-
par.await();
296+
assertTrue(par.await(5, TimeUnit.SECONDS));
297297
if (!par.isFailed())
298298
{
299299
fail("par should have failed.");
@@ -353,7 +353,7 @@ public Promise<String> run(final Context context) throws Exception
353353
promise1.done("done1");
354354
promise2.fail(new Exception());
355355
promise3.done("done3");
356-
par.await();
356+
assertTrue(par.await(5, TimeUnit.SECONDS));
357357
if (!par.isFailed())
358358
{
359359
fail("par should have failed.");
@@ -418,7 +418,7 @@ public Promise<String> run(final Context context) throws Exception
418418
promise1.done("done1");
419419
promise2.fail(new EarlyFinishException());
420420
promise3.fail(new EarlyFinishException());
421-
par.await();
421+
assertTrue(par.await(5, TimeUnit.SECONDS));
422422

423423
if (!par.isFailed())
424424
{
@@ -479,7 +479,7 @@ public Promise<String> run(final Context context) throws Exception
479479
promise1.done("done1");
480480
promise2.fail(new EarlyFinishException());
481481
promise3.fail(new Exception());
482-
par.await();
482+
assertTrue(par.await(5, TimeUnit.SECONDS));
483483

484484
if (!par.isFailed())
485485
{
@@ -503,7 +503,7 @@ public void testPar2() throws InterruptedException
503503
final Task<List<Integer>> par = par(value(1),
504504
value(2));
505505
getEngine().run(par);
506-
par.await();
506+
assertTrue(par.await(5, TimeUnit.SECONDS));
507507
assertEquals(Arrays.asList(1, 2), par.get());
508508
}
509509

@@ -514,7 +514,7 @@ public void testPar3() throws InterruptedException
514514
value(2),
515515
value(3));
516516
getEngine().run(par);
517-
par.await();
517+
assertTrue(par.await(5, TimeUnit.SECONDS));
518518
assertEquals(Arrays.asList(1, 2, 3), par.get());
519519
}
520520

@@ -526,7 +526,7 @@ public void testPar4() throws InterruptedException
526526
value(3),
527527
value(4));
528528
getEngine().run(par);
529-
par.await();
529+
assertTrue(par.await(5, TimeUnit.SECONDS));
530530
assertEquals(Arrays.asList(1, 2, 3, 4), par.get());
531531
}
532532

@@ -539,7 +539,7 @@ public void testPar5() throws InterruptedException
539539
value(4),
540540
value(5));
541541
getEngine().run(par);
542-
par.await();
542+
assertTrue(par.await(5, TimeUnit.SECONDS));
543543
assertEquals(Arrays.asList(1, 2, 3, 4, 5), par.get());
544544
}
545545

@@ -553,7 +553,7 @@ public void testPar6() throws InterruptedException
553553
value(5),
554554
value(6));
555555
getEngine().run(par);
556-
par.await();
556+
assertTrue(par.await(5, TimeUnit.SECONDS));
557557
assertEquals(Arrays.asList(1, 2, 3, 4, 5, 6), par.get());
558558
}
559559

@@ -568,7 +568,7 @@ public void testPar7() throws InterruptedException
568568
value(6),
569569
value(7));
570570
getEngine().run(par);
571-
par.await();
571+
assertTrue(par.await(5, TimeUnit.SECONDS));
572572
assertEquals(Arrays.asList(1, 2, 3, 4, 5, 6, 7), par.get());
573573
}
574574

@@ -584,7 +584,7 @@ public void testPar8() throws InterruptedException
584584
value(7),
585585
value(8));
586586
getEngine().run(par);
587-
par.await();
587+
assertTrue(par.await(5, TimeUnit.SECONDS));
588588
assertEquals(Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8), par.get());
589589
}
590590

@@ -601,7 +601,7 @@ public void testPar9() throws InterruptedException
601601
value(8),
602602
value(9));
603603
getEngine().run(par);
604-
par.await();
604+
assertTrue(par.await(5, TimeUnit.SECONDS));
605605
assertEquals(Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9), par.get());
606606
}
607607

@@ -619,7 +619,7 @@ public void testPar10() throws InterruptedException
619619
value(9),
620620
value(10));
621621
getEngine().run(par);
622-
par.await();
622+
assertTrue(par.await(5, TimeUnit.SECONDS));
623623
assertEquals(Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10), par.get());
624624
}
625625
}

‎test/com/linkedin/parseq/TestSeqTask.java‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@
66
import java.util.Collections;
77
import java.util.List;
88
import java.util.concurrent.Callable;
9+
import java.util.concurrent.TimeUnit;
910

1011
import static com.linkedin.parseq.Tasks.callable;
1112
import static com.linkedin.parseq.Tasks.seq;
1213
import static com.linkedin.parseq.TestUtil.value;
1314
import static org.testng.AssertJUnit.assertEquals;
15+
import static org.testng.AssertJUnit.assertTrue;
1416
import static org.testng.AssertJUnit.fail;
1517

1618
/**
@@ -41,7 +43,7 @@ public void testIterableSeqWithSingletonList() throws InterruptedException
4143

4244
getEngine().run(seq);
4345

44-
seq.await();
46+
assertTrue(seq.await(5, TimeUnit.SECONDS));
4547

4648
assertEquals(valueStr, seq.get());
4749
}
@@ -80,7 +82,7 @@ public Integer call() throws Exception
8082
final Task<Integer> seq = seq(Arrays.asList(tasks));
8183
getEngine().run(seq);
8284

83-
seq.await();
85+
assertTrue(seq.await(5, TimeUnit.SECONDS));
8486

8587
assertEquals(iters, (int)seq.get());
8688
}
@@ -94,7 +96,7 @@ public void testSeq2() throws InterruptedException
9496
final Task<String> seq = seq(value(1),
9597
value("result"));
9698
getEngine().run(seq);
97-
seq.await();
99+
assertTrue(seq.await(5, TimeUnit.SECONDS));
98100
assertEquals("result", seq.get());
99101
}
100102

@@ -105,7 +107,7 @@ public void testSeq3() throws InterruptedException
105107
value(2),
106108
value("result"));
107109
getEngine().run(seq);
108-
seq.await();
110+
assertTrue(seq.await(5, TimeUnit.SECONDS));
109111
assertEquals("result", seq.get());
110112
}
111113

@@ -117,7 +119,7 @@ public void testSeq4() throws InterruptedException
117119
value(3),
118120
value("result"));
119121
getEngine().run(seq);
120-
seq.await();
122+
assertTrue(seq.await(5, TimeUnit.SECONDS));
121123
assertEquals("result", seq.get());
122124
}
123125

@@ -130,7 +132,7 @@ public void testSeq5() throws InterruptedException
130132
value(4),
131133
value("result"));
132134
getEngine().run(seq);
133-
seq.await();
135+
assertTrue(seq.await(5, TimeUnit.SECONDS));
134136
assertEquals("result", seq.get());
135137
}
136138

@@ -144,7 +146,7 @@ public void testSeq6() throws InterruptedException
144146
value(5),
145147
value("result"));
146148
getEngine().run(seq);
147-
seq.await();
149+
assertTrue(seq.await(5, TimeUnit.SECONDS));
148150
assertEquals("result", seq.get());
149151
}
150152

@@ -159,7 +161,7 @@ public void testSeq7() throws InterruptedException
159161
value(6),
160162
value("result"));
161163
getEngine().run(seq);
162-
seq.await();
164+
assertTrue(seq.await(5, TimeUnit.SECONDS));
163165
assertEquals("result", seq.get());
164166
}
165167

@@ -175,7 +177,7 @@ public void testSeq8() throws InterruptedException
175177
value(7),
176178
value("result"));
177179
getEngine().run(seq);
178-
seq.await();
180+
assertTrue(seq.await(5, TimeUnit.SECONDS));
179181
assertEquals("result", seq.get());
180182
}
181183

@@ -192,7 +194,7 @@ public void testSeq9() throws InterruptedException
192194
value(8),
193195
value("result"));
194196
getEngine().run(seq);
195-
seq.await();
197+
assertTrue(seq.await(5, TimeUnit.SECONDS));
196198
assertEquals("result", seq.get());
197199
}
198200

@@ -210,7 +212,7 @@ public void testSeq10() throws InterruptedException
210212
value(9),
211213
value("result"));
212214
getEngine().run(seq);
213-
seq.await();
215+
assertTrue(seq.await(5, TimeUnit.SECONDS));
214216
assertEquals("result", seq.get());
215217
}
216218
}

‎test/com/linkedin/parseq/TestTaskLogging.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import java.util.Collections;
2323
import java.util.List;
24+
import java.util.concurrent.TimeUnit;
2425

2526
import static org.testng.AssertJUnit.assertEquals;
2627
import static org.testng.AssertJUnit.assertTrue;
@@ -40,7 +41,7 @@ public void testSingleTaskWithDefaultLogging() throws InterruptedException
4041
{
4142
final Task<?> task = TestUtil.noop();
4243
getEngine().run(task);
43-
task.await();
44+
assertTrue(task.await(5, TimeUnit.SECONDS));
4445

4546
assertEquals(0, getLogEntries(ALL_LOGGER).size());
4647
assertEquals(0, getLogEntries(ROOT_LOGGER).size());
@@ -66,7 +67,7 @@ ALL_LOGGER, ROOT_LOGGER, planClassLogger(TestUtil.value("dummy", "dummy"))
6667
final Task<?> task = TestUtil.value("t1", taskValue);
6768
setLogLevel(logger, level);
6869
getEngine().run(task);
69-
task.await();
70+
assertTrue(task.await(5, TimeUnit.SECONDS));
7071

7172
for (String checkLogger : loggers)
7273
{
@@ -103,7 +104,7 @@ ALL_LOGGER, ROOT_LOGGER, planClassLogger(TestUtil.errorTask("dummy", exception))
103104
final Task<?> task = TestUtil.errorTask("t1", exception);
104105
setLogLevel(logger, level);
105106
getEngine().run(task);
106-
task.await();
107+
assertTrue(task.await(5, TimeUnit.SECONDS));
107108

108109
for (String checkLogger : loggers)
109110
{
@@ -129,7 +130,7 @@ public void testCompositeTaskWithAllLoggerTrace() throws InterruptedException
129130

130131
setLogLevel(ALL_LOGGER, ListLogger.LEVEL_TRACE);
131132
getEngine().run(parent);
132-
parent.await();
133+
assertTrue(parent.await(5, TimeUnit.SECONDS));
133134

134135
assertTaskLogged(parent, "null", ALL_LOGGER, ListLogger.LEVEL_TRACE);
135136
assertTaskLogged(child1, "value", ALL_LOGGER, ListLogger.LEVEL_TRACE);
@@ -145,7 +146,7 @@ public void testCompositeTaskWithRootLoggerTrace() throws InterruptedException
145146

146147
setLogLevel(ROOT_LOGGER, ListLogger.LEVEL_TRACE);
147148
getEngine().run(parent);
148-
parent.await();
149+
assertTrue(parent.await(5, TimeUnit.SECONDS));
149150

150151
assertTaskLogged(parent, "null", ROOT_LOGGER, ListLogger.LEVEL_TRACE);
151152

@@ -164,7 +165,7 @@ public void testCompositeTaskWithPlanClassLoggerTrace() throws InterruptedExcept
164165

165166
setLogLevel(planClassLogger, ListLogger.LEVEL_TRACE);
166167
getEngine().run(parent);
167-
parent.await();
168+
assertTrue(parent.await(5, TimeUnit.SECONDS));
168169

169170
assertTaskLogged(parent, "null", planClassLogger, ListLogger.LEVEL_TRACE);
170171
assertTaskLogged(child1, "value", planClassLogger, ListLogger.LEVEL_TRACE);

0 commit comments

Comments
 (0)