Author: markt
Date: Mon Nov 13 11:25:51 2017
New Revision: 1815083
URL: http://svn.apache.org/viewvc?rev=1815083&view=rev
Log:
Remove use of all static Assert.* imports
- fixes Gump errors with latest Checkstyle
- doesn't introduce errors for older Checkstyle
- makes unit tests consistent with use of Assert
Modified:
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/ShouldForceReconnectTest.java
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/BorrowWaitTest.java
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/StarvationTest.java
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestJdbcInterceptorConfigParsing.java
tomcat/tc8.5.x/trunk/test/javax/el/TestCompositeELResolver.java
tomcat/tc8.5.x/trunk/test/javax/servlet/jsp/TestPageContext.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/ant/TestDeployTask.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndBasicAuthenticator.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestConnector.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestOutputBuffer.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestRequest.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestResponse.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestSendFile.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationSessionCookieConfig.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestDefaultInstanceManager.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestNamingContextListener.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestStandardContext.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestStandardContextValve.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestStandardWrapper.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/filters/TestAddCharSetFilter.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter2.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/filters/TestRemoteIpFilter.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/filters/TestRestCsrfPreventionFilter.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/filters/TestRestCsrfPreventionFilter2.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/loader/TestVirtualContext.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/loader/TestVirtualWebappLoader.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/mapper/TestMapper.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/mapper/TestMapperPerformance.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/servlets/TestWebdavServlet.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/session/Benchmarks.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/session/Threading.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/LoggingBaseTest.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TestBootstrap.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TestListener.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TestTomcat.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TestTomcatClassLoader.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestGzipInterceptor.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/tribes/membership/TestMemberImplSerialization.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/util/TestContextName.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/valves/TestRemoteIpValve.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/valves/TestRequestFilterValve.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java
tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11InputBuffer.java
tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java
tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/filters/TestGzipOutputFilter.java
tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java
tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
tomcat/tc8.5.x/trunk/test/org/apache/el/TestELEvaluation.java
tomcat/tc8.5.x/trunk/test/org/apache/el/TestMethodExpressionImpl.java
tomcat/tc8.5.x/trunk/test/org/apache/el/TestValueExpressionImpl.java
tomcat/tc8.5.x/trunk/test/org/apache/el/lang/TestELArithmetic.java
tomcat/tc8.5.x/trunk/test/org/apache/el/lang/TestELSupport.java
tomcat/tc8.5.x/trunk/test/org/apache/el/parser/TestELParser.java
tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java
tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestCompiler.java
tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestGenerator.java
tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestJspConfig.java
tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestParser.java
tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java
tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestScriptingVariabler.java
tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestValidator.java
tomcat/tc8.5.x/trunk/test/org/apache/jasper/util/TestFastRemovalDequeue.java
tomcat/tc8.5.x/trunk/test/org/apache/juli/TestFileHandler.java
tomcat/tc8.5.x/trunk/test/org/apache/juli/TestFileHandlerNonRotatable.java
tomcat/tc8.5.x/trunk/test/org/apache/naming/resources/TestNamingContext.java
tomcat/tc8.5.x/trunk/test/org/apache/naming/resources/TestWarDirContext.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/buf/TestUEncoder.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/descriptor/web/TestSecurityConstraint.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXmlOrdering.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestParameters.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TesterParametersPerformance.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/parser/TestMediaType.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TestSsl.java
Modified:
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/ShouldForceReconnectTest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/ShouldForceReconnectTest.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/ShouldForceReconnectTest.java
(original)
+++
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/ShouldForceReconnectTest.java
Mon Nov 13 11:25:51 2017
@@ -16,10 +16,8 @@
*/
package org.apache.tomcat.jdbc.pool;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
import org.junit.After;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -59,74 +57,74 @@ public class ShouldForceReconnectTest {
//connection previously connect with default
configureDefault(con);
- assertFalse(con.shouldForceReconnect(null, null));
+ Assert.assertFalse(con.shouldForceReconnect(null, null));
configureDefault(con);
- assertFalse(con.shouldForceReconnect(DEFAULT_USER, DEFAULT_PASSWD));
+ Assert.assertFalse(con.shouldForceReconnect(DEFAULT_USER,
DEFAULT_PASSWD));
configureDefault(con);
- assertFalse(con.shouldForceReconnect(null,DEFAULT_PASSWD));
+ Assert.assertFalse(con.shouldForceReconnect(null,DEFAULT_PASSWD));
configureDefault(con);
- assertFalse(con.shouldForceReconnect(DEFAULT_USER, null));
+ Assert.assertFalse(con.shouldForceReconnect(DEFAULT_USER, null));
configureDefault(con);
- assertTrue(con.shouldForceReconnect(ALT_USER,ALT_PASSWD));
+ Assert.assertTrue(con.shouldForceReconnect(ALT_USER,ALT_PASSWD));
configureDefault(con);
- assertTrue(con.shouldForceReconnect(null,ALT_PASSWD));
+ Assert.assertTrue(con.shouldForceReconnect(null,ALT_PASSWD));
configureDefault(con);
- assertTrue(con.shouldForceReconnect(ALT_USER,null));
+ Assert.assertTrue(con.shouldForceReconnect(ALT_USER,null));
//connection previously connect with alternate
configureAlt(con);
- assertFalse(con.shouldForceReconnect(ALT_USER, ALT_PASSWD));
+ Assert.assertFalse(con.shouldForceReconnect(ALT_USER, ALT_PASSWD));
configureAlt(con);
- assertTrue(con.shouldForceReconnect(null, null));
+ Assert.assertTrue(con.shouldForceReconnect(null, null));
configureAlt(con);
- assertTrue(con.shouldForceReconnect(DEFAULT_USER, DEFAULT_PASSWD));
+ Assert.assertTrue(con.shouldForceReconnect(DEFAULT_USER,
DEFAULT_PASSWD));
configureAlt(con);
- assertTrue(con.shouldForceReconnect(null, DEFAULT_PASSWD));
+ Assert.assertTrue(con.shouldForceReconnect(null, DEFAULT_PASSWD));
configureAlt(con);
- assertTrue(con.shouldForceReconnect(DEFAULT_USER, null));
+ Assert.assertTrue(con.shouldForceReconnect(DEFAULT_USER, null));
configureAlt(con);
- assertTrue(con.shouldForceReconnect(null,ALT_PASSWD));
+ Assert.assertTrue(con.shouldForceReconnect(null,ALT_PASSWD));
configureAlt(con);
- assertTrue(con.shouldForceReconnect(ALT_USER,null));
+ Assert.assertTrue(con.shouldForceReconnect(ALT_USER,null));
//test changes in username password
configureDefault(con);
- assertFalse(con.shouldForceReconnect(null, null));
- assertTrue(con.shouldForceReconnect(ALT_USER, ALT_PASSWD));
- assertFalse(con.shouldForceReconnect(ALT_USER, ALT_PASSWD));
- assertTrue(con.shouldForceReconnect(null, null));
+ Assert.assertFalse(con.shouldForceReconnect(null, null));
+ Assert.assertTrue(con.shouldForceReconnect(ALT_USER, ALT_PASSWD));
+ Assert.assertFalse(con.shouldForceReconnect(ALT_USER, ALT_PASSWD));
+ Assert.assertTrue(con.shouldForceReconnect(null, null));
configureDefault(con);
- assertFalse(con.shouldForceReconnect(DEFAULT_USER, DEFAULT_PASSWD));
- assertTrue(con.shouldForceReconnect(ALT_USER, ALT_PASSWD));
- assertFalse(con.shouldForceReconnect(ALT_USER, ALT_PASSWD));
- assertTrue(con.shouldForceReconnect(DEFAULT_USER, DEFAULT_PASSWD));
+ Assert.assertFalse(con.shouldForceReconnect(DEFAULT_USER,
DEFAULT_PASSWD));
+ Assert.assertTrue(con.shouldForceReconnect(ALT_USER, ALT_PASSWD));
+ Assert.assertFalse(con.shouldForceReconnect(ALT_USER, ALT_PASSWD));
+ Assert.assertTrue(con.shouldForceReconnect(DEFAULT_USER,
DEFAULT_PASSWD));
configureAlt(con);
- assertFalse(con.shouldForceReconnect(ALT_USER, ALT_PASSWD));
- assertFalse(con.shouldForceReconnect(ALT_USER, ALT_PASSWD));
- assertTrue(con.shouldForceReconnect(DEFAULT_USER, DEFAULT_PASSWD));
- assertFalse(con.shouldForceReconnect(null, null));
- assertTrue(con.shouldForceReconnect(ALT_USER, ALT_PASSWD));
+ Assert.assertFalse(con.shouldForceReconnect(ALT_USER, ALT_PASSWD));
+ Assert.assertFalse(con.shouldForceReconnect(ALT_USER, ALT_PASSWD));
+ Assert.assertTrue(con.shouldForceReconnect(DEFAULT_USER,
DEFAULT_PASSWD));
+ Assert.assertFalse(con.shouldForceReconnect(null, null));
+ Assert.assertTrue(con.shouldForceReconnect(ALT_USER, ALT_PASSWD));
configureAlt(con);
- assertTrue(con.shouldForceReconnect(DEFAULT_USER, DEFAULT_PASSWD));
- assertTrue(con.shouldForceReconnect(ALT_USER, ALT_PASSWD));
- assertFalse(con.shouldForceReconnect(ALT_USER, ALT_PASSWD));
- assertTrue(con.shouldForceReconnect(DEFAULT_USER, DEFAULT_PASSWD));
+ Assert.assertTrue(con.shouldForceReconnect(DEFAULT_USER,
DEFAULT_PASSWD));
+ Assert.assertTrue(con.shouldForceReconnect(ALT_USER, ALT_PASSWD));
+ Assert.assertFalse(con.shouldForceReconnect(ALT_USER, ALT_PASSWD));
+ Assert.assertTrue(con.shouldForceReconnect(DEFAULT_USER,
DEFAULT_PASSWD));
}
Modified:
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/BorrowWaitTest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/BorrowWaitTest.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/BorrowWaitTest.java
(original)
+++
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/BorrowWaitTest.java
Mon Nov 13 11:25:51 2017
@@ -57,11 +57,11 @@ public class BorrowWaitTest extends Defa
long start = System.currentTimeMillis();
try {
Connection con2 = datasource.getConnection();
- assertFalse("This should not happen, connection should be
unavailable.",true);
+ Assert.assertFalse("This should not happen, connection should be
unavailable.",true);
}catch (SQLException x) {
long delta = System.currentTimeMillis();
boolean inrange = Math.abs(wait-delta) < 1000;
- assertTrue("Connection should have been acquired within +/- 1
second.",true);
+ Assert.assertTrue("Connection should have been acquired within +/-
1 second.",true);
}
con.close();
*/
Modified:
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/StarvationTest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/StarvationTest.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/StarvationTest.java
(original)
+++
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/StarvationTest.java
Mon Nov 13 11:25:51 2017
@@ -54,11 +54,11 @@ public class StarvationTest extends Defa
// try {
// con2.setCatalog("mysql");//make sure connection is valid
// }catch (SQLException x) {
-// assertFalse("2nd Connection is not
valid:"+x.getMessage(),true);
+// Assert.assertFalse("2nd Connection is not
valid:"+x.getMessage(),true);
// }
-// assertTrue("Connection 1 should be closed.",con1.isClosed());
//first connection should be closed
+// Assert.assertTrue("Connection 1 should be
closed.",con1.isClosed()); //first connection should be closed
// }catch (Exception x) {
-// assertFalse("Connection got starved:"+x.getMessage(),true);
+// Assert.assertFalse("Connection got
starved:"+x.getMessage(),true);
// }finally {
// if (con2!=null) con2.close();
// }
Modified:
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestJdbcInterceptorConfigParsing.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestJdbcInterceptorConfigParsing.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestJdbcInterceptorConfigParsing.java
(original)
+++
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestJdbcInterceptorConfigParsing.java
Mon Nov 13 11:25:51 2017
@@ -18,10 +18,7 @@ package org.apache.tomcat.jdbc.test;
import java.util.Map;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.tomcat.jdbc.pool.PoolProperties;
@@ -42,24 +39,24 @@ public class TestJdbcInterceptorConfigPa
PoolProperties props = new PoolProperties();
props.setJdbcInterceptors(interceptorConfig);
InterceptorDefinition[] interceptorDefs =
props.getJdbcInterceptorsAsArray();
- assertNotNull(interceptorDefs);
+ Assert.assertNotNull(interceptorDefs);
// 3 items because parser automatically inserts TrapException
interceptor to front of list
- assertEquals(interceptorDefs.length, 3);
- assertEquals(interceptorDefs[0].getClassName(),
TrapException.class.getName());
+ Assert.assertEquals(interceptorDefs.length, 3);
+ Assert.assertEquals(interceptorDefs[0].getClassName(),
TrapException.class.getName());
- assertNotNull(interceptorDefs[1]);
- assertEquals(interceptorDefs[1].getClassName(), "FirstInterceptor");
- assertNotNull(interceptorDefs[2]);
- assertEquals(interceptorDefs[2].getClassName(), "SecondInterceptor");
+ Assert.assertNotNull(interceptorDefs[1]);
+ Assert.assertEquals(interceptorDefs[1].getClassName(),
"FirstInterceptor");
+ Assert.assertNotNull(interceptorDefs[2]);
+ Assert.assertEquals(interceptorDefs[2].getClassName(),
"SecondInterceptor");
Map<String, InterceptorProperty> secondProps =
interceptorDefs[2].getProperties();
- assertNotNull(secondProps);
- assertEquals(secondProps.size(), 2);
- assertNotNull(secondProps.get("parm1"));
- assertEquals(secondProps.get("parm1").getValue(), "value1");
- assertNotNull(secondProps.get("parm2"));
- assertEquals(secondProps.get("parm2").getValue(), "value2");
+ Assert.assertNotNull(secondProps);
+ Assert.assertEquals(secondProps.size(), 2);
+ Assert.assertNotNull(secondProps.get("parm1"));
+ Assert.assertEquals(secondProps.get("parm1").getValue(), "value1");
+ Assert.assertNotNull(secondProps.get("parm2"));
+ Assert.assertEquals(secondProps.get("parm2").getValue(), "value2");
}
@Test
@@ -71,38 +68,38 @@ public class TestJdbcInterceptorConfigPa
PoolProperties props = new PoolProperties();
props.setJdbcInterceptors(interceptorConfig);
InterceptorDefinition[] interceptorDefs =
props.getJdbcInterceptorsAsArray();
- assertNotNull(interceptorDefs);
+ Assert.assertNotNull(interceptorDefs);
// 5 items because parser automatically inserts TrapException
interceptor to front of list
- assertEquals(interceptorDefs.length, 5);
- assertEquals(interceptorDefs[0].getClassName(),
TrapException.class.getName());
+ Assert.assertEquals(interceptorDefs.length, 5);
+ Assert.assertEquals(interceptorDefs[0].getClassName(),
TrapException.class.getName());
- assertNotNull(interceptorDefs[1]);
- assertEquals(interceptorDefs[1].getClassName(), "FirstInterceptor");
- assertNotNull(interceptorDefs[2]);
- assertEquals(interceptorDefs[2].getClassName(), "SecondInterceptor");
- assertNotNull(interceptorDefs[3]);
- assertEquals(interceptorDefs[3].getClassName(),
"org.cyb.ThirdInterceptor");
+ Assert.assertNotNull(interceptorDefs[1]);
+ Assert.assertEquals(interceptorDefs[1].getClassName(),
"FirstInterceptor");
+ Assert.assertNotNull(interceptorDefs[2]);
+ Assert.assertEquals(interceptorDefs[2].getClassName(),
"SecondInterceptor");
+ Assert.assertNotNull(interceptorDefs[3]);
+ Assert.assertEquals(interceptorDefs[3].getClassName(),
"org.cyb.ThirdInterceptor");
Map<String, InterceptorProperty> secondProps =
interceptorDefs[2].getProperties();
- assertNotNull(secondProps);
- assertEquals(secondProps.size(), 2);
- assertNotNull(secondProps.get("parm1"));
- assertEquals(secondProps.get("parm1").getValue(), "value1");
- assertNotNull(secondProps.get("parm2"));
- assertEquals(secondProps.get("parm2").getValue(), "value2"); // Bug
54395
+ Assert.assertNotNull(secondProps);
+ Assert.assertEquals(secondProps.size(), 2);
+ Assert.assertNotNull(secondProps.get("parm1"));
+ Assert.assertEquals(secondProps.get("parm1").getValue(), "value1");
+ Assert.assertNotNull(secondProps.get("parm2"));
+ Assert.assertEquals(secondProps.get("parm2").getValue(), "value2"); //
Bug 54395
Map<String, InterceptorProperty> thirdProps =
interceptorDefs[3].getProperties();
- assertNotNull(thirdProps);
- assertEquals(thirdProps.size(), 1);
- assertNotNull(thirdProps.get("parm1"));
- assertEquals(thirdProps.get("parm1").getValue(), "value1");
+ Assert.assertNotNull(thirdProps);
+ Assert.assertEquals(thirdProps.size(), 1);
+ Assert.assertNotNull(thirdProps.get("parm1"));
+ Assert.assertEquals(thirdProps.get("parm1").getValue(), "value1");
Map<String, InterceptorProperty> emptyParmValProps =
interceptorDefs[4].getProperties();
- assertNotNull(emptyParmValProps);
- assertEquals(emptyParmValProps.size(), 1);
- assertNotNull(emptyParmValProps.get("parm1"));
- assertEquals(emptyParmValProps.get("parm1").getValue(), "");
+ Assert.assertNotNull(emptyParmValProps);
+ Assert.assertEquals(emptyParmValProps.size(), 1);
+ Assert.assertNotNull(emptyParmValProps.get("parm1"));
+ Assert.assertEquals(emptyParmValProps.get("parm1").getValue(), "");
}
/*
@@ -124,7 +121,7 @@ public class TestJdbcInterceptorConfigPa
props.setJdbcInterceptors(badConfig);
try {
props.getJdbcInterceptorsAsArray();
- fail("Expected exception.");
+ Assert.fail("Expected exception.");
} catch (Exception e) {
// Expected
}
@@ -145,7 +142,7 @@ public class TestJdbcInterceptorConfigPa
try {
props.getJdbcInterceptorsAsArray();
} catch (Exception e) {
- fail("Unexpected exception.");
+ Assert.fail("Unexpected exception.");
}
}
}
@@ -157,21 +154,21 @@ public class TestJdbcInterceptorConfigPa
PoolProperties props = new PoolProperties();
props.setJdbcInterceptors(";EmptyLeadingSemiInterceptor");
InterceptorDefinition[] jiDefs = props.getJdbcInterceptorsAsArray();
- assertNotNull(jiDefs);
- assertEquals(jiDefs.length, 3);
+ Assert.assertNotNull(jiDefs);
+ Assert.assertEquals(jiDefs.length, 3);
// This one does NOT get an extra/empty definition (no trailing
whitespace)
props = new PoolProperties();
props.setJdbcInterceptors("EmptyTrailingSemiInterceptor;");
jiDefs = props.getJdbcInterceptorsAsArray();
- assertNotNull(jiDefs);
- assertEquals(jiDefs.length, 2);
+ Assert.assertNotNull(jiDefs);
+ Assert.assertEquals(jiDefs.length, 2);
// This one DOES get an extra/empty definition (with trailing
whitespace)
props = new PoolProperties();
props.setJdbcInterceptors("EmptyTrailingSemiInterceptor; ");
jiDefs = props.getJdbcInterceptorsAsArray();
- assertNotNull(jiDefs);
- assertEquals(jiDefs.length, 3);
+ Assert.assertNotNull(jiDefs);
+ Assert.assertEquals(jiDefs.length, 3);
}
}
\ No newline at end of file
Modified: tomcat/tc8.5.x/trunk/test/javax/el/TestCompositeELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/javax/el/TestCompositeELResolver.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/javax/el/TestCompositeELResolver.java (original)
+++ tomcat/tc8.5.x/trunk/test/javax/el/TestCompositeELResolver.java Mon Nov 13
11:25:51 2017
@@ -18,8 +18,7 @@ package javax.el;
import javax.servlet.http.HttpServletResponse;
-import static org.junit.Assert.assertEquals;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.startup.TomcatBaseTest;
@@ -34,6 +33,6 @@ public class TestCompositeELResolver ext
int rc = getUrl("http://localhost:"; + getPort() +
"/test/bug5nnnn/bug50408.jsp", new ByteChunk(), null);
- assertEquals(HttpServletResponse.SC_OK, rc);
+ Assert.assertEquals(HttpServletResponse.SC_OK, rc);
}
}
Modified: tomcat/tc8.5.x/trunk/test/javax/servlet/jsp/TestPageContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/javax/servlet/jsp/TestPageContext.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/javax/servlet/jsp/TestPageContext.java (original)
+++ tomcat/tc8.5.x/trunk/test/javax/servlet/jsp/TestPageContext.java Mon Nov 13
11:25:51 2017
@@ -16,8 +16,7 @@
*/
package javax.servlet.jsp;
-import static org.junit.Assert.assertTrue;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.startup.TomcatBaseTest;
@@ -33,6 +32,6 @@ public class TestPageContext extends Tom
"/test/bug49nnn/bug49196.jsp");
String result = res.toString();
- assertTrue(result.contains("OK"));
+ Assert.assertTrue(result.contains("OK"));
}
}
Modified: tomcat/tc8.5.x/trunk/test/org/apache/catalina/ant/TestDeployTask.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/ant/TestDeployTask.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/catalina/ant/TestDeployTask.java
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/ant/TestDeployTask.java Mon
Nov 13 11:25:51 2017
@@ -20,8 +20,7 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import static org.junit.Assert.assertEquals;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.startup.Tomcat;
@@ -37,8 +36,8 @@ public class TestDeployTask extends Tomc
@Override
public void execute(String command, InputStream istream, String
contentType, long contentLength)
throws BuildException {
- assertEquals("/deploy?path=somepath", command);
- assertEquals("application/octet-stream", contentType);
+ Assert.assertEquals("/deploy?path=somepath", command);
+ Assert.assertEquals("application/octet-stream", contentType);
try {
istream.close();
} catch (IOException e) {
@@ -89,8 +88,8 @@ public class TestDeployTask extends Tomc
@Override
public void execute(String command, InputStream istream, String
contentType, long contentLength)
throws BuildException {
- assertEquals("/deploy?path=somepath", command);
- assertEquals("application/octet-stream", contentType);
+ Assert.assertEquals("/deploy?path=somepath", command);
+ Assert.assertEquals("application/octet-stream", contentType);
try {
istream.close();
} catch (IOException e) {
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
Mon Nov 13 11:25:51 2017
@@ -23,9 +23,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
import org.junit.Assert;
import org.junit.Test;
@@ -215,8 +212,8 @@ public class TestDigestAuthenticator ext
ByteChunk bc = new ByteChunk();
int rc = getUrl("http://localhost:"; + getPort() + uri, bc, reqHeaders,
respHeaders);
- assertEquals(401, rc);
- assertTrue(bc.getLength() > 0);
+ Assert.assertEquals(401, rc);
+ Assert.assertTrue(bc.getLength() > 0);
bc.recycle();
// Second request should succeed (if we use the server nonce)
@@ -238,11 +235,11 @@ public class TestDigestAuthenticator ext
null);
if (req2expect200) {
- assertEquals(200, rc);
- assertEquals("OK", bc.toString());
+ Assert.assertEquals(200, rc);
+ Assert.assertEquals("OK", bc.toString());
} else {
- assertEquals(401, rc);
- assertTrue(bc.getLength() > 0);
+ Assert.assertEquals(401, rc);
+ Assert.assertTrue(bc.getLength() > 0);
}
// Third request should succeed if we increment nc
@@ -255,11 +252,11 @@ public class TestDigestAuthenticator ext
null);
if (req3expect200) {
- assertEquals(200, rc);
- assertEquals("OK", bc.toString());
+ Assert.assertEquals(200, rc);
+ Assert.assertEquals("OK", bc.toString());
} else {
- assertEquals(401, rc);
- assertTrue(bc.getLength() > 0);
+ Assert.assertEquals(401, rc);
+ Assert.assertTrue(bc.getLength() > 0);
}
}
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
Mon Nov 13 11:25:51 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.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.Context;
@@ -271,28 +268,28 @@ public class TestFormAuthenticator exten
client.doResourceRequest("PUT", true, "/test?" +
SelectedMethodsServlet.PARAM + "=" +
SelectedMethodsServlet.VALUE, null);
- assertTrue(client.getResponseLine(), client.isResponse200());
- assertTrue(client.isResponseBodyOK());
+ Assert.assertTrue(client.getResponseLine(), client.isResponse200());
+ Assert.assertTrue(client.isResponseBodyOK());
String originalSessionId = client.getSessionId();
client.reset();
// Second request replies to the login challenge
client.doResourceRequest("POST", true, "/test/j_security_check",
FormAuthClientBase.LOGIN_REPLY);
- assertTrue("login failed " + client.getResponseLine(),
+ Assert.assertTrue("login failed " + client.getResponseLine(),
client.isResponse303());
- assertTrue(client.isResponseBodyOK());
+ Assert.assertTrue(client.isResponseBodyOK());
String redirectUri = client.getRedirectUri();
client.reset();
// Third request - the login was successful so
// follow the redirect to the protected resource
client.doResourceRequest("GET", true, redirectUri, null);
- assertTrue(client.isResponse200());
- assertTrue(client.isResponseBodyOK());
+ Assert.assertTrue(client.isResponse200());
+ Assert.assertTrue(client.isResponseBodyOK());
String newSessionId = client.getSessionId();
- assertTrue(!originalSessionId.equals(newSessionId));
+ Assert.assertTrue(!originalSessionId.equals(newSessionId));
client.reset();
}
@@ -333,8 +330,8 @@ public class TestFormAuthenticator exten
// First request for protected resource gets the login page
client.setUseContinue(useContinue);
client.doResourceRequest(resourceMethod, false, null, null);
- assertTrue(client.isResponse200());
- assertTrue(client.isResponseBodyOK());
+ Assert.assertTrue(client.isResponse200());
+ Assert.assertTrue(client.isResponseBodyOK());
String loginUri = client.extractBodyUri(
FormAuthClient.LOGIN_PARAM_TAG,
FormAuthClient.LOGIN_RESOURCE);
@@ -351,13 +348,13 @@ public class TestFormAuthenticator exten
client.setUseContinue(useContinue);
client.doLoginRequest(loginUri);
if (clientShouldUseHttp11) {
- assertTrue("login failed " + client.getResponseLine(),
+ Assert.assertTrue("login failed " + client.getResponseLine(),
client.isResponse303());
} else {
- assertTrue("login failed " + client.getResponseLine(),
+ Assert.assertTrue("login failed " + client.getResponseLine(),
client.isResponse302());
}
- assertTrue(client.isResponseBodyOK());
+ Assert.assertTrue(client.isResponseBodyOK());
String redirectUri = client.getRedirectUri();
client.reset();
@@ -367,8 +364,8 @@ public class TestFormAuthenticator exten
if ("POST".equals(redirectMethod)) {
client.setUseContinue(useContinue);
}
- assertTrue(client.isResponse200());
- assertTrue(client.isResponseBodyOK());
+ Assert.assertTrue(client.isResponse200());
+ Assert.assertTrue(client.isResponseBodyOK());
String protectedUri = client.extractBodyUri(
FormAuthClient.RESOURCE_PARAM_TAG,
FormAuthClient.PROTECTED_RESOURCE);
@@ -380,7 +377,7 @@ public class TestFormAuthenticator exten
newSessionId = client.extractPathSessionId(protectedUri);
}
boolean sessionIdIsChanged = !(originalSessionId.equals(newSessionId));
- assertTrue(sessionIdIsChanged == serverWillChangeSessid);
+ Assert.assertTrue(sessionIdIsChanged == serverWillChangeSessid);
client.reset();
// Subsequent requests - keep accessing the protected resource
@@ -413,8 +410,8 @@ public class TestFormAuthenticator exten
for (int i = 0; i < repeatCount; i++) {
client.setUseContinue(useContinue);
client.doResourceRequest(resourceMethod, false, protectedUri,
null);
- assertTrue(client.isResponse200());
- assertTrue(client.isResponseBodyOK(phase));
+ Assert.assertTrue(client.isResponse200());
+ Assert.assertTrue(client.isResponseBodyOK(phase));
client.reset();
}
}
@@ -627,7 +624,7 @@ public class TestFormAuthenticator exten
private void assertContains(String body, String expected) {
if (!body.contains(expected)) {
- fail("Response number " + requestCount
+ Assert.fail("Response number " + requestCount
+ ": body check failure.\n"
+ "Expected to contain substring: [" + expected
+ "]\nActual: [" + body + "]");
@@ -754,8 +751,8 @@ public class TestFormAuthenticator exten
if (isResponse303()) {
return true;
}
- assertTrue(getResponseBody(), getResponseBody().contains("OK"));
- assertFalse(getResponseBody().contains("FAIL"));
+ Assert.assertTrue(getResponseBody(),
getResponseBody().contains("OK"));
+ Assert.assertFalse(getResponseBody().contains("FAIL"));
return true;
}
}
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java
Mon Nov 13 11:25:51 2017
@@ -24,9 +24,7 @@ import java.util.Map;
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;
@@ -307,7 +305,7 @@ public class TestNonLoginAndBasicAuthent
// slightly paranoid verification
boolean sameCookies = originalCookies.equals(cookies);
- assertTrue(!sameCookies);
+ Assert.assertTrue(!sameCookies);
}
/*
@@ -369,11 +367,11 @@ public class TestNonLoginAndBasicAuthent
respHeaders);
if (expectedRC != HttpServletResponse.SC_OK) {
- assertEquals(expectedRC, rc);
- assertTrue(bc.getLength() > 0);
+ Assert.assertEquals(expectedRC, rc);
+ Assert.assertTrue(bc.getLength() > 0);
}
else {
- assertEquals("OK", bc.toString());
+ Assert.assertEquals("OK", bc.toString());
}
}
@@ -399,8 +397,8 @@ public class TestNonLoginAndBasicAuthent
respHeaders);
if (expectedRC != HttpServletResponse.SC_OK) {
- assertEquals(expectedRC, rc);
- assertTrue(bc.getLength() > 0);
+ Assert.assertEquals(expectedRC, rc);
+ Assert.assertTrue(bc.getLength() > 0);
if (expectedRC == HttpServletResponse.SC_UNAUTHORIZED) {
// The server should identify the acceptable method(s)
boolean methodFound = false;
@@ -411,11 +409,11 @@ public class TestNonLoginAndBasicAuthent
break;
}
}
- assertTrue(methodFound);
+ Assert.assertTrue(methodFound);
}
}
else {
- assertEquals("OK", bc.toString());
+ Assert.assertEquals("OK", bc.toString());
List<String> newCookies = respHeaders.get(SERVER_COOKIE_HEADER);
if (newCookies != null) {
// harvest cookies whenever the server sends some new ones
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndBasicAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndBasicAuthenticator.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndBasicAuthenticator.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndBasicAuthenticator.java
Mon Nov 13 11:25:51 2017
@@ -24,11 +24,7 @@ import java.util.Map;
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;
import org.apache.catalina.Context;
@@ -269,7 +265,7 @@ public class TestSSOnonLoginAndBasicAuth
// verify the sessionID was encoded in the absolute URL
String firstEncodedURL = encodedURL;
- assertTrue(firstEncodedURL.contains(ENCODE_SESSION_PARAM));
+ Assert.assertTrue(firstEncodedURL.contains(ENCODE_SESSION_PARAM));
// access the protected resource with the encoded url (with session id)
doTestBasic(firstEncodedURL + forwardParam,
@@ -279,8 +275,8 @@ public class TestSSOnonLoginAndBasicAuth
// verify the sessionID has not changed
// verify the SSO sessionID was not encoded
String secondEncodedURL = encodedURL;
- assertEquals(firstEncodedURL, secondEncodedURL);
- assertFalse(firstEncodedURL.contains(ENCODE_SSOSESSION_PARAM));
+ Assert.assertEquals(firstEncodedURL, secondEncodedURL);
+ Assert.assertFalse(firstEncodedURL.contains(ENCODE_SSOSESSION_PARAM));
// extract the first container's session ID
int ix = secondEncodedURL.indexOf(ENCODE_SESSION_PARAM);
@@ -363,11 +359,11 @@ public class TestSSOnonLoginAndBasicAuth
respHeaders);
if (expectedRC != HttpServletResponse.SC_OK) {
- assertEquals(expectedRC, rc);
- assertTrue(bc.getLength() > 0);
+ Assert.assertEquals(expectedRC, rc);
+ Assert.assertTrue(bc.getLength() > 0);
}
else {
- assertEquals("OK", bc.toString());
+ Assert.assertEquals("OK", bc.toString());
}
}
@@ -393,9 +389,9 @@ public class TestSSOnonLoginAndBasicAuth
int rc = getUrl(HTTP_PREFIX + getPort() + uri, bc, reqHeaders,
respHeaders);
- assertEquals("Unexpected Return Code", expectedRC, rc);
+ Assert.assertEquals("Unexpected Return Code", expectedRC, rc);
if (expectedRC != HttpServletResponse.SC_OK) {
- assertTrue(bc.getLength() > 0);
+ Assert.assertTrue(bc.getLength() > 0);
if (expectedRC == HttpServletResponse.SC_UNAUTHORIZED) {
// The server should identify the acceptable method(s)
boolean methodFound = false;
@@ -406,13 +402,13 @@ public class TestSSOnonLoginAndBasicAuth
break;
}
}
- assertTrue(methodFound);
+ Assert.assertTrue(methodFound);
}
}
else {
String thePage = bc.toString();
- assertNotNull(thePage);
- assertTrue(thePage.startsWith("OK"));
+ Assert.assertNotNull(thePage);
+ Assert.assertTrue(thePage.startsWith("OK"));
if (useCookie) {
List<String> newCookies =
respHeaders.get(SERVER_COOKIE_HEADER);
if (newCookies != null) {
@@ -640,7 +636,7 @@ public class TestSSOnonLoginAndBasicAuth
}
sessions = manager.findSessions();
- assertTrue(sessions.length == 0);
+ Assert.assertTrue(sessions.length == 0);
}
/*
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java
Mon Nov 13 11:25:51 2017
@@ -21,9 +21,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-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;
@@ -215,12 +213,12 @@ public class TestSSOnonLoginAndDigestAut
respHeaders);
if (expectedReject) {
- assertEquals(expectedRC, rc);
- assertTrue(bc.getLength() > 0);
+ Assert.assertEquals(expectedRC, rc);
+ Assert.assertTrue(bc.getLength() > 0);
}
else {
- assertEquals(200, rc);
- assertEquals("OK", bc.toString());
+ Assert.assertEquals(200, rc);
+ Assert.assertEquals("OK", bc.toString());
saveCookies(respHeaders);
}
}
@@ -248,12 +246,12 @@ public class TestSSOnonLoginAndDigestAut
respHeaders1);
if (expectedReject1) {
- assertEquals(expectedRC1, rc);
- assertTrue(bc.getLength() > 0);
+ Assert.assertEquals(expectedRC1, rc);
+ Assert.assertTrue(bc.getLength() > 0);
}
else {
- assertEquals(200, rc);
- assertEquals("OK", bc.toString());
+ Assert.assertEquals(200, rc);
+ Assert.assertEquals("OK", bc.toString());
saveCookies(respHeaders1);
return;
}
@@ -289,12 +287,12 @@ public class TestSSOnonLoginAndDigestAut
respHeaders2);
if (req2expect200) {
- assertEquals(200, rc);
- assertEquals("OK", bc.toString());
+ Assert.assertEquals(200, rc);
+ Assert.assertEquals("OK", bc.toString());
saveCookies(respHeaders2);
} else {
- assertEquals(401, rc);
- assertTrue((bc.getLength() > 0));
+ Assert.assertEquals(401, rc);
+ Assert.assertTrue((bc.getLength() > 0));
}
}
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java
Mon Nov 13 11:25:51 2017
@@ -21,8 +21,7 @@ import java.util.concurrent.atomic.Atomi
import javax.servlet.http.HttpServletResponse;
-import static org.junit.Assert.assertEquals;
-
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -99,7 +98,7 @@ public class TesterDigestAuthenticatorPe
System.out.println("Average time per request (wall): " +
wallTime/(threadCount * requestCount));
- assertEquals(requestCount * threadCount, totalSuccess);
+ Assert.assertEquals(requestCount * threadCount, totalSuccess);
}
@Before
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestConnector.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestConnector.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestConnector.java
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestConnector.java
Mon Nov 13 11:25:51 2017
@@ -24,9 +24,6 @@ import java.util.Map;
import javax.servlet.Servlet;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
import org.junit.Assert;
import org.junit.Test;
@@ -61,8 +58,8 @@ public class TestConnector extends Tomca
ByteChunk bc = new ByteChunk();
int rc = getUrl("http://localhost:"; + getPort() + "/", bc, null, null);
- assertEquals(200, rc);
- assertEquals("OK", bc.toString());
+ Assert.assertEquals(200, rc);
+ Assert.assertEquals("OK", bc.toString());
rc = -1;
bc.recycle();
@@ -77,7 +74,7 @@ public class TestConnector extends Tomca
// Make sure the test passes if we do
rc = 503;
}
- assertEquals(503, rc);
+ Assert.assertEquals(503, rc);
}
@@ -98,8 +95,8 @@ public class TestConnector extends Tomca
int localPort1 = connector1.getLocalPort();
int localPort2 = connector2.getLocalPort();
- assertTrue(localPort1 > 0);
- assertTrue(localPort2 > 0);
+ Assert.assertTrue(localPort1 > 0);
+ Assert.assertTrue(localPort2 > 0);
}
@@ -157,7 +154,7 @@ public class TestConnector extends Tomca
int rc = methodUrl("http://localhost:"; + getPort() + "/index.html",
bc, 30000, null, respHeaders, "OPTIONS");
- assertEquals(200, rc);
+ Assert.assertEquals(200, rc);
boolean foundTrace = false;
for (String header : respHeaders.get("Allow")) {
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java
Mon Nov 13 11:25:51 2017
@@ -23,8 +23,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;
@@ -85,7 +84,7 @@ public class TestKeepAliveCount extends
disconnect();
reset();
tomcat.stop();
- assertTrue(passed);
+ Assert.assertTrue(passed);
}
private void doHttp11Request() throws Exception {
@@ -109,14 +108,14 @@ public class TestKeepAliveCount extends
for (int i=0; i<5; i++) {
processRequest(false); // blocks until response has been read
- assertTrue(getResponseLine()!=null &&
getResponseLine().startsWith("HTTP/1.1 200 "));
+ Assert.assertTrue(getResponseLine()!=null &&
getResponseLine().startsWith("HTTP/1.1 200 "));
}
boolean passed = (this.readLine()==null);
// Close the connection
disconnect();
reset();
tomcat.stop();
- assertTrue(passed);
+ Assert.assertTrue(passed);
}
@Override
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestOutputBuffer.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestOutputBuffer.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestOutputBuffer.java
Mon Nov 13 11:25:51 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;
@@ -60,16 +60,16 @@ public class TestOutputBuffer extends To
for (int i = 1; i <= WritingServlet.EXPECTED_CONTENT_LENGTH; i*=10) {
int rc = getUrl("http://localhost:"; + getPort() +
"/servlet" + i, bc, null, null);
- assertEquals(HttpServletResponse.SC_OK, rc);
- assertEquals(
+ Assert.assertEquals(HttpServletResponse.SC_OK, rc);
+ Assert.assertEquals(
WritingServlet.EXPECTED_CONTENT_LENGTH, bc.getLength());
bc.recycle();
rc = getUrl("http://localhost:"; + getPort() +
"/servlet" + i + "?useBuffer=y", bc, null, null);
- assertEquals(HttpServletResponse.SC_OK, rc);
- assertEquals(
+ Assert.assertEquals(HttpServletResponse.SC_OK, rc);
+ Assert.assertEquals(
WritingServlet.EXPECTED_CONTENT_LENGTH, bc.getLength());
bc.recycle();
@@ -91,8 +91,8 @@ public class TestOutputBuffer extends To
ByteChunk bc = new ByteChunk();
int rc = getUrl("http://localhost:"; + getPort() + "/", bc, null, null);
- assertEquals(HttpServletResponse.SC_OK, rc);
- assertEquals("OK", bc.toString());
+ Assert.assertEquals(HttpServletResponse.SC_OK, rc);
+ Assert.assertEquals("OK", bc.toString());
}
private static class WritingServlet extends HttpServlet {
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestRequest.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestRequest.java
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestRequest.java
Mon Nov 13 11:25:51 2017
@@ -38,11 +38,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.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Ignore;
@@ -84,41 +79,41 @@ public class TestRequest extends TomcatB
// Edge cases around zero
client.doRequest(-1, false); // Unlimited
- assertTrue(client.isResponse200());
- assertTrue(client.isResponseBodyOK());
+ Assert.assertTrue(client.isResponse200());
+ Assert.assertTrue(client.isResponseBodyOK());
client.reset();
client.doRequest(0, false); // 0 bytes - too small should fail
- assertTrue(client.isResponse413());
+ Assert.assertTrue(client.isResponse413());
client.reset();
client.doRequest(1, false); // 1 byte - too small should fail
- assertTrue(client.isResponse413());
+ Assert.assertTrue(client.isResponse413());
client.reset();
// Edge cases around actual content length
client.reset();
client.doRequest(6, false); // Too small should fail
- assertTrue(client.isResponse413());
+ Assert.assertTrue(client.isResponse413());
client.reset();
client.doRequest(7, false); // Just enough should pass
- assertTrue(client.isResponse200());
- assertTrue(client.isResponseBodyOK());
+ Assert.assertTrue(client.isResponse200());
+ Assert.assertTrue(client.isResponseBodyOK());
client.reset();
client.doRequest(8, false); // 1 extra - should pass
- assertTrue(client.isResponse200());
- assertTrue(client.isResponseBodyOK());
+ Assert.assertTrue(client.isResponse200());
+ Assert.assertTrue(client.isResponseBodyOK());
// Much larger
client.reset();
client.doRequest(8096, false); // Plenty of space - should pass
- assertTrue(client.isResponse200());
- assertTrue(client.isResponseBodyOK());
+ Assert.assertTrue(client.isResponse200());
+ Assert.assertTrue(client.isResponseBodyOK());
// Check for case insensitivity
client.reset();
client.doRequest(8096, true); // Plenty of space - should pass
- assertTrue(client.isResponse200());
- assertTrue(client.isResponseBodyOK());
+ Assert.assertTrue(client.isResponse200());
+ Assert.assertTrue(client.isResponseBodyOK());
}
/**
@@ -133,8 +128,8 @@ public class TestRequest extends TomcatB
client.reset();
client.doRequest(6, false); // Too small should fail
// Response code will be OK, but parameters list will be empty
- assertTrue(client.isResponse200());
- assertEquals("", client.getResponseBody());
+ Assert.assertTrue(client.isResponse200());
+ Assert.assertEquals("", client.getResponseBody());
}
private static class Bug37794Servlet extends HttpServlet {
@@ -288,15 +283,15 @@ public class TestRequest extends TomcatB
// No query string
ByteChunk res = getUrl("http://localhost:"; + getPort() + "/");
- assertEquals("QueryString=null", res.toString());
+ Assert.assertEquals("QueryString=null", res.toString());
// Query string
res = getUrl("http://localhost:"; + getPort() + "/?a=b");
- assertEquals("QueryString=a=b", res.toString());
+ Assert.assertEquals("QueryString=a=b", res.toString());
// Empty string
res = getUrl("http://localhost:"; + getPort() + "/?");
- assertEquals("QueryString=", res.toString());
+ Assert.assertEquals("QueryString=", res.toString());
}
private static final class EchoQueryStringServlet extends HttpServlet {
@@ -339,7 +334,7 @@ public class TestRequest extends TomcatB
tomcat.start();
ByteChunk res = getUrl("http://localhost:"; + getPort() + "/");
- assertEquals(LoginLogoutServlet.OK, res.toString());
+ Assert.assertEquals(LoginLogoutServlet.OK, res.toString());
}
private static final class LoginLogoutServlet extends HttpServlet {
@@ -382,7 +377,7 @@ public class TestRequest extends TomcatB
HttpURLConnection conn = getConnection("http://localhost:"; + getPort()
+ "/");
InputStream is = conn.getInputStream();
- assertNotNull(is);
+ Assert.assertNotNull(is);
}
@Test
@@ -397,7 +392,7 @@ public class TestRequest extends TomcatB
HttpURLConnection conn = getConnection("http://localhost:"; + getPort()
+ "/");
conn.setChunkedStreamingMode(8 * 1024);
InputStream is = conn.getInputStream();
- assertNotNull(is);
+ Assert.assertNotNull(is);
}
/**
@@ -413,9 +408,9 @@ public class TestRequest extends TomcatB
// Make sure GET works properly
client.doRequest("GET", "foo=bar", null, null, false);
- assertTrue("Non-200 response for GET request",
+ Assert.assertTrue("Non-200 response for GET request",
client.isResponse200());
- assertEquals("Incorrect response for GET request",
+ Assert.assertEquals("Incorrect response for GET request",
"foo=bar",
client.getResponseBody());
@@ -427,9 +422,9 @@ public class TestRequest extends TomcatB
// POST with separate GET and POST parameters
client.doRequest("POST", "foo=bar",
"application/x-www-form-urlencoded", "bar=baz", true);
- assertTrue("Non-200 response for POST request",
+ Assert.assertTrue("Non-200 response for POST request",
client.isResponse200());
- assertEquals("Incorrect response for POST request",
+ Assert.assertEquals("Incorrect response for POST request",
"bar=baz,foo=bar",
client.getResponseBody());
@@ -438,9 +433,9 @@ public class TestRequest extends TomcatB
// POST with overlapping GET and POST parameters
client.doRequest("POST", "foo=bar&bar=foo",
"application/x-www-form-urlencoded", "bar=baz&foo=baz", true);
- assertTrue("Non-200 response for POST request",
+ Assert.assertTrue("Non-200 response for POST request",
client.isResponse200());
- assertEquals("Incorrect response for POST request",
+ Assert.assertEquals("Incorrect response for POST request",
"bar=baz,bar=foo,foo=bar,foo=baz",
client.getResponseBody());
@@ -449,9 +444,9 @@ public class TestRequest extends TomcatB
// PUT without POST-style parsing
client.doRequest("PUT", "foo=bar&bar=foo",
"application/x-www-form-urlencoded", "bar=baz&foo=baz", false);
- assertTrue("Non-200 response for PUT/noparse request",
+ Assert.assertTrue("Non-200 response for PUT/noparse request",
client.isResponse200());
- assertEquals("Incorrect response for PUT request",
+ Assert.assertEquals("Incorrect response for PUT request",
"bar=foo,foo=bar",
client.getResponseBody());
@@ -460,9 +455,9 @@ public class TestRequest extends TomcatB
// PUT with POST-style parsing
client.doRequest("PUT", "foo=bar&bar=foo",
"application/x-www-form-urlencoded", "bar=baz&foo=baz", true);
- assertTrue("Non-200 response for PUT request",
+ Assert.assertTrue("Non-200 response for PUT request",
client.isResponse200());
- assertEquals("Incorrect response for PUT/parse request",
+ Assert.assertEquals("Incorrect response for PUT/parse request",
"bar=baz,bar=foo,foo=bar,foo=baz",
client.getResponseBody());
@@ -692,10 +687,10 @@ public class TestRequest extends TomcatB
while ((line = reader.readLine()) != null) {
response.add(line);
}
- assertTrue(response.contains("Part äö"));
+ Assert.assertTrue(response.contains("Part äö"));
}
} else {
- fail("OK status was expected: " + status);
+ Assert.fail("OK status was expected: " + status);
}
}
@@ -843,7 +838,7 @@ public class TestRequest extends TomcatB
if (resultPath == null) {
resultPath = "";
}
- assertEquals(expected, resultPath);
+ Assert.assertEquals(expected, resultPath);
}
private class Bug56501Servlet extends HttpServlet {
@@ -945,9 +940,9 @@ public class TestRequest extends TomcatB
int rc = postUrl(body, "http://localhost:"; + getPort() + "/", bc,
reqHeaders, null);
if (expect200) {
- assertEquals(200, rc);
+ Assert.assertEquals(200, rc);
} else {
- assertEquals(500, rc);
+ Assert.assertEquals(500, rc);
}
}
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestResponse.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestResponse.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestResponse.java
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestResponse.java
Mon Nov 13 11:25:51 2017
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.catalina.connector;
import java.io.IOException;
@@ -29,9 +28,6 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
import org.junit.Assert;
import org.junit.Test;
@@ -72,7 +68,7 @@ public class TestResponse extends Tomcat
values.get(0).startsWith("HTTP/1.1")) {
continue;
}
- fail("Null header name detected for value " + values);
+ Assert.fail("Null header name detected for value " + values);
}
}
@@ -83,7 +79,7 @@ public class TestResponse extends Tomcat
count ++;
}
}
- assertEquals(1, count);
+ Assert.assertEquals(1, count);
}
private static final class Bug49598Servlet extends HttpServlet {
@@ -118,7 +114,7 @@ public class TestResponse extends Tomcat
ByteChunk bc = getUrl("http://localhost:"; + getPort() + "/");
- assertEquals("OK", bc.toString());
+ Assert.assertEquals("OK", bc.toString());
}
private static final class CharsetServlet extends HttpServlet {
@@ -157,7 +153,7 @@ public class TestResponse extends Tomcat
ByteChunk bc = getUrl("http://localhost:"; + getPort() + "/");
- assertEquals("OK", bc.toString());
+ Assert.assertEquals("OK", bc.toString());
}
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestSendFile.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestSendFile.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestSendFile.java
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestSendFile.java
Mon Nov 13 11:25:51 2017
@@ -36,9 +36,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.fail;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.Context;
@@ -79,10 +77,10 @@ public class TestSendFile extends Tomcat
long start = System.currentTimeMillis();
int rc = getUrl("http://localhost:"; + getPort() + "/servlet" +
i, bc, null,
respHeaders);
- assertEquals(HttpServletResponse.SC_OK, rc);
+ Assert.assertEquals(HttpServletResponse.SC_OK, rc);
System.out.println("Client received " + bc.getLength() + "
bytes in "
+ (System.currentTimeMillis() - start) + " ms.");
- assertEquals(EXPECTED_CONTENT_LENGTH * (i + 1),
bc.getLength());
+ Assert.assertEquals(EXPECTED_CONTENT_LENGTH * (i + 1),
bc.getLength());
bc.recycle();
}
@@ -183,7 +181,7 @@ public class TestSendFile extends Tomcat
latch.await(3000, TimeUnit.MILLISECONDS);
if (exceptions.size() > 0) {
- fail();
+ Assert.fail();
}
}
@@ -237,8 +235,8 @@ public class TestSendFile extends Tomcat
try {
ByteChunk result = new ByteChunk();
int rc = getUrl(url, result, null);
- assertEquals(HttpServletResponse.SC_OK, rc);
- assertEquals(1024, result.getLength());
+ Assert.assertEquals(HttpServletResponse.SC_OK, rc);
+ Assert.assertEquals(1024, result.getLength());
} catch (Throwable e) {
e.printStackTrace();
exceptions.add(e);
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationSessionCookieConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationSessionCookieConfig.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationSessionCookieConfig.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationSessionCookieConfig.java
Mon Nov 13 11:25:51 2017
@@ -17,8 +17,7 @@
package org.apache.catalina.core;
-import static org.junit.Assert.assertTrue;
-
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -38,7 +37,7 @@ public class TestApplicationSessionCooki
public void testSetCommentInitPhase() {
context.setState(LifecycleState.STARTING_PREP);
applicationSessionCookieConfig.setComment("test");
- assertTrue(applicationSessionCookieConfig.getComment().equals("test"));
+
Assert.assertTrue(applicationSessionCookieConfig.getComment().equals("test"));
}
@Test(expected = IllegalStateException.class)
@@ -51,7 +50,7 @@ public class TestApplicationSessionCooki
public void testSetDomainInitPhase() {
context.setState(LifecycleState.STARTING_PREP);
applicationSessionCookieConfig.setDomain("test");
- assertTrue(applicationSessionCookieConfig.getDomain().equals("test"));
+
Assert.assertTrue(applicationSessionCookieConfig.getDomain().equals("test"));
}
@Test(expected = IllegalStateException.class)
@@ -64,7 +63,7 @@ public class TestApplicationSessionCooki
public void testSetHttpOnlyInitPhase() {
context.setState(LifecycleState.STARTING_PREP);
applicationSessionCookieConfig.setHttpOnly(true);
- assertTrue(applicationSessionCookieConfig.isHttpOnly());
+ Assert.assertTrue(applicationSessionCookieConfig.isHttpOnly());
}
@Test(expected = IllegalStateException.class)
@@ -77,7 +76,7 @@ public class TestApplicationSessionCooki
public void testSetMaxAgeInitPhase() {
context.setState(LifecycleState.STARTING_PREP);
applicationSessionCookieConfig.setMaxAge(1);
- assertTrue(applicationSessionCookieConfig.getMaxAge() == 1);
+ Assert.assertTrue(applicationSessionCookieConfig.getMaxAge() == 1);
}
@Test(expected = IllegalStateException.class)
@@ -90,7 +89,7 @@ public class TestApplicationSessionCooki
public void testSetNameInitPhase() {
context.setState(LifecycleState.STARTING_PREP);
applicationSessionCookieConfig.setName("test");
- assertTrue(applicationSessionCookieConfig.getName().equals("test"));
+
Assert.assertTrue(applicationSessionCookieConfig.getName().equals("test"));
}
@Test(expected = IllegalStateException.class)
@@ -103,7 +102,7 @@ public class TestApplicationSessionCooki
public void testSetPathInitPhase() {
context.setState(LifecycleState.STARTING_PREP);
applicationSessionCookieConfig.setPath("test");
- assertTrue(applicationSessionCookieConfig.getPath().equals("test"));
+
Assert.assertTrue(applicationSessionCookieConfig.getPath().equals("test"));
}
@Test(expected = IllegalStateException.class)
@@ -116,7 +115,7 @@ public class TestApplicationSessionCooki
public void testSetSecureInitPhase() {
context.setState(LifecycleState.STARTING_PREP);
applicationSessionCookieConfig.setSecure(true);
- assertTrue(applicationSessionCookieConfig.isSecure());
+ Assert.assertTrue(applicationSessionCookieConfig.isSecure());
}
@Test(expected = IllegalStateException.class)
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
Mon Nov 13 11:25:51 2017
@@ -45,10 +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.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -109,7 +105,7 @@ public class TestAsyncContextImpl extend
// Call the servlet once
ByteChunk bc = getUrl("http://localhost:"; + getPort() + "/");
- assertEquals("OK", bc.toString());
+ Assert.assertEquals("OK", bc.toString());
// Give the async thread a chance to finish (but not too long)
int counter = 0;
@@ -118,7 +114,7 @@ public class TestAsyncContextImpl extend
counter++;
}
- assertEquals("1false2true3true4true5false", servlet.getResult());
+ Assert.assertEquals("1false2true3true4true5false",
servlet.getResult());
// Check the access log
alv.validateAccessLog(1, 200, Bug49528Servlet.THREAD_SLEEP_TIME,
@@ -146,7 +142,7 @@ public class TestAsyncContextImpl extend
// Call the servlet once
ByteChunk bc = getUrl("http://localhost:"; + getPort() + "/");
- assertEquals("OK", bc.toString());
+ Assert.assertEquals("OK", bc.toString());
// Give the async thread a chance to finish (but not too long)
int counter = 0;
@@ -155,7 +151,7 @@ public class TestAsyncContextImpl extend
counter++;
}
- assertEquals("1false2true3true4true5false", servlet.getResult());
+ Assert.assertEquals("1false2true3true4true5false",
servlet.getResult());
// Check the access log
alv.validateAccessLog(1, 200, Bug49567Servlet.THREAD_SLEEP_TIME,
@@ -231,7 +227,7 @@ public class TestAsyncContextImpl extend
Map<String,List<String>> headers = new HashMap<>();
getUrl("http://localhost:"; + getPort() + "/", bc, headers);
- assertEquals("OK", bc.toString());
+ Assert.assertEquals("OK", bc.toString());
List<String> contentLength = headers.get("Content-Length");
Assert.assertNotNull(contentLength);
Assert.assertEquals(1, contentLength.size());
@@ -533,7 +529,7 @@ public class TestAsyncContextImpl extend
Thread.sleep(50);
count ++;
}
- assertEquals(expectedTrack, getTrack());
+ Assert.assertEquals(expectedTrack, getTrack());
// Check the access log
if (completeOnTimeout == null ||
@@ -670,7 +666,7 @@ public class TestAsyncContextImpl extend
Thread.sleep(50);
count ++;
}
- assertEquals(expectedTrack, getTrack());
+ Assert.assertEquals(expectedTrack, getTrack());
// Check the access log
alv.validateAccessLog(1, 200, 0, REQUEST_TIME);
@@ -1013,7 +1009,7 @@ public class TestAsyncContextImpl extend
Thread.sleep(50);
count ++;
}
- assertEquals(expectedTrack, getTrack());
+ Assert.assertEquals(expectedTrack, getTrack());
// Check the access log
alv.validateAccessLog(1, 500, 0, REQUEST_TIME);
@@ -1067,7 +1063,7 @@ public class TestAsyncContextImpl extend
Thread.sleep(50);
count ++;
}
- assertEquals(expectedTrack, getTrack());
+ Assert.assertEquals(expectedTrack, getTrack());
// Check the access log
alv.validateAccessLog(1, 200, AsyncStartRunnable.THREAD_SLEEP_TIME,
@@ -1129,12 +1125,12 @@ public class TestAsyncContextImpl extend
Map<String,List<String>> headers = new LinkedHashMap<>();
ByteChunk bc = new ByteChunk();
int rc = getUrl("http://localhost:"; + getPort() + "/", bc, headers);
- assertEquals(200, rc);
- assertEquals("OK", bc.toString());
+ Assert.assertEquals(200, rc);
+ Assert.assertEquals("OK", bc.toString());
List<String> testHeader = headers.get("A");
- assertNotNull(testHeader);
- assertEquals(1, testHeader.size());
- assertEquals("xyz",testHeader.get(0));
+ Assert.assertNotNull(testHeader);
+ Assert.assertEquals(1, testHeader.size());
+ Assert.assertEquals("xyz",testHeader.get(0));
// Check the access log
alv.validateAccessLog(1, 200, Bug50753Servlet.THREAD_SLEEP_TIME,
@@ -1195,7 +1191,7 @@ public class TestAsyncContextImpl extend
int rc = getUrl(url.toString(), new ByteChunk(), null);
- assertEquals(500, rc);
+ Assert.assertEquals(500, rc);
// Without this test may complete before access log has a chance to log
// the request
@@ -1232,7 +1228,7 @@ public class TestAsyncContextImpl extend
int rc = getUrl(url.toString(), new ByteChunk(), null);
- assertEquals(HttpServletResponse.SC_BAD_REQUEST, rc);
+ Assert.assertEquals(HttpServletResponse.SC_BAD_REQUEST, rc);
// Without this test may complete before access log has a chance to log
// the request
@@ -1322,7 +1318,7 @@ public class TestAsyncContextImpl extend
ByteChunk res = new ByteChunk();
int rc = getUrl(url.toString(), res, null);
- assertEquals(HttpServletResponse.SC_BAD_REQUEST, rc);
+ Assert.assertEquals(HttpServletResponse.SC_BAD_REQUEST, rc);
// SRV 10.9.2 - Handling an error is entirely the application's
// responsibility when an error occurs on an application thread.
@@ -1330,11 +1326,11 @@ public class TestAsyncContextImpl extend
// error page mechanism to kick in could be viewed as handling the
error
String responseBody = res.toString();
Assert.assertNotNull(responseBody);
- assertTrue(responseBody.length() > 0);
+ Assert.assertTrue(responseBody.length() > 0);
if (customError) {
- assertTrue(responseBody,
responseBody.contains(CustomErrorServlet.ERROR_MESSAGE));
+ Assert.assertTrue(responseBody,
responseBody.contains(CustomErrorServlet.ERROR_MESSAGE));
} else {
- assertTrue(responseBody,
responseBody.contains(AsyncErrorServlet.ERROR_MESSAGE));
+ Assert.assertTrue(responseBody,
responseBody.contains(AsyncErrorServlet.ERROR_MESSAGE));
}
// Without this test may complete before access log has a chance to log
@@ -1427,8 +1423,8 @@ public class TestAsyncContextImpl extend
ByteChunk body = new ByteChunk();
int rc = getUrl(url.toString(), body, null);
- assertEquals(HttpServletResponse.SC_OK, rc);
- assertEquals("OK", body.toString());
+ Assert.assertEquals(HttpServletResponse.SC_OK, rc);
+ Assert.assertEquals("OK", body.toString());
}
private static class Bug53337ServletA extends HttpServlet {
@@ -1506,9 +1502,9 @@ public class TestAsyncContextImpl extend
ByteChunk body = new ByteChunk();
int rc = getUrl(url.toString(), body, null);
- assertEquals(HttpServletResponse.SC_OK, rc);
- assertEquals("OK", body.toString());
- assertTrue(servletA.isAsyncWhenExpected());
+ Assert.assertEquals(HttpServletResponse.SC_OK, rc);
+ Assert.assertEquals("OK", body.toString());
+ Assert.assertTrue(servletA.isAsyncWhenExpected());
}
private static class Bug53843ServletA extends HttpServlet {
@@ -1755,15 +1751,15 @@ public class TestAsyncContextImpl extend
ioe.printStackTrace();
}
- assertEquals(HttpServletResponse.SC_OK, rc);
+ Assert.assertEquals(HttpServletResponse.SC_OK, rc);
body.recycle();
rc = getUrl("http://localhost:"; + getPort() + "/bug54178ServletB",
body, null);
- assertEquals(HttpServletResponse.SC_OK, rc);
- assertEquals("OK", body.toString());
+ Assert.assertEquals(HttpServletResponse.SC_OK, rc);
+ Assert.assertEquals("OK", body.toString());
}
private static class Bug54178ServletA extends HttpServlet {
@@ -2193,7 +2189,7 @@ public class TestAsyncContextImpl extend
getUrl("http://localhost:"; + getPort()+ "/stage1");
-
assertEquals("doGet-startAsync-doGet-startAsync-onStartAsync-NonAsyncServletGet-onComplete-",
getTrack());
+
Assert.assertEquals("doGet-startAsync-doGet-startAsync-onStartAsync-NonAsyncServletGet-onComplete-",
getTrack());
// Check the access log
alv.validateAccessLog(1, 200, 0, REQUEST_TIME);
@@ -2475,8 +2471,8 @@ public class TestAsyncContextImpl extend
}
private void checkRequestResponse(AsyncEvent event) {
- assertEquals(servletRequest, event.getSuppliedRequest());
- assertEquals(servletResponse, event.getSuppliedResponse());
+ Assert.assertEquals(servletRequest,
event.getSuppliedRequest());
+ Assert.assertEquals(servletResponse,
event.getSuppliedResponse());
}
};
final Context context = new TesterContext();
@@ -2630,8 +2626,8 @@ public class TestAsyncContextImpl extend
ByteChunk body = new ByteChunk();
int rc = getUrl("http://localhost:"; + getPort() +
EncodedDispatchServlet.ENCODED_URI, body, null);
- assertEquals(HttpServletResponse.SC_OK, rc);
- assertEquals("OK", body.toString());
+ Assert.assertEquals(HttpServletResponse.SC_OK, rc);
+ Assert.assertEquals("OK", body.toString());
}
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestDefaultInstanceManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestDefaultInstanceManager.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestDefaultInstanceManager.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestDefaultInstanceManager.java
Mon Nov 13 11:25:51 2017
@@ -21,8 +21,7 @@ import java.lang.reflect.InvocationTarge
import javax.naming.NamingException;
-import static org.junit.Assert.assertEquals;
-
+import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
@@ -71,7 +70,7 @@ public class TestDefaultInstanceManager
// First JSP should be unloaded and replaced by third (second left
// alone) so no change in overall count
- assertEquals(count, instanceManager.getAnnotationCacheSize());
+ Assert.assertEquals(count, instanceManager.getAnnotationCacheSize());
}
private DefaultInstanceManager doClassUnloadingPrep() throws Exception {
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestNamingContextListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestNamingContextListener.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestNamingContextListener.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestNamingContextListener.java
Mon Nov 13 11:25:51 2017
@@ -22,8 +22,7 @@ import javax.naming.NamingException;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
-import static org.junit.Assert.assertEquals;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.Context;
@@ -65,7 +64,7 @@ public class TestNamingContextListener e
tomcat.start();
- assertEquals(LifecycleState.STARTED, ctx.getState());
+ Assert.assertEquals(LifecycleState.STARTED, ctx.getState());
}
public static final class Bug49132Listener implements
ServletContextListener {
@@ -118,7 +117,7 @@ public class TestNamingContextListener e
tomcat.start();
- assertEquals(LifecycleState.STARTED, ctx.getState());
+ Assert.assertEquals(LifecycleState.STARTED, ctx.getState());
}
public static class Bug54096EnvA {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
