From dc4c7142339038366081f65c56672ab35784b23c Mon Sep 17 00:00:00 2001 From: "Michael N. Lipp" Date: Thu, 2 May 2024 14:24:36 +0200 Subject: [PATCH] Make sure to always wait for exhaustion. --- .../test/org/jgrapes/core/test/basic/StructureTest.java | 1 + .../test/org/jgrapes/core/test/core/CompletedTest.java | 1 + .../test/org/jgrapes/core/test/core/ErrorTest.java | 2 ++ .../test/org/jgrapes/core/test/core/PriorityTest.java | 1 + .../test/org/jgrapes/core/test/core/StoppedTest.java | 1 + org.jgrapes.io/test/org/jgrapes/io/test/net/EchoTest.java | 2 ++ org.jgrapes.io/test/org/jgrapes/io/test/net/EchoTest2.java | 2 ++ org.jgrapes.io/test/org/jgrapes/io/test/net/EchoTest3.java | 3 +++ .../test/org/jgrapes/io/test/net/SendChunkedTest.java | 1 + .../test/org/jgrapes/io/test/net/ServerStateTest.java | 6 ++++++ .../test/org/jgrapes/io/test/net/SslEchoServerTest.java | 1 + 11 files changed, 21 insertions(+) diff --git a/org.jgrapes.core/test/org/jgrapes/core/test/basic/StructureTest.java b/org.jgrapes.core/test/org/jgrapes/core/test/basic/StructureTest.java index 7ed1ba8227c..6d6f327c676 100644 --- a/org.jgrapes.core/test/org/jgrapes/core/test/basic/StructureTest.java +++ b/org.jgrapes.core/test/org/jgrapes/core/test/basic/StructureTest.java @@ -91,6 +91,7 @@ public void testDetach() throws InterruptedException, ExecutionException { assertNull(comp2.getManager().parent()); assertEquals(comp2, comp2.getManager().root()); assertEquals(0, comp.getManager().children().size()); + Components.awaitExhaustion(); } @Test diff --git a/org.jgrapes.core/test/org/jgrapes/core/test/core/CompletedTest.java b/org.jgrapes.core/test/org/jgrapes/core/test/core/CompletedTest.java index 226728271ea..4e18ad38ccf 100644 --- a/org.jgrapes.core/test/org/jgrapes/core/test/core/CompletedTest.java +++ b/org.jgrapes.core/test/org/jgrapes/core/test/core/CompletedTest.java @@ -91,6 +91,7 @@ public void testComplete() throws InterruptedException { } test1.get(); assertTrue(app.testDone); + Components.awaitExhaustion(); } } diff --git a/org.jgrapes.core/test/org/jgrapes/core/test/core/ErrorTest.java b/org.jgrapes.core/test/org/jgrapes/core/test/core/ErrorTest.java index 10f757cd3f5..80efc5003cd 100644 --- a/org.jgrapes.core/test/org/jgrapes/core/test/core/ErrorTest.java +++ b/org.jgrapes.core/test/org/jgrapes/core/test/core/ErrorTest.java @@ -54,6 +54,7 @@ public void testDefaultHandler() throws InterruptedException { } finally { System.setErr(oldErr); } + Components.awaitExhaustion(); } public static class BuggyComponentWithHandler extends Component { @@ -78,6 +79,7 @@ public void testComplete() throws InterruptedException { BuggyComponentWithHandler app = new BuggyComponentWithHandler(); Components.start(app); assertTrue(app.caughtError); + Components.awaitExhaustion(); } } diff --git a/org.jgrapes.core/test/org/jgrapes/core/test/core/PriorityTest.java b/org.jgrapes.core/test/org/jgrapes/core/test/core/PriorityTest.java index 95add420d33..4e1b6ed8019 100644 --- a/org.jgrapes.core/test/org/jgrapes/core/test/core/PriorityTest.java +++ b/org.jgrapes.core/test/org/jgrapes/core/test/core/PriorityTest.java @@ -64,6 +64,7 @@ public void testComplete() throws InterruptedException { PrioritisedHandlers app = new PrioritisedHandlers(); Components.start(app); assertTrue(app.result.equals("Hello")); + Components.awaitExhaustion(); } } diff --git a/org.jgrapes.core/test/org/jgrapes/core/test/core/StoppedTest.java b/org.jgrapes.core/test/org/jgrapes/core/test/core/StoppedTest.java index fe9ebdb9650..05eb303a07e 100644 --- a/org.jgrapes.core/test/org/jgrapes/core/test/core/StoppedTest.java +++ b/org.jgrapes.core/test/org/jgrapes/core/test/core/StoppedTest.java @@ -65,6 +65,7 @@ public void testComplete() throws InterruptedException { PrioritisedHandlers app = new PrioritisedHandlers(); Components.start(app); assertTrue(app.result.equals("Hel")); + Components.awaitExhaustion(); } } diff --git a/org.jgrapes.io/test/org/jgrapes/io/test/net/EchoTest.java b/org.jgrapes.io/test/org/jgrapes/io/test/net/EchoTest.java index 97af1781d8f..69992650c91 100644 --- a/org.jgrapes.io/test/org/jgrapes/io/test/net/EchoTest.java +++ b/org.jgrapes.io/test/org/jgrapes/io/test/net/EchoTest.java @@ -190,6 +190,7 @@ public void testTcp() throws IOException, InterruptedException, } break; } + Components.awaitExhaustion(); Components.checkAssertions(); } @@ -276,6 +277,7 @@ public void checkServerTrusted( } break; } + Components.awaitExhaustion(); Components.checkAssertions(); } diff --git a/org.jgrapes.io/test/org/jgrapes/io/test/net/EchoTest2.java b/org.jgrapes.io/test/org/jgrapes/io/test/net/EchoTest2.java index 3f75e27f87a..a44aa2c588c 100644 --- a/org.jgrapes.io/test/org/jgrapes/io/test/net/EchoTest2.java +++ b/org.jgrapes.io/test/org/jgrapes/io/test/net/EchoTest2.java @@ -166,6 +166,7 @@ public void testTcp() throws IOException, InterruptedException, } break; } + Components.awaitExhaustion(); Components.checkAssertions(); } @@ -235,6 +236,7 @@ public void testSsl() throws IOException, InterruptedException, } break; } + Components.awaitExhaustion(); Components.checkAssertions(); } diff --git a/org.jgrapes.io/test/org/jgrapes/io/test/net/EchoTest3.java b/org.jgrapes.io/test/org/jgrapes/io/test/net/EchoTest3.java index 1d97d004d3b..8c4f2559075 100644 --- a/org.jgrapes.io/test/org/jgrapes/io/test/net/EchoTest3.java +++ b/org.jgrapes.io/test/org/jgrapes/io/test/net/EchoTest3.java @@ -227,6 +227,7 @@ public void testTcp() throws IOException, InterruptedException, } break; } + Components.awaitExhaustion(); Components.checkAssertions(); } @@ -276,6 +277,7 @@ public void testUds() throws IOException, InterruptedException, } break; } + Components.awaitExhaustion(); Components.checkAssertions(); Files.deleteIfExists(udsPath); } @@ -346,6 +348,7 @@ public void testSsl() throws IOException, InterruptedException, } break; } + Components.awaitExhaustion(); Components.checkAssertions(); } diff --git a/org.jgrapes.io/test/org/jgrapes/io/test/net/SendChunkedTest.java b/org.jgrapes.io/test/org/jgrapes/io/test/net/SendChunkedTest.java index d98bf39e792..64bc7fe3bad 100644 --- a/org.jgrapes.io/test/org/jgrapes/io/test/net/SendChunkedTest.java +++ b/org.jgrapes.io/test/org/jgrapes/io/test/net/SendChunkedTest.java @@ -185,6 +185,7 @@ public void sendTest(int bufferSize) } break; } + Components.awaitExhaustion(); } } diff --git a/org.jgrapes.io/test/org/jgrapes/io/test/net/ServerStateTest.java b/org.jgrapes.io/test/org/jgrapes/io/test/net/ServerStateTest.java index 80495389392..38bf9cc3ac3 100644 --- a/org.jgrapes.io/test/org/jgrapes/io/test/net/ServerStateTest.java +++ b/org.jgrapes.io/test/org/jgrapes/io/test/net/ServerStateTest.java @@ -29,6 +29,7 @@ import org.jgrapes.io.test.WaitForTests; import org.jgrapes.net.SocketServer; import org.jgrapes.net.events.Ready; +import org.junit.After; import static org.junit.Assert.*; import org.junit.Before; import org.junit.Test; @@ -85,6 +86,11 @@ public void setUp() throws Exception { wf.get(); } + @After + public void tearDown() throws Exception { + Components.awaitExhaustion(); + } + @Test public void testStartClose() throws InterruptedException { assertEquals(State.READY, checker.state); diff --git a/org.jgrapes.io/test/org/jgrapes/io/test/net/SslEchoServerTest.java b/org.jgrapes.io/test/org/jgrapes/io/test/net/SslEchoServerTest.java index 2049196dc56..2b99951db13 100644 --- a/org.jgrapes.io/test/org/jgrapes/io/test/net/SslEchoServerTest.java +++ b/org.jgrapes.io/test/org/jgrapes/io/test/net/SslEchoServerTest.java @@ -197,6 +197,7 @@ public void checkServerTrusted( } break; } + Components.awaitExhaustion(); Components.checkAssertions(); }