Converted the tests to JUnit 4.

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

diff --git a/test/org/apache/tomcat/util/http/CookiesBaseTest.java b/test/org/apache/tomcat/util/http/CookiesBaseTest.java
index b5a4921..c559ebd 100644 (file)
--- a/test/org/apache/tomcat/util/http/CookiesBaseTest.java
+++ b/test/org/apache/tomcat/util/http/CookiesBaseTest.java
@@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.catalina.Context;
 import org.apache.catalina.startup.Tomcat;
-import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.catalina.startup.TomcatBaseTestJUnit4;
 
 /**
  * Base Test case for {@link Cookies}. <b>Note</b> because of the use of
@@ -34,7 +34,7 @@ import org.apache.catalina.startup.TomcatBaseTest;
  * must be executed in a new JVM instance. The tests have been place in separate
  * classes to facilitate this when running the unit tests via Ant.
  */
-public abstract class CookiesBaseTest extends TomcatBaseTest {
+public abstract class CookiesBaseTest extends TomcatBaseTestJUnit4 {
 
     /**
      * Servlet for cookie naming test.
@@ -89,7 +89,7 @@ public abstract class CookiesBaseTest extends TomcatBaseTest {
         ctx.addServletMapping("/switch", "switch");
 
     }
-    
+
     public abstract void testCookiesInstance() throws Exception;
     
 }

diff --git a/test/org/apache/tomcat/util/http/TestBug49158.java b/test/org/apache/tomcat/util/http/TestBug49158.java
index e2875b1..027bdcd 100644 (file)
--- a/test/org/apache/tomcat/util/http/TestBug49158.java
+++ b/test/org/apache/tomcat/util/http/TestBug49158.java
@@ -28,6 +28,10 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
 import org.apache.catalina.Context;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.tomcat.util.buf.ByteChunk;
@@ -42,6 +46,7 @@ public class TestBug49158 extends CookiesBaseTest {
     public static final String path = "49158";
     
     @Override
+    @Test
     public void testCookiesInstance() throws Exception {
         Tomcat tomcat = getTomcatInstance();
         addServlets(tomcat);

diff --git a/test/org/apache/tomcat/util/http/TestCookiesAllowEquals.java b/test/org/apache/tomcat/util/http/TestCookiesAllowEquals.java
index bc80d50..8f86851 100644 (file)
--- a/test/org/apache/tomcat/util/http/TestCookiesAllowEquals.java
+++ b/test/org/apache/tomcat/util/http/TestCookiesAllowEquals.java
@@ -24,17 +24,22 @@ 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.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 TestCookiesAllowEquals extends TomcatBaseTest{
+public class TestCookiesAllowEquals extends TomcatBaseTestJUnit4 {
 
     private static final String COOKIE_WITH_EQUALS_1 = "name=equals=middle";
     private static final String COOKIE_WITH_EQUALS_2 = "name==equalsstart";
     private static final String COOKIE_WITH_EQUALS_3 = "name=equalsend=";
-    
+
+    @Test
     public void testWithEquals() throws Exception {
         System.setProperty(
                 "org.apache.tomcat.util.http.ServerCookie.ALLOW_EQUALS_IN_VALUE",

diff --git a/test/org/apache/tomcat/util/http/TestCookiesAllowHttpSeps.java b/test/org/apache/tomcat/util/http/TestCookiesAllowHttpSeps.java
index cae9aef..4026470 100644 (file)
--- a/test/org/apache/tomcat/util/http/TestCookiesAllowHttpSeps.java
+++ b/test/org/apache/tomcat/util/http/TestCookiesAllowHttpSeps.java
@@ -24,15 +24,20 @@ 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.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 TestCookiesAllowHttpSeps extends TomcatBaseTest{
+public class TestCookiesAllowHttpSeps extends TomcatBaseTestJUnit4 {
 
     private static final String COOKIE_WITH_SEPS = "name=val(ue";
-    
+
+    @Test
     public void testWithHttpSep() throws Exception {
         System.setProperty(
                 "org.apache.tomcat.util.http.ServerCookie.ALLOW_HTTP_SEPARATORS_IN_V0",

diff --git a/test/org/apache/tomcat/util/http/TestCookiesAllowNameOnly.java b/test/org/apache/tomcat/util/http/TestCookiesAllowNameOnly.java
index 8a95137..f206f56 100644 (file)
--- a/test/org/apache/tomcat/util/http/TestCookiesAllowNameOnly.java
+++ b/test/org/apache/tomcat/util/http/TestCookiesAllowNameOnly.java
@@ -24,16 +24,21 @@ 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.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 TestCookiesAllowNameOnly extends TomcatBaseTest{
+public class TestCookiesAllowNameOnly extends TomcatBaseTestJUnit4 {
 
     private static final String COOKIE_WITH_NAME_ONLY_1 = "bob";
     private static final String COOKIE_WITH_NAME_ONLY_2 = "bob=";
-    
+
+    @Test
     public void testWithEquals() throws Exception {
         System.setProperty(
                 "org.apache.tomcat.util.http.ServerCookie.ALLOW_NAME_ONLY",

diff --git a/test/org/apache/tomcat/util/http/TestCookiesDefaultSysProps.java b/test/org/apache/tomcat/util/http/TestCookiesDefaultSysProps.java
index de32d19..02954de 100644 (file)
--- a/test/org/apache/tomcat/util/http/TestCookiesDefaultSysProps.java
+++ b/test/org/apache/tomcat/util/http/TestCookiesDefaultSysProps.java
@@ -21,6 +21,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
 import org.apache.catalina.startup.Tomcat;
 import org.apache.tomcat.util.buf.ByteChunk;
 
@@ -33,6 +37,7 @@ import org.apache.tomcat.util.buf.ByteChunk;
 public class TestCookiesDefaultSysProps extends CookiesBaseTest {
 
     @Override
+    @Test
     public void testCookiesInstance() throws Exception {
 
         Tomcat tomcat = getTomcatInstance();

diff --git a/test/org/apache/tomcat/util/http/TestCookiesDisallowEquals.java b/test/org/apache/tomcat/util/http/TestCookiesDisallowEquals.java
index 8123a84..9995abd 100644 (file)
--- a/test/org/apache/tomcat/util/http/TestCookiesDisallowEquals.java
+++ b/test/org/apache/tomcat/util/http/TestCookiesDisallowEquals.java
@@ -24,16 +24,21 @@ 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.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 TestCookiesDisallowEquals extends TomcatBaseTest{
+public class TestCookiesDisallowEquals extends TomcatBaseTestJUnit4 {
 
     private static final String COOKIE_WITH_EQUALS = "name=value=withequals";
     private static final String COOKIE_TRUNCATED = "name=value";
-    
+
+    @Test
     public void testWithEquals() throws Exception {
         TestCookieEqualsClient client = new TestCookieEqualsClient();
         client.doRequest();

diff --git a/test/org/apache/tomcat/util/http/TestCookiesNoFwdStrictSysProps.java b/test/org/apache/tomcat/util/http/TestCookiesNoFwdStrictSysProps.java
index f7f18bd..08cd7de 100644 (file)
--- a/test/org/apache/tomcat/util/http/TestCookiesNoFwdStrictSysProps.java
+++ b/test/org/apache/tomcat/util/http/TestCookiesNoFwdStrictSysProps.java
@@ -17,6 +17,10 @@
 
 package org.apache.tomcat.util.http;
 
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
 import org.apache.catalina.startup.Tomcat;
 import org.apache.tomcat.util.buf.ByteChunk;
 
@@ -29,6 +33,7 @@ import org.apache.tomcat.util.buf.ByteChunk;
 public class TestCookiesNoFwdStrictSysProps extends CookiesBaseTest {
     
     @Override
+    @Test
     public void testCookiesInstance() throws Exception {
 
         System.setProperty("org.apache.catalina.STRICT_SERVLET_COMPLIANCE",

diff --git a/test/org/apache/tomcat/util/http/TestCookiesNoStrictNamingSysProps.java b/test/org/apache/tomcat/util/http/TestCookiesNoStrictNamingSysProps.java
index 0a21982..807a87f 100644 (file)
--- a/test/org/apache/tomcat/util/http/TestCookiesNoStrictNamingSysProps.java
+++ b/test/org/apache/tomcat/util/http/TestCookiesNoStrictNamingSysProps.java
@@ -17,6 +17,10 @@
 
 package org.apache.tomcat.util.http;
 
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
 import org.apache.catalina.startup.Tomcat;
 import org.apache.tomcat.util.buf.ByteChunk;
 
@@ -29,6 +33,7 @@ import org.apache.tomcat.util.buf.ByteChunk;
 public class TestCookiesNoStrictNamingSysProps extends CookiesBaseTest {
 
     @Override
+    @Test
     public void testCookiesInstance() throws Exception {
     
         System.setProperty("org.apache.catalina.STRICT_SERVLET_COMPLIANCE",

diff --git a/test/org/apache/tomcat/util/http/TestCookiesStrictSysProps.java b/test/org/apache/tomcat/util/http/TestCookiesStrictSysProps.java
index 130a65f..c846999 100644 (file)
--- a/test/org/apache/tomcat/util/http/TestCookiesStrictSysProps.java
+++ b/test/org/apache/tomcat/util/http/TestCookiesStrictSysProps.java
@@ -21,6 +21,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
 import org.apache.catalina.startup.Tomcat;
 import org.apache.tomcat.util.buf.ByteChunk;
 
@@ -33,6 +37,7 @@ import org.apache.tomcat.util.buf.ByteChunk;
 public class TestCookiesStrictSysProps extends CookiesBaseTest {
 
     @Override
+    @Test
     public void testCookiesInstance() throws Exception {
 
         System.setProperty("org.apache.catalina.STRICT_SERVLET_COMPLIANCE",