Using TestTracker Rule in test classes.

jetty · Feb 18, 2015 · 84b8882 · 84b8882
1 parent d4809e9
commit 84b8882
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/AbstractTest.java b/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/AbstractTest.java
@@ -20,7 +20,6 @@
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.TimeUnit;
-
 import javax.servlet.http.HttpServlet;
 
 import org.eclipse.jetty.http.HostPortHttpField;
@@ -38,12 +37,16 @@
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.toolchain.test.TestTracker;
 import org.eclipse.jetty.util.FuturePromise;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
 import org.junit.After;
+import org.junit.Rule;
 
 public class AbstractTest
 {
+    @Rule
+    public TestTracker tracker = new TestTracker();
     protected ServerConnector connector;
     protected String servletPath = "/test";
     protected HTTP2Client client;

diff --git a/...p2/http2-client/src/test/java/org/eclipse/jetty/http2/client/FlowControlStrategyTest.java b/...p2/http2-client/src/test/java/org/eclipse/jetty/http2/client/FlowControlStrategyTest.java
@@ -53,16 +53,20 @@
 import org.eclipse.jetty.server.HttpConfiguration;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.toolchain.test.TestTracker;
 import org.eclipse.jetty.util.Callback;
 import org.eclipse.jetty.util.FuturePromise;
 import org.eclipse.jetty.util.Promise;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
 import org.junit.After;
 import org.junit.Assert;
+import org.junit.Rule;
 import org.junit.Test;
 
 public abstract class FlowControlStrategyTest
 {
+    @Rule
+    public TestTracker tracker = new TestTracker();
     protected ServerConnector connector;
     protected HTTP2Client client;
     protected Server server;

diff --git a/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/StreamCountTest.java b/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/StreamCountTest.java
@@ -44,7 +44,7 @@
 public class StreamCountTest extends AbstractTest
 {
     @Test
-    public void testServersAllowsOneStreamEnforcedByClient() throws Exception
+    public void testServerAllowsOneStreamEnforcedByClient() throws Exception
     {
         start(new ServerSessionListener.Adapter()
         {
@@ -122,7 +122,7 @@ public void onHeaders(Stream stream, HeadersFrame frame)
     }
 
     @Test
-    public void testServersAllowsOneStreamEnforcedByServer() throws Exception
+    public void testServerAllowsOneStreamEnforcedByServer() throws Exception
     {
         final CountDownLatch resetLatch = new CountDownLatch(1);
         start(new ServerSessionListener.Adapter()

diff --git a/...y-http2/http2-server/src/test/java/org/eclipse/jetty/http2/server/AbstractServerTest.java b/...y-http2/http2-server/src/test/java/org/eclipse/jetty/http2/server/AbstractServerTest.java
@@ -23,7 +23,6 @@
 import java.net.Socket;
 import java.net.SocketTimeoutException;
 import java.nio.ByteBuffer;
-
 import javax.servlet.http.HttpServlet;
 
 import org.eclipse.jetty.http.HostPortHttpField;
@@ -42,11 +41,15 @@
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.toolchain.test.TestTracker;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
 import org.junit.After;
+import org.junit.Rule;
 
 public class AbstractServerTest
 {
+    @Rule
+    public TestTracker tracker = new TestTracker();
     protected ServerConnector connector;
     protected ByteBufferPool byteBufferPool;
     protected Generator generator;