Modified: tomcat/tc8.0.x/trunk/test/org/apache/catalina/valves/TestRemoteIpValve.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/valves/TestRemoteIpValve.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/catalina/valves/TestRemoteIpValve.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/valves/TestRemoteIpValve.java Mon Nov 13 12:00:30 2017 @@ -24,12 +24,6 @@ import java.util.List; import javax.servlet.ServletException; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -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; @@ -107,20 +101,20 @@ public class TestRemoteIpValve { public void testListToCommaDelimitedString() { List<String> elements = Arrays.asList("element1", "element2", "element3"); String actual = RemoteIpValve.listToCommaDelimitedString(elements); - assertEquals("element1, element2, element3", actual); + Assert.assertEquals("element1, element2, element3", actual); } @Test public void testListToCommaDelimitedStringEmptyList() { List<String> elements = new ArrayList<>(); String actual = RemoteIpValve.listToCommaDelimitedString(elements); - assertEquals("", actual); + Assert.assertEquals("", actual); } @Test public void testCommaDelimitedListToStringArrayNullList() { String actual = RemoteIpValve.listToCommaDelimitedString(null); - assertEquals("", actual); + Assert.assertEquals("", actual); } @Test @@ -144,22 +138,22 @@ public class TestRemoteIpValve { // 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 = remoteAddrAndHostTrackerValve.getRemoteAddr(); - assertEquals("remoteAddr", "192.168.0.10", actualRemoteAddr); + Assert.assertEquals("remoteAddr", "192.168.0.10", actualRemoteAddr); String actualRemoteHost = remoteAddrAndHostTrackerValve.getRemoteHost(); - assertEquals("remoteHost", "remote-host-original-value", actualRemoteHost); + Assert.assertEquals("remoteHost", "remote-host-original-value", actualRemoteHost); String actualPostInvokeRemoteAddr = request.getRemoteAddr(); - assertEquals("postInvoke remoteAddr", "192.168.0.10", actualPostInvokeRemoteAddr); + Assert.assertEquals("postInvoke remoteAddr", "192.168.0.10", actualPostInvokeRemoteAddr); String actualPostInvokeRemoteHost = request.getRemoteHost(); - assertEquals("postInvoke remoteAddr", "remote-host-original-value", actualPostInvokeRemoteHost); + Assert.assertEquals("postInvoke remoteAddr", "remote-host-original-value", actualPostInvokeRemoteHost); } @@ -186,22 +180,22 @@ public class TestRemoteIpValve { // VERIFY String actualXForwardedFor = remoteAddrAndHostTrackerValve.getForwardedFor(); - 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 = remoteAddrAndHostTrackerValve.getForwardedBy(); - 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 = remoteAddrAndHostTrackerValve.getRemoteAddr(); - assertEquals("remoteAddr", "140.211.11.130", actualRemoteAddr); + Assert.assertEquals("remoteAddr", "140.211.11.130", actualRemoteAddr); String actualRemoteHost = remoteAddrAndHostTrackerValve.getRemoteHost(); - assertEquals("remoteHost", "140.211.11.130", actualRemoteHost); + Assert.assertEquals("remoteHost", "140.211.11.130", actualRemoteHost); String actualPostInvokeRemoteAddr = request.getRemoteAddr(); - assertEquals("postInvoke remoteAddr", "192.168.0.10", actualPostInvokeRemoteAddr); + Assert.assertEquals("postInvoke remoteAddr", "192.168.0.10", actualPostInvokeRemoteAddr); String actualPostInvokeRemoteHost = request.getRemoteHost(); - assertEquals("postInvoke remoteAddr", "remote-host-original-value", actualPostInvokeRemoteHost); + Assert.assertEquals("postInvoke remoteAddr", "remote-host-original-value", actualPostInvokeRemoteHost); } @Test @@ -228,22 +222,22 @@ public class TestRemoteIpValve { // VERIFY String actualXForwardedFor = remoteAddrAndHostTrackerValve.getForwardedFor(); - 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 = remoteAddrAndHostTrackerValve.getForwardedBy(); - 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 = remoteAddrAndHostTrackerValve.getRemoteAddr(); - assertEquals("remoteAddr", "140.211.11.130", actualRemoteAddr); + Assert.assertEquals("remoteAddr", "140.211.11.130", actualRemoteAddr); String actualRemoteHost = remoteAddrAndHostTrackerValve.getRemoteHost(); - assertEquals("remoteHost", "140.211.11.130", actualRemoteHost); + Assert.assertEquals("remoteHost", "140.211.11.130", actualRemoteHost); String actualPostInvokeRemoteAddr = request.getRemoteAddr(); - assertEquals("postInvoke remoteAddr", "192.168.0.10", actualPostInvokeRemoteAddr); + Assert.assertEquals("postInvoke remoteAddr", "192.168.0.10", actualPostInvokeRemoteAddr); String actualPostInvokeRemoteHost = request.getRemoteHost(); - assertEquals("postInvoke remoteAddr", "remote-host-original-value", actualPostInvokeRemoteHost); + Assert.assertEquals("postInvoke remoteAddr", "remote-host-original-value", actualPostInvokeRemoteHost); } @Test @@ -269,22 +263,22 @@ public class TestRemoteIpValve { // VERIFY String actualXForwardedFor = remoteAddrAndHostTrackerValve.getForwardedFor(); - 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 = request.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 = remoteAddrAndHostTrackerValve.getRemoteAddr(); - assertEquals("remoteAddr", "140.211.11.130", actualRemoteAddr); + Assert.assertEquals("remoteAddr", "140.211.11.130", actualRemoteAddr); String actualRemoteHost = remoteAddrAndHostTrackerValve.getRemoteHost(); - assertEquals("remoteHost", "140.211.11.130", actualRemoteHost); + Assert.assertEquals("remoteHost", "140.211.11.130", actualRemoteHost); String actualPostInvokeRemoteAddr = request.getRemoteAddr(); - assertEquals("postInvoke remoteAddr", "192.168.0.10", actualPostInvokeRemoteAddr); + Assert.assertEquals("postInvoke remoteAddr", "192.168.0.10", actualPostInvokeRemoteAddr); String actualPostInvokeRemoteHost = request.getRemoteHost(); - assertEquals("postInvoke remoteAddr", "remote-host-original-value", actualPostInvokeRemoteHost); + Assert.assertEquals("postInvoke remoteAddr", "remote-host-original-value", actualPostInvokeRemoteHost); } @Test @@ -312,22 +306,22 @@ public class TestRemoteIpValve { // VERIFY String actualXForwardedFor = remoteAddrAndHostTrackerValve.getForwardedFor(); - 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 = remoteAddrAndHostTrackerValve.getForwardedBy(); - 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 = remoteAddrAndHostTrackerValve.getRemoteAddr(); - assertEquals("remoteAddr", "140.211.11.130", actualRemoteAddr); + Assert.assertEquals("remoteAddr", "140.211.11.130", actualRemoteAddr); String actualRemoteHost = remoteAddrAndHostTrackerValve.getRemoteHost(); - assertEquals("remoteHost", "140.211.11.130", actualRemoteHost); + Assert.assertEquals("remoteHost", "140.211.11.130", actualRemoteHost); String actualPostInvokeRemoteAddr = request.getRemoteAddr(); - assertEquals("postInvoke remoteAddr", "192.168.0.10", actualPostInvokeRemoteAddr); + Assert.assertEquals("postInvoke remoteAddr", "192.168.0.10", actualPostInvokeRemoteAddr); String actualPostInvokeRemoteHost = request.getRemoteHost(); - assertEquals("postInvoke remoteAddr", "remote-host-original-value", actualPostInvokeRemoteHost); + Assert.assertEquals("postInvoke remoteAddr", "remote-host-original-value", actualPostInvokeRemoteHost); } @Test @@ -353,25 +347,25 @@ public class TestRemoteIpValve { // VERIFY String actualXForwardedFor = remoteAddrAndHostTrackerValve.getForwardedFor(); - 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 actualRemoteAddr = remoteAddrAndHostTrackerValve.getRemoteAddr(); - assertEquals("remoteAddr", "209.244.0.3", actualRemoteAddr); + Assert.assertEquals("remoteAddr", "209.244.0.3", actualRemoteAddr); String actualRemoteHost = remoteAddrAndHostTrackerValve.getRemoteHost(); - assertEquals("remoteHost", "209.244.0.3", actualRemoteHost); + Assert.assertEquals("remoteHost", "209.244.0.3", actualRemoteHost); String actualPostInvokeRemoteAddr = remoteAddrAndHostTrackerValve.getRemoteAddr(); - assertEquals("postInvoke remoteAddr", "209.244.0.3", actualPostInvokeRemoteAddr); + Assert.assertEquals("postInvoke remoteAddr", "209.244.0.3", actualPostInvokeRemoteAddr); String actualPostInvokeRemoteHost = request.getRemoteHost(); - assertEquals("postInvoke remoteAddr", "remote-host-original-value", actualPostInvokeRemoteHost); + Assert.assertEquals("postInvoke remoteAddr", "remote-host-original-value", actualPostInvokeRemoteHost); boolean isSecure = remoteAddrAndHostTrackerValve.isSecure(); - assertTrue("request from internal proxy should be marked secure", isSecure); + Assert.assertTrue("request from internal proxy should be marked secure", isSecure); String scheme = remoteAddrAndHostTrackerValve.getScheme(); - assertEquals("Scheme should be marked to https.","https",scheme); + Assert.assertEquals("Scheme should be marked to https.","https",scheme); request = new MockRequest(); request.setCoyoteRequest(new org.apache.coyote.Request()); @@ -385,25 +379,25 @@ public class TestRemoteIpValve { // VERIFY actualXForwardedFor = remoteAddrAndHostTrackerValve.getForwardedFor(); - 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); actualRemoteAddr = remoteAddrAndHostTrackerValve.getRemoteAddr(); - assertEquals("remoteAddr", "209.244.0.3", actualRemoteAddr); + Assert.assertEquals("remoteAddr", "209.244.0.3", actualRemoteAddr); actualRemoteHost = remoteAddrAndHostTrackerValve.getRemoteHost(); - assertEquals("remoteHost", "209.244.0.3", actualRemoteHost); + Assert.assertEquals("remoteHost", "209.244.0.3", actualRemoteHost); actualPostInvokeRemoteAddr = remoteAddrAndHostTrackerValve.getRemoteAddr(); - assertEquals("postInvoke remoteAddr", "209.244.0.3", actualPostInvokeRemoteAddr); + Assert.assertEquals("postInvoke remoteAddr", "209.244.0.3", actualPostInvokeRemoteAddr); actualPostInvokeRemoteHost = request.getRemoteHost(); - assertEquals("postInvoke remoteAddr", "remote-host-original-value", actualPostInvokeRemoteHost); + Assert.assertEquals("postInvoke remoteAddr", "remote-host-original-value", actualPostInvokeRemoteHost); isSecure = remoteAddrAndHostTrackerValve.isSecure(); - assertTrue("request from internal proxy should be marked secure", isSecure); + Assert.assertTrue("request from internal proxy should be marked secure", isSecure); scheme = remoteAddrAndHostTrackerValve.getScheme(); - assertEquals("Scheme should be marked to https.","https",scheme); + Assert.assertEquals("Scheme should be marked to https.","https",scheme); } @@ -437,41 +431,41 @@ public class TestRemoteIpValve { // VERIFY // client ip String actualXForwardedFor = remoteAddrAndHostTrackerValve.getForwardedFor(); - assertNull("no intermediate non-trusted proxy, x-forwarded-for must be null", actualXForwardedFor); + Assert.assertNull("no intermediate non-trusted proxy, x-forwarded-for must be null", actualXForwardedFor); String actualXForwardedBy = request.getHeader("x-forwarded-by"); - assertNull("no intermediate trusted proxy", actualXForwardedBy); + Assert.assertNull("no intermediate trusted proxy", actualXForwardedBy); String actualRemoteAddr = remoteAddrAndHostTrackerValve.getRemoteAddr(); - assertEquals("remoteAddr", "140.211.11.130", actualRemoteAddr); + Assert.assertEquals("remoteAddr", "140.211.11.130", actualRemoteAddr); String actualRemoteHost = remoteAddrAndHostTrackerValve.getRemoteHost(); - assertEquals("remoteHost", "140.211.11.130", actualRemoteHost); + Assert.assertEquals("remoteHost", "140.211.11.130", actualRemoteHost); String actualPostInvokeRemoteAddr = request.getRemoteAddr(); - assertEquals("postInvoke remoteAddr", "192.168.0.10", actualPostInvokeRemoteAddr); + Assert.assertEquals("postInvoke remoteAddr", "192.168.0.10", actualPostInvokeRemoteAddr); String actualPostInvokeRemoteHost = request.getRemoteHost(); - assertEquals("postInvoke remoteAddr", "192.168.0.10", actualPostInvokeRemoteHost); + Assert.assertEquals("postInvoke remoteAddr", "192.168.0.10", actualPostInvokeRemoteHost); // protocol String actualScheme = remoteAddrAndHostTrackerValve.getScheme(); - assertEquals("x-forwarded-proto says https", "https", actualScheme); + Assert.assertEquals("x-forwarded-proto says https", "https", actualScheme); int actualServerPort = remoteAddrAndHostTrackerValve.getServerPort(); - assertEquals("x-forwarded-proto says https", 443, actualServerPort); + Assert.assertEquals("x-forwarded-proto says https", 443, actualServerPort); boolean actualSecure = remoteAddrAndHostTrackerValve.isSecure(); - assertTrue("x-forwarded-proto says https", actualSecure); + Assert.assertTrue("x-forwarded-proto says https", actualSecure); boolean actualPostInvokeSecure = request.isSecure(); - assertFalse("postInvoke secure", actualPostInvokeSecure); + Assert.assertFalse("postInvoke secure", actualPostInvokeSecure); int actualPostInvokeServerPort = request.getServerPort(); - assertEquals("postInvoke serverPort", 8080, actualPostInvokeServerPort); + Assert.assertEquals("postInvoke serverPort", 8080, actualPostInvokeServerPort); String actualPostInvokeScheme = request.getScheme(); - assertEquals("postInvoke scheme", "http", actualPostInvokeScheme); + Assert.assertEquals("postInvoke scheme", "http", actualPostInvokeScheme); } @Test @@ -502,41 +496,41 @@ public class TestRemoteIpValve { // VERIFY // client ip String actualXForwardedFor = remoteAddrAndHostTrackerValve.getForwardedFor(); - assertNull("no intermediate non-trusted proxy, x-forwarded-for must be null", actualXForwardedFor); + Assert.assertNull("no intermediate non-trusted proxy, x-forwarded-for must be null", actualXForwardedFor); String actualXForwardedBy = request.getHeader("x-forwarded-by"); - assertNull("no intermediate trusted proxy", actualXForwardedBy); + Assert.assertNull("no intermediate trusted proxy", actualXForwardedBy); String actualRemoteAddr = remoteAddrAndHostTrackerValve.getRemoteAddr(); - assertEquals("remoteAddr", "140.211.11.130", actualRemoteAddr); + Assert.assertEquals("remoteAddr", "140.211.11.130", actualRemoteAddr); String actualRemoteHost = remoteAddrAndHostTrackerValve.getRemoteHost(); - assertEquals("remoteHost", "140.211.11.130", actualRemoteHost); + Assert.assertEquals("remoteHost", "140.211.11.130", actualRemoteHost); String actualPostInvokeRemoteAddr = request.getRemoteAddr(); - assertEquals("postInvoke remoteAddr", "192.168.0.10", actualPostInvokeRemoteAddr); + Assert.assertEquals("postInvoke remoteAddr", "192.168.0.10", actualPostInvokeRemoteAddr); String actualPostInvokeRemoteHost = request.getRemoteHost(); - assertEquals("postInvoke remoteAddr", "192.168.0.10", actualPostInvokeRemoteHost); + Assert.assertEquals("postInvoke remoteAddr", "192.168.0.10", actualPostInvokeRemoteHost); // protocol String actualScheme = remoteAddrAndHostTrackerValve.getScheme(); - assertEquals("x-forwarded-proto is null", "http", actualScheme); + Assert.assertEquals("x-forwarded-proto is null", "http", actualScheme); int actualServerPort = remoteAddrAndHostTrackerValve.getServerPort(); - assertEquals("x-forwarded-proto is null", 8080, actualServerPort); + Assert.assertEquals("x-forwarded-proto is null", 8080, actualServerPort); boolean actualSecure = remoteAddrAndHostTrackerValve.isSecure(); - assertFalse("x-forwarded-proto is null", actualSecure); + Assert.assertFalse("x-forwarded-proto is null", actualSecure); boolean actualPostInvokeSecure = request.isSecure(); - assertFalse("postInvoke secure", actualPostInvokeSecure); + Assert.assertFalse("postInvoke secure", actualPostInvokeSecure); int actualPostInvokeServerPort = request.getServerPort(); - assertEquals("postInvoke serverPort", 8080, actualPostInvokeServerPort); + Assert.assertEquals("postInvoke serverPort", 8080, actualPostInvokeServerPort); String actualPostInvokeScheme = request.getScheme(); - assertEquals("postInvoke scheme", "http", actualPostInvokeScheme); + Assert.assertEquals("postInvoke scheme", "http", actualPostInvokeScheme); } @Test @@ -567,41 +561,41 @@ public class TestRemoteIpValve { // VERIFY // client ip String actualXForwardedFor = remoteAddrAndHostTrackerValve.getForwardedFor(); - assertNull("no intermediate non-trusted proxy, x-forwarded-for must be null", actualXForwardedFor); + Assert.assertNull("no intermediate non-trusted proxy, x-forwarded-for must be null", actualXForwardedFor); String actualXForwardedBy = remoteAddrAndHostTrackerValve.getForwardedBy(); - assertNull("no intermediate trusted proxy", actualXForwardedBy); + Assert.assertNull("no intermediate trusted proxy", actualXForwardedBy); String actualRemoteAddr = remoteAddrAndHostTrackerValve.getRemoteAddr(); - assertEquals("remoteAddr", "140.211.11.130", actualRemoteAddr); + Assert.assertEquals("remoteAddr", "140.211.11.130", actualRemoteAddr); String actualRemoteHost = remoteAddrAndHostTrackerValve.getRemoteHost(); - assertEquals("remoteHost", "140.211.11.130", actualRemoteHost); + Assert.assertEquals("remoteHost", "140.211.11.130", actualRemoteHost); String actualPostInvokeRemoteAddr = request.getRemoteAddr(); - assertEquals("postInvoke remoteAddr", "192.168.0.10", actualPostInvokeRemoteAddr); + Assert.assertEquals("postInvoke remoteAddr", "192.168.0.10", actualPostInvokeRemoteAddr); String actualPostInvokeRemoteHost = request.getRemoteHost(); - assertEquals("postInvoke remoteAddr", "192.168.0.10", actualPostInvokeRemoteHost); + Assert.assertEquals("postInvoke remoteAddr", "192.168.0.10", actualPostInvokeRemoteHost); // protocol String actualScheme = remoteAddrAndHostTrackerValve.getScheme(); - assertEquals("x-forwarded-proto says http", "http", actualScheme); + Assert.assertEquals("x-forwarded-proto says http", "http", actualScheme); int actualServerPort = remoteAddrAndHostTrackerValve.getServerPort(); - assertEquals("x-forwarded-proto says http", 80, actualServerPort); + Assert.assertEquals("x-forwarded-proto says http", 80, actualServerPort); boolean actualSecure = remoteAddrAndHostTrackerValve.isSecure(); - assertFalse("x-forwarded-proto says http", actualSecure); + Assert.assertFalse("x-forwarded-proto says http", actualSecure); boolean actualPostInvokeSecure = request.isSecure(); - assertTrue("postInvoke secure", actualPostInvokeSecure); + Assert.assertTrue("postInvoke secure", actualPostInvokeSecure); int actualPostInvokeServerPort = request.getServerPort(); - assertEquals("postInvoke serverPort", 8443, actualPostInvokeServerPort); + Assert.assertEquals("postInvoke serverPort", 8443, actualPostInvokeServerPort); String actualPostInvokeScheme = request.getScheme(); - assertEquals("postInvoke scheme", "https", actualPostInvokeScheme); + Assert.assertEquals("postInvoke scheme", "https", actualPostInvokeScheme); } @Test @@ -632,41 +626,41 @@ public class TestRemoteIpValve { // VERIFY // client ip String actualXForwardedFor = remoteAddrAndHostTrackerValve.getForwardedFor(); - assertNull("no intermediate non-trusted proxy, x-forwarded-for must be null", actualXForwardedFor); + Assert.assertNull("no intermediate non-trusted proxy, x-forwarded-for must be null", actualXForwardedFor); String actualXForwardedBy = request.getHeader("x-forwarded-by"); - assertNull("no intermediate trusted proxy", actualXForwardedBy); + Assert.assertNull("no intermediate trusted proxy", actualXForwardedBy); String actualRemoteAddr = remoteAddrAndHostTrackerValve.getRemoteAddr(); - assertEquals("remoteAddr", "140.211.11.130", actualRemoteAddr); + Assert.assertEquals("remoteAddr", "140.211.11.130", actualRemoteAddr); String actualRemoteHost = remoteAddrAndHostTrackerValve.getRemoteHost(); - assertEquals("remoteHost", "140.211.11.130", actualRemoteHost); + Assert.assertEquals("remoteHost", "140.211.11.130", actualRemoteHost); String actualPostInvokeRemoteAddr = request.getRemoteAddr(); - assertEquals("postInvoke remoteAddr", "192.168.0.10", actualPostInvokeRemoteAddr); + Assert.assertEquals("postInvoke remoteAddr", "192.168.0.10", actualPostInvokeRemoteAddr); String actualPostInvokeRemoteHost = request.getRemoteHost(); - assertEquals("postInvoke remoteAddr", "192.168.0.10", actualPostInvokeRemoteHost); + Assert.assertEquals("postInvoke remoteAddr", "192.168.0.10", actualPostInvokeRemoteHost); // protocol String actualScheme = remoteAddrAndHostTrackerValve.getScheme(); - assertEquals("x-forwarded-proto is null", "https", actualScheme); + Assert.assertEquals("x-forwarded-proto is null", "https", actualScheme); int actualServerPort = remoteAddrAndHostTrackerValve.getServerPort(); - assertEquals("x-forwarded-proto is null", 8443, actualServerPort); + Assert.assertEquals("x-forwarded-proto is null", 8443, actualServerPort); boolean actualSecure = remoteAddrAndHostTrackerValve.isSecure(); - assertTrue("x-forwarded-proto is null", actualSecure); + Assert.assertTrue("x-forwarded-proto is null", actualSecure); boolean actualPostInvokeSecure = request.isSecure(); - assertTrue("postInvoke secure", actualPostInvokeSecure); + Assert.assertTrue("postInvoke secure", actualPostInvokeSecure); int actualPostInvokeServerPort = request.getServerPort(); - assertEquals("postInvoke serverPort", 8443, actualPostInvokeServerPort); + Assert.assertEquals("postInvoke serverPort", 8443, actualPostInvokeServerPort); String actualPostInvokeScheme = request.getScheme(); - assertEquals("postInvoke scheme", "https", actualPostInvokeScheme); + Assert.assertEquals("postInvoke scheme", "https", actualPostInvokeScheme); } @Test @@ -691,22 +685,22 @@ public class TestRemoteIpValve { // VERIFY String actualXForwardedFor = request.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 = request.getHeader("x-forwarded-by"); - assertNull("x-forwarded-by must be null", actualXForwardedBy); + Assert.assertNull("x-forwarded-by must be null", actualXForwardedBy); String actualRemoteAddr = remoteAddrAndHostTrackerValve.getRemoteAddr(); - assertEquals("remoteAddr", "not-allowed-internal-proxy", actualRemoteAddr); + Assert.assertEquals("remoteAddr", "not-allowed-internal-proxy", actualRemoteAddr); String actualRemoteHost = remoteAddrAndHostTrackerValve.getRemoteHost(); - assertEquals("remoteHost", "not-allowed-internal-proxy-host", actualRemoteHost); + Assert.assertEquals("remoteHost", "not-allowed-internal-proxy-host", actualRemoteHost); String actualPostInvokeRemoteAddr = request.getRemoteAddr(); - assertEquals("postInvoke remoteAddr", "not-allowed-internal-proxy", actualPostInvokeRemoteAddr); + Assert.assertEquals("postInvoke remoteAddr", "not-allowed-internal-proxy", actualPostInvokeRemoteAddr); String actualPostInvokeRemoteHost = request.getRemoteHost(); - assertEquals("postInvoke remoteAddr", "not-allowed-internal-proxy-host", actualPostInvokeRemoteHost); + Assert.assertEquals("postInvoke remoteAddr", "not-allowed-internal-proxy-host", actualPostInvokeRemoteHost); } @Test @@ -732,22 +726,22 @@ public class TestRemoteIpValve { // VERIFY String actualXForwardedFor = remoteAddrAndHostTrackerValve.getForwardedFor(); - 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 = remoteAddrAndHostTrackerValve.getForwardedBy(); - 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 = remoteAddrAndHostTrackerValve.getRemoteAddr(); - assertEquals("remoteAddr", "untrusted-proxy", actualRemoteAddr); + Assert.assertEquals("remoteAddr", "untrusted-proxy", actualRemoteAddr); String actualRemoteHost = remoteAddrAndHostTrackerValve.getRemoteHost(); - assertEquals("remoteHost", "untrusted-proxy", actualRemoteHost); + Assert.assertEquals("remoteHost", "untrusted-proxy", actualRemoteHost); String actualPostInvokeRemoteAddr = request.getRemoteAddr(); - assertEquals("postInvoke remoteAddr", "192.168.0.10", actualPostInvokeRemoteAddr); + Assert.assertEquals("postInvoke remoteAddr", "192.168.0.10", actualPostInvokeRemoteAddr); String actualPostInvokeRemoteHost = request.getRemoteHost(); - assertEquals("postInvoke remoteAddr", "remote-host-original-value", actualPostInvokeRemoteHost); + Assert.assertEquals("postInvoke remoteAddr", "remote-host-original-value", actualPostInvokeRemoteHost); } @Test @@ -807,19 +801,19 @@ public class TestRemoteIpValve { private void assertArrayEquals(String[] expected, String[] actual) { if (expected == null) { - assertNull(actual); + Assert.assertNull(actual); return; } - assertNotNull(actual); - assertEquals(expected.length, actual.length); + Assert.assertNotNull(actual); + Assert.assertEquals(expected.length, actual.length); List<String> e = new ArrayList<>(); e.addAll(Arrays.asList(expected)); List<String> a = new ArrayList<>(); a.addAll(Arrays.asList(actual)); for (String entry : e) { - assertTrue(a.remove(entry)); + Assert.assertTrue(a.remove(entry)); } - assertTrue(a.isEmpty()); + Assert.assertTrue(a.isEmpty()); } }
Modified: tomcat/tc8.0.x/trunk/test/org/apache/catalina/valves/TestRequestFilterValve.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/valves/TestRequestFilterValve.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/catalina/valves/TestRequestFilterValve.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/valves/TestRequestFilterValve.java Mon Nov 13 12:00:30 2017 @@ -21,9 +21,6 @@ import java.io.IOException; import javax.servlet.ServletException; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - import org.junit.Assert; import org.junit.Test; @@ -134,7 +131,7 @@ public class TestRequestFilterValve { } else if (valve instanceof RemoteHostValve) { ((RemoteHostValve)valve).setAddConnectorPort(true); } else { - fail("Can only set 'addConnectorPort' for RemoteAddrValve and RemoteHostValve"); + Assert.fail("Can only set 'addConnectorPort' for RemoteAddrValve and RemoteHostValve"); } msg.append(" addConnectorPort='true'"); } @@ -155,10 +152,10 @@ public class TestRequestFilterValve { // VERIFY if (!allowed && auth) { - assertEquals(msg.toString(), OK, response.getStatus()); - assertEquals(msg.toString(), "invalid", request.getHeader("authorization")); + Assert.assertEquals(msg.toString(), OK, response.getStatus()); + Assert.assertEquals(msg.toString(), "invalid", request.getHeader("authorization")); } else { - assertEquals(msg.toString(), expected, response.getStatus()); + Assert.assertEquals(msg.toString(), expected, response.getStatus()); } } Modified: tomcat/tc8.0.x/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java Mon Nov 13 12:00:30 2017 @@ -22,8 +22,7 @@ import java.util.concurrent.ConcurrentLi import javax.servlet.ServletException; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import org.junit.Assert; import org.apache.catalina.AccessLog; import org.apache.catalina.connector.Request; @@ -85,12 +84,12 @@ public class TesterAccessLogValve extend entriesLog.append(entry.toString()); entriesLog.append(System.lineSeparator()); } - assertEquals(entriesLog.toString(), count, entries.size()); + Assert.assertEquals(entriesLog.toString(), count, entries.size()); for (Entry entry : entries) { - assertEquals(status, entry.getStatus()); - assertTrue(entry.toString() + " duration is not >= " + (minTime - ERROR_MARGIN), + Assert.assertEquals(status, entry.getStatus()); + Assert.assertTrue(entry.toString() + " duration is not >= " + (minTime - ERROR_MARGIN), entry.getTime() >= minTime - ERROR_MARGIN); - assertTrue(entry.toString() + " duration is not < " + (maxTime + ERROR_MARGIN), + Assert.assertTrue(entry.toString() + " duration is not < " + (maxTime + ERROR_MARGIN), entry.getTime() < maxTime + ERROR_MARGIN); } } Modified: tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java Mon Nov 13 12:00:30 2017 @@ -45,11 +45,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.assertNotNull; -import static org.junit.Assert.assertTrue; - import org.junit.Assert; import org.junit.Test; @@ -97,7 +92,7 @@ public class TestAbstractHttp11Processor // Expected response is a 200 response followed by an incomplete chunked // body. - assertTrue(client.isResponse200()); + Assert.assertTrue(client.isResponse200()); // Should use chunked encoding String transferEncoding = null; for (String header : client.getResponseHeaders()) { @@ -107,9 +102,9 @@ public class TestAbstractHttp11Processor } Assert.assertEquals("chunked", transferEncoding); // There should not be an end chunk - assertFalse(client.getResponseBody().endsWith("0")); + Assert.assertFalse(client.getResponseBody().endsWith("0")); // The last portion of text should be there - assertTrue(client.getResponseBody().endsWith("line03")); + Assert.assertTrue(client.getResponseBody().endsWith("line03")); } private static class ResponseWithErrorServlet extends HttpServlet { @@ -163,7 +158,7 @@ public class TestAbstractHttp11Processor client.connect(); client.processRequest(); - assertTrue(client.isResponse417()); + Assert.assertTrue(client.isResponse417()); } @@ -186,7 +181,7 @@ public class TestAbstractHttp11Processor client.connect(); client.processRequest(); - assertTrue(client.isResponse501()); + Assert.assertTrue(client.isResponse501()); } @@ -209,7 +204,7 @@ public class TestAbstractHttp11Processor client.connect(); client.processRequest(); - assertTrue(client.isResponse501()); + Assert.assertTrue(client.isResponse501()); } @@ -249,8 +244,8 @@ public class TestAbstractHttp11Processor client.connect(); client.processRequest(); - assertTrue(client.isResponse200()); - assertTrue(client.getResponseBody().contains("test - data")); + Assert.assertTrue(client.isResponse200()); + Assert.assertTrue(client.getResponseBody().contains("test - data")); } @@ -274,8 +269,8 @@ public class TestAbstractHttp11Processor client.connect(); client.processRequest(); - assertTrue(client.isResponse200()); - assertTrue(client.getResponseBody().contains("test - data")); + Assert.assertTrue(client.isResponse200()); + Assert.assertTrue(client.getResponseBody().contains("test - data")); } @@ -298,7 +293,7 @@ public class TestAbstractHttp11Processor client.connect(); client.processRequest(); - assertTrue(client.isResponse501()); + Assert.assertTrue(client.isResponse501()); } @@ -321,7 +316,7 @@ public class TestAbstractHttp11Processor client.connect(); client.processRequest(); - assertTrue(client.isResponse501()); + Assert.assertTrue(client.isResponse501()); } @@ -372,16 +367,16 @@ public class TestAbstractHttp11Processor // Now read the first response client.readResponse(true); - assertFalse(client.isResponse50x()); - assertTrue(client.isResponse200()); - assertEquals("OK", client.getResponseBody()); + Assert.assertFalse(client.isResponse50x()); + Assert.assertTrue(client.isResponse200()); + Assert.assertEquals("OK", client.getResponseBody()); // Read the second response. No need to sleep, read will block until // there is data to process client.readResponse(true); - assertFalse(client.isResponse50x()); - assertTrue(client.isResponse200()); - assertEquals("OK", client.getResponseBody()); + Assert.assertFalse(client.isResponse50x()); + Assert.assertTrue(client.isResponse200()); + Assert.assertEquals("OK", client.getResponseBody()); } @@ -403,11 +398,11 @@ public class TestAbstractHttp11Processor int rc = getUrl("http://localhost:"; + getPort() + "/test", responseBody, responseHeaders); - assertEquals(HttpServletResponse.SC_OK, rc); - assertTrue(responseHeaders.containsKey("Transfer-Encoding")); + Assert.assertEquals(HttpServletResponse.SC_OK, rc); + Assert.assertTrue(responseHeaders.containsKey("Transfer-Encoding")); List<String> encodings = responseHeaders.get("Transfer-Encoding"); - assertEquals(1, encodings.size()); - assertEquals("chunked", encodings.get(0)); + Assert.assertEquals(1, encodings.size()); + Assert.assertEquals("chunked", encodings.get(0)); } @Test @@ -431,16 +426,16 @@ public class TestAbstractHttp11Processor int rc = getUrl("http://localhost:"; + getPort() + "/test", responseBody, responseHeaders); - assertEquals(HttpServletResponse.SC_OK, rc); + Assert.assertEquals(HttpServletResponse.SC_OK, rc); - assertTrue(responseHeaders.containsKey("Connection")); + Assert.assertTrue(responseHeaders.containsKey("Connection")); List<String> connections = responseHeaders.get("Connection"); - assertEquals(1, connections.size()); - assertEquals("close", connections.get(0)); + Assert.assertEquals(1, connections.size()); + Assert.assertEquals("close", connections.get(0)); - assertFalse(responseHeaders.containsKey("Transfer-Encoding")); + Assert.assertFalse(responseHeaders.containsKey("Transfer-Encoding")); - assertEquals("OK", responseBody.toString()); + Assert.assertEquals("OK", responseBody.toString()); } @Test @@ -470,11 +465,11 @@ public class TestAbstractHttp11Processor int rc = getUrl("http://localhost:"; + getPort() + "/test", responseBody, responseHeaders); - assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc); + Assert.assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc); if (responseBody.getLength() > 0) { // It will be >0 if the standard error page handling has been // triggered - assertFalse(responseBody.toString().contains("FAIL")); + Assert.assertFalse(responseBody.toString().contains("FAIL")); } } @@ -736,14 +731,14 @@ public class TestAbstractHttp11Processor client.connect(); client.doRequest(); - assertTrue(client.getResponseLine(), client.isResponse200()); - assertTrue(client.isResponseBodyOK()); + Assert.assertTrue(client.getResponseLine(), client.isResponse200()); + Assert.assertTrue(client.isResponseBodyOK()); // Do the request again to ensure that the remaining body was swallowed client.resetResponse(); client.processRequest(); - assertTrue(client.isResponse200()); - assertTrue(client.isResponseBodyOK()); + Assert.assertTrue(client.isResponse200()); + Assert.assertTrue(client.isResponseBodyOK()); client.disconnect(); } @@ -830,9 +825,9 @@ public class TestAbstractHttp11Processor int rc = headUrl("http://localhost:"; + getPort() + "/test", responseBody, responseHeaders); - assertEquals(HttpServletResponse.SC_OK, rc); - assertEquals(0, responseBody.getLength()); - assertFalse(responseHeaders.containsKey("Content-Length")); + Assert.assertEquals(HttpServletResponse.SC_OK, rc); + Assert.assertEquals(0, responseBody.getLength()); + Assert.assertFalse(responseHeaders.containsKey("Content-Length")); } @@ -964,10 +959,10 @@ public class TestAbstractHttp11Processor Map<String,List<String>> responseHeaders = new HashMap<>(); int rc = getUrl("http://localhost:"; + getPort() + "/test", responseBody, responseHeaders); - assertEquals(HttpServletResponse.SC_RESET_CONTENT, rc); - assertNotNull(responseHeaders.get("Content-Length")); - assertTrue("0".equals(responseHeaders.get("Content-Length").get(0))); - assertTrue(responseBody.getLength() == 0); + Assert.assertEquals(HttpServletResponse.SC_RESET_CONTENT, rc); + Assert.assertNotNull(responseHeaders.get("Content-Length")); + Assert.assertTrue("0".equals(responseHeaders.get("Content-Length").get(0))); + Assert.assertTrue(responseBody.getLength() == 0); } private static final class Bug61086Servlet extends HttpServlet { Modified: tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/TestGzipOutputFilter.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/TestGzipOutputFilter.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/TestGzipOutputFilter.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/TestGzipOutputFilter.java Mon Nov 13 12:00:30 2017 @@ -20,8 +20,7 @@ package org.apache.coyote.http11; import java.io.ByteArrayOutputStream; import java.util.zip.GZIPOutputStream; -import static org.junit.Assert.assertTrue; - +import org.junit.Assert; import org.junit.Test; import org.apache.coyote.Response; @@ -86,6 +85,6 @@ public class TestGzipOutputFilter { byte[] dataExpected = gbos.toByteArray(); // most of the data should have been flushed out - assertTrue(dataFound.length >= (dataExpected.length - 20)); + Assert.assertTrue(dataFound.length >= (dataExpected.length - 20)); } } Modified: tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/TestInternalInputBuffer.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/TestInternalInputBuffer.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/TestInternalInputBuffer.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/TestInternalInputBuffer.java Mon Nov 13 12:00:30 2017 @@ -26,10 +26,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; @@ -50,8 +47,8 @@ public class TestInternalInputBuffer ext Bug48839Client client = new Bug48839Client(); client.doRequest(); - assertTrue(client.isResponse200()); - assertTrue(client.isResponseBodyOK()); + Assert.assertTrue(client.isResponse200()); + Assert.assertTrue(client.isResponseBodyOK()); } @@ -136,9 +133,9 @@ public class TestInternalInputBuffer ext Bug51557Client client = new Bug51557Client("X-Bug51557Valid", "1234"); client.doRequest(); - assertTrue(client.isResponse200()); - assertEquals("1234abcd", client.getResponseBody()); - assertTrue(client.isResponseBodyOK()); + Assert.assertTrue(client.isResponse200()); + Assert.assertEquals("1234abcd", client.getResponseBody()); + Assert.assertTrue(client.isResponseBodyOK()); } @@ -148,7 +145,7 @@ public class TestInternalInputBuffer ext Bug51557Client client = new Bug51557Client("X-Bug51557=Invalid", "1234", true); client.doRequest(); - assertTrue(client.isResponse400()); + Assert.assertTrue(client.isResponse400()); } @@ -158,9 +155,9 @@ public class TestInternalInputBuffer ext Bug51557Client client = new Bug51557Client("X-Bug51557NoColon"); client.doRequest(); - assertTrue(client.isResponse200()); - assertEquals("abcd", client.getResponseBody()); - assertTrue(client.isResponseBodyOK()); + Assert.assertTrue(client.isResponse200()); + Assert.assertEquals("abcd", client.getResponseBody()); + Assert.assertTrue(client.isResponseBodyOK()); } @@ -196,9 +193,9 @@ public class TestInternalInputBuffer ext "foo" + SimpleHttpClient.CRLF + " bar"); client.doRequest(); - assertTrue(client.isResponse200()); - assertEquals("abcd", client.getResponseBody()); - assertTrue(client.isResponseBodyOK()); + Assert.assertTrue(client.isResponse200()); + Assert.assertEquals("abcd", client.getResponseBody()); + Assert.assertTrue(client.isResponseBodyOK()); } @@ -209,9 +206,9 @@ public class TestInternalInputBuffer ext "invalid"); client.doRequest(); - assertTrue(client.isResponse200()); - assertEquals("abcd", client.getResponseBody()); - assertTrue(client.isResponseBodyOK()); + Assert.assertTrue(client.isResponse200()); + Assert.assertEquals("abcd", client.getResponseBody()); + Assert.assertTrue(client.isResponseBodyOK()); } @@ -222,9 +219,9 @@ public class TestInternalInputBuffer ext "invalid"); client.doRequest(); - assertTrue(client.isResponse200()); - assertEquals("abcd", client.getResponseBody()); - assertTrue(client.isResponseBodyOK()); + Assert.assertTrue(client.isResponse200()); + Assert.assertEquals("abcd", client.getResponseBody()); + Assert.assertTrue(client.isResponseBodyOK()); } @@ -233,9 +230,9 @@ public class TestInternalInputBuffer ext new Bug51557Client("X-Bug" + s + "51557", "invalid"); client.doRequest(); - assertTrue(client.isResponse200()); - assertEquals("abcd", client.getResponseBody()); - assertTrue(client.isResponseBodyOK()); + Assert.assertTrue(client.isResponse200()); + Assert.assertEquals("abcd", client.getResponseBody()); + Assert.assertTrue(client.isResponseBodyOK()); } /** @@ -364,8 +361,8 @@ public class TestInternalInputBuffer ext NewLinesClient client = new NewLinesClient(10); client.doRequest(); - assertTrue(client.isResponse200()); - assertTrue(client.isResponseBodyOK()); + Assert.assertTrue(client.isResponse200()); + Assert.assertTrue(client.isResponseBodyOK()); } @@ -382,9 +379,9 @@ public class TestInternalInputBuffer ext // fail and the response won't be read. Exception e = client.doRequest(); if (e == null) { - assertTrue(client.isResponse400()); + Assert.assertTrue(client.isResponse400()); } - assertFalse(client.isResponseBodyOK()); + Assert.assertFalse(client.isResponseBodyOK()); } @@ -458,8 +455,8 @@ public class TestInternalInputBuffer ext Bug54947Client client = new Bug54947Client(); client.doRequest(); - assertTrue(client.isResponse200()); - assertTrue(client.isResponseBodyOK()); + Assert.assertTrue(client.isResponse200()); + Assert.assertTrue(client.isResponseBodyOK()); } @@ -522,8 +519,8 @@ public class TestInternalInputBuffer ext Bug59089Client client = new Bug59089Client(); client.doRequest(); - assertTrue(client.isResponse200()); - assertTrue(client.isResponseBodyOK()); + Assert.assertTrue(client.isResponse200()); + Assert.assertTrue(client.isResponseBodyOK()); } @@ -585,8 +582,8 @@ public class TestInternalInputBuffer ext InvalidMethodClient client = new InvalidMethodClient(); client.doRequest(); - assertTrue(client.getResponseLine(), client.isResponse400()); - assertTrue(client.isResponseBodyOK()); + Assert.assertTrue(client.getResponseLine(), client.isResponse400()); + Assert.assertTrue(client.isResponseBodyOK()); } Modified: tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java Mon Nov 13 12:00:30 2017 @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.coyote.http11.filters; import java.io.IOException; @@ -26,11 +25,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.assertNull; -import static org.junit.Assert.assertTrue; - +import org.junit.Assert; import org.junit.Test; import org.apache.catalina.Context; @@ -147,17 +142,17 @@ public class TestChunkedInputFilter exte } if (expectPass) { - assertTrue(client.isResponse200()); - assertEquals("nullnull7TestValue1TestValue2", + Assert.assertTrue(client.isResponse200()); + Assert.assertEquals("nullnull7TestValue1TestValue2", client.getResponseBody()); - assertNull(processException); - assertFalse(servlet.getExceptionDuringRead()); + Assert.assertNull(processException); + Assert.assertFalse(servlet.getExceptionDuringRead()); } else { if (processException == null) { - assertTrue(client.getResponseLine(), client.isResponse500()); + Assert.assertTrue(client.getResponseLine(), client.isResponse500()); } else { // Use fall-back for checking the error occurred - assertTrue(servlet.getExceptionDuringRead()); + Assert.assertTrue(servlet.getExceptionDuringRead()); } } } @@ -201,7 +196,7 @@ public class TestChunkedInputFilter exte client.processRequest(); // Expected to fail because the trailers are longer // than the set limit of 10 bytes - assertTrue(client.isResponse500()); + Assert.assertTrue(client.isResponse500()); } @@ -267,9 +262,9 @@ public class TestChunkedInputFilter exte client.processRequest(); if (ok) { - assertTrue(client.isResponse200()); + Assert.assertTrue(client.isResponse200()); } else { - assertTrue(client.isResponse500()); + Assert.assertTrue(client.isResponse500()); } } @@ -307,7 +302,7 @@ public class TestChunkedInputFilter exte client.connect(); client.processRequest(); - assertEquals("nullnull7nullnull", client.getResponseBody()); + Assert.assertEquals("nullnull7nullnull", client.getResponseBody()); } @Test @@ -411,20 +406,20 @@ public class TestChunkedInputFilter exte } if (expectPass) { if (expectReadWholeBody) { - assertNull(processException); + Assert.assertNull(processException); } if (processException == null) { - assertTrue(client.getResponseLine(), client.isResponse200()); - assertEquals(String.valueOf(expectReadCount), + Assert.assertTrue(client.getResponseLine(), client.isResponse200()); + Assert.assertEquals(String.valueOf(expectReadCount), client.getResponseBody()); } - assertEquals(expectReadCount, servlet.getCountRead()); + Assert.assertEquals(expectReadCount, servlet.getCountRead()); } else { if (processException == null) { - assertTrue(client.getResponseLine(), client.isResponse500()); + Assert.assertTrue(client.getResponseLine(), client.isResponse500()); } - assertEquals(0, servlet.getCountRead()); - assertTrue(servlet.getExceptionDuringRead()); + Assert.assertEquals(0, servlet.getCountRead()); + Assert.assertTrue(servlet.getExceptionDuringRead()); } } Modified: tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java Mon Nov 13 12:00:30 2017 @@ -43,7 +43,6 @@ import org.junit.Assert; import org.junit.Test; import static org.apache.catalina.startup.SimpleHttpClient.CRLF; - import org.apache.catalina.Context; import org.apache.catalina.startup.Tomcat; import org.apache.catalina.startup.TomcatBaseTest; Modified: tomcat/tc8.0.x/trunk/test/org/apache/el/TestELEvaluation.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/el/TestELEvaluation.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/el/TestELEvaluation.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/el/TestELEvaluation.java Mon Nov 13 12:00:30 2017 @@ -23,11 +23,6 @@ import java.util.Date; import javax.el.ELException; import javax.el.ValueExpression; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import org.junit.Assert; import org.junit.Test; @@ -47,22 +42,22 @@ public class TestELEvaluation { */ @Test public void testBug42565() { - assertEquals("false", evaluateExpression("${false?true:false}")); - assertEquals("false", evaluateExpression("${false?true: false}")); - assertEquals("false", evaluateExpression("${false?true :false}")); - assertEquals("false", evaluateExpression("${false?true : false}")); - assertEquals("false", evaluateExpression("${false? true:false}")); - assertEquals("false", evaluateExpression("${false? true: false}")); - assertEquals("false", evaluateExpression("${false? true :false}")); - assertEquals("false", evaluateExpression("${false? true : false}")); - assertEquals("false", evaluateExpression("${false ?true:false}")); - assertEquals("false", evaluateExpression("${false ?true: false}")); - assertEquals("false", evaluateExpression("${false ?true :false}")); - assertEquals("false", evaluateExpression("${false ?true : false}")); - assertEquals("false", evaluateExpression("${false ? true:false}")); - assertEquals("false", evaluateExpression("${false ? true: false}")); - assertEquals("false", evaluateExpression("${false ? true :false}")); - assertEquals("false", evaluateExpression("${false ? true : false}")); + Assert.assertEquals("false", evaluateExpression("${false?true:false}")); + Assert.assertEquals("false", evaluateExpression("${false?true: false}")); + Assert.assertEquals("false", evaluateExpression("${false?true :false}")); + Assert.assertEquals("false", evaluateExpression("${false?true : false}")); + Assert.assertEquals("false", evaluateExpression("${false? true:false}")); + Assert.assertEquals("false", evaluateExpression("${false? true: false}")); + Assert.assertEquals("false", evaluateExpression("${false? true :false}")); + Assert.assertEquals("false", evaluateExpression("${false? true : false}")); + Assert.assertEquals("false", evaluateExpression("${false ?true:false}")); + Assert.assertEquals("false", evaluateExpression("${false ?true: false}")); + Assert.assertEquals("false", evaluateExpression("${false ?true :false}")); + Assert.assertEquals("false", evaluateExpression("${false ?true : false}")); + Assert.assertEquals("false", evaluateExpression("${false ? true:false}")); + Assert.assertEquals("false", evaluateExpression("${false ? true: false}")); + Assert.assertEquals("false", evaluateExpression("${false ? true :false}")); + Assert.assertEquals("false", evaluateExpression("${false ? true : false}")); } @@ -71,27 +66,27 @@ public class TestELEvaluation { */ @Test public void testBug44994() { - assertEquals("none", evaluateExpression( + Assert.assertEquals("none", evaluateExpression( "${0 lt 0 ? 1 lt 0 ? 'many': 'one': 'none'}")); - assertEquals("one", evaluateExpression( + Assert.assertEquals("one", evaluateExpression( "${0 lt 1 ? 1 lt 1 ? 'many': 'one': 'none'}")); - assertEquals("many", evaluateExpression( + Assert.assertEquals("many", evaluateExpression( "${0 lt 2 ? 1 lt 2 ? 'many': 'one': 'none'}")); } @Test public void testParserBug45511() { // Test cases provided by OP - assertEquals("true", evaluateExpression("${empty ('')}")); - assertEquals("true", evaluateExpression("${empty('')}")); - assertEquals("false", evaluateExpression("${(true) and (false)}")); - assertEquals("false", evaluateExpression("${(true)and(false)}")); + Assert.assertEquals("true", evaluateExpression("${empty ('')}")); + Assert.assertEquals("true", evaluateExpression("${empty('')}")); + Assert.assertEquals("false", evaluateExpression("${(true) and (false)}")); + Assert.assertEquals("false", evaluateExpression("${(true)and(false)}")); } @Test public void testBug48112() { // bug 48112 - assertEquals("{world}", evaluateExpression("${fn:trim('{world}')}")); + Assert.assertEquals("{world}", evaluateExpression("${fn:trim('{world}')}")); } @Test @@ -100,30 +95,30 @@ public class TestELEvaluation { // list and looking at the spec to find some edge cases // '\' is only an escape character inside a StringLiteral - assertEquals("\\\\", evaluateExpression("\\\\")); + Assert.assertEquals("\\\\", evaluateExpression("\\\\")); /* * LiteralExpressions can only contain ${ or #{ if escaped with \ * \ is not an escape character in any other circumstances including \\ */ - assertEquals("\\", evaluateExpression("\\")); - assertEquals("$", evaluateExpression("$")); - assertEquals("#", evaluateExpression("#")); - assertEquals("\\$", evaluateExpression("\\$")); - assertEquals("\\#", evaluateExpression("\\#")); - assertEquals("\\\\$", evaluateExpression("\\\\$")); - assertEquals("\\\\#", evaluateExpression("\\\\#")); - assertEquals("${", evaluateExpression("\\${")); - assertEquals("#{", evaluateExpression("\\#{")); - assertEquals("\\${", evaluateExpression("\\\\${")); - assertEquals("\\#{", evaluateExpression("\\\\#{")); + Assert.assertEquals("\\", evaluateExpression("\\")); + Assert.assertEquals("$", evaluateExpression("$")); + Assert.assertEquals("#", evaluateExpression("#")); + Assert.assertEquals("\\$", evaluateExpression("\\$")); + Assert.assertEquals("\\#", evaluateExpression("\\#")); + Assert.assertEquals("\\\\$", evaluateExpression("\\\\$")); + Assert.assertEquals("\\\\#", evaluateExpression("\\\\#")); + Assert.assertEquals("${", evaluateExpression("\\${")); + Assert.assertEquals("#{", evaluateExpression("\\#{")); + Assert.assertEquals("\\${", evaluateExpression("\\\\${")); + Assert.assertEquals("\\#{", evaluateExpression("\\\\#{")); // '\' is only an escape for '${' and '#{'. - assertEquals("\\$", evaluateExpression("\\$")); - assertEquals("${", evaluateExpression("\\${")); - assertEquals("\\$a", evaluateExpression("\\$a")); - assertEquals("\\a", evaluateExpression("\\a")); - assertEquals("\\\\", evaluateExpression("\\\\")); + Assert.assertEquals("\\$", evaluateExpression("\\$")); + Assert.assertEquals("${", evaluateExpression("\\${")); + Assert.assertEquals("\\$a", evaluateExpression("\\$a")); + Assert.assertEquals("\\a", evaluateExpression("\\a")); + Assert.assertEquals("\\\\", evaluateExpression("\\\\")); } @Test @@ -133,10 +128,10 @@ public class TestELEvaluation { // The only characters that can be escaped inside a String literal // are \ " and '. # and $ are not escaped inside a String literal. - assertEquals("\\", evaluateExpression("${'\\\\'}")); - assertEquals("\\", evaluateExpression("${\"\\\\\"}")); - assertEquals("\\\"'$#", evaluateExpression("${'\\\\\\\"\\'$#'}")); - assertEquals("\\\"'$#", evaluateExpression("${\"\\\\\\\"\\'$#\"}")); + Assert.assertEquals("\\", evaluateExpression("${'\\\\'}")); + Assert.assertEquals("\\", evaluateExpression("${\"\\\\\"}")); + Assert.assertEquals("\\\"'$#", evaluateExpression("${'\\\\\\\"\\'$#'}")); + Assert.assertEquals("\\\"'$#", evaluateExpression("${\"\\\\\\\"\\'$#\"}")); // Trying to quote # or $ should throw an error Exception e = null; @@ -145,34 +140,34 @@ public class TestELEvaluation { } catch (ELException el) { e = el; } - assertNotNull(e); + Assert.assertNotNull(e); - assertEquals("\\$", evaluateExpression("${'\\\\$'}")); - assertEquals("\\\\$", evaluateExpression("${'\\\\\\\\$'}")); + Assert.assertEquals("\\$", evaluateExpression("${'\\\\$'}")); + Assert.assertEquals("\\\\$", evaluateExpression("${'\\\\\\\\$'}")); // Can use ''' inside '"' when quoting with '"' and vice versa without // escaping - assertEquals("\\\"", evaluateExpression("${'\\\\\"'}")); - assertEquals("\"\\", evaluateExpression("${'\"\\\\'}")); - assertEquals("\\'", evaluateExpression("${'\\\\\\''}")); - assertEquals("'\\", evaluateExpression("${'\\'\\\\'}")); - assertEquals("\\'", evaluateExpression("${\"\\\\'\"}")); - assertEquals("'\\", evaluateExpression("${\"'\\\\\"}")); - assertEquals("\\\"", evaluateExpression("${\"\\\\\\\"\"}")); - assertEquals("\"\\", evaluateExpression("${\"\\\"\\\\\"}")); + Assert.assertEquals("\\\"", evaluateExpression("${'\\\\\"'}")); + Assert.assertEquals("\"\\", evaluateExpression("${'\"\\\\'}")); + Assert.assertEquals("\\'", evaluateExpression("${'\\\\\\''}")); + Assert.assertEquals("'\\", evaluateExpression("${'\\'\\\\'}")); + Assert.assertEquals("\\'", evaluateExpression("${\"\\\\'\"}")); + Assert.assertEquals("'\\", evaluateExpression("${\"'\\\\\"}")); + Assert.assertEquals("\\\"", evaluateExpression("${\"\\\\\\\"\"}")); + Assert.assertEquals("\"\\", evaluateExpression("${\"\\\"\\\\\"}")); } @Test public void testMultipleEscaping() throws Exception { - assertEquals("''", evaluateExpression("${\"\'\'\"}")); + Assert.assertEquals("''", evaluateExpression("${\"\'\'\"}")); } private void compareBoth(String msg, int expected, Object o1, Object o2){ int i1 = ELSupport.compare(null, o1, o2); int i2 = ELSupport.compare(null, o2, o1); - assertEquals(msg,expected, i1); - assertEquals(msg,expected, -i2); + Assert.assertEquals(msg,expected, i1); + Assert.assertEquals(msg,expected, -i2); } @Test @@ -184,11 +179,11 @@ public class TestELEvaluation { compareBoth("Date(0) should be less than Date(1)",-1, new Date(0), new Date(1)); try { compareBoth("Should not compare",0, new Date(), new File("")); - fail("Expecting ClassCastException"); + Assert.fail("Expecting ClassCastException"); } catch (ClassCastException expected) { // Expected } - assertTrue(null == null); + Assert.assertTrue(null == null); } /** @@ -203,7 +198,7 @@ public class TestELEvaluation { } catch (ELException el) { e = el; } - assertNotNull(e); + Assert.assertNotNull(e); } @Test Modified: tomcat/tc8.0.x/trunk/test/org/apache/el/TestMethodExpressionImpl.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/el/TestMethodExpressionImpl.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/el/TestMethodExpressionImpl.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/el/TestMethodExpressionImpl.java Mon Nov 13 12:00:30 2017 @@ -22,11 +22,7 @@ import javax.el.ExpressionFactory; import javax.el.MethodExpression; import javax.el.ValueExpression; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - +import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -92,8 +88,8 @@ public class TestMethodExpressionImpl { context, "${beanB.sayHello('JUnit')}", String.class, new Class<?>[] { String.class }); - assertFalse(me1.isParametersProvided()); - assertTrue(me2.isParametersProvided()); + Assert.assertFalse(me1.isParametersProvided()); + Assert.assertTrue(me2.isParametersProvided()); } @Test @@ -107,15 +103,15 @@ public class TestMethodExpressionImpl { context, "${beanB.sayHello}", String.class, new Class<?>[] { String.class }); - assertEquals("B", me1.invoke(context, null)); - assertEquals("Hello JUnit from B", me2.invoke(context, null)); - assertEquals("Hello JUnit from B", + Assert.assertEquals("B", me1.invoke(context, null)); + Assert.assertEquals("Hello JUnit from B", me2.invoke(context, null)); + Assert.assertEquals("Hello JUnit from B", me2.invoke(context, new Object[] { "JUnit2" })); - assertEquals("Hello JUnit2 from B", + Assert.assertEquals("Hello JUnit2 from B", me3.invoke(context, new Object[] { "JUnit2" })); - assertEquals("Hello JUnit from B", + Assert.assertEquals("Hello JUnit from B", me2.invoke(context, new Object[] { null })); - assertEquals("Hello from B", + Assert.assertEquals("Hello from B", me3.invoke(context, new Object[] { null })); } @@ -128,7 +124,7 @@ public class TestMethodExpressionImpl { ValueExpression ve = factory.createValueExpression(context, "${beanA.bean.name}", String.class); Object r = ve.getValue(context); - assertEquals("BB", r); + Assert.assertEquals("BB", r); } @Test @@ -136,7 +132,7 @@ public class TestMethodExpressionImpl { MethodExpression me2 = factory.createMethodExpression(context, "${beanC.sayHello(beanA,beanB)}", null , null); Object r2 = me2.invoke(context, null); - assertEquals("AB: Hello A from B", r2.toString()); + Assert.assertEquals("AB: Hello A from B", r2.toString()); } @Test @@ -144,7 +140,7 @@ public class TestMethodExpressionImpl { MethodExpression me3 = factory.createMethodExpression(context, "${beanC.sayHello(beanA,beanB)}", String.class , null); Object r3 = me3.invoke(context, null); - assertEquals("AB: Hello A from B", r3.toString()); + Assert.assertEquals("AB: Hello A from B", r3.toString()); } @Test @@ -153,7 +149,7 @@ public class TestMethodExpressionImpl { "${beanC.sayHello(beanA,beanB)}", null , new Class<?>[] {TesterBeanA.class, TesterBeanB.class}); Object r4 = me4.invoke(context, null); - assertEquals("AB: Hello A from B", r4.toString()); + Assert.assertEquals("AB: Hello A from B", r4.toString()); } @Test @@ -162,7 +158,7 @@ public class TestMethodExpressionImpl { "${beanC.sayHello(beanA,beanB)}", String.class , new Class<?>[] {TesterBeanA.class, TesterBeanB.class}); Object r5 = me5.invoke(context, null); - assertEquals("AB: Hello A from B", r5.toString()); + Assert.assertEquals("AB: Hello A from B", r5.toString()); } @Test @@ -170,7 +166,7 @@ public class TestMethodExpressionImpl { MethodExpression me6 = factory.createMethodExpression(context, "${beanC.sayHello(beanA,beanBB)}", null , null); Object r6 = me6.invoke(context, null); - assertEquals("ABB: Hello A from BB", r6.toString()); + Assert.assertEquals("ABB: Hello A from BB", r6.toString()); } @Test @@ -178,7 +174,7 @@ public class TestMethodExpressionImpl { MethodExpression me7 = factory.createMethodExpression(context, "${beanC.sayHello(beanA,beanBBB)}", null , null); Object r7 = me7.invoke(context, null); - assertEquals("ABB: Hello A from BBB", r7.toString()); + Assert.assertEquals("ABB: Hello A from BBB", r7.toString()); } @Test @@ -186,7 +182,7 @@ public class TestMethodExpressionImpl { MethodExpression me8 = factory.createMethodExpression(context, "${beanC.sayHello(beanAA,beanB)}", null , null); Object r8 = me8.invoke(context, null); - assertEquals("AAB: Hello AA from B", r8.toString()); + Assert.assertEquals("AAB: Hello AA from B", r8.toString()); } @Test @@ -200,7 +196,7 @@ public class TestMethodExpressionImpl { e = e1; } // Expected to fail - assertNotNull(e); + Assert.assertNotNull(e); } @Test @@ -211,7 +207,7 @@ public class TestMethodExpressionImpl { MethodExpression me10 = factory.createMethodExpression(context, "${beanC.sayHello(beanAA,beanBBB)}", null , null); Object r10 = me10.invoke(context, null); - assertEquals("AAB: Hello AA from BBB", r10.toString()); + Assert.assertEquals("AAB: Hello AA from BBB", r10.toString()); } @Test @@ -219,7 +215,7 @@ public class TestMethodExpressionImpl { MethodExpression me11 = factory.createMethodExpression(context, "${beanC.sayHello(beanAAA,beanB)}", null , null); Object r11 = me11.invoke(context, null); - assertEquals("AAB: Hello AAA from B", r11.toString()); + Assert.assertEquals("AAB: Hello AAA from B", r11.toString()); } @Test @@ -230,7 +226,7 @@ public class TestMethodExpressionImpl { MethodExpression me12 = factory.createMethodExpression(context, "${beanC.sayHello(beanAAA,beanBB)}", null , null); Object r12 = me12.invoke(context, null); - assertEquals("ABB: Hello AAA from BB", r12.toString()); + Assert.assertEquals("ABB: Hello AAA from BB", r12.toString()); } @Test @@ -244,7 +240,7 @@ public class TestMethodExpressionImpl { e = e1; } // Expected to fail - assertNotNull(e); + Assert.assertNotNull(e); } @Test @@ -258,7 +254,7 @@ public class TestMethodExpressionImpl { e = e1; } // Expected to fail - assertNotNull(e); + Assert.assertNotNull(e); } @Test @@ -266,7 +262,7 @@ public class TestMethodExpressionImpl { MethodExpression me2 = factory.createMethodExpression(context, "${beanC.sayHello(beanA,beanBB,beanBB)}", null , null); Object r2 = me2.invoke(context, null); - assertEquals("ABB[]: Hello A from BB, BB", r2.toString()); + Assert.assertEquals("ABB[]: Hello A from BB, BB", r2.toString()); } @Test @@ -274,7 +270,7 @@ public class TestMethodExpressionImpl { MethodExpression me3 = factory.createMethodExpression(context, "${beanC.sayHello(beanA,beanBBB,beanBBB)}", null , null); Object r3 = me3.invoke(context, null); - assertEquals("ABB[]: Hello A from BBB, BBB", r3.toString()); + Assert.assertEquals("ABB[]: Hello A from BBB, BBB", r3.toString()); } @Test @@ -288,7 +284,7 @@ public class TestMethodExpressionImpl { e = e1; } // Expected to fail - assertNotNull(e); + Assert.assertNotNull(e); } @Test @@ -296,7 +292,7 @@ public class TestMethodExpressionImpl { MethodExpression me5 = factory.createMethodExpression(context, "${beanC.sayHello(beanAA,beanBB,beanBB)}", null , null); Object r5 = me5.invoke(context, null); - assertEquals("ABB[]: Hello AA from BB, BB", r5.toString()); + Assert.assertEquals("ABB[]: Hello AA from BB, BB", r5.toString()); } @Test @@ -304,7 +300,7 @@ public class TestMethodExpressionImpl { MethodExpression me6 = factory.createMethodExpression(context, "${beanC.sayHello(beanAA,beanBBB,beanBBB)}", null , null); Object r6 = me6.invoke(context, null); - assertEquals("ABB[]: Hello AA from BBB, BBB", r6.toString()); + Assert.assertEquals("ABB[]: Hello AA from BBB, BBB", r6.toString()); } @Test @@ -318,7 +314,7 @@ public class TestMethodExpressionImpl { e = e1; } // Expected to fail - assertNotNull(e); + Assert.assertNotNull(e); } @Test @@ -326,7 +322,7 @@ public class TestMethodExpressionImpl { MethodExpression me8 = factory.createMethodExpression(context, "${beanC.sayHello(beanAAA,beanBB,beanBB)}", null , null); Object r8 = me8.invoke(context, null); - assertEquals("ABB[]: Hello AAA from BB, BB", r8.toString()); + Assert.assertEquals("ABB[]: Hello AAA from BB, BB", r8.toString()); } @Test @@ -334,7 +330,7 @@ public class TestMethodExpressionImpl { MethodExpression me9 = factory.createMethodExpression(context, "${beanC.sayHello(beanAAA,beanBBB,beanBBB)}", null , null); Object r9 = me9.invoke(context, null); - assertEquals("ABB[]: Hello AAA from BBB, BBB", r9.toString()); + Assert.assertEquals("ABB[]: Hello AAA from BBB, BBB", r9.toString()); } /* @@ -350,7 +346,7 @@ public class TestMethodExpressionImpl { me.invoke(context, null); ValueExpression ve = factory.createValueExpression(context, "#{beanA.name}", java.lang.String.class); - assertEquals("New value", ve.getValue(context)); + Assert.assertEquals("New value", ve.getValue(context)); } @Test @@ -360,7 +356,7 @@ public class TestMethodExpressionImpl { me.invoke(context, null); ValueExpression ve = factory.createValueExpression(context, "#{beanA.valLong}", java.lang.String.class); - assertEquals("5", ve.getValue(context)); + Assert.assertEquals("5", ve.getValue(context)); } @Test @@ -368,7 +364,7 @@ public class TestMethodExpressionImpl { MethodExpression me1 = factory.createMethodExpression(context, "${beanB.sayHello()}", null, null); String actual = (String) me1.invoke(context, null); - assertEquals("Hello from B", actual); + Assert.assertEquals("Hello from B", actual); } @Test @@ -376,7 +372,7 @@ public class TestMethodExpressionImpl { MethodExpression me1 = factory.createMethodExpression(context, "${beanB.sayHello('Tomcat')}", null, null); String actual = (String) me1.invoke(context, null); - assertEquals("Hello Tomcat from B", actual); + Assert.assertEquals("Hello Tomcat from B", actual); } @Test @@ -384,7 +380,7 @@ public class TestMethodExpressionImpl { ValueExpression ve = factory.createValueExpression(context, "#{beanAA.name.contains(beanA.name)}", java.lang.Boolean.class); Boolean actual = (Boolean) ve.getValue(context); - assertEquals(Boolean.TRUE, actual); + Assert.assertEquals(Boolean.TRUE, actual); } @Test @@ -392,7 +388,7 @@ public class TestMethodExpressionImpl { ValueExpression ve = factory.createValueExpression(context, "#{beanA.name.contains(beanAA.name)}", java.lang.Boolean.class); Boolean actual = (Boolean) ve.getValue(context); - assertEquals(Boolean.FALSE, actual); + Assert.assertEquals(Boolean.FALSE, actual); } @Test @@ -405,7 +401,7 @@ public class TestMethodExpressionImpl { MethodExpression me1 = factory.createMethodExpression(context, "${beanA.bean.sayHello()}", null, null); String actual = (String) me1.invoke(context, null); - assertEquals("Hello from BB", actual); + Assert.assertEquals("Hello from BB", actual); } @Test @@ -418,7 +414,7 @@ public class TestMethodExpressionImpl { ValueExpression ve = factory.createValueExpression(context, "#{beanEnum.lastSubmitted}", TesterEnum.class); TesterEnum actual = (TesterEnum) ve.getValue(context); - assertEquals(TesterEnum.APPLE, actual); + Assert.assertEquals(TesterEnum.APPLE, actual); } @@ -436,7 +432,7 @@ public class TestMethodExpressionImpl { ValueExpression ve = factory.createValueExpression(context, "#{beanA.getBean().name}", java.lang.String.class); String actual = (String) ve.getValue(context); - assertEquals(BUG53792, actual); + Assert.assertEquals(BUG53792, actual); } @Test @@ -453,7 +449,7 @@ public class TestMethodExpressionImpl { ValueExpression ve = factory.createValueExpression(context, "#{beanA.getBean().name.length()}", java.lang.Integer.class); Integer actual = (Integer) ve.getValue(context); - assertEquals(Integer.valueOf(BUG53792.length()), actual); + Assert.assertEquals(Integer.valueOf(BUG53792.length()), actual); } @@ -462,7 +458,7 @@ public class TestMethodExpressionImpl { MethodExpression me = factory.createMethodExpression(context, "#{beanB.sayHello().length()}", null, new Class<?>[] {}); Integer result = (Integer) me.invoke(context, null); - assertEquals(beanB.sayHello().length(), result.intValue()); + Assert.assertEquals(beanB.sayHello().length(), result.intValue()); } @@ -471,7 +467,7 @@ public class TestMethodExpressionImpl { MethodExpression me = factory.createMethodExpression(context, "#{beanB.sayHello().length()}", null, new Class<?>[] {}); Integer result = (Integer) me.invoke(context, new Object[] { "foo" }); - assertEquals(beanB.sayHello().length(), result.intValue()); + Assert.assertEquals(beanB.sayHello().length(), result.intValue()); } @@ -480,7 +476,7 @@ public class TestMethodExpressionImpl { MethodExpression me = factory.createMethodExpression(context, "${beanAA.echo1('Hello World!')}", null , null); Object r = me.invoke(context, null); - assertEquals("AA1Hello World!", r.toString()); + Assert.assertEquals("AA1Hello World!", r.toString()); } @@ -489,7 +485,7 @@ public class TestMethodExpressionImpl { MethodExpression me = factory.createMethodExpression(context, "${beanAA.echo2('Hello World!')}", null , null); Object r = me.invoke(context, null); - assertEquals("AA2Hello World!", r.toString()); + Assert.assertEquals("AA2Hello World!", r.toString()); } @@ -521,14 +517,14 @@ public class TestMethodExpressionImpl { MethodExpression me = factory.createMethodExpression(context, "${beanB.echo}", null , new Class[]{String.class}); Object r = me.invoke(context, new String[] { "aaa" }); - assertEquals("aaa", r.toString()); + Assert.assertEquals("aaa", r.toString()); } @Test public void testBug57855e() { MethodExpression me = factory.createMethodExpression(context, "${beanB.echo}", null , new Class[]{String.class}); Object r = me.invoke(context, new String[] { "aaa", "bbb" }); - assertEquals("aaa, bbb", r.toString()); + Assert.assertEquals("aaa, bbb", r.toString()); } Modified: tomcat/tc8.0.x/trunk/test/org/apache/el/TestValueExpressionImpl.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/el/TestValueExpressionImpl.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/el/TestValueExpressionImpl.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/el/TestValueExpressionImpl.java Mon Nov 13 12:00:30 2017 @@ -28,9 +28,7 @@ import javax.el.ExpressionFactory; import javax.el.ValueExpression; import javax.el.ValueReference; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - +import org.junit.Assert; import org.junit.Test; import org.apache.jasper.el.ELContextImpl; @@ -53,14 +51,14 @@ public class TestValueExpressionImpl { // First check the basics work String result = (String) ve.getValue(context); - assertEquals("Tomcat", result); + Assert.assertEquals("Tomcat", result); // Now check the value reference ValueReference vr = ve.getValueReference(context); - assertNotNull(vr); + Assert.assertNotNull(vr); - assertEquals(beanB, vr.getBase()); - assertEquals("name", vr.getProperty()); + Assert.assertEquals(beanB, vr.getBase()); + Assert.assertEquals("name", vr.getProperty()); } @Test @@ -85,10 +83,10 @@ public class TestValueExpressionImpl { // Now check the value reference ValueReference vr = ve.getValueReference(context); - assertNotNull(vr); + Assert.assertNotNull(vr); - assertEquals(beanB, vr.getBase()); - assertEquals("name", vr.getProperty()); + Assert.assertEquals(beanB, vr.getBase()); + Assert.assertEquals("name", vr.getProperty()); } @Test @@ -110,14 +108,14 @@ public class TestValueExpressionImpl { // First check the basics work String result = (String) ve.getValue(context); - assertEquals("Tomcat", result); + Assert.assertEquals("Tomcat", result); // Now check the value reference ValueReference vr = ve.getValueReference(context); - assertNotNull(vr); + Assert.assertNotNull(vr); - assertEquals(beanB, vr.getBase()); - assertEquals("name", vr.getProperty()); + Assert.assertEquals(beanB, vr.getBase()); + Assert.assertEquals("name", vr.getProperty()); } @Test @@ -135,12 +133,12 @@ public class TestValueExpressionImpl { ValueExpression ve1 = factory.createValueExpression( context, "${testEnum}", String.class); String result1 = (String) ve1.getValue(context); - assertEquals("APPLE", result1); + Assert.assertEquals("APPLE", result1); ValueExpression ve2 = factory.createValueExpression( context, "foo${testEnum}bar", String.class); String result2 = (String) ve2.getValue(context); - assertEquals("fooAPPLEbar", result2); + Assert.assertEquals("fooAPPLEbar", result2); } @Test @@ -162,12 +160,12 @@ public class TestValueExpressionImpl { ValueExpression ve1 = factory.createValueExpression( context, "${map.key1}", Object.class); ve1.setValue(context, o2); - assertEquals(o2, ve1.getValue(context)); + Assert.assertEquals(o2, ve1.getValue(context)); ValueExpression ve2 = factory.createValueExpression( context, "${map.key2}", Object.class); ve2.setValue(context, o1); - assertEquals(o1, ve2.getValue(context)); + Assert.assertEquals(o1, ve2.getValue(context)); } @Test @@ -189,12 +187,12 @@ public class TestValueExpressionImpl { ValueExpression ve1 = factory.createValueExpression( context, "${list[0]}", Object.class); ve1.setValue(context, o2); - assertEquals(o2, ve1.getValue(context)); + Assert.assertEquals(o2, ve1.getValue(context)); ValueExpression ve2 = factory.createValueExpression( context, "${list[1]}", Object.class); ve2.setValue(context, o1); - assertEquals(o1, ve2.getValue(context)); + Assert.assertEquals(o1, ve2.getValue(context)); } @@ -217,7 +215,7 @@ public class TestValueExpressionImpl { context, "${beanA.valList.size()}", Integer.class); Integer result = (Integer) ve.getValue(context); - assertEquals(Integer.valueOf(0), result); + Assert.assertEquals(Integer.valueOf(0), result); } @@ -239,7 +237,7 @@ public class TestValueExpressionImpl { context, "${list.size()}", Integer.class); Integer result = (Integer) ve.getValue(context); - assertEquals(Integer.valueOf(0), result); + Assert.assertEquals(Integer.valueOf(0), result); } @@ -259,11 +257,11 @@ public class TestValueExpressionImpl { // First check the basics work String result = (String) ve.getValue(context); - assertEquals("Tomcat", result); + Assert.assertEquals("Tomcat", result); // Now set the value to null ve.setValue(context, null); - assertEquals("", beanB.getName()); + Assert.assertEquals("", beanB.getName()); } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
