1 files changed, 42 insertions, 56 deletions
diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
index b1f1ce9f48..17f36d571c 100644
--- a/jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
+++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
@@ -21,15 +21,12 @@ import java.net.Socket;
 import java.util.Enumeration;
 import java.util.Locale;
 import java.util.Map;
-
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSessionContext;
 
-import junit.framework.TestCase;
-
 import org.eclipse.jetty.http.HttpHeaders;
 import org.eclipse.jetty.io.ByteArrayBuffer;
 import org.eclipse.jetty.io.ByteArrayEndPoint;
@@ -39,54 +36,43 @@ import org.eclipse.jetty.server.handler.ContextHandler;
 import org.eclipse.jetty.server.session.AbstractSessionManager;
 import org.eclipse.jetty.server.session.HashSessionIdManager;
 import org.eclipse.jetty.server.session.HashSessionManager;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 /**
  *
- *
- * To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
  */
-public class ResponseTest extends TestCase
+public class ResponseTest
 {
-    Server server = new Server();
-    LocalConnector connector = new LocalConnector();
+    private Server server;
+    private LocalConnector connector;
 
-    public ResponseTest(String arg0)
+    @Before
+    public void init() throws Exception
     {
-        super(arg0);
-        server.setConnectors(new Connector[]{connector});
+        server = new Server();
+        connector = new LocalConnector();
+        server.addConnector(connector);
         server.setHandler(new DumpHandler());
-    }
-
-    public static void main(String[] args)
-    {
-        junit.textui.TestRunner.run(ResponseTest.class);
-    }
-
-    /*
-     * @see TestCase#setUp()
-     */
-    protected void setUp() throws Exception
-    {
-        super.setUp();
-
         server.start();
     }
 
-    /*
-     * @see TestCase#tearDown()
-     */
-    protected void tearDown() throws Exception
+    @After
+    public void destroy() throws Exception
     {
-        super.tearDown();
         server.stop();
+        server.join();
     }
 
-
-    public void testContentType()
-    	throws Exception
+    @Test
+    public void testContentType() throws Exception
     {
-
         HttpConnection connection = new HttpConnection(connector,new ByteArrayEndPoint(), connector.getServer());
         Response response = connection.getResponse();
 
@@ -120,9 +106,8 @@ public class ResponseTest extends TestCase
         response.recycle();
     }
 
-
-    public void testLocale()
-        throws Exception
+    @Test
+    public void testLocale() throws Exception
     {
 
         HttpConnection connection = new HttpConnection(connector,new ByteArrayEndPoint(), connector.getServer());
@@ -146,8 +131,8 @@ public class ResponseTest extends TestCase
         assertTrue(response.toString().indexOf("charset=UTF-8")>0);
     }
 
-    public void testContentTypeCharacterEncoding()
-        throws Exception
+    @Test
+    public void testContentTypeCharacterEncoding() throws Exception
     {
         HttpConnection connection = new HttpConnection(connector,new ByteArrayEndPoint(), connector.getServer());
 
@@ -179,8 +164,8 @@ public class ResponseTest extends TestCase
 
     }
 
-    public void testCharacterEncodingContentType()
-    throws Exception
+    @Test
+    public void testCharacterEncodingContentType() throws Exception
     {
         Response response = new Response(new HttpConnection(connector,new ByteArrayEndPoint(), connector.getServer()));
 
@@ -208,8 +193,8 @@ public class ResponseTest extends TestCase
 
     }
 
-    public void testContentTypeWithCharacterEncoding()
-        throws Exception
+    @Test
+    public void testContentTypeWithCharacterEncoding() throws Exception
     {
         Response response = new Response(new HttpConnection(connector,new ByteArrayEndPoint(), connector.getServer()));
 
@@ -237,8 +222,8 @@ public class ResponseTest extends TestCase
 
     }
 
-    public void testContentTypeWithOther()
-    throws Exception
+    @Test
+    public void testContentTypeWithOther() throws Exception
     {
         Response response = new Response(new HttpConnection(connector,new ByteArrayEndPoint(), connector.getServer()));
 
@@ -260,9 +245,8 @@ public class ResponseTest extends TestCase
         assertEquals("text/xml;charset=UTF-8",response.getContentType());
     }
 
-
-    public void testContentTypeWithCharacterEncodingAndOther()
-        throws Exception
+    @Test
+    public void testContentTypeWithCharacterEncodingAndOther() throws Exception
     {
         Response response = new Response(new HttpConnection(connector,new ByteArrayEndPoint(), connector.getServer()));
 
@@ -290,6 +274,7 @@ public class ResponseTest extends TestCase
 
     }
 
+    @Test
     public void testStatusCodes() throws Exception
     {
         Response response=newResponse();
@@ -319,6 +304,7 @@ public class ResponseTest extends TestCase
         assertEquals("must-revalidate,no-cache,no-store", response.getHeader(HttpHeaders.CACHE_CONTROL));
     }
 
+    @Test
     public void testEncodeRedirect()
         throws Exception
     {
@@ -339,21 +325,21 @@ public class ResponseTest extends TestCase
         request.setSession(new TestSession(manager,"12345"));
 
         manager.setCheckingRemoteSessionIdEncoding(false);
-        
+
         assertEquals("http://myhost:8888/path/info;param;jsessionid=12345?query=0&more=1#target",response.encodeURL("http://myhost:8888/path/info;param?query=0&more=1#target"));
         assertEquals("http://other:8888/path/info;param;jsessionid=12345?query=0&more=1#target",response.encodeURL("http://other:8888/path/info;param?query=0&more=1#target"));
         assertEquals("http://myhost/path/info;param;jsessionid=12345?query=0&more=1#target",response.encodeURL("http://myhost/path/info;param?query=0&more=1#target"));
         assertEquals("http://myhost:8888/other/info;param;jsessionid=12345?query=0&more=1#target",response.encodeURL("http://myhost:8888/other/info;param?query=0&more=1#target"));
-        
+
         manager.setCheckingRemoteSessionIdEncoding(true);
         assertEquals("http://myhost:8888/path/info;param;jsessionid=12345?query=0&more=1#target",response.encodeURL("http://myhost:8888/path/info;param?query=0&more=1#target"));
         assertEquals("http://other:8888/path/info;param?query=0&more=1#target",response.encodeURL("http://other:8888/path/info;param?query=0&more=1#target"));
         assertEquals("http://myhost/path/info;param?query=0&more=1#target",response.encodeURL("http://myhost/path/info;param?query=0&more=1#target"));
-        assertEquals("http://myhost:8888/other/info;param?query=0&more=1#target",response.encodeURL("http://myhost:8888/other/info;param?query=0&more=1#target"));    
+        assertEquals("http://myhost:8888/other/info;param?query=0&more=1#target",response.encodeURL("http://myhost:8888/other/info;param?query=0&more=1#target"));
     }
 
-    public void testSetBufferSize ()
-    throws Exception
+    @Test
+    public void testSetBufferSize () throws Exception
     {
         Response response = new Response(new HttpConnection(connector,new ByteArrayEndPoint(), connector.getServer()));
         response.setBufferSize(20*1024);
@@ -369,6 +355,7 @@ public class ResponseTest extends TestCase
         }
     }
 
+    @Test
     public void testHead() throws Exception
     {
         Server server = new Server();
@@ -428,7 +415,7 @@ public class ResponseTest extends TestCase
         return response;
     }
 
-    class TestSession extends AbstractSessionManager.Session
+    private class TestSession extends AbstractSessionManager.Session
     {
         public TestSession(AbstractSessionManager abstractSessionManager, String id)
         {
@@ -518,7 +505,6 @@ public class ResponseTest extends TestCase
 
         protected Map newAttributeMap()
         {
-            // TODO Auto-generated method stub
             return null;
         }
     }