Converted the tests to JUnit 4.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1150877 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java b/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
index 54e6d81..192137c 100644 (file)
--- a/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
+++ b/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
@@ -16,10 +16,15 @@
  */
 package org.apache.coyote.ajp;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
 import org.apache.catalina.startup.Tomcat;
-import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.catalina.startup.TomcatBaseTestJUnit4;
 
-public class TestAbstractAjpProcessor extends TomcatBaseTest {
+public class TestAbstractAjpProcessor extends TomcatBaseTestJUnit4 {
 
     @Override
     protected String getProtocol() {
@@ -43,7 +48,8 @@ public class TestAbstractAjpProcessor extends TomcatBaseTest {
         
         return protocol;
     }
-    
+
+    @Test
     public void testKeepAlive() throws Exception {
         Tomcat tomcat = getTomcatInstance();
         tomcat.getConnector().setProperty("connectionTimeout", "-1");
@@ -159,8 +165,8 @@ public class TestAbstractAjpProcessor extends TomcatBaseTest {
         if (message.readByte() > 0) {
             reuse = true;
         }
-        
-        assertEquals(expectedReuse, reuse);
+
+        assertEquals(Boolean.valueOf(expectedReuse), Boolean.valueOf(reuse));
     }
 
     private void validateCpong(TesterAjpMessage message) throws Exception {

diff --git a/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java b/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java
index 41660d7..f2c7fc1 100644 (file)
--- a/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java
+++ b/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java
@@ -19,14 +19,21 @@ package org.apache.coyote.http11;
 import java.io.File;
 import java.io.IOException;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
 import org.apache.catalina.Context;
 import org.apache.catalina.startup.SimpleHttpClient;
 import org.apache.catalina.startup.TesterServlet;
 import org.apache.catalina.startup.Tomcat;
-import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.catalina.startup.TomcatBaseTestJUnit4;
 
-public class TestAbstractHttp11Processor extends TomcatBaseTest {
+public class TestAbstractHttp11Processor extends TomcatBaseTestJUnit4 {
 
+    @Test
     public void testWithTEVoid() throws Exception {
         Tomcat tomcat = getTomcatInstance();
         
@@ -55,6 +62,7 @@ public class TestAbstractHttp11Processor extends TomcatBaseTest {
         assertTrue(client.isResponse501());
     }
 
+    @Test
     public void testWithTEBuffered() throws Exception {
         Tomcat tomcat = getTomcatInstance();
         
@@ -84,6 +92,7 @@ public class TestAbstractHttp11Processor extends TomcatBaseTest {
     }
 
 
+    @Test
     public void testWithTEIdentity() throws Exception {
         Tomcat tomcat = getTomcatInstance();
         
@@ -115,6 +124,7 @@ public class TestAbstractHttp11Processor extends TomcatBaseTest {
     }
 
 
+    @Test
     public void testWithTESavedRequest() throws Exception {
         Tomcat tomcat = getTomcatInstance();
         
@@ -144,6 +154,7 @@ public class TestAbstractHttp11Processor extends TomcatBaseTest {
     }
 
 
+    @Test
     public void testWithTEUnsupported() throws Exception {
         Tomcat tomcat = getTomcatInstance();
         
@@ -173,6 +184,7 @@ public class TestAbstractHttp11Processor extends TomcatBaseTest {
     }
 
 
+    @Test
     public void testPipelining() throws Exception {
         Tomcat tomcat = getTomcatInstance();
         

diff --git a/test/org/apache/coyote/http11/TestInternalInputBuffer.java b/test/org/apache/coyote/http11/TestInternalInputBuffer.java
index a186872..074726c 100644 (file)
--- a/test/org/apache/coyote/http11/TestInternalInputBuffer.java
+++ b/test/org/apache/coyote/http11/TestInternalInputBuffer.java
@@ -26,18 +26,23 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
 import org.apache.catalina.Context;
 import org.apache.catalina.connector.Connector;
 import org.apache.catalina.startup.SimpleHttpClient;
 import org.apache.catalina.startup.Tomcat;
-import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.catalina.startup.TomcatBaseTestJUnit4;
 
-public class TestInternalInputBuffer extends TomcatBaseTest {
+public class TestInternalInputBuffer extends TomcatBaseTestJUnit4 {
     
     /**
      * Test case for https://issues.apache.org/bugzilla/show_bug.cgi?id=48839
      * with BIO
      */
+    @Test
     public void testBug48839BIO() {
         
         Bug48839Client client = new Bug48839Client();
@@ -54,6 +59,7 @@ public class TestInternalInputBuffer extends TomcatBaseTest {
      * Test case for https://issues.apache.org/bugzilla/show_bug.cgi?id=48839
      * with NIO
      */
+    @Test
     public void testBug48839NIO() {
         
         Bug48839Client client = new Bug48839Client();

diff --git a/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java b/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
index f85cc38..83d02da 100644 (file)
--- a/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
+++ b/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
@@ -26,13 +26,19 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
 import org.apache.catalina.Context;
 import org.apache.catalina.startup.SimpleHttpClient;
 import org.apache.catalina.startup.Tomcat;
-import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.catalina.startup.TomcatBaseTestJUnit4;
 
-public class TestChunkedInputFilter extends TomcatBaseTest {
+public class TestChunkedInputFilter extends TomcatBaseTestJUnit4 {
 
+    @Test
     public void testTrailingHeaders() throws Exception {
         // Setup Tomcat instance
         Tomcat tomcat = getTomcatInstance();
@@ -71,6 +77,7 @@ public class TestChunkedInputFilter extends TomcatBaseTest {
         assertEquals("null7TestTestTest0123456789abcdefghijABCDEFGHIJopqrstuvwxyz", client.getResponseBody());
     }
 
+    @Test
     public void testTrailingHeadersSizeLimit() throws Exception {
         // Setup Tomcat instance
         Tomcat tomcat = getTomcatInstance();
@@ -113,6 +120,7 @@ public class TestChunkedInputFilter extends TomcatBaseTest {
         assertTrue(client.isResponse500());
     }
 
+    @Test
     public void testNoTrailingHeaders() throws Exception {
         // Setup Tomcat instance
         Tomcat tomcat = getTomcatInstance();

diff --git a/test/org/apache/el/TestELInJsp.java b/test/org/apache/el/TestELInJsp.java
index c3ed96c..56f440f 100644 (file)
--- a/test/org/apache/el/TestELInJsp.java
+++ b/test/org/apache/el/TestELInJsp.java
@@ -19,8 +19,12 @@ package org.apache.el;
 
 import java.io.File;
 
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
 import org.apache.catalina.startup.Tomcat;
-import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.catalina.startup.TomcatBaseTestJUnit4;
 import org.apache.tomcat.util.buf.ByteChunk;
 
 /**
@@ -28,8 +32,9 @@ import org.apache.tomcat.util.buf.ByteChunk;
  * tests may be found in {@link TestELEvaluation} and
  * {@link org.apache.jasper.compiler.TestAttributeParser}.
  */
-public class TestELInJsp extends TomcatBaseTest {
-    
+public class TestELInJsp extends TomcatBaseTestJUnit4 {
+
+    @Test
     public void testBug36923() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
@@ -46,6 +51,7 @@ public class TestELInJsp extends TomcatBaseTest {
         assertEcho(result, "00-${hello world}");
     }
 
+    @Test
     public void testBug42565() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
@@ -77,6 +83,7 @@ public class TestELInJsp extends TomcatBaseTest {
         assertEcho(result, "15-false");
     }
 
+    @Test
     public void testBug44994() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
@@ -96,6 +103,7 @@ public class TestELInJsp extends TomcatBaseTest {
         assertEcho(result, "02-many");
     }
 
+    @Test
     public void testBug45427() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
@@ -131,6 +139,7 @@ public class TestELInJsp extends TomcatBaseTest {
         assertEcho(result, "17-hello \"world");
     }
 
+    @Test
     public void testBug45451() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
@@ -231,6 +240,7 @@ public class TestELInJsp extends TomcatBaseTest {
         assertEcho(result, "13-\\\\#{1+1}");
     }
 
+    @Test
     public void testBug45511() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
@@ -249,6 +259,7 @@ public class TestELInJsp extends TomcatBaseTest {
         assertEcho(result, "01-false");
     }
 
+    @Test
     public void testBug46596() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
@@ -264,7 +275,8 @@ public class TestELInJsp extends TomcatBaseTest {
         String result = res.toString();
         assertEcho(result, "{OK}");
     }
-    
+
+    @Test
     public void testBug47413() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
@@ -293,6 +305,7 @@ public class TestELInJsp extends TomcatBaseTest {
         assertEcho(result, "11-0");
     }
 
+    @Test
     public void testBug48112() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
@@ -308,7 +321,8 @@ public class TestELInJsp extends TomcatBaseTest {
         String result = res.toString();
         assertEcho(result, "{OK}");
     }
-    
+
+    @Test
     public void testBug49555() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
@@ -325,6 +339,7 @@ public class TestELInJsp extends TomcatBaseTest {
         assertEcho(result, "00-" + TesterFunctions.Inner$Class.RETVAL);
     }
 
+    @Test
     public void testBug51544() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
@@ -341,6 +356,7 @@ public class TestELInJsp extends TomcatBaseTest {
         assertEcho(result, "Empty list: true");
     }
 
+    @Test
     public void testELMisc() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
@@ -374,6 +390,7 @@ public class TestELInJsp extends TomcatBaseTest {
         assertEcho(result, "17-foo\\bar\\baz");
     }
 
+    @Test
     public void testScriptingExpression() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
@@ -401,6 +418,7 @@ public class TestELInJsp extends TomcatBaseTest {
         assertEcho(result, "11-hello %> world");
     }
 
+    @Test
     public void testELMethod() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 

diff --git a/test/org/apache/naming/resources/TestNamingContext.java b/test/org/apache/naming/resources/TestNamingContext.java
index 2ac9997..3726e6f 100644 (file)
--- a/test/org/apache/naming/resources/TestNamingContext.java
+++ b/test/org/apache/naming/resources/TestNamingContext.java
@@ -29,18 +29,24 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
 import org.apache.catalina.core.StandardContext;
 import org.apache.catalina.deploy.ContextResource;
 import org.apache.catalina.startup.Tomcat;
-import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.catalina.startup.TomcatBaseTestJUnit4;
 import org.apache.tomcat.util.buf.ByteChunk;
 
-public class TestNamingContext extends TomcatBaseTest {
+public class TestNamingContext extends TomcatBaseTestJUnit4 {
 
+    @Test
     public void testLookupSingletonResource() throws Exception {
         doTestLookup(true);
     }
-    
+
+    @Test
     public void testLookupNonSingletonResource() throws Exception {
         doTestLookup(false);
     }
@@ -106,6 +112,7 @@ public class TestNamingContext extends TomcatBaseTest {
         }
     }
 
+    @Test
     public void testListBindings() throws Exception {
         Tomcat tomcat = getTomcatInstance();
         tomcat.enableNaming();
@@ -156,7 +163,8 @@ public class TestNamingContext extends TomcatBaseTest {
             }
         }
     }
-    
+
+    @Test
     public void testBeanFactory() throws Exception {
         Tomcat tomcat = getTomcatInstance();
         tomcat.enableNaming();

diff --git a/test/org/apache/naming/resources/TestProxyDirContext.java b/test/org/apache/naming/resources/TestProxyDirContext.java
index 6977e6c..d466b06 100644 (file)
--- a/test/org/apache/naming/resources/TestProxyDirContext.java
+++ b/test/org/apache/naming/resources/TestProxyDirContext.java
@@ -18,20 +18,25 @@ package org.apache.naming.resources;
 
 import javax.naming.NameNotFoundException;
 
+import static org.junit.Assert.fail;
+
+import org.junit.Test;
+
 import org.apache.catalina.core.StandardContext;
 import org.apache.catalina.startup.Tomcat;
-import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.catalina.startup.TomcatBaseTestJUnit4;
 
 /**
  * Unit test for the {@link ProxyDirContext}.
  * @author Marc Guillemot
  * @version $Revision: $
  */
-public class TestProxyDirContext extends TomcatBaseTest {
+public class TestProxyDirContext extends TomcatBaseTestJUnit4 {
 
     /**
      * lookup doesn't always throw the same exception.
      */
+    @Test
     public void testLookupException() throws Exception {
         Tomcat tomcat = getTomcatInstance();
         

diff --git a/test/org/apache/naming/resources/TestWarDirContext.java b/test/org/apache/naming/resources/TestWarDirContext.java
index a21a501..24898a8 100644 (file)
--- a/test/org/apache/naming/resources/TestWarDirContext.java
+++ b/test/org/apache/naming/resources/TestWarDirContext.java
@@ -18,13 +18,17 @@ package org.apache.naming.resources;
 
 import java.io.File;
 
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
 import org.apache.catalina.core.JreMemoryLeakPreventionListener;
 import org.apache.catalina.core.StandardContext;
 import org.apache.catalina.startup.Tomcat;
-import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.catalina.startup.TomcatBaseTestJUnit4;
 import org.apache.tomcat.util.buf.ByteChunk;
 
-public class TestWarDirContext extends TomcatBaseTest {
+public class TestWarDirContext extends TomcatBaseTestJUnit4 {
     
     @Override
     public void setUp() throws Exception {
@@ -43,6 +47,7 @@ public class TestWarDirContext extends TomcatBaseTest {
     /**
      * Check https://jira.springsource.org/browse/SPR-7350 isn't really an issue
      */
+    @Test
     public void testLookupException() throws Exception {
         Tomcat tomcat = getTomcatInstance();
         
@@ -63,6 +68,7 @@ public class TestWarDirContext extends TomcatBaseTest {
      * Additional test following on from SPR-7350 above to check files that
      * contain JNDI reserved characters can be served when caching is enabled.
      */
+    @Test
     public void testReservedJNDIFileNamesWithCache() throws Exception {
         Tomcat tomcat = getTomcatInstance();
         
@@ -92,6 +98,7 @@ public class TestWarDirContext extends TomcatBaseTest {
      * Additional test following on from SPR-7350 above to check files that
      * contain JNDI reserved characters can be served when caching is disabled.
      */
+    @Test
     public void testReservedJNDIFileNamesNoCache() throws Exception {
         Tomcat tomcat = getTomcatInstance();