Modified: tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java?rev=1815079&r1=1815078&r2=1815079&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java (original) +++ tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java Mon Nov 13 10:49:13 2017 @@ -44,12 +44,6 @@ import javax.servlet.http.HttpServletRes import org.hamcrest.CoreMatchers; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import org.junit.Assert; import org.junit.Test; @@ -95,7 +89,7 @@ public class TestStandardContext extends File docBase = new File(tomcat.getHost().getAppBaseFile(), "ROOT"); if (!docBase.mkdirs() && !docBase.isDirectory()) { - fail("Unable to create docBase"); + Assert.fail("Unable to create docBase"); } Context root = tomcat.addContext("", "ROOT"); @@ -109,11 +103,11 @@ public class TestStandardContext extends client.connect(); client.processRequest(); - assertTrue(client.isResponse404()); + Assert.assertTrue(client.isResponse404()); // Context failed to start. This checks that automatic transition // from FAILED to STOPPED state was successful. - assertEquals(LifecycleState.STOPPED, root.getState()); + Assert.assertEquals(LifecycleState.STOPPED, root.getState()); // Prepare context for the second attempt // Configuration was cleared on stop() thanks to @@ -124,8 +118,8 @@ public class TestStandardContext extends // The same request is processed successfully client.connect(); client.processRequest(); - assertTrue(client.isResponse200()); - assertEquals(Bug46243Filter.class.getName() + Assert.assertTrue(client.isResponse200()); + Assert.assertEquals(Bug46243Filter.class.getName() + HelloWorldServlet.RESPONSE_TEXT, client.getResponseBody()); } @@ -200,21 +194,21 @@ public class TestStandardContext extends try { context.start(); - fail(); + Assert.fail(); } catch (LifecycleException ex) { // As expected } - assertEquals(LifecycleState.FAILED, context.getState()); + Assert.assertEquals(LifecycleState.FAILED, context.getState()); // The second attempt loader.setFail(false); context.start(); - assertEquals(LifecycleState.STARTED, context.getState()); + Assert.assertEquals(LifecycleState.STARTED, context.getState()); // Using a test from testBug49922() to check that the webapp is running ByteChunk result = getUrl("http://localhost:"; + getPort() + "/bug49922/target"); - assertEquals("Target", result.toString()); + Assert.assertEquals("Target", result.toString()); } @Test @@ -236,21 +230,21 @@ public class TestStandardContext extends try { context.start(); - fail(); + Assert.fail(); } catch (LifecycleException ex) { // As expected } - assertEquals(LifecycleState.FAILED, context.getState()); + Assert.assertEquals(LifecycleState.FAILED, context.getState()); // The second attempt listener.setFail(false); context.start(); - assertEquals(LifecycleState.STARTED, context.getState()); + Assert.assertEquals(LifecycleState.STARTED, context.getState()); // Using a test from testBug49922() to check that the webapp is running ByteChunk result = getUrl("http://localhost:"; + getPort() + "/bug49922/target"); - assertEquals("Target", result.toString()); + Assert.assertEquals("Target", result.toString()); } private static class FailingWebappLoader extends WebappLoader { @@ -294,39 +288,39 @@ public class TestStandardContext extends // Check filter and servlet aren't called int rc = getUrl("http://localhost:"; + getPort() + "/test/bug49922/foo", result, null); - assertEquals(HttpServletResponse.SC_NOT_FOUND, rc); - assertTrue(result.getLength() > 0); + Assert.assertEquals(HttpServletResponse.SC_NOT_FOUND, rc); + Assert.assertTrue(result.getLength() > 0); // Check extension mapping works result = getUrl("http://localhost:"; + getPort() + "/test/foo.do"); - assertEquals("FilterServlet", result.toString()); + Assert.assertEquals("FilterServlet", result.toString()); // Check path mapping works result = getUrl("http://localhost:"; + getPort() + "/test/bug49922/servlet"); - assertEquals("FilterServlet", result.toString()); + Assert.assertEquals("FilterServlet", result.toString()); // Check servlet name mapping works result = getUrl("http://localhost:"; + getPort() + "/test/foo.od"); - assertEquals("FilterServlet", result.toString()); + Assert.assertEquals("FilterServlet", result.toString()); // Check filter is only called once result = getUrl("http://localhost:"; + getPort() + "/test/bug49922/servlet/foo.do"); - assertEquals("FilterServlet", result.toString()); + Assert.assertEquals("FilterServlet", result.toString()); result = getUrl("http://localhost:"; + getPort() + "/test/bug49922/servlet/foo.od"); - assertEquals("FilterServlet", result.toString()); + Assert.assertEquals("FilterServlet", result.toString()); // Check dispatcher mapping result = getUrl("http://localhost:"; + getPort() + "/test/bug49922/target"); - assertEquals("Target", result.toString()); + Assert.assertEquals("Target", result.toString()); result = getUrl("http://localhost:"; + getPort() + "/test/bug49922/forward"); - assertEquals("FilterTarget", result.toString()); + Assert.assertEquals("FilterTarget", result.toString()); result = getUrl("http://localhost:"; + getPort() + "/test/bug49922/include"); - assertEquals("IncludeFilterTarget", result.toString()); + Assert.assertEquals("IncludeFilterTarget", result.toString()); } @@ -431,8 +425,8 @@ public class TestStandardContext extends bc, null); // Check for a 401 - assertNotSame("OK", bc.toString()); - assertEquals(401, rc); + Assert.assertNotSame("OK", bc.toString()); + Assert.assertEquals(401, rc); } public static final class Bug50015SCI @@ -567,8 +561,8 @@ public class TestStandardContext extends ctx.stop(); // Make sure that init() and destroy() were called correctly - assertTrue(sci.getServlet().isOk()); - assertTrue(loadOnStartUp == sci.getServlet().isInitCalled()); + Assert.assertTrue(sci.getServlet().isOk()); + Assert.assertTrue(loadOnStartUp == sci.getServlet().isInitCalled()); } public static final class Bug51376SCI @@ -658,14 +652,14 @@ public class TestStandardContext extends client.doRequest("/regular", false, false); // Servlet attempts to read parts which will trigger an ISE - assertTrue(client.isResponse500()); + Assert.assertTrue(client.isResponse500()); client.reset(); // Make sure regular multipart works properly client.doRequest("/multipart", false, true); // send multipart request - assertEquals("Regular multipart doesn't work", + Assert.assertEquals("Regular multipart doesn't work", "parts=1", client.getResponseBody()); @@ -676,7 +670,7 @@ public class TestStandardContext extends client.doRequest("/regular", false, true); // send multipart request // Servlet attempts to read parts which will trigger an ISE - assertTrue(client.isResponse500()); + Assert.assertTrue(client.isResponse500()); client.reset(); @@ -685,7 +679,7 @@ public class TestStandardContext extends // there is no @MultipartConfig client.doRequest("/regular", true, true); // send multipart request - assertEquals("Incorrect response for configured casual multipart request", + Assert.assertEquals("Incorrect response for configured casual multipart request", "parts=1", client.getResponseBody()); @@ -870,13 +864,13 @@ public class TestStandardContext extends // first we test the flag itself, which can be set on the Host and // Context - assertFalse(context.getComputedFailCtxIfServletStartFails()); + Assert.assertFalse(context.getComputedFailCtxIfServletStartFails()); StandardHost host = (StandardHost) tomcat.getHost(); host.setFailCtxIfServletStartFails(true); - assertTrue(context.getComputedFailCtxIfServletStartFails()); + Assert.assertTrue(context.getComputedFailCtxIfServletStartFails()); context.setFailCtxIfServletStartFails(Boolean.FALSE); - assertFalse("flag on Context should override Host config", + Assert.assertFalse("flag on Context should override Host config", context.getComputedFailCtxIfServletStartFails()); // second, we test the actual effect of the flag on the startup @@ -885,11 +879,11 @@ public class TestStandardContext extends servlet.setLoadOnStartup(1); tomcat.start(); - assertTrue("flag false should not fail deployment", context.getState() + Assert.assertTrue("flag false should not fail deployment", context.getState() .isAvailable()); tomcat.stop(); - assertFalse(context.getState().isAvailable()); + Assert.assertFalse(context.getState().isAvailable()); host.removeChild(context); context = (StandardContext) tomcat.addContext("", @@ -898,7 +892,7 @@ public class TestStandardContext extends new FailingStartupServlet()); servlet.setLoadOnStartup(1); tomcat.start(); - assertFalse("flag true should fail deployment", context.getState() + Assert.assertFalse("flag true should fail deployment", context.getState() .isAvailable()); }
Modified: tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java?rev=1815079&r1=1815078&r2=1815079&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java (original) +++ tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java Mon Nov 13 10:49:13 2017 @@ -28,8 +28,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import static org.junit.Assert.assertTrue; - +import org.junit.Assert; import org.junit.Test; import org.apache.catalina.Context; @@ -67,9 +66,9 @@ public class TestStandardContextAliases result = ""; } - assertTrue(result.contains("00-PASS")); - assertTrue(result.contains("01-PASS")); - assertTrue(result.contains("02-PASS")); + Assert.assertTrue(result.contains("00-PASS")); + Assert.assertTrue(result.contains("01-PASS")); + Assert.assertTrue(result.contains("02-PASS")); } Modified: tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java?rev=1815079&r1=1815078&r2=1815079&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java (original) +++ tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java Mon Nov 13 10:49:13 2017 @@ -31,9 +31,7 @@ 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.Assert; import org.junit.Test; import org.apache.catalina.Context; @@ -94,7 +92,7 @@ public class TestStandardContextResource } int index = orderedLibs.indexOf("resources.jar"); int index2 = orderedLibs.indexOf("resources2.jar"); - assertTrue(orderedLibs.toString(), index >= 0 && index2 >= 0 + Assert.assertTrue(orderedLibs.toString(), index >= 0 && index2 >= 0 && index < index2); } @@ -147,7 +145,7 @@ public class TestStandardContextResource "<p>resourceB.jsp in resources.jar</p>"); // Check ordering, for BZ 54391 - assertEquals(Arrays.asList("resources.jar", "resources2.jar"), ctx + Assert.assertEquals(Arrays.asList("resources.jar", "resources2.jar"), ctx .getServletContext().getAttribute(ServletContext.ORDERED_LIBS)); tomcat.getHost().removeChild(ctx); @@ -169,7 +167,7 @@ public class TestStandardContextResource "<p>resourceB.jsp in resources2.jar</p>"); // Check ordering, for BZ 54391 - assertEquals(Arrays.asList("resources2.jar", "resources.jar"), ctx + Assert.assertEquals(Arrays.asList("resources2.jar", "resources.jar"), ctx .getServletContext().getAttribute(ServletContext.ORDERED_LIBS)); } @@ -273,11 +271,11 @@ public class TestStandardContextResource ByteChunk res = new ByteChunk(); int sc = getUrl("http://localhost:"; + getPort() + pageUrl, res, null); - assertEquals(expectedStatus, sc); + Assert.assertEquals(expectedStatus, sc); if (expectedStatus == 200) { String result = res.toString(); - assertTrue(result, result.indexOf(expectedBody) > 0); + Assert.assertTrue(result, result.indexOf(expectedBody) > 0); } } } Modified: tomcat/trunk/test/org/apache/catalina/core/TestStandardContextValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContextValve.java?rev=1815079&r1=1815078&r2=1815079&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/core/TestStandardContextValve.java (original) +++ tomcat/trunk/test/org/apache/catalina/core/TestStandardContextValve.java Mon Nov 13 10:49:13 2017 @@ -25,7 +25,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import static org.junit.Assert.assertEquals; +import org.junit.Assert; import org.junit.Test; import org.apache.catalina.Context; @@ -79,8 +79,8 @@ public class TestStandardContextValve ex i--; } - assertEquals(Response.SC_NOT_FOUND, rc); - assertEquals("InitErrorDestroy", trace.toString()); + Assert.assertEquals(Response.SC_NOT_FOUND, rc); + Assert.assertEquals("InitErrorDestroy", trace.toString()); } @Test @@ -129,8 +129,8 @@ public class TestStandardContextValve ex i--; } - assertEquals(Response.SC_NOT_FOUND, rc); - assertEquals("InitErrorDestroy", trace.toString()); + Assert.assertEquals(Response.SC_NOT_FOUND, rc); + Assert.assertEquals("InitErrorDestroy", trace.toString()); } private static class Bug51653ErrorTrigger extends HttpServlet { Modified: tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java?rev=1815079&r1=1815078&r2=1815079&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java (original) +++ tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java Mon Nov 13 10:49:13 2017 @@ -42,10 +42,7 @@ 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.assertFalse; -import static org.junit.Assert.assertTrue; - +import org.junit.Assert; import org.junit.Test; import org.apache.catalina.Context; @@ -164,8 +161,8 @@ public class TestStandardWrapper extends "/testStandardWrapper/securityAnnotationsWebXmlPriority", bc, null, null); - assertTrue(bc.getLength() > 0); - assertEquals(403, rc); + Assert.assertTrue(bc.getLength() > 0); + Assert.assertEquals(403, rc); } @Test @@ -178,8 +175,8 @@ public class TestStandardWrapper extends "/test/testStandardWrapper/securityAnnotationsMetaDataPriority", bc, null, null); - assertEquals("OK", bc.toString()); - assertEquals(200, rc); + Assert.assertEquals("OK", bc.toString()); + Assert.assertEquals(200, rc); } @Test @@ -207,8 +204,8 @@ public class TestStandardWrapper extends rc = getUrl("http://localhost:"; + getPort() + "/", bc, null, null); - assertTrue(bc.getLength() > 0); - assertEquals(403, rc); + Assert.assertTrue(bc.getLength() > 0); + Assert.assertEquals(403, rc); } @Test @@ -226,16 +223,16 @@ public class TestStandardWrapper extends rc = getUrl("http://localhost:"; + getPort() + "/protected.jsp", bc, null, null); - assertTrue(bc.getLength() > 0); - assertEquals(403, rc); + Assert.assertTrue(bc.getLength() > 0); + Assert.assertEquals(403, rc); bc.recycle(); rc = getUrl("http://localhost:"; + getPort() + "/unprotected.jsp", bc, null, null); - assertEquals(200, rc); - assertTrue(bc.toString().contains("00-OK")); + Assert.assertEquals(200, rc); + Assert.assertTrue(bc.toString().contains("00-OK")); } private void doTestSecurityAnnotationsAddServlet(boolean useCreateServlet) @@ -258,11 +255,11 @@ public class TestStandardWrapper extends rc = getUrl("http://localhost:"; + getPort() + "/", bc, null, null); if (useCreateServlet) { - assertTrue(bc.getLength() > 0); - assertEquals(403, rc); + Assert.assertTrue(bc.getLength() > 0); + Assert.assertEquals(403, rc); } else { - assertEquals("OK", bc.toString()); - assertEquals(200, rc); + Assert.assertEquals("OK", bc.toString()); + Assert.assertEquals(200, rc); } } @@ -314,11 +311,11 @@ public class TestStandardWrapper extends } if (expect200) { - assertEquals("OK", bc.toString()); - assertEquals(200, rc); + Assert.assertEquals("OK", bc.toString()); + Assert.assertEquals(200, rc); } else { - assertTrue(bc.getLength() > 0); - assertEquals(403, rc); + Assert.assertTrue(bc.getLength() > 0); + Assert.assertEquals(403, rc); } } @@ -453,9 +450,9 @@ public class TestStandardWrapper extends // Check the result for (int i = 0; i < BUG51445_THREAD_COUNT; i ++) { String[] results = threads[i].getResult().split(","); - assertEquals(2, results.length); - assertEquals("10", results[0]); - assertFalse(servlets.contains(results[1])); + Assert.assertEquals(2, results.length); + Assert.assertEquals("10", results[0]); + Assert.assertFalse(servlets.contains(results[1])); servlets.add(results[1]); } } @@ -498,9 +495,9 @@ public class TestStandardWrapper extends // Check the result for (int i = 0; i < BUG51445_THREAD_COUNT; i ++) { String[] results = threads[i].getResult().split(","); - assertEquals(2, results.length); - assertEquals("10", results[0]); - assertFalse(servlets.contains(results[1])); + Assert.assertEquals(2, results.length); + Assert.assertEquals("10", results[0]); + Assert.assertFalse(servlets.contains(results[1])); servlets.add(results[1]); } } Modified: tomcat/trunk/test/org/apache/catalina/core/TestSwallowAbortedUploads.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestSwallowAbortedUploads.java?rev=1815079&r1=1815078&r2=1815079&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/core/TestSwallowAbortedUploads.java (original) +++ tomcat/trunk/test/org/apache/catalina/core/TestSwallowAbortedUploads.java Mon Nov 13 10:49:13 2017 @@ -35,9 +35,6 @@ import javax.servlet.http.HttpServletReq import javax.servlet.http.HttpServletResponse; import javax.servlet.http.Part; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - import org.junit.Assert; import org.junit.Test; @@ -94,9 +91,9 @@ public class TestSwallowAbortedUploads e log.info("Unlimited, swallow enabled"); AbortedUploadClient client = new AbortedUploadClient(); Exception ex = doAbortedUploadTest(client, false, true); - assertNull("Unlimited upload with swallow enabled generates client exception", + Assert.assertNull("Unlimited upload with swallow enabled generates client exception", ex); - assertTrue("Unlimited upload with swallow enabled returns error status code", + Assert.assertTrue("Unlimited upload with swallow enabled returns error status code", client.isResponse200()); client.reset(); } @@ -106,9 +103,9 @@ public class TestSwallowAbortedUploads e log.info("Unlimited, swallow disabled"); AbortedUploadClient client = new AbortedUploadClient(); Exception ex = doAbortedUploadTest(client, false, false); - assertNull("Unlimited upload with swallow disabled generates client exception", + Assert.assertNull("Unlimited upload with swallow disabled generates client exception", ex); - assertTrue("Unlimited upload with swallow disabled returns error status code", + Assert.assertTrue("Unlimited upload with swallow disabled returns error status code", client.isResponse200()); client.reset(); } @@ -118,9 +115,9 @@ public class TestSwallowAbortedUploads e log.info("Limited, swallow enabled"); AbortedUploadClient client = new AbortedUploadClient(); Exception ex = doAbortedUploadTest(client, true, true); - assertNull("Limited upload with swallow enabled generates client exception", + Assert.assertNull("Limited upload with swallow enabled generates client exception", ex); - assertTrue("Limited upload with swallow enabled returns non-500 status code", + Assert.assertTrue("Limited upload with swallow enabled returns non-500 status code", client.isResponse500()); client.reset(); } @@ -130,7 +127,7 @@ public class TestSwallowAbortedUploads e log.info("Limited, swallow disabled"); AbortedUploadClient client = new AbortedUploadClient(); Exception ex = doAbortedUploadTest(client, true, false); - assertTrue("Limited upload with swallow disabled does not generate client exception", + Assert.assertTrue("Limited upload with swallow disabled does not generate client exception", ex instanceof java.net.SocketException); client.reset(); } @@ -140,9 +137,9 @@ public class TestSwallowAbortedUploads e log.info("Aborted (OK), swallow enabled"); AbortedPOSTClient client = new AbortedPOSTClient(); Exception ex = doAbortedPOSTTest(client, HttpServletResponse.SC_OK, true); - assertNull("Unlimited upload with swallow enabled generates client exception", + Assert.assertNull("Unlimited upload with swallow enabled generates client exception", ex); - assertTrue("Unlimited upload with swallow enabled returns error status code", + Assert.assertTrue("Unlimited upload with swallow enabled returns error status code", client.isResponse200()); client.reset(); } @@ -152,9 +149,9 @@ public class TestSwallowAbortedUploads e log.info("Aborted (OK), swallow disabled"); AbortedPOSTClient client = new AbortedPOSTClient(); Exception ex = doAbortedPOSTTest(client, HttpServletResponse.SC_OK, false); - assertNull("Unlimited upload with swallow disabled generates client exception", + Assert.assertNull("Unlimited upload with swallow disabled generates client exception", ex); - assertTrue("Unlimited upload with swallow disabled returns error status code", + Assert.assertTrue("Unlimited upload with swallow disabled returns error status code", client.isResponse200()); client.reset(); } @@ -164,9 +161,9 @@ public class TestSwallowAbortedUploads e log.info("Aborted (413), swallow enabled"); AbortedPOSTClient client = new AbortedPOSTClient(); Exception ex = doAbortedPOSTTest(client, HttpServletResponse.SC_REQUEST_ENTITY_TOO_LARGE, true); - assertNull("Limited upload with swallow enabled generates client exception", + Assert.assertNull("Limited upload with swallow enabled generates client exception", ex); - assertTrue("Limited upload with swallow enabled returns error status code", + Assert.assertTrue("Limited upload with swallow enabled returns error status code", client.isResponse413()); client.reset(); } @@ -176,7 +173,7 @@ public class TestSwallowAbortedUploads e log.info("Aborted (413), swallow disabled"); AbortedPOSTClient client = new AbortedPOSTClient(); Exception ex = doAbortedPOSTTest(client, HttpServletResponse.SC_REQUEST_ENTITY_TOO_LARGE, false); - assertTrue("Limited upload with swallow disabled does not generate client exception", + Assert.assertTrue("Limited upload with swallow disabled does not generate client exception", ex instanceof java.net.SocketException); client.reset(); } Modified: tomcat/trunk/test/org/apache/catalina/filters/TestAddCharSetFilter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/filters/TestAddCharSetFilter.java?rev=1815079&r1=1815078&r2=1815079&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/filters/TestAddCharSetFilter.java (original) +++ tomcat/trunk/test/org/apache/catalina/filters/TestAddCharSetFilter.java Mon Nov 13 10:49:13 2017 @@ -29,8 +29,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import static org.junit.Assert.assertEquals; - +import org.junit.Assert; import org.junit.Test; import org.apache.catalina.Context; @@ -119,9 +118,9 @@ public class TestAddCharSetFilter extend getUrl("http://localhost:"; + getPort() + "/", new ByteChunk(), headers); List<String> ctHeaders = headers.get("Content-Type"); - assertEquals(1, ctHeaders.size()); + Assert.assertEquals(1, ctHeaders.size()); String ct = ctHeaders.get(0).toLowerCase(Locale.ENGLISH); - assertEquals("text/plain;charset=" + expected.toLowerCase(Locale.ENGLISH), ct); + Assert.assertEquals("text/plain;charset=" + expected.toLowerCase(Locale.ENGLISH), ct); } private static class CharsetServlet extends HttpServlet { Modified: tomcat/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter.java?rev=1815079&r1=1815078&r2=1815079&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter.java (original) +++ tomcat/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter.java Mon Nov 13 10:49:13 2017 @@ -24,10 +24,7 @@ import java.io.ObjectOutputStream; import javax.servlet.http.HttpServletResponse; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - +import org.junit.Assert; import org.junit.Test; import org.apache.catalina.filters.CsrfPreventionFilter.LruCache; @@ -44,25 +41,25 @@ public class TestCsrfPreventionFilter ex @Test public void testAddNonceNoQueryNoAnchor() throws Exception { - assertEquals("/test?" + RESULT_NONCE , + Assert.assertEquals("/test?" + RESULT_NONCE , wrapper.encodeRedirectURL("/test")); } @Test public void testAddNonceQueryNoAnchor() throws Exception { - assertEquals("/test?a=b&" + RESULT_NONCE , + Assert.assertEquals("/test?a=b&" + RESULT_NONCE , wrapper.encodeRedirectURL("/test?a=b")); } @Test public void testAddNonceNoQueryAnchor() throws Exception { - assertEquals("/test?" + RESULT_NONCE + "#c", + Assert.assertEquals("/test?" + RESULT_NONCE + "#c", wrapper.encodeRedirectURL("/test#c")); } @Test public void testAddNonceQueryAnchor() throws Exception { - assertEquals("/test?a=b&" + RESULT_NONCE + "#c", + Assert.assertEquals("/test?a=b&" + RESULT_NONCE + "#c", wrapper.encodeRedirectURL("/test?a=b#c")); } @@ -87,13 +84,13 @@ public class TestCsrfPreventionFilter ex LruCache<String> cache2 = (LruCache<String>) ois.readObject(); cache2.add("key7"); - assertFalse(cache2.contains("key1")); - assertFalse(cache2.contains("key2")); - assertTrue(cache2.contains("key3")); - assertTrue(cache2.contains("key4")); - assertTrue(cache2.contains("key5")); - assertTrue(cache2.contains("key6")); - assertTrue(cache2.contains("key7")); + Assert.assertFalse(cache2.contains("key1")); + Assert.assertFalse(cache2.contains("key2")); + Assert.assertTrue(cache2.contains("key3")); + Assert.assertTrue(cache2.contains("key4")); + Assert.assertTrue(cache2.contains("key5")); + Assert.assertTrue(cache2.contains("key6")); + Assert.assertTrue(cache2.contains("key7")); } @Test Modified: tomcat/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter2.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter2.java?rev=1815079&r1=1815078&r2=1815079&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter2.java (original) +++ tomcat/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter2.java Mon Nov 13 10:49:13 2017 @@ -17,8 +17,7 @@ package org.apache.catalina.filters; -import static org.junit.Assert.assertTrue; - +import org.junit.Assert; import org.junit.Test; import org.apache.catalina.filters.CsrfPreventionFilter.LruCache; @@ -34,7 +33,7 @@ public class TestCsrfPreventionFilter2 { int threadCount = 2; long iterationCount = 100000L; - assertTrue(threadCount > 1); + Assert.assertTrue(threadCount > 1); LruCache<String> cache = new LruCache<>(threadCount - 1); @@ -52,7 +51,7 @@ public class TestCsrfPreventionFilter2 { } for (int i = 0; i < threadCount; i++) { - assertTrue(threads[i].getResult()); + Assert.assertTrue(threads[i].getResult()); } } Modified: tomcat/trunk/test/org/apache/catalina/filters/TestRemoteIpFilter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/filters/TestRemoteIpFilter.java?rev=1815079&r1=1815078&r2=1815079&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/filters/TestRemoteIpFilter.java (original) +++ tomcat/trunk/test/org/apache/catalina/filters/TestRemoteIpFilter.java Mon Nov 13 10:49:13 2017 @@ -37,10 +37,6 @@ 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.assertFalse; -import static org.junit.Assert.assertNull; - import org.junit.Assert; import org.junit.Test; @@ -162,20 +158,20 @@ public class TestRemoteIpFilter extends public void testCommaDelimitedListToStringArray() { List<String> elements = Arrays.asList("element1", "element2", "element3"); String actual = RemoteIpFilter.listToCommaDelimitedString(elements); - assertEquals("element1, element2, element3", actual); + Assert.assertEquals("element1, element2, element3", actual); } @Test public void testCommaDelimitedListToStringArrayEmptyList() { List<String> elements = new ArrayList<>(); String actual = RemoteIpFilter.listToCommaDelimitedString(elements); - assertEquals("", actual); + Assert.assertEquals("", actual); } @Test public void testCommaDelimitedListToStringArrayNullList() { String actual = RemoteIpFilter.listToCommaDelimitedString(null); - assertEquals("", actual); + Assert.assertEquals("", actual); } @Test @@ -184,8 +180,8 @@ public class TestRemoteIpFilter extends request.setHeader("myheader", "lower Case"); request.setHeader("MYHEADER", "UPPER CASE"); request.setHeader("MyHeader", "Camel Case"); - assertEquals(1, request.headers.size()); - assertEquals("Camel Case", request.getHeader("myheader")); + Assert.assertEquals(1, request.headers.size()); + Assert.assertEquals("Camel Case", request.getHeader("myheader")); } @Test @@ -208,19 +204,19 @@ public class TestRemoteIpFilter extends // VERIFY boolean actualSecure = actualRequest.isSecure(); - assertFalse("request must be unsecured as header x-forwarded-proto said it is http", actualSecure); + Assert.assertFalse("request must be unsecured as header x-forwarded-proto said it is http", actualSecure); String actualScheme = actualRequest.getScheme(); - assertEquals("scheme must be http as header x-forwarded-proto said it is http", "http", actualScheme); + Assert.assertEquals("scheme must be http as header x-forwarded-proto said it is http", "http", actualScheme); int actualServerPort = actualRequest.getServerPort(); - assertEquals("wrong http server port", 8080, actualServerPort); + Assert.assertEquals("wrong http server port", 8080, actualServerPort); String actualRemoteAddr = actualRequest.getRemoteAddr(); - assertEquals("remoteAddr", "140.211.11.130", actualRemoteAddr); + Assert.assertEquals("remoteAddr", "140.211.11.130", actualRemoteAddr); String actualRemoteHost = actualRequest.getRemoteHost(); - assertEquals("remoteHost", "140.211.11.130", actualRemoteHost); + Assert.assertEquals("remoteHost", "140.211.11.130", actualRemoteHost); } @Test @@ -241,16 +237,16 @@ public class TestRemoteIpFilter extends // VERIFY boolean actualSecure = actualRequest.isSecure(); - assertFalse("request must be unsecured as header x-forwarded-proto said it is http", actualSecure); + Assert.assertFalse("request must be unsecured as header x-forwarded-proto said it is http", actualSecure); String actualScheme = actualRequest.getScheme(); - assertEquals("scheme must be http as header x-forwarded-proto said it is http", "http", actualScheme); + Assert.assertEquals("scheme must be http as header x-forwarded-proto said it is http", "http", actualScheme); String actualRemoteAddr = actualRequest.getRemoteAddr(); - assertEquals("remoteAddr", "140.211.11.130", actualRemoteAddr); + Assert.assertEquals("remoteAddr", "140.211.11.130", actualRemoteAddr); String actualRemoteHost = actualRequest.getRemoteHost(); - assertEquals("remoteHost", "140.211.11.130", actualRemoteHost); + Assert.assertEquals("remoteHost", "140.211.11.130", actualRemoteHost); } @@ -272,16 +268,16 @@ public class TestRemoteIpFilter extends // VERIFY String actualXForwardedFor = request.getHeader("x-forwarded-for"); - assertNull("x-forwarded-for must be null", actualXForwardedFor); + Assert.assertNull("x-forwarded-for must be null", actualXForwardedFor); String actualXForwardedBy = request.getHeader("x-forwarded-by"); - assertNull("x-forwarded-by must be null", actualXForwardedBy); + Assert.assertNull("x-forwarded-by must be null", actualXForwardedBy); String actualRemoteAddr = actualRequest.getRemoteAddr(); - assertEquals("remoteAddr", "192.168.0.10", actualRemoteAddr); + Assert.assertEquals("remoteAddr", "192.168.0.10", actualRemoteAddr); String actualRemoteHost = actualRequest.getRemoteHost(); - assertEquals("remoteHost", "remote-host-original-value", actualRemoteHost); + Assert.assertEquals("remoteHost", "remote-host-original-value", actualRemoteHost); } @Test @@ -304,16 +300,16 @@ public class TestRemoteIpFilter extends // VERIFY String actualXForwardedFor = actualRequest.getHeader("x-forwarded-for"); - assertNull("all proxies are internal, x-forwarded-for must be null", actualXForwardedFor); + Assert.assertNull("all proxies are internal, x-forwarded-for must be null", actualXForwardedFor); String actualXForwardedBy = actualRequest.getHeader("x-forwarded-by"); - assertNull("all proxies are internal, x-forwarded-by must be null", actualXForwardedBy); + Assert.assertNull("all proxies are internal, x-forwarded-by must be null", actualXForwardedBy); String actualRemoteAddr = actualRequest.getRemoteAddr(); - assertEquals("remoteAddr", "140.211.11.130", actualRemoteAddr); + Assert.assertEquals("remoteAddr", "140.211.11.130", actualRemoteAddr); String actualRemoteHost = actualRequest.getRemoteHost(); - assertEquals("remoteHost", "140.211.11.130", actualRemoteHost); + Assert.assertEquals("remoteHost", "140.211.11.130", actualRemoteHost); } @Test @@ -339,16 +335,16 @@ public class TestRemoteIpFilter extends // VERIFY String actualXForwardedFor = actualRequest.getHeader("x-forwarded-for"); - assertNull("all proxies are trusted, x-forwarded-for must be null", actualXForwardedFor); + Assert.assertNull("all proxies are trusted, x-forwarded-for must be null", actualXForwardedFor); String actualXForwardedBy = actualRequest.getHeader("x-forwarded-by"); - assertEquals("all proxies are trusted, they must appear in x-forwarded-by", "proxy1, proxy2", actualXForwardedBy); + Assert.assertEquals("all proxies are trusted, they must appear in x-forwarded-by", "proxy1, proxy2", actualXForwardedBy); String actualRemoteAddr = actualRequest.getRemoteAddr(); - assertEquals("remoteAddr", "140.211.11.130", actualRemoteAddr); + Assert.assertEquals("remoteAddr", "140.211.11.130", actualRemoteAddr); String actualRemoteHost = actualRequest.getRemoteHost(); - assertEquals("remoteHost", "140.211.11.130", actualRemoteHost); + Assert.assertEquals("remoteHost", "140.211.11.130", actualRemoteHost); } @Test @@ -373,16 +369,16 @@ public class TestRemoteIpFilter extends // VERIFY String actualXForwardedFor = actualRequest.getHeader("x-forwarded-for"); - assertNull("all proxies are trusted, x-forwarded-for must be null", actualXForwardedFor); + Assert.assertNull("all proxies are trusted, x-forwarded-for must be null", actualXForwardedFor); String actualXForwardedBy = actualRequest.getHeader("x-forwarded-by"); - assertEquals("all proxies are trusted, they must appear in x-forwarded-by", "proxy1, proxy2", actualXForwardedBy); + Assert.assertEquals("all proxies are trusted, they must appear in x-forwarded-by", "proxy1, proxy2", actualXForwardedBy); String actualRemoteAddr = actualRequest.getRemoteAddr(); - assertEquals("remoteAddr", "140.211.11.130", actualRemoteAddr); + Assert.assertEquals("remoteAddr", "140.211.11.130", actualRemoteAddr); String actualRemoteHost = actualRequest.getRemoteHost(); - assertEquals("remoteHost", "140.211.11.130", actualRemoteHost); + Assert.assertEquals("remoteHost", "140.211.11.130", actualRemoteHost); } @Test @@ -406,16 +402,16 @@ public class TestRemoteIpFilter extends // VERIFY String actualXForwardedFor = actualRequest.getHeader("x-forwarded-for"); - assertNull("all proxies are trusted, x-forwarded-for must be null", actualXForwardedFor); + Assert.assertNull("all proxies are trusted, x-forwarded-for must be null", actualXForwardedFor); String actualXForwardedBy = actualRequest.getHeader("x-forwarded-by"); - assertEquals("all proxies are trusted, they must appear in x-forwarded-by", "proxy1, proxy2", actualXForwardedBy); + Assert.assertEquals("all proxies are trusted, they must appear in x-forwarded-by", "proxy1, proxy2", actualXForwardedBy); String actualRemoteAddr = actualRequest.getRemoteAddr(); - assertEquals("remoteAddr", "140.211.11.130", actualRemoteAddr); + Assert.assertEquals("remoteAddr", "140.211.11.130", actualRemoteAddr); String actualRemoteHost = actualRequest.getRemoteHost(); - assertEquals("remoteHost", "140.211.11.130", actualRemoteHost); + Assert.assertEquals("remoteHost", "140.211.11.130", actualRemoteHost); } @Test @@ -438,16 +434,16 @@ public class TestRemoteIpFilter extends // VERIFY String actualXForwardedFor = actualRequest.getHeader("x-forwarded-for"); - assertEquals("x-forwarded-for must be unchanged", "140.211.11.130, proxy1, proxy2", actualXForwardedFor); + Assert.assertEquals("x-forwarded-for must be unchanged", "140.211.11.130, proxy1, proxy2", actualXForwardedFor); String actualXForwardedBy = actualRequest.getHeader("x-forwarded-by"); - assertNull("x-forwarded-by must be null", actualXForwardedBy); + Assert.assertNull("x-forwarded-by must be null", actualXForwardedBy); String actualRemoteAddr = actualRequest.getRemoteAddr(); - assertEquals("remoteAddr", "not-allowed-internal-proxy", actualRemoteAddr); + Assert.assertEquals("remoteAddr", "not-allowed-internal-proxy", actualRemoteAddr); String actualRemoteHost = actualRequest.getRemoteHost(); - assertEquals("remoteHost", "not-allowed-internal-proxy-host", actualRemoteHost); + Assert.assertEquals("remoteHost", "not-allowed-internal-proxy-host", actualRemoteHost); } @Test @@ -470,25 +466,25 @@ public class TestRemoteIpFilter extends // VERIFY String actualXForwardedFor = actualRequest.getHeader("x-forwarded-for"); - assertEquals("ip/host before untrusted-proxy must appear in x-forwarded-for", "140.211.11.130, proxy1", actualXForwardedFor); + Assert.assertEquals("ip/host before untrusted-proxy must appear in x-forwarded-for", "140.211.11.130, proxy1", actualXForwardedFor); String actualXForwardedBy = actualRequest.getHeader("x-forwarded-by"); - assertEquals("ip/host after untrusted-proxy must appear in x-forwarded-by", "proxy2", actualXForwardedBy); + Assert.assertEquals("ip/host after untrusted-proxy must appear in x-forwarded-by", "proxy2", actualXForwardedBy); String actualRemoteAddr = actualRequest.getRemoteAddr(); - assertEquals("remoteAddr", "untrusted-proxy", actualRemoteAddr); + Assert.assertEquals("remoteAddr", "untrusted-proxy", actualRemoteAddr); String actualRemoteHost = actualRequest.getRemoteHost(); - assertEquals("remoteHost", "untrusted-proxy", actualRemoteHost); + Assert.assertEquals("remoteHost", "untrusted-proxy", actualRemoteHost); } @Test public void testListToCommaDelimitedString() { String[] actual = RemoteIpFilter.commaDelimitedListToStringArray("element1, element2, element3"); String[] expected = new String[] { "element1", "element2", "element3" }; - assertEquals(expected.length, actual.length); + Assert.assertEquals(expected.length, actual.length); for (int i = 0; i < actual.length; i++) { - assertEquals(expected[i], actual[i]); + Assert.assertEquals(expected[i], actual[i]); } } @@ -496,9 +492,9 @@ public class TestRemoteIpFilter extends public void testListToCommaDelimitedStringMixedSpaceChars() { String[] actual = RemoteIpFilter.commaDelimitedListToStringArray("element1 , element2,\t element3"); String[] expected = new String[] { "element1", "element2", "element3" }; - assertEquals(expected.length, actual.length); + Assert.assertEquals(expected.length, actual.length); for (int i = 0; i < actual.length; i++) { - assertEquals(expected[i], actual[i]); + Assert.assertEquals(expected[i], actual[i]); } } Modified: tomcat/trunk/test/org/apache/catalina/filters/TestRestCsrfPreventionFilter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/filters/TestRestCsrfPreventionFilter.java?rev=1815079&r1=1815078&r2=1815079&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/filters/TestRestCsrfPreventionFilter.java (original) +++ tomcat/trunk/test/org/apache/catalina/filters/TestRestCsrfPreventionFilter.java Mon Nov 13 10:49:13 2017 @@ -25,9 +25,7 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - +import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -272,24 +270,24 @@ public class TestRestCsrfPreventionFilte } private void verifyContinueChain() { - assertTrue(filterChain.isVisited()); + Assert.assertTrue(filterChain.isVisited()); } private void verifyContinueChainNonceAvailable() { - assertTrue(NONCE.equals(response.getHeader(Constants.CSRF_REST_NONCE_HEADER_NAME))); + Assert.assertTrue(NONCE.equals(response.getHeader(Constants.CSRF_REST_NONCE_HEADER_NAME))); verifyContinueChain(); } private void verifyContinueChainNonceNotAvailable() { - assertNull(response.getHeader(Constants.CSRF_REST_NONCE_HEADER_NAME)); + Assert.assertNull(response.getHeader(Constants.CSRF_REST_NONCE_HEADER_NAME)); verifyContinueChain(); } private void verifyDenyResponse(int statusCode) { - assertTrue(Constants.CSRF_REST_NONCE_HEADER_REQUIRED_VALUE.equals(response + Assert.assertTrue(Constants.CSRF_REST_NONCE_HEADER_REQUIRED_VALUE.equals(response .getHeader(Constants.CSRF_REST_NONCE_HEADER_NAME))); - assertTrue(statusCode == response.getStatus()); - assertTrue(!filterChain.isVisited()); + Assert.assertTrue(statusCode == response.getStatus()); + Assert.assertTrue(!filterChain.isVisited()); } private static class TesterFilterChain implements FilterChain { Modified: tomcat/trunk/test/org/apache/catalina/filters/TestRestCsrfPreventionFilter2.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/filters/TestRestCsrfPreventionFilter2.java?rev=1815079&r1=1815078&r2=1815079&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/filters/TestRestCsrfPreventionFilter2.java (original) +++ tomcat/trunk/test/org/apache/catalina/filters/TestRestCsrfPreventionFilter2.java Mon Nov 13 10:49:13 2017 @@ -30,11 +30,7 @@ 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.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - +import org.junit.Assert; import org.junit.Test; import org.apache.catalina.Context; @@ -223,21 +219,21 @@ public class TestRestCsrfPreventionFilte rc = postUrl(body, HTTP_PREFIX + getPort() + uri, bc, reqHeaders, respHeaders); } - assertEquals(expectedRC, rc); + Assert.assertEquals(expectedRC, rc); if (expectedRC == HttpServletResponse.SC_OK) { - assertEquals(expectedResponse, bc.toString()); + Assert.assertEquals(expectedResponse, bc.toString()); List<String> newCookies = respHeaders.get(SERVER_COOKIE_HEADER); saveCookies(newCookies, l -> Objects.nonNull(l) && l.size() > 0); } if (!expectCsrfRH) { - assertNull(respHeaders.get(Constants.CSRF_REST_NONCE_HEADER_NAME)); + Assert.assertNull(respHeaders.get(Constants.CSRF_REST_NONCE_HEADER_NAME)); } else { List<String> respHeaderValue = respHeaders.get(Constants.CSRF_REST_NONCE_HEADER_NAME); - assertNotNull(respHeaderValue); + Assert.assertNotNull(respHeaderValue); if (Objects.nonNull(expectedCsrfRHV)) { - assertTrue(respHeaderValue.contains(expectedCsrfRHV)); + Assert.assertTrue(respHeaderValue.contains(expectedCsrfRHV)); } else { validNonce = respHeaderValue.get(0); } Modified: tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java?rev=1815079&r1=1815078&r2=1815079&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java (original) +++ tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java Mon Nov 13 10:49:13 2017 @@ -14,10 +14,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.catalina.loader; - import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -25,9 +23,6 @@ import java.io.InputStream; import java.util.Arrays; import java.util.HashSet; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import org.junit.Assert; import org.junit.Test; @@ -145,19 +140,19 @@ public class TestVirtualContext extends getUrl( "http://localhost:"; + getPort() + "/test/classpathGetResources.jsp?path=rsrc/").toString(); - assertTrue( + Assert.assertTrue( allUrls, allUrls.indexOf("/test/webapp-virtual-webapp/src/main/webapp/WEB-INF/classes/rsrc") > 0); - assertTrue( + Assert.assertTrue( allUrls, allUrls.indexOf("/test/webapp-virtual-webapp/src/main/webapp2/WEB-INF/classes/rsrc") > 0); - assertTrue( + Assert.assertTrue( allUrls, allUrls.indexOf("/test/webapp-virtual-webapp/src/main/webapp/WEB-INF/lib/rsrc.jar!/rsrc") > 0); - assertTrue( + Assert.assertTrue( allUrls, allUrls.indexOf("/test/webapp-virtual-webapp/target/classes/rsrc") > 0); - assertTrue( + Assert.assertTrue( allUrls, allUrls.indexOf("/test/webapp-virtual-library/target/WEB-INF/classes/rsrc") > 0); @@ -170,7 +165,7 @@ public class TestVirtualContext extends getUrl( "http://localhost:"; + getPort() + "/test/classpathGetResources.jsp?path=rsrc2/").toString(); - assertTrue( + Assert.assertTrue( allRsrsc2ClasspathUrls, allRsrsc2ClasspathUrls.indexOf("/test/webapp-virtual-webapp/src/main/webapp2/WEB-INF/classes/rsrc2") > 0); @@ -213,13 +208,13 @@ public class TestVirtualContext extends getUrl( "http://localhost:"; + getPort() + "/test/contextGetResourcePaths.jsp?path=/rsrc/").toString(); - assertTrue( + Assert.assertTrue( allRsrcPaths, allRsrcPaths.indexOf("/rsrc/resourceF.properties") > 0); - assertTrue( + Assert.assertTrue( allRsrcPaths, allRsrcPaths.indexOf("/rsrc/resourceE.properties") > 0); - assertTrue( + Assert.assertTrue( allRsrcPaths, allRsrcPaths.indexOf("/rsrc/resourceH.properties") > 0); @@ -232,7 +227,7 @@ public class TestVirtualContext extends getUrl( "http://localhost:"; + getPort() + "/test/contextGetResourcePaths.jsp?path=/rsrc2/").toString(); - assertTrue( + Assert.assertTrue( allRsrc2Paths, allRsrc2Paths.indexOf("/rsrc2/resourceJ.properties") > 0); @@ -329,11 +324,11 @@ public class TestVirtualContext extends int sc = getUrl("http://localhost:"; + getPort() + pageUrl, res, 10000, null, null); - assertEquals(expectedStatus, sc); + Assert.assertEquals(expectedStatus, sc); if (expectedStatus == 200) { String result = res.toString(); - assertTrue(result, result.contains(expectedBody)); + Assert.assertTrue(result, result.contains(expectedBody)); } } } Modified: tomcat/trunk/test/org/apache/catalina/loader/TestVirtualWebappLoader.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/loader/TestVirtualWebappLoader.java?rev=1815079&r1=1815078&r2=1815079&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/loader/TestVirtualWebappLoader.java (original) +++ tomcat/trunk/test/org/apache/catalina/loader/TestVirtualWebappLoader.java Mon Nov 13 10:49:13 2017 @@ -18,10 +18,7 @@ package org.apache.catalina.loader; import java.io.File; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; - +import org.junit.Assert; import org.junit.Test; import org.apache.catalina.WebResourceRoot; @@ -35,8 +32,8 @@ public class TestVirtualWebappLoader ext @Test public void testModified() throws Exception { WebappLoader loader = new WebappLoader(); - assertNull(loader.getClassLoader()); - assertFalse(loader.modified()); + Assert.assertNull(loader.getClassLoader()); + Assert.assertFalse(loader.modified()); } @Test @@ -63,16 +60,16 @@ public class TestVirtualWebappLoader ext loader.start(); String[] repos = loader.getLoaderRepositories(); - assertEquals(4,repos.length); + Assert.assertEquals(4,repos.length); loader.stop(); repos = loader.getLoaderRepositories(); - assertEquals(0, repos.length); + Assert.assertEquals(0, repos.length); // no leak loader.start(); repos = loader.getLoaderRepositories(); - assertEquals(4,repos.length); + Assert.assertEquals(4,repos.length); // clear loader ctx.setLoader(null); Modified: tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java?rev=1815079&r1=1815078&r2=1815079&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java (original) +++ tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java Mon Nov 13 10:49:13 2017 @@ -25,8 +25,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import static org.junit.Assert.fail; - +import org.junit.Assert; import org.junit.Test; import org.apache.catalina.Context; @@ -64,7 +63,7 @@ public class TestWebappClassLoaderMemory TaskServlet.TIMER_THREAD_NAME.equals(thread.getName())) { thread.join(5000); if (thread.isAlive()) { - fail("Timer thread still running"); + Assert.fail("Timer thread still running"); } } } Modified: tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java?rev=1815079&r1=1815078&r2=1815079&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java (original) +++ tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java Mon Nov 13 10:49:13 2017 @@ -24,12 +24,6 @@ import java.lang.instrument.ClassFileTra import java.lang.reflect.Method; import java.security.ProtectionDomain; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -86,8 +80,8 @@ public class TestWebappClassLoaderWeavin this.tomcat.start(); ClassLoader loader = this.context.getLoader().getClassLoader(); - assertNotNull("The class loader should not be null.", loader); - assertTrue("The class loader is not correct.", loader instanceof WebappClassLoaderBase); + Assert.assertNotNull("The class loader should not be null.", loader); + Assert.assertTrue("The class loader is not correct.", loader instanceof WebappClassLoaderBase); this.loader = (WebappClassLoaderBase) loader; @@ -113,10 +107,10 @@ public class TestWebappClassLoaderWeavin public void testNoWeaving() throws Exception { String result = invokeDoMethodOnClass(this.loader, "TesterNeverWeavedClass"); - assertEquals("The first result is not correct.", "This will never be weaved.", result); + Assert.assertEquals("The first result is not correct.", "This will never be weaved.", result); result = invokeDoMethodOnClass(this.loader, "TesterUnweavedClass"); - assertEquals("The second result is not correct.", "Hello, Unweaved World!", result); + Assert.assertEquals("The second result is not correct.", "Hello, Unweaved World!", result); } @@ -125,17 +119,17 @@ public class TestWebappClassLoaderWeavin try { this.loader.addTransformer(null); - fail("Expected exception IllegalArgumentException, got no exception."); + Assert.fail("Expected exception IllegalArgumentException, got no exception."); } catch (IllegalArgumentException ignore) { // good } // class loading should still work, no weaving String result = invokeDoMethodOnClass(this.loader, "TesterNeverWeavedClass"); - assertEquals("The first result is not correct.", "This will never be weaved.", result); + Assert.assertEquals("The first result is not correct.", "This will never be weaved.", result); result = invokeDoMethodOnClass(this.loader, "TesterUnweavedClass"); - assertEquals("The second result is not correct.", "Hello, Unweaved World!", result); + Assert.assertEquals("The second result is not correct.", "Hello, Unweaved World!", result); } @@ -145,10 +139,10 @@ public class TestWebappClassLoaderWeavin this.loader.addTransformer(new ReplacementTransformer(WEAVED_REPLACEMENT_1)); String result = invokeDoMethodOnClass(this.loader, "TesterNeverWeavedClass"); - assertEquals("The first result is not correct.", "This will never be weaved.", result); + Assert.assertEquals("The first result is not correct.", "This will never be weaved.", result); result = invokeDoMethodOnClass(this.loader, "TesterUnweavedClass"); - assertEquals("The second result is not correct.", "Hello, Weaver #1!", result); + Assert.assertEquals("The second result is not correct.", "Hello, Weaver #1!", result); } @@ -158,10 +152,10 @@ public class TestWebappClassLoaderWeavin this.loader.addTransformer(new ReplacementTransformer(WEAVED_REPLACEMENT_2)); String result = invokeDoMethodOnClass(this.loader, "TesterNeverWeavedClass"); - assertEquals("The first result is not correct.", "This will never be weaved.", result); + Assert.assertEquals("The first result is not correct.", "This will never be weaved.", result); result = invokeDoMethodOnClass(this.loader, "TesterUnweavedClass"); - assertEquals("The second result is not correct.", "Hello, Weaver #2!", result); + Assert.assertEquals("The second result is not correct.", "Hello, Weaver #2!", result); } @@ -172,10 +166,10 @@ public class TestWebappClassLoaderWeavin this.loader.addTransformer(new ReplacementTransformer(WEAVED_REPLACEMENT_2)); String result = invokeDoMethodOnClass(this.loader, "TesterNeverWeavedClass"); - assertEquals("The first result is not correct.", "This will never be weaved.", result); + Assert.assertEquals("The first result is not correct.", "This will never be weaved.", result); result = invokeDoMethodOnClass(this.loader, "TesterUnweavedClass"); - assertEquals("The second result is not correct.", "Hello, Weaver #2!", result); + Assert.assertEquals("The second result is not correct.", "Hello, Weaver #2!", result); } @@ -186,10 +180,10 @@ public class TestWebappClassLoaderWeavin this.loader.addTransformer(new ReplacementTransformer(WEAVED_REPLACEMENT_1)); String result = invokeDoMethodOnClass(this.loader, "TesterNeverWeavedClass"); - assertEquals("The first result is not correct.", "This will never be weaved.", result); + Assert.assertEquals("The first result is not correct.", "This will never be weaved.", result); result = invokeDoMethodOnClass(this.loader, "TesterUnweavedClass"); - assertEquals("The second result is not correct.", "Hello, Weaver #1!", result); + Assert.assertEquals("The second result is not correct.", "Hello, Weaver #1!", result); } @@ -201,10 +195,10 @@ public class TestWebappClassLoaderWeavin this.loader.removeTransformer(removed); String result = invokeDoMethodOnClass(this.loader, "TesterNeverWeavedClass"); - assertEquals("The first result is not correct.", "This will never be weaved.", result); + Assert.assertEquals("The first result is not correct.", "This will never be weaved.", result); result = invokeDoMethodOnClass(this.loader, "TesterUnweavedClass"); - assertEquals("The second result is not correct.", "Hello, Unweaved World!", result); + Assert.assertEquals("The second result is not correct.", "Hello, Unweaved World!", result); } @@ -218,10 +212,10 @@ public class TestWebappClassLoaderWeavin this.loader.removeTransformer(removed); String result = invokeDoMethodOnClass(this.loader, "TesterNeverWeavedClass"); - assertEquals("The first result is not correct.", "This will never be weaved.", result); + Assert.assertEquals("The first result is not correct.", "This will never be weaved.", result); result = invokeDoMethodOnClass(this.loader, "TesterUnweavedClass"); - assertEquals("The second result is not correct.", "Hello, Weaver #1!", result); + Assert.assertEquals("The second result is not correct.", "Hello, Weaver #1!", result); } @@ -235,10 +229,10 @@ public class TestWebappClassLoaderWeavin this.loader.removeTransformer(removed); String result = invokeDoMethodOnClass(this.loader, "TesterNeverWeavedClass"); - assertEquals("The first result is not correct.", "This will never be weaved.", result); + Assert.assertEquals("The first result is not correct.", "This will never be weaved.", result); result = invokeDoMethodOnClass(this.loader, "TesterUnweavedClass"); - assertEquals("The second result is not correct.", "Hello, Weaver #2!", result); + Assert.assertEquals("The second result is not correct.", "Hello, Weaver #2!", result); } @@ -249,39 +243,39 @@ public class TestWebappClassLoaderWeavin this.loader.addTransformer(new ReplacementTransformer(WEAVED_REPLACEMENT_2)); String result = invokeDoMethodOnClass(this.loader, "TesterNeverWeavedClass"); - assertEquals("The first result is not correct.", "This will never be weaved.", result); + Assert.assertEquals("The first result is not correct.", "This will never be weaved.", result); result = invokeDoMethodOnClass(this.loader, "TesterUnweavedClass"); - assertEquals("The second result is not correct.", "Hello, Weaver #2!", result); + Assert.assertEquals("The second result is not correct.", "Hello, Weaver #2!", result); WebappClassLoaderBase copiedLoader = (WebappClassLoaderBase) this.loader.copyWithoutTransformers(); result = invokeDoMethodOnClass(copiedLoader, "TesterNeverWeavedClass"); - assertEquals("The third result is not correct.", "This will never be weaved.", result); + Assert.assertEquals("The third result is not correct.", "This will never be weaved.", result); result = invokeDoMethodOnClass(copiedLoader, "TesterUnweavedClass"); - assertEquals("The fourth result is not correct.", "Hello, Unweaved World!", result); + Assert.assertEquals("The fourth result is not correct.", "Hello, Unweaved World!", result); - assertEquals("getClearReferencesHttpClientKeepAliveThread did not match.", + Assert.assertEquals("getClearReferencesHttpClientKeepAliveThread did not match.", Boolean.valueOf(this.loader.getClearReferencesHttpClientKeepAliveThread()), Boolean.valueOf(copiedLoader.getClearReferencesHttpClientKeepAliveThread())); - assertEquals("getClearReferencesLogFactoryRelease did not match.", + Assert.assertEquals("getClearReferencesLogFactoryRelease did not match.", Boolean.valueOf(this.loader.getClearReferencesLogFactoryRelease()), Boolean.valueOf(copiedLoader.getClearReferencesLogFactoryRelease())); - assertEquals("getClearReferencesStopThreads did not match.", + Assert.assertEquals("getClearReferencesStopThreads did not match.", Boolean.valueOf(this.loader.getClearReferencesStopThreads()), Boolean.valueOf(copiedLoader.getClearReferencesStopThreads())); - assertEquals("getClearReferencesStopTimerThreads did not match.", + Assert.assertEquals("getClearReferencesStopTimerThreads did not match.", Boolean.valueOf(this.loader.getClearReferencesStopTimerThreads()), Boolean.valueOf(copiedLoader.getClearReferencesStopTimerThreads())); - assertEquals("getContextName did not match.", this.loader.getContextName(), + Assert.assertEquals("getContextName did not match.", this.loader.getContextName(), copiedLoader.getContextName()); - assertEquals("getDelegate did not match.", + Assert.assertEquals("getDelegate did not match.", Boolean.valueOf(this.loader.getDelegate()), Boolean.valueOf(copiedLoader.getDelegate())); - assertEquals("getURLs did not match.", this.loader.getURLs().length, + Assert.assertEquals("getURLs did not match.", this.loader.getURLs().length, copiedLoader.getURLs().length); - assertSame("getParent did not match.", this.loader.getParent(), copiedLoader.getParent()); + Assert.assertSame("getParent did not match.", this.loader.getParent(), copiedLoader.getParent()); } @@ -304,7 +298,7 @@ public class TestWebappClassLoaderWeavin throws Exception { Class<?> c = loader.findClass("org.apache.catalina.loader." + className); - assertNotNull("The loaded class should not be null.", c); + Assert.assertNotNull("The loaded class should not be null.", c); Method m = c.getMethod("doMethod"); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
