1 files changed, 32 insertions, 29 deletions
diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ScopedHandlerTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ScopedHandlerTest.java
index 13312809f4..5956b54b48 100644
--- a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ScopedHandlerTest.java
+++ b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ScopedHandlerTest.java
@@ -1,23 +1,29 @@
 package org.eclipse.jetty.server.handler;
 
 import java.io.IOException;
-
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import junit.framework.TestCase;
-
 import org.eclipse.jetty.server.Request;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
 
-public class ScopedHandlerTest extends TestCase
+public class ScopedHandlerTest
 {
-    StringBuilder _history=new StringBuilder();
+    private StringBuilder _history=new StringBuilder();
 
-    public void testSingle()
-        throws Exception
+    @Before
+    public void resetHistory()
     {
         _history.setLength(0);
+    }
+
+    @Test
+    public void testSingle() throws Exception
+    {
         TestHandler handler0 = new TestHandler("0");
         handler0.start();
         handler0.handle("target",null,null,null);
@@ -27,10 +33,9 @@ public class ScopedHandlerTest extends TestCase
         assertEquals(">S0>W0<W0<S0",history);
     }
 
-    public void testSimpleDouble()
-    throws Exception
+    @Test
+    public void testSimpleDouble() throws Exception
     {
-        _history.setLength(0);
         TestHandler handler0 = new TestHandler("0");
         TestHandler handler1 = new TestHandler("1");
         handler0.setHandler(handler1);
@@ -42,10 +47,9 @@ public class ScopedHandlerTest extends TestCase
         assertEquals(">S0>S1>W0>W1<W1<W0<S1<S0",history);
     }
 
-    public void testSimpleTriple()
-    throws Exception
+    @Test
+    public void testSimpleTriple() throws Exception
     {
-        _history.setLength(0);
         TestHandler handler0 = new TestHandler("0");
         TestHandler handler1 = new TestHandler("1");
         TestHandler handler2 = new TestHandler("2");
@@ -59,10 +63,9 @@ public class ScopedHandlerTest extends TestCase
         assertEquals(">S0>S1>S2>W0>W1>W2<W2<W1<W0<S2<S1<S0",history);
     }
 
-    public void testDouble()
-    throws Exception
+    @Test
+    public void testDouble() throws Exception
     {
-        _history.setLength(0);
         TestHandler handler0 = new TestHandler("0");
         OtherHandler handlerA = new OtherHandler("A");
         TestHandler handler1 = new TestHandler("1");
@@ -78,10 +81,9 @@ public class ScopedHandlerTest extends TestCase
         assertEquals(">S0>S1>W0>HA>W1>HB<HB<W1<HA<W0<S1<S0",history);
     }
 
-    public void testTriple()
-    throws Exception
+    @Test
+    public void testTriple() throws Exception
     {
-        _history.setLength(0);
         TestHandler handler0 = new TestHandler("0");
         OtherHandler handlerA = new OtherHandler("A");
         TestHandler handler1 = new TestHandler("1");
@@ -100,15 +102,16 @@ public class ScopedHandlerTest extends TestCase
         System.err.println(history);
         assertEquals(">S0>S1>S2>W0>HA>W1>HB>W2>HC<HC<W2<HB<W1<HA<W0<S2<S1<S0",history);
     }
-    
+
     private class TestHandler extends ScopedHandler
     {
-        String _name;
-        TestHandler(String name)
+        private final String _name;
+
+        private TestHandler(String name)
         {
             _name=name;
         }
-        
+
         @Override
         public void doScope(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
         {
@@ -122,7 +125,7 @@ public class ScopedHandlerTest extends TestCase
                 _history.append("<S").append(_name);
             }
         }
-        
+
         @Override
         public void doHandle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
         {
@@ -138,16 +141,16 @@ public class ScopedHandlerTest extends TestCase
         }
 
     }
-    
+
     private class OtherHandler extends HandlerWrapper
     {
-        String _name;
-        
-        OtherHandler(String name)
+        private final String _name;
+
+        private OtherHandler(String name)
         {
             _name=name;
         }
-        
+
         @Override
         public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
         {