diff options
Diffstat (limited to 'jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/AbstractHttpClientServerTest.java')
-rw-r--r-- | jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/AbstractHttpClientServerTest.java | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/AbstractHttpClientServerTest.java b/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/AbstractHttpClientServerTest.java index 9c83445108..35b75f5dda 100644 --- a/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/AbstractHttpClientServerTest.java +++ b/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/AbstractHttpClientServerTest.java @@ -18,12 +18,9 @@ package org.eclipse.jetty.fcgi.server; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; - import java.util.concurrent.atomic.AtomicLong; -import org.eclipse.jetty.client.ConnectionPool; +import org.eclipse.jetty.client.DuplexConnectionPool; import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.client.HttpDestination; import org.eclipse.jetty.client.LeakTrackingConnectionPool; @@ -40,9 +37,12 @@ import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.toolchain.test.TestTracker; import org.eclipse.jetty.util.LeakDetector; import org.eclipse.jetty.util.thread.QueuedThreadPool; +import org.hamcrest.Matchers; import org.junit.After; import org.junit.Rule; +import static org.junit.Assert.assertThat; + public abstract class AbstractHttpClientServerTest { @Rule @@ -71,7 +71,7 @@ public abstract class AbstractHttpClientServerTest QueuedThreadPool executor = new QueuedThreadPool(); executor.setName(executor.getName() + "-client"); - + client = new HttpClient(new HttpClientTransportOverFCGI(1, false, "") { @Override @@ -80,7 +80,7 @@ public abstract class AbstractHttpClientServerTest return new HttpDestinationOverFCGI(client, origin) { @Override - protected ConnectionPool newConnectionPool(HttpClient client) + protected DuplexConnectionPool newConnectionPool(HttpClient client) { return new LeakTrackingConnectionPool(this, client.getMaxConnectionsPerDestination(), this) { @@ -105,15 +105,15 @@ public abstract class AbstractHttpClientServerTest { System.gc(); - assertThat("Server BufferPool - leaked acquires", serverBufferPool.getLeakedAcquires(), is(0L)); - assertThat("Server BufferPool - leaked releases", serverBufferPool.getLeakedReleases(), is(0L)); - assertThat("Server BufferPool - unreleased", serverBufferPool.getLeakedResources(), is(0L)); - - assertThat("Client BufferPool - leaked acquires", clientBufferPool.getLeakedAcquires(), is(0L)); - assertThat("Client BufferPool - leaked releases", clientBufferPool.getLeakedReleases(), is(0L)); - assertThat("Client BufferPool - unreleased", clientBufferPool.getLeakedResources(), is(0L)); - - assertThat("Connection Leaks", connectionLeaks.get(), is(0L)); + assertThat("Server BufferPool - leaked acquires", serverBufferPool.getLeakedAcquires(), Matchers.is(0L)); + assertThat("Server BufferPool - leaked releases", serverBufferPool.getLeakedReleases(), Matchers.is(0L)); + assertThat("Server BufferPool - unreleased", serverBufferPool.getLeakedResources(), Matchers.is(0L)); + + assertThat("Client BufferPool - leaked acquires", clientBufferPool.getLeakedAcquires(), Matchers.is(0L)); + assertThat("Client BufferPool - leaked releases", clientBufferPool.getLeakedReleases(), Matchers.is(0L)); + assertThat("Client BufferPool - unreleased", clientBufferPool.getLeakedResources(), Matchers.is(0L)); + + assertThat("Connection Leaks", connectionLeaks.get(), Matchers.is(0L)); if (client != null) client.stop(); |