Skip to content

Commit 610a9af

Browse files
committed
Minor changes
1 parent 79d6979 commit 610a9af

File tree

2 files changed

+16
-15
lines changed

2 files changed

+16
-15
lines changed

Diff for: src/test/java/se/krka/futures/AllOfTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ public void testAllOfIncorrect() {
4444
futureA.complete("A");
4545
futureB.complete("B");
4646
futureC.complete("C");
47-
futureC.complete("D");
47+
48+
// futureAll is complete now, but callback is deadlocked!
4849

4950
joined.join();
5051
});

Diff for: src/test/java/se/krka/futures/ObtrudeTest.java

+14-14
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,28 @@
1010
public class ObtrudeTest {
1111
@Test
1212
public void testObtrudeAfterCallback() {
13-
CompletableFuture<String> future = CompletableFuture.completedFuture("first");
14-
CompletableFuture<String> future2 = future.thenApply(v -> v + " second");
13+
CompletableFuture<String> parent = CompletableFuture.completedFuture("first");
14+
CompletableFuture<String> child = parent.thenApply(v -> v + " second");
1515

16-
assertEquals("first", CompletableFutures.getCompleted(future));
17-
assertEquals("first second", CompletableFutures.getCompleted(future2));
16+
assertEquals("first", CompletableFutures.getCompleted(parent));
17+
assertEquals("first second", CompletableFutures.getCompleted(child));
1818

19-
future.obtrudeValue("not-first");
20-
assertEquals("not-first", CompletableFutures.getCompleted(future));
21-
assertEquals("first second", CompletableFutures.getCompleted(future2));
19+
parent.obtrudeValue("not-first");
20+
assertEquals("not-first", CompletableFutures.getCompleted(parent));
21+
assertEquals("first second", CompletableFutures.getCompleted(child));
2222
}
2323

2424
@Test
2525
public void testObtrudeBeforeCallback() {
26-
CompletableFuture<String> future = new CompletableFuture<>();
27-
CompletableFuture<String> future2 = future.thenApply(v -> v + " second");
26+
CompletableFuture<String> parent = new CompletableFuture<>();
27+
CompletableFuture<String> child = parent.thenApply(v -> v + " second");
2828

29-
future.obtrudeValue("first");
30-
assertEquals("first", CompletableFutures.getCompleted(future));
31-
assertEquals("first second", CompletableFutures.getCompleted(future2));
29+
parent.obtrudeValue("first");
30+
assertEquals("first", CompletableFutures.getCompleted(parent));
31+
assertEquals("first second", CompletableFutures.getCompleted(child));
3232

33-
future.obtrudeValue("not-first");
34-
CompletableFuture<String> future3 = future.thenApply(v -> v + " second");
33+
parent.obtrudeValue("not-first");
34+
CompletableFuture<String> future3 = parent.thenApply(v -> v + " second");
3535

3636
assertEquals("not-first second", CompletableFutures.getCompleted(future3));
3737
}

0 commit comments

Comments
 (0)