test: Close things

.github/workflows/ci.yml

@@ -8,7 +8,8 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-24.04
+          # Changing this will change glibc
+          - os: ubuntu-22.04
             java: 8
             jobtype: 1
           - os: ubuntu-24.04
@@ -17,10 +18,10 @@ jobs:
           - os: macos-13
             java: 8
             jobtype: 1
-          - os: macos-14
+          - os: macos-15
             java: 8
             jobtype: 1
-          - os: macos-14
+          - os: macos-15
             java: 25
             jobtype: 1
           - os: windows-latest

src/test/java/org/scalasbt/ipcsocket/duplex/DuplexClient.java

@@ -6,7 +6,7 @@
 import java.util.concurrent.ExecutorService;
 import org.scalasbt.ipcsocket.BaseSocketSetup;
 
-public class DuplexClient extends BaseSocketSetup {
+public class DuplexClient extends BaseSocketSetup implements AutoCloseable {
 
   private final String pipeName;
   private final int sendMessages;
@@ -34,4 +34,9 @@ public void startAndAwait() {
       e.printStackTrace();
     }
   }
+
+  public void close() throws IOException {
+    this.sender.close();
+    this.receiver.close();
+  }
 }

src/test/java/org/scalasbt/ipcsocket/duplex/DuplexServer.java

@@ -7,7 +7,7 @@
 import java.util.concurrent.ExecutorService;
 import org.scalasbt.ipcsocket.BaseSocketSetup;
 
-public class DuplexServer extends BaseSocketSetup {
+public class DuplexServer extends BaseSocketSetup implements AutoCloseable {
 
   private final String pipeName;
   private final int sendMessages;
@@ -38,4 +38,9 @@ public void startAndAwait() {
       e.printStackTrace();
     }
   }
+
+  public void close() throws IOException {
+    this.sender.close();
+    this.receiver.close();
+  }
 }

src/test/java/org/scalasbt/ipcsocket/duplex/DuplexTest.java

@@ -17,22 +17,30 @@ public void testDuplexCommunication() throws Exception {
           // start server
           int serverSendMessages = 15;
           DuplexServer server = new DuplexServer(socketName, serverSendMessages);
-          pool.execute(() -> server.startAndAwait());
-
-          // wait for pipe to be instantiated
-          Thread.sleep(2000);
-
-          // start client
-          int clientSendMessages = 7;
-          DuplexClient client = new DuplexClient(socketName, clientSendMessages);
-          pool.execute(() -> client.startAndAwait());
-
-          // wait client and server to terminate
-          Thread.sleep((Math.max(serverSendMessages, clientSendMessages) + 3) * 1000);
+          try {
+            pool.execute(() -> server.startAndAwait());
+
+            // wait for pipe to be instantiated
+            Thread.sleep(2000);
+
+            // start client
+            int clientSendMessages = 7;
+            DuplexClient client = new DuplexClient(socketName, clientSendMessages);
+            try {
+              pool.execute(() -> client.startAndAwait());
+
+              // wait client and server to terminate
+              Thread.sleep((Math.max(serverSendMessages, clientSendMessages) + 5) * 1000);
+
+              assertEquals(serverSendMessages, client.receiver.receivedMessages);
+              assertEquals(clientSendMessages, server.receiver.receivedMessages);
+            } finally {
+              client.close();
+            }
+          } finally {
+            server.close();
+          }
           pool.shutdown();
-
-          assertEquals(serverSendMessages, client.receiver.receivedMessages);
-          assertEquals(clientSendMessages, server.receiver.receivedMessages);
         });
   }
 }

src/test/java/org/scalasbt/ipcsocket/duplex/Receiver.java

@@ -5,7 +5,7 @@
 import java.util.Random;
 import java.util.Scanner;
 
-public class Receiver implements Runnable {
+public class Receiver implements Runnable, AutoCloseable {
 
   private final String name;
   private final Socket socket;
@@ -31,4 +31,9 @@ public void run() {
       e.printStackTrace();
     }
   }
+
+  @Override
+  public void close() throws IOException {
+    this.socket.close();
+  }
 }

src/test/java/org/scalasbt/ipcsocket/duplex/Sender.java

@@ -5,7 +5,7 @@
 import java.net.Socket;
 import java.util.Random;
 
-public class Sender implements Runnable {
+public class Sender implements Runnable, AutoCloseable {
 
   private final String name;
   private final Socket socket;
@@ -31,4 +31,9 @@ public void run() {
       e.printStackTrace();
     }
   }
+
+  @Override
+  public void close() throws IOException {
+    this.socket.close();
+  }
 }