test: InterruptIssue158Test: Make delay-to-close configurable

... and log the stacktrace for unexpected exceptions #158
kohlschutter · Jul 1, 2024 · 3f1c393 · 3f1c393
1 parent 0bed969
commit 3f1c393
Showing 1 changed file with 24 additions and 7 deletions.
diff --git a/junixsocket-common/src/test/java/org/newsclub/net/unix/InterruptIssue158Test.java b/junixsocket-common/src/test/java/org/newsclub/net/unix/InterruptIssue158Test.java
@@ -70,6 +70,9 @@ public abstract class InterruptIssue158Test<A extends SocketAddress> extends Soc
   private static boolean DEBUG_VERBOSE = (System.getProperty("com.kohlschutter.selftest") == null)
       && SystemPropertyUtil.getBooleanSystemProperty("selftest.issue.158.debug.verbose", true);
 
+  private static boolean DELAY_CLOSE = SystemPropertyUtil.getBooleanSystemProperty(
+      "selftest.issue.158.delay-close", false);
+
   private final A address;
   private TestInfo testInfo;
 
@@ -198,19 +201,28 @@ private void withServer(boolean acceptConnections, ThrowingRunnable func) throws
             } finally {
               if (socket != null) {
                 final SocketChannel socketToClose = socket;
-                CompletableFuture.runAsync(() -> {
-                  try {
-                    done.tryAcquire(1, TimeUnit.SECONDS);
-                  } catch (InterruptedException e) {
-                    // ignore
-                  }
+                if (DELAY_CLOSE) {
+                  CompletableFuture.runAsync(() -> {
+                    try {
+                      done.tryAcquire(1, TimeUnit.SECONDS);
+                    } catch (InterruptedException e) {
+                      // ignore
+                    }
+                    try {
+                      socketToClose.close();
+                    } catch (IOException e) {
+                      // TODO Auto-generated catch block
+                      e.printStackTrace();
+                    }
+                  });
+                } else {
                   try {
                     socketToClose.close();
                   } catch (IOException e) {
                     // TODO Auto-generated catch block
                     e.printStackTrace();
                   }
-                });
+                }
               }
             }
           }
@@ -252,6 +264,11 @@ <T extends AutoCloseable> Throwable runOperation(CountDownLatch ready, IOSupplie
         boolean interruptStateOK = Thread.interrupted() || (ClosedChannelException.class
             .isAssignableFrom(expectedException) && !(e instanceof ClosedByInterruptException));
 
+        if (!expectedException.isAssignableFrom(e.getClass())) {
+          // log unexpected exception stack trace
+          e.printStackTrace();
+        }
+
         assertAll(() -> assertInstanceOf(expectedException, e, "Socket exception"),
             () -> assertTrue(ignoreInterruptState || interruptStateOK, "Thread interrupted"),
             () -> assertTrue(closeCheck.test(sock), "Socket closed"));