From 14a96d40a266eea02683d51e6f76f7a3a8b415ba Mon Sep 17 00:00:00 2001 From: kkolinko Date: Mon, 25 Jul 2011 22:20:19 +0000 Subject: [PATCH] Conversion of TomcatBaseTest classes to JUnit 4 completed. Rename TomcatBaseTestJUnit4 -> TomcatBaseTest. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1150939 13f79535-47bb-0310-9956-ffa450edef68 --- test/javax/el/TestCompositeELResolver.java | 4 +- test/javax/servlet/jsp/TestPageContext.java | 4 +- .../authenticator/TestDigestAuthenticator.java | 4 +- .../authenticator/TestFormAuthenticator.java | 4 +- .../TesterDigestAuthenticatorPerformance.java | 4 +- .../apache/catalina/comet/TestCometProcessor.java | 4 +- .../apache/catalina/connector/TestConnector.java | 4 +- .../catalina/connector/TestCoyoteAdapter.java | 4 +- .../catalina/connector/TestKeepAliveCount.java | 4 +- .../catalina/connector/TestMaxConnections.java | 4 +- .../org/apache/catalina/connector/TestRequest.java | 4 +- .../apache/catalina/connector/TestResponse.java | 4 +- .../apache/catalina/core/TestAsyncContextImpl.java | 4 +- .../catalina/core/TestNamingContextListener.java | 4 +- .../apache/catalina/core/TestStandardContext.java | 4 +- .../catalina/core/TestStandardContextAliases.java | 4 +- .../core/TestStandardContextResources.java | 4 +- .../apache/catalina/core/TestStandardWrapper.java | 4 +- .../catalina/core/TestSwallowAbortedUploads.java | 4 +- .../catalina/filters/TestAddCharSetFilter.java | 4 +- .../catalina/filters/TestCsrfPreventionFilter.java | 4 +- .../apache/catalina/filters/TestExpiresFilter.java | 4 +- .../catalina/filters/TestRemoteIpFilter.java | 4 +- .../catalina/loader/TestVirtualWebappLoader.java | 4 +- .../loader/TestWebappClassLoaderMemoryLeak.java | 4 +- .../apache/catalina/mbeans/TestRegistration.java | 4 +- .../catalina/servlets/TestDefaultServlet.java | 3 +- .../catalina/servlets/TestWebdavServlet.java | 3 +- .../apache/catalina/startup/TestContextConfig.java | 2 +- test/org/apache/catalina/startup/TestListener.java | 2 +- test/org/apache/catalina/startup/TestTomcat.java | 2 +- .../catalina/startup/TestTomcatClassLoader.java | 2 +- .../apache/catalina/startup/TomcatBaseTest.java | 11 +- .../catalina/startup/TomcatBaseTestJUnit4.java | 361 --------------------- .../coyote/ajp/TestAbstractAjpProcessor.java | 4 +- .../coyote/http11/TestAbstractHttp11Processor.java | 4 +- .../coyote/http11/TestInternalInputBuffer.java | 4 +- .../http11/filters/TestChunkedInputFilter.java | 4 +- test/org/apache/el/TestELInJsp.java | 4 +- test/org/apache/jasper/compiler/TestCompiler.java | 4 +- test/org/apache/jasper/compiler/TestGenerator.java | 4 +- test/org/apache/jasper/compiler/TestJspConfig.java | 4 +- .../jasper/compiler/TestJspDocumentParser.java | 4 +- test/org/apache/jasper/compiler/TestParser.java | 4 +- .../compiler/TestParserNoStrictWhitespace.java | 4 +- .../jasper/compiler/TestScriptingVariabler.java | 4 +- test/org/apache/jasper/compiler/TestValidator.java | 4 +- .../apache/naming/resources/TestNamingContext.java | 4 +- .../naming/resources/TestProxyDirContext.java | 4 +- .../apache/naming/resources/TestWarDirContext.java | 4 +- .../apache/tomcat/util/http/CookiesBaseTest.java | 4 +- .../tomcat/util/http/TestCookiesAllowEquals.java | 4 +- .../tomcat/util/http/TestCookiesAllowHttpSeps.java | 4 +- .../tomcat/util/http/TestCookiesAllowNameOnly.java | 4 +- .../util/http/TestCookiesDisallowEquals.java | 4 +- .../util/http/mapper/TestMapperWelcomeFiles.java | 4 +- .../org/apache/tomcat/util/net/TestClientCert.java | 4 +- test/org/apache/tomcat/util/net/TestCustomSsl.java | 4 +- test/org/apache/tomcat/util/net/TestSsl.java | 4 +- .../apache/tomcat/util/net/TestXxxEndpoint.java | 4 +- .../apache/tomcat/util/scan/TestJarScanner.java | 4 +- 61 files changed, 119 insertions(+), 479 deletions(-) delete mode 100644 test/org/apache/catalina/startup/TomcatBaseTestJUnit4.java diff --git a/test/javax/el/TestCompositeELResolver.java b/test/javax/el/TestCompositeELResolver.java index bfad6517c..0925eb9f7 100644 --- a/test/javax/el/TestCompositeELResolver.java +++ b/test/javax/el/TestCompositeELResolver.java @@ -26,10 +26,10 @@ import org.junit.Test; import org.apache.catalina.core.StandardContext; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; import org.apache.tomcat.util.buf.ByteChunk; -public class TestCompositeELResolver extends TomcatBaseTestJUnit4 { +public class TestCompositeELResolver extends TomcatBaseTest { @Test public void testBug50408() throws Exception { diff --git a/test/javax/servlet/jsp/TestPageContext.java b/test/javax/servlet/jsp/TestPageContext.java index c859de3ef..c1b29d9b2 100644 --- a/test/javax/servlet/jsp/TestPageContext.java +++ b/test/javax/servlet/jsp/TestPageContext.java @@ -24,10 +24,10 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; import org.apache.tomcat.util.buf.ByteChunk; -public class TestPageContext extends TomcatBaseTestJUnit4 { +public class TestPageContext extends TomcatBaseTest { @Test public void testBug49196() throws Exception { diff --git a/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java b/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java index c2ad30567..40714d8ab 100644 --- a/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java +++ b/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java @@ -35,11 +35,11 @@ import org.apache.catalina.deploy.SecurityConstraint; import org.apache.catalina.startup.TestTomcat.MapRealm; import org.apache.catalina.startup.TesterServlet; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; import org.apache.catalina.util.MD5Encoder; import org.apache.tomcat.util.buf.ByteChunk; -public class TestDigestAuthenticator extends TomcatBaseTestJUnit4 { +public class TestDigestAuthenticator extends TomcatBaseTest { private static String USER = "user"; private static String PWD = "pwd"; diff --git a/test/org/apache/catalina/authenticator/TestFormAuthenticator.java b/test/org/apache/catalina/authenticator/TestFormAuthenticator.java index d681914eb..9178dbed9 100644 --- a/test/org/apache/catalina/authenticator/TestFormAuthenticator.java +++ b/test/org/apache/catalina/authenticator/TestFormAuthenticator.java @@ -26,9 +26,9 @@ import org.apache.catalina.Context; import org.apache.catalina.startup.SimpleHttpClient; import org.apache.catalina.startup.TestTomcat.MapRealm; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; -public class TestFormAuthenticator extends TomcatBaseTestJUnit4 { +public class TestFormAuthenticator extends TomcatBaseTest { @Test public void testGet() throws Exception { diff --git a/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java b/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java index bb56073ac..3e6744149 100644 --- a/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java +++ b/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java @@ -34,11 +34,11 @@ import org.apache.catalina.deploy.SecurityConstraint; import org.apache.catalina.startup.TestTomcat.MapRealm; import org.apache.catalina.startup.TesterServlet; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; import org.apache.catalina.util.MD5Encoder; import org.apache.tomcat.util.buf.ByteChunk; -public class TesterDigestAuthenticatorPerformance extends TomcatBaseTestJUnit4 { +public class TesterDigestAuthenticatorPerformance extends TomcatBaseTest { private static String USER = "user"; private static String PWD = "pwd"; diff --git a/test/org/apache/catalina/comet/TestCometProcessor.java b/test/org/apache/catalina/comet/TestCometProcessor.java index 0076afaef..06362da0f 100644 --- a/test/org/apache/catalina/comet/TestCometProcessor.java +++ b/test/org/apache/catalina/comet/TestCometProcessor.java @@ -36,9 +36,9 @@ import org.junit.Test; import org.apache.catalina.Context; import org.apache.catalina.comet.CometEvent.EventType; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; -public class TestCometProcessor extends TomcatBaseTestJUnit4 { +public class TestCometProcessor extends TomcatBaseTest { @Test public void testSimpleCometClient() throws Exception { diff --git a/test/org/apache/catalina/connector/TestConnector.java b/test/org/apache/catalina/connector/TestConnector.java index de61f5931..97e1b4cd3 100644 --- a/test/org/apache/catalina/connector/TestConnector.java +++ b/test/org/apache/catalina/connector/TestConnector.java @@ -26,13 +26,13 @@ import org.apache.catalina.Context; import org.apache.catalina.Wrapper; import org.apache.catalina.startup.TesterServlet; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; import org.apache.tomcat.util.buf.ByteChunk; /** * Test cases for {@link Connector}. */ -public class TestConnector extends TomcatBaseTestJUnit4 { +public class TestConnector extends TomcatBaseTest { @Test public void testStop() throws Exception { diff --git a/test/org/apache/catalina/connector/TestCoyoteAdapter.java b/test/org/apache/catalina/connector/TestCoyoteAdapter.java index df9b73c72..aaeed8962 100644 --- a/test/org/apache/catalina/connector/TestCoyoteAdapter.java +++ b/test/org/apache/catalina/connector/TestCoyoteAdapter.java @@ -32,10 +32,10 @@ import org.junit.Test; import org.apache.catalina.Context; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; import org.apache.tomcat.util.buf.ByteChunk; -public class TestCoyoteAdapter extends TomcatBaseTestJUnit4 { +public class TestCoyoteAdapter extends TomcatBaseTest { @Test public void testPathParmsRootNone() throws Exception { diff --git a/test/org/apache/catalina/connector/TestKeepAliveCount.java b/test/org/apache/catalina/connector/TestKeepAliveCount.java index 97f2f8441..0c34b0ebb 100644 --- a/test/org/apache/catalina/connector/TestKeepAliveCount.java +++ b/test/org/apache/catalina/connector/TestKeepAliveCount.java @@ -30,9 +30,9 @@ 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.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; -public class TestKeepAliveCount extends TomcatBaseTestJUnit4 { +public class TestKeepAliveCount extends TomcatBaseTest { @Test public void testHttp10() throws Exception { diff --git a/test/org/apache/catalina/connector/TestMaxConnections.java b/test/org/apache/catalina/connector/TestMaxConnections.java index 37bdaf649..c9b45ca74 100644 --- a/test/org/apache/catalina/connector/TestMaxConnections.java +++ b/test/org/apache/catalina/connector/TestMaxConnections.java @@ -30,11 +30,11 @@ 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.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; -public class TestMaxConnections extends TomcatBaseTestJUnit4 { +public class TestMaxConnections extends TomcatBaseTest { private static Log log = LogFactory.getLog(TestMaxConnections.class); static int soTimeout = 3000; static int connectTimeout = 1000; diff --git a/test/org/apache/catalina/connector/TestRequest.java b/test/org/apache/catalina/connector/TestRequest.java index 76266838a..0114c5531 100644 --- a/test/org/apache/catalina/connector/TestRequest.java +++ b/test/org/apache/catalina/connector/TestRequest.java @@ -42,13 +42,13 @@ import org.apache.catalina.deploy.LoginConfig; import org.apache.catalina.startup.SimpleHttpClient; import org.apache.catalina.startup.TestTomcat.MapRealm; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; import org.apache.tomcat.util.buf.ByteChunk; /** * Test case for {@link Request}. */ -public class TestRequest extends TomcatBaseTestJUnit4 { +public class TestRequest extends TomcatBaseTest { /** * Test case for https://issues.apache.org/bugzilla/show_bug.cgi?id=37794 diff --git a/test/org/apache/catalina/connector/TestResponse.java b/test/org/apache/catalina/connector/TestResponse.java index 28429638b..176166ae3 100644 --- a/test/org/apache/catalina/connector/TestResponse.java +++ b/test/org/apache/catalina/connector/TestResponse.java @@ -36,13 +36,13 @@ import org.junit.Test; import org.apache.catalina.Context; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; import org.apache.tomcat.util.buf.ByteChunk; /** * Test case for {@link Request}. */ -public class TestResponse extends TomcatBaseTestJUnit4 { +public class TestResponse extends TomcatBaseTest { @Test public void testBug49598() throws Exception { diff --git a/test/org/apache/catalina/core/TestAsyncContextImpl.java b/test/org/apache/catalina/core/TestAsyncContextImpl.java index 117f6d9ab..32a0d93eb 100644 --- a/test/org/apache/catalina/core/TestAsyncContextImpl.java +++ b/test/org/apache/catalina/core/TestAsyncContextImpl.java @@ -45,12 +45,12 @@ import org.apache.catalina.Context; import org.apache.catalina.Wrapper; import org.apache.catalina.connector.Request; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; import org.apache.catalina.valves.TesterAccessLogValve; import org.apache.catalina.valves.TesterAccessLogValve.Entry; import org.apache.tomcat.util.buf.ByteChunk; -public class TestAsyncContextImpl extends TomcatBaseTestJUnit4 { +public class TestAsyncContextImpl extends TomcatBaseTest { // Time for a request to process (need to allow for threads to start etc.) private static final long REQUEST_TIME = 1000; diff --git a/test/org/apache/catalina/core/TestNamingContextListener.java b/test/org/apache/catalina/core/TestNamingContextListener.java index b1558b84d..43a1719dd 100644 --- a/test/org/apache/catalina/core/TestNamingContextListener.java +++ b/test/org/apache/catalina/core/TestNamingContextListener.java @@ -29,9 +29,9 @@ import org.junit.Test; import org.apache.catalina.LifecycleState; import org.apache.catalina.deploy.ContextEnvironment; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; -public class TestNamingContextListener extends TomcatBaseTestJUnit4 { +public class TestNamingContextListener extends TomcatBaseTest { private static final String JNDI_NAME = "TestName"; private static final String JNDI_VALUE= "Test Value"; diff --git a/test/org/apache/catalina/core/TestStandardContext.java b/test/org/apache/catalina/core/TestStandardContext.java index a2a5f6f92..7774bd4c4 100644 --- a/test/org/apache/catalina/core/TestStandardContext.java +++ b/test/org/apache/catalina/core/TestStandardContext.java @@ -58,10 +58,10 @@ import org.apache.catalina.deploy.LoginConfig; import org.apache.catalina.startup.SimpleHttpClient; import org.apache.catalina.startup.TestTomcat.MapRealm; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; import org.apache.tomcat.util.buf.ByteChunk; -public class TestStandardContext extends TomcatBaseTestJUnit4 { +public class TestStandardContext extends TomcatBaseTest { private static final String REQUEST = "GET / HTTP/1.1\r\n" + diff --git a/test/org/apache/catalina/core/TestStandardContextAliases.java b/test/org/apache/catalina/core/TestStandardContextAliases.java index da9d7e62c..28859fe9c 100644 --- a/test/org/apache/catalina/core/TestStandardContextAliases.java +++ b/test/org/apache/catalina/core/TestStandardContextAliases.java @@ -33,10 +33,10 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; import org.apache.tomcat.util.buf.ByteChunk; -public class TestStandardContextAliases extends TomcatBaseTestJUnit4 { +public class TestStandardContextAliases extends TomcatBaseTest { @Test public void testDirContextAliases() throws Exception { diff --git a/test/org/apache/catalina/core/TestStandardContextResources.java b/test/org/apache/catalina/core/TestStandardContextResources.java index 22c22b437..1478fe3fa 100644 --- a/test/org/apache/catalina/core/TestStandardContextResources.java +++ b/test/org/apache/catalina/core/TestStandardContextResources.java @@ -41,10 +41,10 @@ import org.apache.catalina.deploy.WebXml; import org.apache.catalina.startup.Constants; import org.apache.catalina.startup.ContextConfig; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; import org.apache.tomcat.util.buf.ByteChunk; -public class TestStandardContextResources extends TomcatBaseTestJUnit4 { +public class TestStandardContextResources extends TomcatBaseTest { @Override public void setUp() throws Exception { diff --git a/test/org/apache/catalina/core/TestStandardWrapper.java b/test/org/apache/catalina/core/TestStandardWrapper.java index d76213363..92d6788f9 100644 --- a/test/org/apache/catalina/core/TestStandardWrapper.java +++ b/test/org/apache/catalina/core/TestStandardWrapper.java @@ -56,10 +56,10 @@ import org.apache.catalina.authenticator.BasicAuthenticator; import org.apache.catalina.deploy.LoginConfig; import org.apache.catalina.startup.TestTomcat.MapRealm; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; import org.apache.tomcat.util.buf.ByteChunk; -public class TestStandardWrapper extends TomcatBaseTestJUnit4 { +public class TestStandardWrapper extends TomcatBaseTest { @Test public void testSecurityAnnotationsSimple() throws Exception { diff --git a/test/org/apache/catalina/core/TestSwallowAbortedUploads.java b/test/org/apache/catalina/core/TestSwallowAbortedUploads.java index 5f067b312..8d38f84e6 100644 --- a/test/org/apache/catalina/core/TestSwallowAbortedUploads.java +++ b/test/org/apache/catalina/core/TestSwallowAbortedUploads.java @@ -38,11 +38,11 @@ import org.apache.catalina.Context; import org.apache.catalina.Wrapper; import org.apache.catalina.startup.SimpleHttpClient; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; -public class TestSwallowAbortedUploads extends TomcatBaseTestJUnit4 { +public class TestSwallowAbortedUploads extends TomcatBaseTest { private static Log log = LogFactory.getLog(TestSwallowAbortedUploads.class); diff --git a/test/org/apache/catalina/filters/TestAddCharSetFilter.java b/test/org/apache/catalina/filters/TestAddCharSetFilter.java index 257c5610e..d818b4443 100644 --- a/test/org/apache/catalina/filters/TestAddCharSetFilter.java +++ b/test/org/apache/catalina/filters/TestAddCharSetFilter.java @@ -36,10 +36,10 @@ import org.apache.catalina.Context; import org.apache.catalina.deploy.FilterDef; import org.apache.catalina.deploy.FilterMap; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; import org.apache.tomcat.util.buf.ByteChunk; -public class TestAddCharSetFilter extends TomcatBaseTestJUnit4 { +public class TestAddCharSetFilter extends TomcatBaseTest { @Test public void testNoneSpecifiedMode1() throws Exception { diff --git a/test/org/apache/catalina/filters/TestCsrfPreventionFilter.java b/test/org/apache/catalina/filters/TestCsrfPreventionFilter.java index a42edf0bb..b8b1d7a8f 100644 --- a/test/org/apache/catalina/filters/TestCsrfPreventionFilter.java +++ b/test/org/apache/catalina/filters/TestCsrfPreventionFilter.java @@ -31,9 +31,9 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; import org.apache.catalina.filters.CsrfPreventionFilter.LruCache; -import org.apache.catalina.startup.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; -public class TestCsrfPreventionFilter extends TomcatBaseTestJUnit4 { +public class TestCsrfPreventionFilter extends TomcatBaseTest { private static final String RESULT_NONCE = Constants.CSRF_NONCE_SESSION_ATTR_NAME + "=TESTNONCE"; diff --git a/test/org/apache/catalina/filters/TestExpiresFilter.java b/test/org/apache/catalina/filters/TestExpiresFilter.java index e20dfc2b6..38f3e4577 100644 --- a/test/org/apache/catalina/filters/TestExpiresFilter.java +++ b/test/org/apache/catalina/filters/TestExpiresFilter.java @@ -43,9 +43,9 @@ import org.apache.catalina.filters.ExpiresFilter.DurationUnit; import org.apache.catalina.filters.ExpiresFilter.ExpiresConfiguration; import org.apache.catalina.filters.ExpiresFilter.StartingPoint; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; -public class TestExpiresFilter extends TomcatBaseTestJUnit4 { +public class TestExpiresFilter extends TomcatBaseTest { public static final String TEMP_DIR = System.getProperty("java.io.tmpdir"); @Test diff --git a/test/org/apache/catalina/filters/TestRemoteIpFilter.java b/test/org/apache/catalina/filters/TestRemoteIpFilter.java index 337e49f79..c8e95d13a 100644 --- a/test/org/apache/catalina/filters/TestRemoteIpFilter.java +++ b/test/org/apache/catalina/filters/TestRemoteIpFilter.java @@ -53,9 +53,9 @@ import org.apache.catalina.connector.Response; import org.apache.catalina.deploy.FilterDef; import org.apache.catalina.deploy.FilterMap; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; -public class TestRemoteIpFilter extends TomcatBaseTestJUnit4 { +public class TestRemoteIpFilter extends TomcatBaseTest { /** * Mock {@link FilterChain} to keep a handle on the passed diff --git a/test/org/apache/catalina/loader/TestVirtualWebappLoader.java b/test/org/apache/catalina/loader/TestVirtualWebappLoader.java index 3021fbc52..09444f7c4 100644 --- a/test/org/apache/catalina/loader/TestVirtualWebappLoader.java +++ b/test/org/apache/catalina/loader/TestVirtualWebappLoader.java @@ -26,10 +26,10 @@ import org.junit.Test; import org.apache.catalina.core.StandardContext; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; import org.apache.naming.resources.FileDirContext; -public class TestVirtualWebappLoader extends TomcatBaseTestJUnit4 { +public class TestVirtualWebappLoader extends TomcatBaseTest { @Test public void testModified() throws Exception { diff --git a/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java b/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java index 2d63f991c..fb283aee5 100644 --- a/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java +++ b/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java @@ -32,9 +32,9 @@ import org.junit.Test; import org.apache.catalina.Context; import org.apache.catalina.core.StandardContext; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; -public class TestWebappClassLoaderMemoryLeak extends TomcatBaseTestJUnit4 { +public class TestWebappClassLoaderMemoryLeak extends TomcatBaseTest { @Test public void testTimerThreadLeak() throws Exception { diff --git a/test/org/apache/catalina/mbeans/TestRegistration.java b/test/org/apache/catalina/mbeans/TestRegistration.java index 952c1b304..893f0077a 100644 --- a/test/org/apache/catalina/mbeans/TestRegistration.java +++ b/test/org/apache/catalina/mbeans/TestRegistration.java @@ -33,7 +33,7 @@ import org.junit.Test; import org.apache.catalina.core.StandardHost; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; import org.apache.tomcat.util.modeler.Registry; /** @@ -41,7 +41,7 @@ import org.apache.tomcat.util.modeler.Registry; * don't necessarily apply to one specific Tomcat class. * */ -public class TestRegistration extends TomcatBaseTestJUnit4 { +public class TestRegistration extends TomcatBaseTest { private static final String contextName = "/foo"; diff --git a/test/org/apache/catalina/servlets/TestDefaultServlet.java b/test/org/apache/catalina/servlets/TestDefaultServlet.java index 030e7e813..18abf56a9 100644 --- a/test/org/apache/catalina/servlets/TestDefaultServlet.java +++ b/test/org/apache/catalina/servlets/TestDefaultServlet.java @@ -42,10 +42,9 @@ import static org.apache.catalina.startup.SimpleHttpClient.CRLF; import org.apache.catalina.startup.SimpleHttpClient; 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 TestDefaultServlet extends TomcatBaseTestJUnit4 { +public class TestDefaultServlet extends TomcatBaseTest { /** * Test attempting to access special paths (WEB-INF/META-INF) using diff --git a/test/org/apache/catalina/servlets/TestWebdavServlet.java b/test/org/apache/catalina/servlets/TestWebdavServlet.java index 305a88cba..38803bec3 100644 --- a/test/org/apache/catalina/servlets/TestWebdavServlet.java +++ b/test/org/apache/catalina/servlets/TestWebdavServlet.java @@ -29,10 +29,9 @@ 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; -public class TestWebdavServlet extends TomcatBaseTestJUnit4 { +public class TestWebdavServlet extends TomcatBaseTest { /** * Test attempting to access special paths (WEB-INF/META-INF) using WebdavServlet diff --git a/test/org/apache/catalina/startup/TestContextConfig.java b/test/org/apache/catalina/startup/TestContextConfig.java index b40883296..525270cca 100644 --- a/test/org/apache/catalina/startup/TestContextConfig.java +++ b/test/org/apache/catalina/startup/TestContextConfig.java @@ -37,7 +37,7 @@ import org.junit.Test; import org.apache.catalina.core.StandardContext; import org.apache.tomcat.util.buf.ByteChunk; -public class TestContextConfig extends TomcatBaseTestJUnit4 { +public class TestContextConfig extends TomcatBaseTest { @Test public void testOverrideWithSCIDefaultName() throws Exception { diff --git a/test/org/apache/catalina/startup/TestListener.java b/test/org/apache/catalina/startup/TestListener.java index 871fc1b27..0c146025f 100644 --- a/test/org/apache/catalina/startup/TestListener.java +++ b/test/org/apache/catalina/startup/TestListener.java @@ -31,7 +31,7 @@ import org.junit.Test; import org.apache.catalina.Context; -public class TestListener extends TomcatBaseTestJUnit4 { +public class TestListener extends TomcatBaseTest { /** * Check that a ServletContainerInitializer can install a diff --git a/test/org/apache/catalina/startup/TestTomcat.java b/test/org/apache/catalina/startup/TestTomcat.java index fa8d08efe..e68e9125f 100644 --- a/test/org/apache/catalina/startup/TestTomcat.java +++ b/test/org/apache/catalina/startup/TestTomcat.java @@ -48,7 +48,7 @@ import org.apache.catalina.realm.GenericPrincipal; import org.apache.catalina.realm.RealmBase; import org.apache.tomcat.util.buf.ByteChunk; -public class TestTomcat extends TomcatBaseTestJUnit4 { +public class TestTomcat extends TomcatBaseTest { /** * Simple servlet to test in-line registration diff --git a/test/org/apache/catalina/startup/TestTomcatClassLoader.java b/test/org/apache/catalina/startup/TestTomcatClassLoader.java index a886690a2..54a0c26fb 100644 --- a/test/org/apache/catalina/startup/TestTomcatClassLoader.java +++ b/test/org/apache/catalina/startup/TestTomcatClassLoader.java @@ -34,7 +34,7 @@ import org.apache.catalina.Context; import org.apache.catalina.loader.WebappClassLoader; import org.apache.tomcat.util.buf.ByteChunk; -public class TestTomcatClassLoader extends TomcatBaseTestJUnit4 { +public class TestTomcatClassLoader extends TomcatBaseTest { @Test public void testDefaultClassLoader() throws Exception { diff --git a/test/org/apache/catalina/startup/TomcatBaseTest.java b/test/org/apache/catalina/startup/TomcatBaseTest.java index f6c27055e..7696becc5 100644 --- a/test/org/apache/catalina/startup/TomcatBaseTest.java +++ b/test/org/apache/catalina/startup/TomcatBaseTest.java @@ -32,7 +32,10 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import junit.framework.TestCase; +import static org.junit.Assert.fail; + +import org.junit.After; +import org.junit.Before; import org.apache.catalina.LifecycleState; import org.apache.catalina.connector.Connector; @@ -45,7 +48,7 @@ import org.apache.tomcat.util.buf.ByteChunk; * Base test case that provides a Tomcat instance for each test - mainly so we * don't have to keep writing the cleanup code. */ -public abstract class TomcatBaseTest extends TestCase { +public abstract class TomcatBaseTest { private Tomcat tomcat; private File tempDir; private boolean accessLogEnabled = false; @@ -101,7 +104,7 @@ public abstract class TomcatBaseTest extends TestCase { return accessLogEnabled; } - @Override + @Before public void setUp() throws Exception { // Need to use JULI so log messages from the tests are visible System.setProperty("java.util.logging.manager", @@ -169,7 +172,7 @@ public abstract class TomcatBaseTest extends TestCase { return protocol; } - @Override + @After public void tearDown() throws Exception { // Some tests may call tomcat.destroy(), some tests may just call // tomcat.stop(), some not call either method. Make sure that stop() & diff --git a/test/org/apache/catalina/startup/TomcatBaseTestJUnit4.java b/test/org/apache/catalina/startup/TomcatBaseTestJUnit4.java deleted file mode 100644 index 1f3c36934..000000000 --- a/test/org/apache/catalina/startup/TomcatBaseTestJUnit4.java +++ /dev/null @@ -1,361 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.catalina.startup; - -import java.io.BufferedInputStream; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.PrintWriter; -import java.net.HttpURLConnection; -import java.net.URL; -import java.util.List; -import java.util.Map; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import static org.junit.Assert.fail; - -import org.junit.After; -import org.junit.Before; - -import org.apache.catalina.LifecycleState; -import org.apache.catalina.connector.Connector; -import org.apache.catalina.core.AprLifecycleListener; -import org.apache.catalina.core.StandardServer; -import org.apache.catalina.valves.AccessLogValve; -import org.apache.tomcat.util.buf.ByteChunk; - -/** - * Base test case that provides a Tomcat instance for each test - mainly so we - * don't have to keep writing the cleanup code. - */ -public abstract class TomcatBaseTestJUnit4 { - private Tomcat tomcat; - private File tempDir; - private boolean accessLogEnabled = false; - private static int port = 8000; - - public static final String TEMP_DIR = System.getProperty("java.io.tmpdir"); - - /** - * Make Tomcat instance accessible to sub-classes. - */ - public Tomcat getTomcatInstance() { - return tomcat; - } - - /** - * Sub-classes need to know port so they can connect - */ - public int getPort() { - return port; - } - - /** - * Sub-classes may want to add connectors on a new port - */ - public int getNextPort() { - port++; - return getPort(); - } - - /** - * Helper method that returns the path of the temporary directory used by - * the test runs. The directory is configured during {@link #setUp()} and is - * deleted at {@link #tearDown()}. - */ - public File getTemporaryDirectory() { - return tempDir; - } - - /** - * Helper method that returns the directory where Tomcat build resides. It - * is used to access resources that are part of default Tomcat deployment. - * E.g. the examples webapp. - */ - public File getBuildDirectory() { - return new File(System.getProperty("tomcat.test.tomcatbuild", - "output/build")); - } - - /** - * Sub-classes may want to check, whether an AccessLogValve is active - */ - public boolean isAccessLogEnabled() { - return accessLogEnabled; - } - - @Before - public void setUp() throws Exception { - // Need to use JULI so log messages from the tests are visible - System.setProperty("java.util.logging.manager", - "org.apache.juli.ClassLoaderLogManager"); - System.setProperty("java.util.logging.config.file", new File( - getBuildDirectory(), "conf/logging.properties").toString()); - - tempDir = new File(System.getProperty("tomcat.test.temp", "output/tmp")); - if (!tempDir.exists() && !tempDir.mkdirs()) { - fail("Unable to create temporary directory for test"); - } - - System.setProperty("catalina.base", tempDir.getAbsolutePath()); - // Trigger loading of catalina.properties - CatalinaProperties.getProperty("foo"); - - File appBase = new File(tempDir, "webapps"); - if (!appBase.exists() && !appBase.mkdir()) { - fail("Unable to create appBase for test"); - } - - tomcat = new Tomcat(); - - String protocol = getProtocol(); - Connector connector = new Connector(protocol); - // If each test is running on same port - they - // may interfere with each other - connector.setPort(getNextPort()); - // Mainly set to reduce timeouts during async tests - connector.setAttribute("connectionTimeout", "3000"); - tomcat.getService().addConnector(connector); - tomcat.setConnector(connector); - - // Add AprLifecycleListener if we are using the Apr connector - if (protocol.contains("Apr")) { - StandardServer server = (StandardServer) tomcat.getServer(); - AprLifecycleListener listener = new AprLifecycleListener(); - listener.setSSLRandomSeed("/dev/urandom"); - server.addLifecycleListener(listener); - connector.setAttribute("pollerThreadCount", Integer.valueOf(1)); - } - - tomcat.setBaseDir(tempDir.getAbsolutePath()); - tomcat.getHost().setAppBase(appBase.getAbsolutePath()); - - accessLogEnabled = Boolean.parseBoolean( - System.getProperty("tomcat.test.accesslog", "false")); - if (accessLogEnabled) { - AccessLogValve alv = new AccessLogValve(); - alv.setDirectory(getBuildDirectory() + "/logs"); - alv.setPattern("%h %l %u %t \"%r\" %s %b %I %D"); - tomcat.getHost().getPipeline().addValve(alv); - } - } - - protected String getProtocol() { - // Has a protocol been specified - String protocol = System.getProperty("tomcat.test.protocol"); - - // Use BIO by default - if (protocol == null) { - protocol = "org.apache.coyote.http11.Http11Protocol"; - } - - return protocol; - } - - @After - public void tearDown() throws Exception { - // Some tests may call tomcat.destroy(), some tests may just call - // tomcat.stop(), some not call either method. Make sure that stop() & - // destroy() are called as necessary. - if (tomcat.server != null && - tomcat.server.getState() != LifecycleState.DESTROYED) { - if (tomcat.server.getState() != LifecycleState.STOPPED) { - tomcat.stop(); - } - tomcat.destroy(); - } - ExpandWar.delete(tempDir); - } - - /** - * Simple Hello World servlet for use by test cases - */ - public static final class HelloWorldServlet extends HttpServlet { - - private static final long serialVersionUID = 1L; - - public static final String RESPONSE_TEXT = - "

Hello World

"; - - @Override - protected void doGet(HttpServletRequest req, HttpServletResponse resp) - throws ServletException, IOException { - PrintWriter out = resp.getWriter(); - out.print(RESPONSE_TEXT); - } - } - - - /** - * Wrapper for getting the response. - */ - public static ByteChunk getUrl(String path) throws IOException { - ByteChunk out = new ByteChunk(); - getUrl(path, out, null); - return out; - } - - public static int getUrl(String path, ByteChunk out, - Map> resHead) throws IOException { - return getUrl(path, out, null, resHead); - } - - public static int getUrl(String path, ByteChunk out, - Map> reqHead, - Map> resHead) throws IOException { - return getUrl(path, out, 1000000, reqHead, resHead); - } - - public static int getUrl(String path, ByteChunk out, int readTimeout, - Map> reqHead, - Map> resHead) throws IOException { - - URL url = new URL(path); - HttpURLConnection connection = - (HttpURLConnection) url.openConnection(); - connection.setUseCaches(false); - connection.setReadTimeout(readTimeout); - if (reqHead != null) { - for (Map.Entry> entry : reqHead.entrySet()) { - StringBuilder valueList = new StringBuilder(); - for (String value : entry.getValue()) { - if (valueList.length() > 0) { - valueList.append(','); - } - valueList.append(value); - } - connection.setRequestProperty(entry.getKey(), - valueList.toString()); - } - } - connection.connect(); - int rc = connection.getResponseCode(); - if (resHead != null) { - Map> head = connection.getHeaderFields(); - resHead.putAll(head); - } - if (rc == HttpServletResponse.SC_OK) { - InputStream is = connection.getInputStream(); - BufferedInputStream bis = null; - try { - bis = new BufferedInputStream(is); - byte[] buf = new byte[2048]; - int rd = 0; - while((rd = bis.read(buf)) > 0) { - out.append(buf, 0, rd); - } - } finally { - if (bis != null) { - try { - bis.close(); - } catch (IOException e) { - // Ignore - } - } - } - } - return rc; - } - - public static ByteChunk postUrl(byte[] body, String path) - throws IOException { - ByteChunk out = new ByteChunk(); - postUrl(body, path, out, null); - return out; - } - - public static int postUrl(byte[] body, String path, ByteChunk out, - Map> resHead) throws IOException { - return postUrl(body, path, out, null, resHead); - } - - public static int postUrl(byte[] body, String path, ByteChunk out, - Map> reqHead, - Map> resHead) throws IOException { - - URL url = new URL(path); - HttpURLConnection connection = - (HttpURLConnection) url.openConnection(); - connection.setDoOutput(true); - connection.setReadTimeout(1000000); - if (reqHead != null) { - for (Map.Entry> entry : reqHead.entrySet()) { - StringBuilder valueList = new StringBuilder(); - for (String value : entry.getValue()) { - if (valueList.length() > 0) { - valueList.append(','); - } - valueList.append(value); - } - connection.setRequestProperty(entry.getKey(), - valueList.toString()); - } - } - connection.connect(); - - // Write the request body - OutputStream os = null; - try { - os = connection.getOutputStream(); - if (body != null) { - os.write(body, 0, body.length); - } - } finally { - if (os != null) { - try { - os.close(); - } catch (IOException ioe) { - // Ignore - } - } - } - - int rc = connection.getResponseCode(); - if (resHead != null) { - Map> head = connection.getHeaderFields(); - resHead.putAll(head); - } - if (rc == HttpServletResponse.SC_OK) { - InputStream is = connection.getInputStream(); - BufferedInputStream bis = null; - try { - bis = new BufferedInputStream(is); - byte[] buf = new byte[2048]; - int rd = 0; - while((rd = bis.read(buf)) > 0) { - out.append(buf, 0, rd); - } - } finally { - if (bis != null) { - try { - bis.close(); - } catch (IOException e) { - // Ignore - } - } - } - } - return rc; - } - -} diff --git a/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java b/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java index 192137c54..0112c8e60 100644 --- a/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java +++ b/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java @@ -22,9 +22,9 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; -public class TestAbstractAjpProcessor extends TomcatBaseTestJUnit4 { +public class TestAbstractAjpProcessor extends TomcatBaseTest { @Override protected String getProtocol() { diff --git a/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java b/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java index f2c7fc1da..37da2fa08 100644 --- a/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java +++ b/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java @@ -29,9 +29,9 @@ 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.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; -public class TestAbstractHttp11Processor extends TomcatBaseTestJUnit4 { +public class TestAbstractHttp11Processor extends TomcatBaseTest { @Test public void testWithTEVoid() throws Exception { diff --git a/test/org/apache/coyote/http11/TestInternalInputBuffer.java b/test/org/apache/coyote/http11/TestInternalInputBuffer.java index 074726ccd..6e61a916a 100644 --- a/test/org/apache/coyote/http11/TestInternalInputBuffer.java +++ b/test/org/apache/coyote/http11/TestInternalInputBuffer.java @@ -34,9 +34,9 @@ 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.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; -public class TestInternalInputBuffer extends TomcatBaseTestJUnit4 { +public class TestInternalInputBuffer extends TomcatBaseTest { /** * Test case for https://issues.apache.org/bugzilla/show_bug.cgi?id=48839 diff --git a/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java b/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java index 83d02da59..b18ffbafc 100644 --- a/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java +++ b/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java @@ -34,9 +34,9 @@ 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.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; -public class TestChunkedInputFilter extends TomcatBaseTestJUnit4 { +public class TestChunkedInputFilter extends TomcatBaseTest { @Test public void testTrailingHeaders() throws Exception { diff --git a/test/org/apache/el/TestELInJsp.java b/test/org/apache/el/TestELInJsp.java index 56f440fc9..bb38e4681 100644 --- a/test/org/apache/el/TestELInJsp.java +++ b/test/org/apache/el/TestELInJsp.java @@ -24,7 +24,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; import org.apache.tomcat.util.buf.ByteChunk; /** @@ -32,7 +32,7 @@ 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 TomcatBaseTestJUnit4 { +public class TestELInJsp extends TomcatBaseTest { @Test public void testBug36923() throws Exception { diff --git a/test/org/apache/jasper/compiler/TestCompiler.java b/test/org/apache/jasper/compiler/TestCompiler.java index 500d4c6cf..47af1e5ee 100644 --- a/test/org/apache/jasper/compiler/TestCompiler.java +++ b/test/org/apache/jasper/compiler/TestCompiler.java @@ -27,10 +27,10 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; import org.apache.tomcat.util.buf.ByteChunk; -public class TestCompiler extends TomcatBaseTestJUnit4 { +public class TestCompiler extends TomcatBaseTest { @Test public void testBug49726a() throws Exception { diff --git a/test/org/apache/jasper/compiler/TestGenerator.java b/test/org/apache/jasper/compiler/TestGenerator.java index 9e803627b..29d494d4d 100644 --- a/test/org/apache/jasper/compiler/TestGenerator.java +++ b/test/org/apache/jasper/compiler/TestGenerator.java @@ -37,10 +37,10 @@ import org.junit.Test; import org.apache.catalina.core.StandardContext; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; import org.apache.tomcat.util.buf.ByteChunk; -public class TestGenerator extends TomcatBaseTestJUnit4 { +public class TestGenerator extends TomcatBaseTest { @Test public void testBug45015a() throws Exception { diff --git a/test/org/apache/jasper/compiler/TestJspConfig.java b/test/org/apache/jasper/compiler/TestJspConfig.java index 18ea8c3a7..cdd340a15 100644 --- a/test/org/apache/jasper/compiler/TestJspConfig.java +++ b/test/org/apache/jasper/compiler/TestJspConfig.java @@ -24,10 +24,10 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; import org.apache.tomcat.util.buf.ByteChunk; -public class TestJspConfig extends TomcatBaseTestJUnit4 { +public class TestJspConfig extends TomcatBaseTest { @Test public void testServlet23NoEL() throws Exception { diff --git a/test/org/apache/jasper/compiler/TestJspDocumentParser.java b/test/org/apache/jasper/compiler/TestJspDocumentParser.java index e03c5fb4b..7f3a123b0 100644 --- a/test/org/apache/jasper/compiler/TestJspDocumentParser.java +++ b/test/org/apache/jasper/compiler/TestJspDocumentParser.java @@ -28,10 +28,10 @@ import static org.junit.Assert.assertNull; import org.junit.Test; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; import org.apache.tomcat.util.buf.ByteChunk; -public class TestJspDocumentParser extends TomcatBaseTestJUnit4 { +public class TestJspDocumentParser extends TomcatBaseTest { @Test public void testBug47977() throws Exception { diff --git a/test/org/apache/jasper/compiler/TestParser.java b/test/org/apache/jasper/compiler/TestParser.java index 06f188809..13d8fa61b 100644 --- a/test/org/apache/jasper/compiler/TestParser.java +++ b/test/org/apache/jasper/compiler/TestParser.java @@ -27,14 +27,14 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; import org.apache.tomcat.util.buf.ByteChunk; /** * Tests are duplicated in {@link TestParserNoStrictWhitespace} with the strict * whitespace parsing disabled. */ -public class TestParser extends TomcatBaseTestJUnit4 { +public class TestParser extends TomcatBaseTest { @Test public void testBug48627() throws Exception { diff --git a/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java b/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java index c1180987c..5d03012ca 100644 --- a/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java +++ b/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java @@ -27,14 +27,14 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; import org.apache.tomcat.util.buf.ByteChunk; /** * Tests are duplicated in {@link TestParser} with the strict whitespace parsing * enabled by default. */ -public class TestParserNoStrictWhitespace extends TomcatBaseTestJUnit4 { +public class TestParserNoStrictWhitespace extends TomcatBaseTest { @Override public void setUp() throws Exception { diff --git a/test/org/apache/jasper/compiler/TestScriptingVariabler.java b/test/org/apache/jasper/compiler/TestScriptingVariabler.java index 9a74915db..0eaf2be3e 100644 --- a/test/org/apache/jasper/compiler/TestScriptingVariabler.java +++ b/test/org/apache/jasper/compiler/TestScriptingVariabler.java @@ -30,9 +30,9 @@ import static org.junit.Assert.assertNull; import org.junit.Test; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; -public class TestScriptingVariabler extends TomcatBaseTestJUnit4 { +public class TestScriptingVariabler extends TomcatBaseTest { @Test public void testBug42390() throws Exception { diff --git a/test/org/apache/jasper/compiler/TestValidator.java b/test/org/apache/jasper/compiler/TestValidator.java index 3c1091518..c019d8bd4 100644 --- a/test/org/apache/jasper/compiler/TestValidator.java +++ b/test/org/apache/jasper/compiler/TestValidator.java @@ -30,10 +30,10 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; import org.apache.tomcat.util.buf.ByteChunk; -public class TestValidator extends TomcatBaseTestJUnit4 { +public class TestValidator extends TomcatBaseTest { @Test public void testBug47331() throws Exception { diff --git a/test/org/apache/naming/resources/TestNamingContext.java b/test/org/apache/naming/resources/TestNamingContext.java index 3726e6fbf..64720ec25 100644 --- a/test/org/apache/naming/resources/TestNamingContext.java +++ b/test/org/apache/naming/resources/TestNamingContext.java @@ -36,10 +36,10 @@ 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.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; import org.apache.tomcat.util.buf.ByteChunk; -public class TestNamingContext extends TomcatBaseTestJUnit4 { +public class TestNamingContext extends TomcatBaseTest { @Test public void testLookupSingletonResource() throws Exception { diff --git a/test/org/apache/naming/resources/TestProxyDirContext.java b/test/org/apache/naming/resources/TestProxyDirContext.java index d466b06fa..6ddb1153d 100644 --- a/test/org/apache/naming/resources/TestProxyDirContext.java +++ b/test/org/apache/naming/resources/TestProxyDirContext.java @@ -24,14 +24,14 @@ import org.junit.Test; import org.apache.catalina.core.StandardContext; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; /** * Unit test for the {@link ProxyDirContext}. * @author Marc Guillemot * @version $Revision: $ */ -public class TestProxyDirContext extends TomcatBaseTestJUnit4 { +public class TestProxyDirContext extends TomcatBaseTest { /** * lookup doesn't always throw the same exception. diff --git a/test/org/apache/naming/resources/TestWarDirContext.java b/test/org/apache/naming/resources/TestWarDirContext.java index 24898a8fb..7215dc429 100644 --- a/test/org/apache/naming/resources/TestWarDirContext.java +++ b/test/org/apache/naming/resources/TestWarDirContext.java @@ -25,10 +25,10 @@ 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.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; import org.apache.tomcat.util.buf.ByteChunk; -public class TestWarDirContext extends TomcatBaseTestJUnit4 { +public class TestWarDirContext extends TomcatBaseTest { @Override public void setUp() throws Exception { diff --git a/test/org/apache/tomcat/util/http/CookiesBaseTest.java b/test/org/apache/tomcat/util/http/CookiesBaseTest.java index c559ebd6b..166856666 100644 --- 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.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; /** * Base Test case for {@link Cookies}. Note because of the use of @@ -34,7 +34,7 @@ import org.apache.catalina.startup.TomcatBaseTestJUnit4; * 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 TomcatBaseTestJUnit4 { +public abstract class CookiesBaseTest extends TomcatBaseTest { /** * Servlet for cookie naming test. diff --git a/test/org/apache/tomcat/util/http/TestCookiesAllowEquals.java b/test/org/apache/tomcat/util/http/TestCookiesAllowEquals.java index 8f86851fb..cf1f39da1 100644 --- a/test/org/apache/tomcat/util/http/TestCookiesAllowEquals.java +++ b/test/org/apache/tomcat/util/http/TestCookiesAllowEquals.java @@ -31,9 +31,9 @@ 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.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; -public class TestCookiesAllowEquals extends TomcatBaseTestJUnit4 { +public class TestCookiesAllowEquals extends TomcatBaseTest { private static final String COOKIE_WITH_EQUALS_1 = "name=equals=middle"; private static final String COOKIE_WITH_EQUALS_2 = "name==equalsstart"; diff --git a/test/org/apache/tomcat/util/http/TestCookiesAllowHttpSeps.java b/test/org/apache/tomcat/util/http/TestCookiesAllowHttpSeps.java index 40264707f..3cf38abcd 100644 --- a/test/org/apache/tomcat/util/http/TestCookiesAllowHttpSeps.java +++ b/test/org/apache/tomcat/util/http/TestCookiesAllowHttpSeps.java @@ -31,9 +31,9 @@ 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.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; -public class TestCookiesAllowHttpSeps extends TomcatBaseTestJUnit4 { +public class TestCookiesAllowHttpSeps extends TomcatBaseTest { private static final String COOKIE_WITH_SEPS = "name=val(ue"; diff --git a/test/org/apache/tomcat/util/http/TestCookiesAllowNameOnly.java b/test/org/apache/tomcat/util/http/TestCookiesAllowNameOnly.java index f206f56dd..7ab53722d 100644 --- a/test/org/apache/tomcat/util/http/TestCookiesAllowNameOnly.java +++ b/test/org/apache/tomcat/util/http/TestCookiesAllowNameOnly.java @@ -31,9 +31,9 @@ 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.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; -public class TestCookiesAllowNameOnly extends TomcatBaseTestJUnit4 { +public class TestCookiesAllowNameOnly extends TomcatBaseTest { private static final String COOKIE_WITH_NAME_ONLY_1 = "bob"; private static final String COOKIE_WITH_NAME_ONLY_2 = "bob="; diff --git a/test/org/apache/tomcat/util/http/TestCookiesDisallowEquals.java b/test/org/apache/tomcat/util/http/TestCookiesDisallowEquals.java index 9995abddb..7796d85c0 100644 --- a/test/org/apache/tomcat/util/http/TestCookiesDisallowEquals.java +++ b/test/org/apache/tomcat/util/http/TestCookiesDisallowEquals.java @@ -31,9 +31,9 @@ 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.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; -public class TestCookiesDisallowEquals extends TomcatBaseTestJUnit4 { +public class TestCookiesDisallowEquals extends TomcatBaseTest { private static final String COOKIE_WITH_EQUALS = "name=value=withequals"; private static final String COOKIE_TRUNCATED = "name=value"; diff --git a/test/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java b/test/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java index 095dc8fa9..3d0e3e1ca 100644 --- a/test/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java +++ b/test/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java @@ -33,10 +33,10 @@ import org.junit.Test; import org.apache.catalina.core.StandardContext; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; import org.apache.tomcat.util.buf.ByteChunk; -public class TestMapperWelcomeFiles extends TomcatBaseTestJUnit4 { +public class TestMapperWelcomeFiles extends TomcatBaseTest { @Test public void testWelcomeFileNotStrict() throws Exception { diff --git a/test/org/apache/tomcat/util/net/TestClientCert.java b/test/org/apache/tomcat/util/net/TestClientCert.java index 2a02ef35a..26ad81f78 100644 --- a/test/org/apache/tomcat/util/net/TestClientCert.java +++ b/test/org/apache/tomcat/util/net/TestClientCert.java @@ -23,7 +23,7 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; import org.apache.tomcat.util.buf.ByteChunk; /** @@ -31,7 +31,7 @@ import org.apache.tomcat.util.buf.ByteChunk; * generated using a test CA the files for which are in the Tomcat PMC private * repository since not all of them are AL2 licensed. */ -public class TestClientCert extends TomcatBaseTestJUnit4 { +public class TestClientCert extends TomcatBaseTest { @Test public void testClientCertGet() throws Exception { diff --git a/test/org/apache/tomcat/util/net/TestCustomSsl.java b/test/org/apache/tomcat/util/net/TestCustomSsl.java index 36fe3854b..6f3c482ff 100644 --- a/test/org/apache/tomcat/util/net/TestCustomSsl.java +++ b/test/org/apache/tomcat/util/net/TestCustomSsl.java @@ -29,7 +29,7 @@ import org.junit.Test; import org.apache.catalina.connector.Connector; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; import org.apache.coyote.ProtocolHandler; import org.apache.coyote.http11.AbstractHttp11JsseProtocol; import org.apache.tomcat.util.buf.ByteChunk; @@ -40,7 +40,7 @@ import org.apache.tomcat.util.net.jsse.TesterBug50640SslImpl; * generated using a test CA the files for which are in the Tomcat PMC private * repository since not all of them are AL2 licensed. */ -public class TestCustomSsl extends TomcatBaseTestJUnit4 { +public class TestCustomSsl extends TomcatBaseTest { @Test public void testCustomSslImplementation() throws Exception { diff --git a/test/org/apache/tomcat/util/net/TestSsl.java b/test/org/apache/tomcat/util/net/TestSsl.java index a1751ebbf..8e8f4b61b 100644 --- a/test/org/apache/tomcat/util/net/TestSsl.java +++ b/test/org/apache/tomcat/util/net/TestSsl.java @@ -36,7 +36,7 @@ import static org.junit.Assert.fail; import org.junit.Test; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; import org.apache.tomcat.util.buf.ByteChunk; /** @@ -44,7 +44,7 @@ import org.apache.tomcat.util.buf.ByteChunk; * generated using a test CA the files for which are in the Tomcat PMC private * repository since not all of them are AL2 licensed. */ -public class TestSsl extends TomcatBaseTestJUnit4 { +public class TestSsl extends TomcatBaseTest { @Test public void testSimpleSsl() throws Exception { diff --git a/test/org/apache/tomcat/util/net/TestXxxEndpoint.java b/test/org/apache/tomcat/util/net/TestXxxEndpoint.java index b71f57c7d..b8b556713 100644 --- a/test/org/apache/tomcat/util/net/TestXxxEndpoint.java +++ b/test/org/apache/tomcat/util/net/TestXxxEndpoint.java @@ -28,7 +28,7 @@ import org.junit.Test; import org.apache.catalina.connector.Connector; import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; import org.apache.tomcat.jni.Address; @@ -42,7 +42,7 @@ import org.apache.tomcat.jni.Socket; * Test case for the Endpoint implementations. The testing framework will ensure * that each implementation is tested. */ -public class TestXxxEndpoint extends TomcatBaseTestJUnit4 { +public class TestXxxEndpoint extends TomcatBaseTest { private static Log log = LogFactory.getLog(TestXxxEndpoint.class); diff --git a/test/org/apache/tomcat/util/scan/TestJarScanner.java b/test/org/apache/tomcat/util/scan/TestJarScanner.java index e51be51f9..182124cc8 100644 --- a/test/org/apache/tomcat/util/scan/TestJarScanner.java +++ b/test/org/apache/tomcat/util/scan/TestJarScanner.java @@ -26,9 +26,9 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; -import org.apache.catalina.startup.TomcatBaseTestJUnit4; +import org.apache.catalina.startup.TomcatBaseTest; -public class TestJarScanner extends TomcatBaseTestJUnit4 { +public class TestJarScanner extends TomcatBaseTest { @Test public void testJarsToSkipFormat() { -- 2.11.0