Tune running of tests to reduce overhead (#266)

src/main/java/net/openhft/chronicle/network/TcpEventHandler.java

@@ -507,6 +507,8 @@ protected void performClose() {
         if (nc != null)
             closeQuietly(nc, nc.socketReconnector(), nc.networkStatsListener());
         closeQuietly(tcpHandler, sc);
+        IOTools.unmonitor(inBBB);
+        IOTools.unmonitor(outBBB);
     }
 
     boolean flushedOut(boolean flushed) {

src/test/java/net/openhft/chronicle/network/AlwaysStartOnPrimaryConnectionStrategyTest.java

@@ -45,6 +45,11 @@ void setUp() throws IOException {
         TCPRegistry.createServerSocketChannelFor(hostPort);
         uri = TCPRegistry.acquireServerSocketChannel(hostPort).getLocalAddress().toString();
     }
+    @Override
+    @BeforeEach
+    protected void threadDump() {
+        super.threadDump();
+    }
 
     @Test
     @Timeout(1)

src/test/java/net/openhft/chronicle/network/ConnectionListenerTest.java

@@ -31,6 +31,12 @@ void setUp() throws IOException {
         ignoreException("core-event-loop thread has blocked for");
     }
 
+    @Override
+    @BeforeEach
+    protected void threadDump() {
+        super.threadDump();
+    }
+
     @Test
     void onConnectAndOnDisconnectAreCalledOnce_OnOrderlyConnectionAndDisconnection() {
         try (TestClusterContext acceptorCtx = forHosts(acceptorHost, initiatorHost);

src/test/java/net/openhft/chronicle/network/NetworkTestCommon.java

@@ -45,13 +45,14 @@ public void assertReferencesReleased() {
         AbstractReferenceCounted.assertReferencesReleased();
     }
 
-    @BeforeEach
-    void threadDump() {
+    // @BeforeEach add to tests that need it
+    protected void threadDump() {
         threadDump = new ThreadDump();
     }
 
     public void checkThreadDump() {
-        threadDump.assertNoNewThreads();
+        if (threadDump != null)
+            threadDump.assertNoNewThreads();
     }
 
     @BeforeEach
@@ -86,11 +87,10 @@ void afterChecks() {
         CleaningThread.performCleanup(Thread.currentThread());
 
         // find any discarded resources.
-        System.gc();
-        AbstractCloseable.waitForCloseablesToClose(100);
-
         TCPRegistry.reset();
 
+        AbstractCloseable.waitForCloseablesToClose(100);
+
         assertReferencesReleased();
         checkThreadDump();
         checkExceptions();

src/test/java/net/openhft/chronicle/network/RemoteConnectorTest.java

@@ -30,6 +30,12 @@ void setUp() {
         remoteConnector = new RemoteConnector<>(this::createTcpEventHandler);
     }
 
+    @Override
+    @BeforeEach
+    protected void threadDump() {
+        super.threadDump();
+    }
+
     @Test
     @Timeout(3)
     void remoteConnectorLooksUpAddressOnEachIteration() throws IOException {

src/test/java/net/openhft/chronicle/network/TcpEventHandlerReleaseTest.java

@@ -67,29 +67,29 @@ void testBuffersReleasedWhenSocketChannelClosed() throws IOException {
     void performIdleWorkIsOnlyCalledWhenHandlerIsBusyOrOneHundredIterations() throws IOException, InvalidEventHandlerException {
         NetworkContext nc = new VanillaNetworkContext();
         nc.socketChannel(TCPRegistry.createSocketChannel(hostPort));
-        BusyTcpEventHandler tcpEventHandler = new BusyTcpEventHandler(nc);
-        final BusyTcpHandler tcpHandler = new BusyTcpHandler();
-        tcpEventHandler.tcpHandler(tcpHandler);
-
-        // not called when busy
-        tcpEventHandler.busy = true;
-        tcpEventHandler.action();
-        assertEquals(0, tcpHandler.performedIdleWorkCount.get());
-
-        // called when not busy
-        tcpEventHandler.busy = false;
-        tcpEventHandler.action();
-        assertEquals(1, tcpHandler.performedIdleWorkCount.get());
-
-        // called when not called for 101 iterations
-        tcpEventHandler.busy = true;
-        for (int i = 0; i < 101; i++) {
+        try (BusyTcpEventHandler tcpEventHandler = new BusyTcpEventHandler(nc)) {
+            final BusyTcpHandler tcpHandler = new BusyTcpHandler();
+            tcpEventHandler.tcpHandler(tcpHandler);
+
+            // not called when busy
+            tcpEventHandler.busy = true;
+            tcpEventHandler.action();
+            assertEquals(0, tcpHandler.performedIdleWorkCount.get());
+
+            // called when not busy
+            tcpEventHandler.busy = false;
+            tcpEventHandler.action();
+            assertEquals(1, tcpHandler.performedIdleWorkCount.get());
+
+            // called when not called for 101 iterations
+            tcpEventHandler.busy = true;
+            for (int i = 0; i < 101; i++) {
+                tcpEventHandler.action();
+            }
+            assertEquals(1, tcpHandler.performedIdleWorkCount.get());
             tcpEventHandler.action();
+            assertEquals(2, tcpHandler.performedIdleWorkCount.get());
         }
-        assertEquals(1, tcpHandler.performedIdleWorkCount.get());
-        tcpEventHandler.action();
-        assertEquals(2, tcpHandler.performedIdleWorkCount.get());
-        tcpEventHandler.close();
     }
 
     public TcpEventHandler createTcpEventHandler() throws IOException {

src/test/java/net/openhft/chronicle/network/UberHandlerTest.java

@@ -94,6 +94,12 @@ void before() {
         REGISTRY.set(null);
     }
 
+    @Override
+    @BeforeEach
+    protected void threadDump() {
+        super.threadDump();
+    }
+
     @AfterEach
     public void after() {
         System.clearProperty("TcpEventHandler.tcpBufferSize");

src/test/java/net/openhft/chronicle/network/cluster/ClusterAcceptorEventHandlerTest.java

@@ -26,6 +26,7 @@
 import net.openhft.chronicle.threads.EventGroupBuilder;
 import net.openhft.chronicle.wire.WireType;
 import org.jetbrains.annotations.NotNull;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
@@ -38,6 +39,11 @@
 import static org.mockito.Mockito.verify;
 
 class ClusterAcceptorEventHandlerTest extends NetworkTestCommon {
+    @Override
+    @BeforeEach
+    protected void threadDump() {
+        super.threadDump();
+    }
 
     @Test
     void willPopulateNetworkStatsListenerWhenNetworkStatsListenerFactorySpecified() throws IOException {

src/test/java/net/openhft/chronicle/network/cluster/ClusterConnectivityTest.java

@@ -44,6 +44,11 @@ void setUp() throws IOException {
         executorService.submit(hostOneProxy);
         executorService.submit(hostTwoProxy);
     }
+    @Override
+    @BeforeEach
+    protected void threadDump() {
+        super.threadDump();
+    }
 
     @AfterEach
     void tearDown() {

src/test/java/net/openhft/chronicle/network/cluster/ClusterContextTest.java

@@ -20,10 +20,12 @@
 
 import net.openhft.chronicle.core.Jvm;
 import net.openhft.chronicle.core.util.ThrowingFunction;
+import net.openhft.chronicle.network.NetworkTestCommon;
 import net.openhft.chronicle.network.TcpEventHandler;
 import net.openhft.chronicle.threads.Pauser;
 import net.openhft.chronicle.threads.TimingPauser;
 import org.jetbrains.annotations.NotNull;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
@@ -34,7 +36,12 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
-class ClusterContextTest {
+class ClusterContextTest extends NetworkTestCommon {
+    @Override
+    @BeforeEach
+    protected void threadDump() {
+        super.threadDump();
+    }
 
     @Test
     void testStatesAreStillInTheCorrectOrder() {

src/test/java/net/openhft/chronicle/network/cluster/handlers/HeartbeatHandlerTest.java

@@ -19,13 +19,14 @@
 package net.openhft.chronicle.network.cluster.handlers;
 
 import net.openhft.chronicle.bytes.Bytes;
+import net.openhft.chronicle.network.NetworkTestCommon;
 import net.openhft.chronicle.wire.BinaryWire;
 import net.openhft.chronicle.wire.Wire;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-class HeartbeatHandlerTest {
+class HeartbeatHandlerTest extends NetworkTestCommon {
 
     public static final long CID = 1234L;
     public static final int VALID_HEARTBEAT_TIMEOUT_MS = 1000;
@@ -82,7 +83,7 @@ void intervalGreaterThanTimeoutThrowsIllegalStateExceptionConstructor() {
     }
 
     private void createByDeserialization(long heartbeatTimeoutMs, long heartbeatIntervalMs) {
-        Wire wire = new BinaryWire(Bytes.elasticByteBuffer());
+        Wire wire = new BinaryWire(Bytes.allocateElasticOnHeap());
         wire.write("heartbeatTimeoutMs").int64(heartbeatTimeoutMs);
         wire.write("heartbeatIntervalMs").int64(heartbeatIntervalMs);
         new HeartbeatHandler<>(wire);

src/test/java/net/openhft/chronicle/network/connection/FatalFailureConnectionStrategyTest.java

@@ -19,10 +19,12 @@
 
 import net.openhft.chronicle.core.Jvm;
 import net.openhft.chronicle.core.OS;
+import net.openhft.chronicle.network.NetworkTestCommon;
 import net.openhft.chronicle.network.TCPRegistry;
 import net.openhft.chronicle.network.tcp.ChronicleSocketChannel;
 import net.openhft.chronicle.network.util.TestServer;
 import net.openhft.chronicle.wire.Marshallable;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
 
@@ -34,7 +36,12 @@
 import static org.junit.jupiter.api.Assertions.*;
 import static org.junit.jupiter.api.Assumptions.assumeFalse;
 
-class FatalFailureConnectionStrategyTest {
+class FatalFailureConnectionStrategyTest extends NetworkTestCommon {
+    @Override
+    @BeforeEach
+    protected void threadDump() {
+        super.threadDump();
+    }
 
     /**
      * Checks that {@link FatalFailureConnectionStrategy} can be used in YAML config.

src/test/java/net/openhft/chronicle/network/internal/AddressCacheTest.java

@@ -19,6 +19,7 @@
 package net.openhft.chronicle.network.internal;
 
 import net.openhft.chronicle.core.util.ThrowingRunnable;
+import net.openhft.chronicle.network.NetworkTestCommon;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -27,7 +28,7 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
-class AddressCacheTest {
+class AddressCacheTest extends NetworkTestCommon {
 
     private static final String NETWORK_ADDRESS_CACHE_TTL = "networkaddress.cache.ttl";
     private static final String DEFAULT_NETWORK_ADDRESS_CACHE_TTL = "-1";

src/test/java/net/openhft/chronicle/network/internal/SocketExceptionUtilTest.java

@@ -25,6 +25,7 @@
 import net.openhft.chronicle.network.tcp.ChronicleSocketChannel;
 import net.openhft.chronicle.network.tcp.ChronicleSocketChannelFactory;
 import net.openhft.chronicle.threads.Threads;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
@@ -39,6 +40,11 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 class SocketExceptionUtilTest extends NetworkTestCommon {
+    @Override
+    @BeforeEach
+    protected void threadDump() {
+        super.threadDump();
+    }
 
     /**
      * Original means of detection

src/test/java/net/openhft/chronicle/network/internal/lookuptable/FileBasedHostnamePortLookupTableTest.java

@@ -38,7 +38,7 @@
 
 class FileBasedHostnamePortLookupTableTest extends NetworkTestCommon {
 
-    public static final String TEST_TABLE_FILENAME = "FileBasedHostnamePortLookupTableTest";
+    public static final String TEST_TABLE_FILENAME = OS.getTarget()+"/FileBasedHostnamePortLookupTableTest";
     private FileBasedHostnamePortLookupTable lookupTable;
 
     @BeforeEach
@@ -49,6 +49,11 @@ void setUp() {
         IOTools.deleteDirWithFilesOrThrow(TEST_TABLE_FILENAME);
         lookupTable = new FileBasedHostnamePortLookupTable(TEST_TABLE_FILENAME);
     }
+    @Override
+    @BeforeEach
+    protected void threadDump() {
+        super.threadDump();
+    }
 
     @AfterEach
     public void closeLookupTable() {

src/test/java/net/openhft/chronicle/network/ssl/NioSslIntegrationTest.java

@@ -53,6 +53,12 @@ void setUp() {
             System.setProperty("jdk.tls.server.protocols", "TLSv1.2");
     }
 
+    @Override
+    @BeforeEach
+    protected void threadDump() {
+        super.threadDump();
+    }
+
     @AfterEach
     void teardown() {
         System.clearProperty("jdk.tls.server.protocols");

src/test/java/net/openhft/chronicle/network/ssl/NonClusteredSslIntegrationTest.java

@@ -74,6 +74,11 @@ public final class NonClusteredSslIntegrationTest extends NetworkTestCommon {
     private final CountingTcpHandler clientInitiator = new CountingTcpHandler("client-initiator");
     private final CountingTcpHandler serverInitiator = new CountingTcpHandler("server-initiator");
     private Mode mode;
+    @Override
+    @BeforeEach
+    protected void threadDump() {
+        super.threadDump();
+    }
 
     public static List<Object[]> params() {
         final List<Object[]> params = new ArrayList<>();

src/test/java/net/openhft/chronicle/network/ssl/TransparentSslPerformanceTest.java

@@ -44,6 +44,12 @@ void setUp() throws IOException {
         TCPRegistry.createServerSocketChannelFor("client", "server");
     }
 
+    @Override
+    @BeforeEach
+    protected void threadDump() {
+        super.threadDump();
+    }
+
     @AfterEach
     void teardown() {
         System.clearProperty("jdk.tls.server.protocols");

src/test/java/net/openhft/chronicle/network/tcp/FastJ8SocketChannelTest.java

@@ -1,5 +1,6 @@
 package net.openhft.chronicle.network.tcp;
 
+import net.openhft.chronicle.network.NetworkTestCommon;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
@@ -11,7 +12,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-class FastJ8SocketChannelTest {
+class FastJ8SocketChannelTest extends NetworkTestCommon {
 
     @Test
     void closedChannelExceptionIsThrownWhenAttemptIsMadeToReadFromClosedChannel() throws IOException {
@@ -22,6 +23,7 @@ void closedChannelExceptionIsThrownWhenAttemptIsMadeToReadFromClosedChannel() th
                 final FastJ8SocketChannel fastJ8SocketChannel = new FastJ8SocketChannel(remote);
                 remote.close();
                 assertThrows(ClosedChannelException.class, () -> fastJ8SocketChannel.read(ByteBuffer.allocateDirect(100)));
+                fastJ8SocketChannel.close();
             }
         }
     }
@@ -35,6 +37,7 @@ void closedChannelExceptionIsThrownWhenAttemptIsMadeToWriteToClosedChannel() thr
                 final FastJ8SocketChannel fastJ8SocketChannel = new FastJ8SocketChannel(remote);
                 remote.close();
                 assertThrows(ClosedChannelException.class, () -> fastJ8SocketChannel.write(ByteBuffer.allocateDirect(100)));
+                fastJ8SocketChannel.close();
             }
         }
     }

src/test/java/net/openhft/performance/tests/network/BufferSizeTest.java

@@ -57,7 +57,7 @@ class BufferSizeTest extends NetworkTestCommon {
     private ThreadDump threadDump;
 
     @BeforeEach
-    void threadDump() {
+    protected void threadDump() {
         threadDump = new ThreadDump();
     }