Author: markt
Date: Mon Nov 13 12:00:30 2017
New Revision: 1815090
URL: http://svn.apache.org/viewvc?rev=1815090&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.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/ShouldForceReconnectTest.java
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/BorrowWaitTest.java
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/StarvationTest.java
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestJdbcInterceptorConfigParsing.java
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/coyote/lite/TomcatLiteCoyoteTest.java
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/ClientTest.java
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/CompressFilterTest.java
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/DispatcherTest.java
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/HttpChannelInMemoryTest.java
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/HttpChannelTest.java
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/HttpsTest.java
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/LiveHttp1Test.java
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/MultiMapTest.java
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/SpdyTest.java
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/BBufferTest.java
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/CBufferTest.java
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/UEncoderTest.java
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/load/LiveHttpThreadedTest.java
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/proxy/ProxyTest.java
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/proxy/SmallProxyTest.java
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/util/UEncoderTest.java
tomcat/tc8.0.x/trunk/test/javax/el/TestCompositeELResolver.java
tomcat/tc8.0.x/trunk/test/javax/servlet/jsp/TestPageContext.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/ant/TestDeployTask.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestNonLoginAndBasicAuthenticator.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndBasicAuthenticator.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestConnector.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestKeepAliveCount.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestOutputBuffer.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestRequest.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestResponse.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestSendFile.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestApplicationSessionCookieConfig.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestDefaultInstanceManager.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestNamingContextListener.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestStandardContext.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestStandardContextValve.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestStandardWrapper.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/filters/TestAddCharSetFilter.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter2.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/filters/TestRemoteIpFilter.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/filters/TestRestCsrfPreventionFilter.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/filters/TestRestCsrfPreventionFilter2.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/loader/TestVirtualContext.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/loader/TestVirtualWebappLoader.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/mapper/TestMapper.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/mapper/TestMapperPerformance.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/servlets/TestWebdavServlet.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/session/Benchmarks.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/session/Threading.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/LoggingBaseTest.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestBootstrap.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestListener.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestTomcatClassLoader.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestGzipInterceptor.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/membership/TestMemberImplSerialization.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/util/TestContextName.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/util/TestConversions.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/valves/TestRemoteIpValve.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/valves/TestRequestFilterValve.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java
tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java
tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/TestGzipOutputFilter.java
tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/TestInternalInputBuffer.java
tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
tomcat/tc8.0.x/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java
tomcat/tc8.0.x/trunk/test/org/apache/el/TestELEvaluation.java
tomcat/tc8.0.x/trunk/test/org/apache/el/TestMethodExpressionImpl.java
tomcat/tc8.0.x/trunk/test/org/apache/el/TestValueExpressionImpl.java
tomcat/tc8.0.x/trunk/test/org/apache/el/lang/TestELArithmetic.java
tomcat/tc8.0.x/trunk/test/org/apache/el/lang/TestELSupport.java
tomcat/tc8.0.x/trunk/test/org/apache/el/parser/TestELParser.java
tomcat/tc8.0.x/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java
tomcat/tc8.0.x/trunk/test/org/apache/jasper/compiler/TestCompiler.java
tomcat/tc8.0.x/trunk/test/org/apache/jasper/compiler/TestGenerator.java
tomcat/tc8.0.x/trunk/test/org/apache/jasper/compiler/TestJspConfig.java
tomcat/tc8.0.x/trunk/test/org/apache/jasper/compiler/TestParser.java
tomcat/tc8.0.x/trunk/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java
tomcat/tc8.0.x/trunk/test/org/apache/jasper/compiler/TestScriptingVariabler.java
tomcat/tc8.0.x/trunk/test/org/apache/jasper/compiler/TestValidator.java
tomcat/tc8.0.x/trunk/test/org/apache/jasper/util/TestFastRemovalDequeue.java
tomcat/tc8.0.x/trunk/test/org/apache/juli/TestFileHandler.java
tomcat/tc8.0.x/trunk/test/org/apache/juli/TestFileHandlerNonRotatable.java
tomcat/tc8.0.x/trunk/test/org/apache/naming/resources/TestNamingContext.java
tomcat/tc8.0.x/trunk/test/org/apache/naming/resources/TestWarDirContext.java
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/buf/TestUEncoder.java
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/descriptor/web/TestSecurityConstraint.java
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXmlOrdering.java
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/http/TestParameters.java
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/http/TesterParametersPerformance.java
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/http/parser/TestMediaType.java
Modified:
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/ShouldForceReconnectTest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/ShouldForceReconnectTest.java?rev=1815090&r1=1815089&r2=1815090&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/ShouldForceReconnectTest.java
(original)
+++
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/ShouldForceReconnectTest.java
Mon Nov 13 12:00:30 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.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/BorrowWaitTest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/BorrowWaitTest.java?rev=1815090&r1=1815089&r2=1815090&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/BorrowWaitTest.java
(original)
+++
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/BorrowWaitTest.java
Mon Nov 13 12:00:30 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.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/StarvationTest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/StarvationTest.java?rev=1815090&r1=1815089&r2=1815090&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/StarvationTest.java
(original)
+++
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/StarvationTest.java
Mon Nov 13 12:00:30 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.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestJdbcInterceptorConfigParsing.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestJdbcInterceptorConfigParsing.java?rev=1815090&r1=1815089&r2=1815090&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestJdbcInterceptorConfigParsing.java
(original)
+++
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestJdbcInterceptorConfigParsing.java
Mon Nov 13 12:00:30 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(), "");
}
/**
@@ -126,7 +123,7 @@ public class TestJdbcInterceptorConfigPa
props.setJdbcInterceptors(badConfig);
try {
props.getJdbcInterceptorsAsArray();
- fail("Expected exception.");
+ Assert.fail("Expected exception.");
} catch (Exception e) {
// Expected
}
@@ -147,7 +144,7 @@ public class TestJdbcInterceptorConfigPa
try {
props.getJdbcInterceptorsAsArray();
} catch (Exception e) {
- fail("Unexpected exception.");
+ Assert.fail("Unexpected exception.");
}
}
}
@@ -159,21 +156,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.0.x/trunk/modules/tomcat-lite/test/org/apache/coyote/lite/TomcatLiteCoyoteTest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/coyote/lite/TomcatLiteCoyoteTest.java?rev=1815090&r1=1815089&r2=1815090&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/coyote/lite/TomcatLiteCoyoteTest.java
(original)
+++
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/coyote/lite/TomcatLiteCoyoteTest.java
Mon Nov 13 12:00:30 2017
@@ -34,7 +34,7 @@ public class TomcatLiteCoyoteTest extend
BBuffer res = ch.readAll(null, 0);
- assertTrue(res.toString(),
+ Assert.assertTrue(res.toString(),
res.toString().indexOf("<title>Apache Tomcat</title>") >= 0);
}
Modified:
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/ClientTest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/ClientTest.java?rev=1815090&r1=1815089&r2=1815090&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/ClientTest.java
(original)
+++
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/ClientTest.java
Mon Nov 13 12:00:30 2017
@@ -35,12 +35,12 @@ public class ClientTest extends TestCase
HttpRequest req = httpCon.request("http://localhost:8802/echo/test1";);
HttpResponse res = req.waitResponse();
- assertEquals(200, res.getStatus());
+ Assert.assertEquals(200, res.getStatus());
//assertEquals("", res.getHeader(""));
BufferedReader reader = res.getReader();
String line1 = reader.readLine();
- assertEquals("REQ HEAD:", line1);
+ Assert.assertEquals("REQ HEAD:", line1);
}
public void testSimpleCallback() throws IOException {
Modified:
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/CompressFilterTest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/CompressFilterTest.java?rev=1815090&r1=1815089&r2=1815090&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/CompressFilterTest.java
(original)
+++
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/CompressFilterTest.java
Mon Nov 13 12:00:30 2017
@@ -33,11 +33,11 @@ public class CompressFilterTest extends
out.close();
cf.decompress(out, in);
- assertEquals(in.copyAll(null).toString(), clear);
- assertTrue(in.isAppendClosed());
+ Assert.assertEquals(in.copyAll(null).toString(), clear);
+ Assert.assertTrue(in.isAppendClosed());
if (xtra != null) {
- assertEquals(out.copyAll(null).toString(), xtra);
+ Assert.assertEquals(out.copyAll(null).toString(), xtra);
}
}
Modified:
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/DispatcherTest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/DispatcherTest.java?rev=1815090&r1=1815089&r2=1815090&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/DispatcherTest.java
(original)
+++
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/DispatcherTest.java
Mon Nov 13 12:00:30 2017
@@ -40,7 +40,7 @@ public class DispatcherTest extends Test
mapper.map(host, uri, mappingData);
- assertEquals("context2", mappingData.context.toString());
- assertEquals("/foo/bar", mappingData.contextPath.toString());
+ Assert.assertEquals("context2", mappingData.context.toString());
+ Assert.assertEquals("/foo/bar", mappingData.contextPath.toString());
}
}
Modified:
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/HttpChannelInMemoryTest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/HttpChannelInMemoryTest.java?rev=1815090&r1=1815089&r2=1815090&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/HttpChannelInMemoryTest.java
(original)
+++
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/HttpChannelInMemoryTest.java
Mon Nov 13 12:00:30 2017
@@ -74,12 +74,12 @@ public class HttpChannelInMemoryTest ext
net.getIn().append(req);
//http = lastServer.get(0);
- assertTrue(http.getRequest().method().equals("GET"));
- assertTrue(http.getRequest().protocol().equals("HTTP/1.1"));
- assertEquals(http.getRequest().getMimeHeaders().size(), 4);
-
assertEquals(http.getRequest().getMimeHeaders().getHeader("Host").toString(),
+ Assert.assertTrue(http.getRequest().method().equals("GET"));
+ Assert.assertTrue(http.getRequest().protocol().equals("HTTP/1.1"));
+ Assert.assertEquals(http.getRequest().getMimeHeaders().size(), 4);
+
Assert.assertEquals(http.getRequest().getMimeHeaders().getHeader("Host").toString(),
"Foo.com");
-
assertEquals(http.getRequest().getMimeHeaders().getHeader("H2").toString(),
+
Assert.assertEquals(http.getRequest().getMimeHeaders().getHeader("H2").toString(),
"Bar");
http.getOut().append("Response1");
@@ -92,10 +92,10 @@ public class HttpChannelInMemoryTest ext
//http = lastServer.get(1);
- assertTrue(http.getRequest().method().equals("HEAD"));
- assertTrue(http.getRequest().protocol().equals("HTTP/1.1"));
- assertTrue(http.getRequest().getMimeHeaders().size() == 3);
- assertTrue(http.getRequest().getMimeHeaders().getHeader("Host")
+ Assert.assertTrue(http.getRequest().method().equals("HEAD"));
+ Assert.assertTrue(http.getRequest().protocol().equals("HTTP/1.1"));
+ Assert.assertTrue(http.getRequest().getMimeHeaders().size() == 3);
+ Assert.assertTrue(http.getRequest().getMimeHeaders().getHeader("Host")
.equals("Foo.com"));
}
@@ -106,16 +106,16 @@ public class HttpChannelInMemoryTest ext
"\n";
net.getIn().append(req);
- assertTrue(http.getRequest().method().equals("GET"));
- assertTrue(http.getRequest().protocol().equals("HTTP/1.1"));
+ Assert.assertTrue(http.getRequest().method().equals("GET"));
+ Assert.assertTrue(http.getRequest().protocol().equals("HTTP/1.1"));
http.getOut().append("Response1");
http.getOut().close();
http.startSending();
http.release();
- assertTrue(net.out.indexOf("connection:close") > 0);
- assertFalse(net.isOpen());
+ Assert.assertTrue(net.out.indexOf("connection:close") > 0);
+ Assert.assertFalse(net.isOpen());
}
public void testHttp10Close() throws IOException {
@@ -124,15 +124,15 @@ public class HttpChannelInMemoryTest ext
"\r\n";
net.getIn().append(req);
- assertTrue(http.getRequest().method().equals("GET"));
- assertTrue(http.getRequest().protocol().equals("HTTP/1.0"));
+ Assert.assertTrue(http.getRequest().method().equals("GET"));
+ Assert.assertTrue(http.getRequest().protocol().equals("HTTP/1.0"));
http.getOut().append("Response1");
http.getOut().close();
http.startSending();
- assertTrue(net.out.indexOf("connection:close") > 0);
- assertFalse(net.isOpen());
+ Assert.assertTrue(net.out.indexOf("connection:close") > 0);
+ Assert.assertFalse(net.isOpen());
}
public void testHttp10KA() throws IOException {
@@ -142,20 +142,20 @@ public class HttpChannelInMemoryTest ext
"\r\n";
net.getIn().append(req);
- assertTrue(http.getRequest().method().equals("GET"));
- assertTrue(http.getRequest().protocol().equals("HTTP/1.0"));
+ Assert.assertTrue(http.getRequest().method().equals("GET"));
+ Assert.assertTrue(http.getRequest().protocol().equals("HTTP/1.0"));
http.getOut().append("Hi");
http.getOut().close();
http.startSending();
// after request
- assertEquals(conn.activeHttp, null);
+ Assert.assertEquals(conn.activeHttp, null);
- assertTrue(net.out.indexOf("connection:keep-alive") > 0);
- assertTrue(net.isOpen());
+ Assert.assertTrue(net.out.indexOf("connection:keep-alive") > 0);
+ Assert.assertTrue(net.isOpen());
// inserted since we can calculate the response
- assertEquals(http.getResponse().getHeader("Content-Length"),
+ Assert.assertEquals(http.getResponse().getHeader("Content-Length"),
"2");
}
@@ -166,8 +166,8 @@ public class HttpChannelInMemoryTest ext
"\r\n";
net.getIn().append(req);
- assertTrue(http.getRequest().method().equals("GET"));
- assertTrue(http.getRequest().protocol().equals("HTTP/1.0"));
+ Assert.assertTrue(http.getRequest().method().equals("GET"));
+ Assert.assertTrue(http.getRequest().protocol().equals("HTTP/1.0"));
http.getOut().append("Hi");
http.startSending();
@@ -177,14 +177,14 @@ public class HttpChannelInMemoryTest ext
http.startSending();
// after request
- assertEquals(conn.activeHttp, null);
+ Assert.assertEquals(conn.activeHttp, null);
- assertFalse(net.out.indexOf("connection:keep-alive") > 0);
- assertFalse(net.isOpen());
+ Assert.assertFalse(net.out.indexOf("connection:keep-alive") > 0);
+ Assert.assertFalse(net.isOpen());
// inserted since we can calculate the response
- assertEquals(http.getResponse().getHeader("Content-Length"),
+ Assert.assertEquals(http.getResponse().getHeader("Content-Length"),
null);
- assertEquals(http.getResponse().getHeader("Transfer-Encoding"),
+ Assert.assertEquals(http.getResponse().getHeader("Transfer-Encoding"),
null);
}
@@ -198,10 +198,10 @@ public class HttpChannelInMemoryTest ext
MultiMap headers = http.getRequest().getMimeHeaders();
CBuffer cookie = headers.getHeader("Cookie");
CBuffer conn = headers.getHeader("Connection");
- assertEquals(conn.toString(), "close");
- assertEquals(cookie.toString(), "1234 456");
+ Assert.assertEquals(conn.toString(), "close");
+ Assert.assertEquals(cookie.toString(), "1234 456");
- assertEquals(http.conn.headRecvBuf.toString(),
+ Assert.assertEquals(http.conn.headRecvBuf.toString(),
"GET / HTTP/1.0\n" +
"Cookie: 1234 456 \n" + // \n -> trailing space
"Connection: Close\n\n");
@@ -211,10 +211,10 @@ public class HttpChannelInMemoryTest ext
net.getIn().append("GET / HTTP/1.1\n"
+ "Host: localhost\n"
+ "\n");
- assertTrue(((Http11Connection)http.conn).keepAlive());
+ Assert.assertTrue(((Http11Connection)http.conn).keepAlive());
net.getIn().close();
- assertFalse(((Http11Connection)http.conn).keepAlive());
+ Assert.assertFalse(((Http11Connection)http.conn).keepAlive());
}
public void test2ReqByte2Byte() throws IOException {
@@ -235,10 +235,10 @@ public class HttpChannelInMemoryTest ext
net.getIn().append(req.charAt(i));
}
- assertTrue(http.getRequest().method().equals("GET"));
- assertTrue(http.getRequest().protocol().equals("HTTP/1.1"));
- assertTrue(http.getRequest().getMimeHeaders().size() == 4);
- assertTrue(http.getRequest().getMimeHeaders().getHeader("Host")
+ Assert.assertTrue(http.getRequest().method().equals("GET"));
+ Assert.assertTrue(http.getRequest().protocol().equals("HTTP/1.1"));
+ Assert.assertTrue(http.getRequest().getMimeHeaders().size() == 4);
+ Assert.assertTrue(http.getRequest().getMimeHeaders().getHeader("Host")
.equals("Foo.com"));
// send a response
@@ -249,10 +249,10 @@ public class HttpChannelInMemoryTest ext
http.release(); // now second response must be in
- assertTrue(http.getRequest().method().equals("HEAD"));
- assertTrue(http.getRequest().protocol().equals("HTTP/1.1"));
- assertTrue(http.getRequest().getMimeHeaders().size() == 2);
- assertTrue(http.getRequest().getMimeHeaders().getHeader("Host")
+ Assert.assertTrue(http.getRequest().method().equals("HEAD"));
+ Assert.assertTrue(http.getRequest().protocol().equals("HTTP/1.1"));
+ Assert.assertTrue(http.getRequest().getMimeHeaders().size() == 2);
+ Assert.assertTrue(http.getRequest().getMimeHeaders().getHeader("Host")
.equals("Foo1.com"));
// send a response - service method will be called
@@ -279,7 +279,7 @@ public class HttpChannelInMemoryTest ext
http.getOut().close();
http.startSending(); // will call handleEndSend
- assertTrue(allDone);
+ Assert.assertTrue(allDone);
}
@@ -322,19 +322,19 @@ public class HttpChannelInMemoryTest ext
"Connection: Close\n" +
"Content-Length: 4\n\n" +
"1");
- assertTrue(headersDone);
+ Assert.assertTrue(headersDone);
net.getIn().append("234");
net.getIn().close();
- assertTrue(bodyDone);
+ Assert.assertTrue(bodyDone);
http.sendBody.queue("Hi");
http.getOut().close();
http.startSending();
- assertTrue(bodySentDone);
+ Assert.assertTrue(bodySentDone);
- assertTrue(allDone);
+ Assert.assertTrue(allDone);
}
@@ -352,15 +352,15 @@ public class HttpChannelInMemoryTest ext
BBuffer res = BBuffer.allocate(1000);
appData.readAll(res);
- assertEquals(res.toString(), "1234");
- assertFalse(((Http11Connection)http.conn).keepAlive());
+ Assert.assertEquals(res.toString(), "1234");
+ Assert.assertFalse(((Http11Connection)http.conn).keepAlive());
http.sendBody.queue(res);
http.getOut().close();
http.startSending();
- assertTrue(net.getOut().isAppendClosed());
- assertTrue(net.out.toString().indexOf("\n1234") > 0);
+ Assert.assertTrue(net.getOut().isAppendClosed());
+ Assert.assertTrue(net.out.toString().indexOf("\n1234") > 0);
}
@@ -374,11 +374,11 @@ public class HttpChannelInMemoryTest ext
net.getIn().close();
BufferedReader r = http.getRequest().getReader();
- assertEquals("Line 1", r.readLine());
- assertEquals("Line 2", r.readLine());
- assertEquals("Line 3", r.readLine());
- assertEquals("Line 4", r.readLine());
- assertEquals(null, r.readLine());
+ Assert.assertEquals("Line 1", r.readLine());
+ Assert.assertEquals("Line 2", r.readLine());
+ Assert.assertEquals("Line 3", r.readLine());
+ Assert.assertEquals("Line 4", r.readLine());
+ Assert.assertEquals(null, r.readLine());
}
}
Modified:
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/HttpChannelTest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/HttpChannelTest.java?rev=1815090&r1=1815089&r2=1815090&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/HttpChannelTest.java
(original)
+++
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/HttpChannelTest.java
Mon Nov 13 12:00:30 2017
@@ -47,15 +47,15 @@ public class HttpChannelTest extends Tes
requestB.recycle();
methodB.recycle();
con.parseRequestLine(line, methodB, requestB, queryB, protoB);
- assertEquals(proto, protoB.toString());
- assertEquals(req, requestB.toString());
- assertEquals(qry, queryB.toString());
- assertEquals(method, methodB.toString());
+ Assert.assertEquals(proto, protoB.toString());
+ Assert.assertEquals(req, requestB.toString());
+ Assert.assertEquals(qry, queryB.toString());
+ Assert.assertEquals(method, methodB.toString());
}
public void testParams() throws IOException {
MultiMap params = processQry("a=b&c=d");
- assertEquals("b", params.getString("a"));
+ Assert.assertEquals("b", params.getString("a"));
}
private MultiMap processQry(String qry) throws IOException {
@@ -83,11 +83,11 @@ public class HttpChannelTest extends Tes
head.readLine(line);
con.parseHeader(ch, head, line, name, value);
- assertEquals(expName, name.toString());
- assertEquals(expValue, value.toString());
+ Assert.assertEquals(expName, name.toString());
+ Assert.assertEquals(expValue, value.toString());
- assertEquals(expLine, line.toString());
- assertEquals(expRest, head.toString());
+ Assert.assertEquals(expLine, line.toString());
+ Assert.assertEquals(expRest, head.toString());
}
public void testParseHeader() throws IOException {
@@ -112,9 +112,9 @@ public class HttpChannelTest extends Tes
BBuffer line = BBuffer.wrapper(lineS);
con.parseResponseLine(line,
protoB, statusB, msgB);
- assertEquals(proto, protoB.toString());
- assertEquals(status, statusB.toString());
- assertEquals(msg, msgB.toString());
+ Assert.assertEquals(proto, protoB.toString());
+ Assert.assertEquals(status, statusB.toString());
+ Assert.assertEquals(msg, msgB.toString());
}
public void testResponse() throws Exception {
Modified:
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/HttpsTest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/HttpsTest.java?rev=1815090&r1=1815089&r2=1815090&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/HttpsTest.java
(original)
+++
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/HttpsTest.java
Mon Nov 13 12:00:30 2017
@@ -34,7 +34,7 @@ public class HttpsTest extends TestCase
public void testSimpleServer() throws Exception {
final HttpConnector httpClient = TestMain.shared().getClient();
BBuffer res = TestMain.getUrl("https://localhost:8443/hello";);
- assertTrue(res.toString().indexOf("Hello") >= 0);
+ Assert.assertTrue(res.toString().indexOf("Hello") >= 0);
}
@@ -46,7 +46,7 @@ public class HttpsTest extends TestCase
ch.send();
BBuffer res = ch.readAll();
- assertTrue(res.toString().indexOf("Hello") >= 0);
+ Assert.assertTrue(res.toString().indexOf("Hello") >= 0);
}
public void testSimpleClient20() throws Exception {
@@ -66,7 +66,7 @@ public class HttpsTest extends TestCase
client.send();
BBuffer res = client.readAll();
- assertTrue(res.toString().indexOf("<title>Google Accounts</title>") >
0);
+ Assert.assertTrue(res.toString().indexOf("<title>Google
Accounts</title>") > 0);
}
}
Modified:
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/LiveHttp1Test.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/LiveHttp1Test.java?rev=1815090&r1=1815089&r2=1815090&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/LiveHttp1Test.java
(original)
+++
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/LiveHttp1Test.java
Mon Nov 13 12:00:30 2017
@@ -56,7 +56,7 @@ public class LiveHttp1Test extends TestC
httpReq.send();
httpReq.readAll(bodyRecvBuffer, to);
- assertEquals("Hello world", bodyRecvBuffer.toString());
+ Assert.assertEquals("Hello world", bodyRecvBuffer.toString());
}
public void testSimpleRequestClose() throws Exception {
@@ -65,7 +65,7 @@ public class LiveHttp1Test extends TestC
httpReq.send();
httpReq.readAll(bodyRecvBuffer, to);
- assertEquals("Hello world", bodyRecvBuffer.toString());
+ Assert.assertEquals("Hello world", bodyRecvBuffer.toString());
}
public void testPoolGetRelease() throws Exception {
@@ -86,7 +86,7 @@ public class LiveHttp1Test extends TestC
httpReq.requestURI().set("/chunked/foo");
httpReq.send();
httpReq.readAll(bodyRecvBuffer, to);
- assertTrue(bodyRecvBuffer.toString(),
bodyRecvBuffer.toString().indexOf("AAA") >= 0);
+ Assert.assertTrue(bodyRecvBuffer.toString(),
bodyRecvBuffer.toString().indexOf("AAA") >= 0);
}
// Check waitResponseHead()
@@ -97,7 +97,7 @@ public class LiveHttp1Test extends TestC
httpReq.send();
httpReq.readAll(bodyRecvBuffer, to);
- assertTrue(bodyRecvBuffer.toString().indexOf("GET /echo/foo") > 0);
+ Assert.assertTrue(bodyRecvBuffer.toString().indexOf("GET /echo/foo") >
0);
}
public void test10() throws Exception {
@@ -147,6 +147,6 @@ public class LiveHttp1Test extends TestC
httpReq.send();
httpReq.readAll(bodyRecvBuffer, to);
- assertEquals(0, bodyRecvBuffer.remaining());
+ Assert.assertEquals(0, bodyRecvBuffer.remaining());
}
}
Modified:
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/MultiMapTest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/MultiMapTest.java?rev=1815090&r1=1815089&r2=1815090&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/MultiMapTest.java
(original)
+++
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/MultiMapTest.java
Mon Nov 13 12:00:30 2017
@@ -13,27 +13,27 @@ public class MultiMapTest extends TestCa
public void testAdd() {
map.add("foo", "bar");
- assertEquals("bar", map.get("foo").toString());
+ Assert.assertEquals("bar", map.get("foo").toString());
}
public void testRemove() {
map.add("foo", "bar");
map.add("foo", "bar");
map.add("foo1", "bar");
- assertEquals(3, map.count);
+ Assert.assertEquals(3, map.count);
map.remove("foo");
- assertEquals(1, map.count);
+ Assert.assertEquals(1, map.count);
}
public void testRemove1() {
map.add("foo", "bar");
map.add("foo1", "bar");
map.add("foo", "bar");
- assertEquals(3, map.count);
+ Assert.assertEquals(3, map.count);
map.remove("foo");
- assertEquals(1, map.count);
+ Assert.assertEquals(1, map.count);
map.remove("foo1");
- assertEquals(0, map.count);
+ Assert.assertEquals(0, map.count);
}
public void testCase() {
@@ -41,14 +41,14 @@ public class MultiMapTest extends TestCa
lmap.add("Foo", "bar2");
lmap.add("a", "bar3");
lmap.add("B", "bar4");
- assertEquals(4, lmap.count);
- assertEquals(3, lmap.map.size());
+ Assert.assertEquals(4, lmap.count);
+ Assert.assertEquals(3, lmap.map.size());
- assertEquals("bar3", lmap.getString("a"));
- assertEquals("bar3", lmap.getString("A"));
- assertEquals("bar1", lmap.getString("Foo"));
+ Assert.assertEquals("bar3", lmap.getString("a"));
+ Assert.assertEquals("bar3", lmap.getString("A"));
+ Assert.assertEquals("bar1", lmap.getString("Foo"));
Entry entry = lmap.getEntry("FOO");
- assertEquals(2, entry.values.size());
+ Assert.assertEquals(2, entry.values.size());
}
}
Modified:
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/SpdyTest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/SpdyTest.java?rev=1815090&r1=1815089&r2=1815090&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/SpdyTest.java
(original)
+++
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/http/SpdyTest.java
Mon Nov 13 12:00:30 2017
@@ -31,7 +31,7 @@ public class SpdyTest extends TestCase {
HttpResponse res = req.waitResponse();
- assertEquals(200, res.getStatus());
+ Assert.assertEquals(200, res.getStatus());
//assertEquals("", res.getHeader(""));
BufferedReader reader = res.getReader();
@@ -52,7 +52,7 @@ public class SpdyTest extends TestCase {
HttpResponse res = req.waitResponse();
- assertEquals(200, res.getStatus());
+ Assert.assertEquals(200, res.getStatus());
//assertEquals("", res.getHeader(""));
res.setReadTimeout(2000);
@@ -79,15 +79,15 @@ public class SpdyTest extends TestCase {
HttpChannel spdyChannel = con.channels.get(1);
- assertEquals(1, con.lastFrame.version);
- assertEquals(1, con.lastFrame.type);
- assertEquals(1, con.lastFrame.flags);
+ Assert.assertEquals(1, con.lastFrame.version);
+ Assert.assertEquals(1, con.lastFrame.type);
+ Assert.assertEquals(1, con.lastFrame.flags);
- assertEquals(417, con.lastFrame.length);
+ Assert.assertEquals(417, con.lastFrame.length);
// TODO: test req, headers
HttpRequest req = spdyChannel.getRequest();
- assertTrue(req.getHeader("accept").indexOf("application/xml") >= 0);
+ Assert.assertTrue(req.getHeader("accept").indexOf("application/xml")
>= 0);
}
@@ -108,13 +108,13 @@ public class SpdyTest extends TestCase {
HttpChannel spdyChannel = con.channels.get(1);
- assertEquals(1, con.lastFrame.version);
- assertEquals(1, con.lastFrame.type);
- assertEquals(1, con.lastFrame.flags);
+ Assert.assertEquals(1, con.lastFrame.version);
+ Assert.assertEquals(1, con.lastFrame.type);
+ Assert.assertEquals(1, con.lastFrame.flags);
// TODO: test req, headers
HttpRequest req = spdyChannel.getRequest();
- assertTrue(req.getHeader("accept").indexOf("application/xml") >= 0);
+ Assert.assertTrue(req.getHeader("accept").indexOf("application/xml")
>= 0);
}
@@ -134,10 +134,10 @@ public class SpdyTest extends TestCase {
SpdyConnection con = new SpdyConnection(memSpdyCon, new
RemoteServer());
con.dataReceived(iob);
- assertEquals(1, con.currentInFrame.version);
- assertEquals(0xFFFF, con.currentInFrame.type);
- assertEquals(0xFF, con.currentInFrame.flags);
- assertEquals(0xFFFFFF, con.currentInFrame.length);
+ Assert.assertEquals(1, con.currentInFrame.version);
+ Assert.assertEquals(0xFFFF, con.currentInFrame.type);
+ Assert.assertEquals(0xFF, con.currentInFrame.flags);
+ Assert.assertEquals(0xFFFFFF, con.currentInFrame.length);
}
@@ -158,7 +158,7 @@ public class SpdyTest extends TestCase {
SpdyConnection con = new SpdyConnection(memSpdyCon, new
RemoteServer());
con.dataReceived(iob);
- assertEquals(1, con.streamErrors.get());
+ Assert.assertEquals(1, con.streamErrors.get());
}
Modified:
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/BBufferTest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/BBufferTest.java?rev=1815090&r1=1815089&r2=1815090&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/BBufferTest.java
(original)
+++
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/BBufferTest.java
Mon Nov 13 12:00:30 2017
@@ -41,7 +41,7 @@ public class BBufferTest extends TestCas
BBuffer h3 = BBuffer.wrapper("a b");
public void hashTest(String s) {
- assertEquals(s.hashCode(), BBuffer.wrapper(s).hashCode());
+ Assert.assertEquals(s.hashCode(), BBuffer.wrapper(s).hashCode());
}
public void testHash() {
@@ -53,107 +53,107 @@ public class BBufferTest extends TestCas
}
public void testReadToSpace() {
- assertEquals(3, l8.readToSpace(res));
- assertEquals("GET", res.toString());
- assertEquals(" /\n", l8.toString());
-
- assertEquals(0, l1.readToSpace(res));
- assertEquals("", res.toString());
- assertEquals("", l1.toString());
+ Assert.assertEquals(3, l8.readToSpace(res));
+ Assert.assertEquals("GET", res.toString());
+ Assert.assertEquals(" /\n", l8.toString());
+
+ Assert.assertEquals(0, l1.readToSpace(res));
+ Assert.assertEquals("", res.toString());
+ Assert.assertEquals("", l1.toString());
}
public void testReadToDelim() {
- assertEquals(1, h1.readToDelimOrSpace((byte)'?', res));
- assertEquals("a", res.toString());
- assertEquals("", h1.toString());
-
- assertEquals(1, h2.readToDelimOrSpace((byte)'?', res));
- assertEquals("a", res.toString());
- assertEquals("?b", h2.toString());
-
- assertEquals(1, h3.readToDelimOrSpace((byte)'?', res));
- assertEquals("a", res.toString());
- assertEquals(" b", h3.toString());
+ Assert.assertEquals(1, h1.readToDelimOrSpace((byte)'?', res));
+ Assert.assertEquals("a", res.toString());
+ Assert.assertEquals("", h1.toString());
+
+ Assert.assertEquals(1, h2.readToDelimOrSpace((byte)'?', res));
+ Assert.assertEquals("a", res.toString());
+ Assert.assertEquals("?b", h2.toString());
+
+ Assert.assertEquals(1, h3.readToDelimOrSpace((byte)'?', res));
+ Assert.assertEquals("a", res.toString());
+ Assert.assertEquals(" b", h3.toString());
}
public void testGet() {
- assertEquals(0x20, s1.get(0));
- assertEquals(0x0a, s1.get(1));
+ Assert.assertEquals(0x20, s1.get(0));
+ Assert.assertEquals(0x0a, s1.get(1));
try {
s1.get(2);
} catch(ArrayIndexOutOfBoundsException ex) {
return;
}
- fail("Exception");
+ Assert.fail("Exception");
}
public void testSkipSpace() {
- assertEquals(1, s1.skipSpace());
- assertEquals("\n", s1.toString());
+ Assert.assertEquals(1, s1.skipSpace());
+ Assert.assertEquals("\n", s1.toString());
- assertEquals(1, s2.skipSpace());
- assertEquals("a", s2.toString());
+ Assert.assertEquals(1, s2.skipSpace());
+ Assert.assertEquals("a", s2.toString());
- assertEquals(2, s3.skipSpace());
- assertEquals("", s3.toString());
+ Assert.assertEquals(2, s3.skipSpace());
+ Assert.assertEquals("", s3.toString());
- assertEquals(3, s4.skipSpace());
- assertEquals("a", s4.toString());
+ Assert.assertEquals(3, s4.skipSpace());
+ Assert.assertEquals("a", s4.toString());
- assertEquals(0, l1.skipSpace());
- assertEquals("", l1.toString());
+ Assert.assertEquals(0, l1.skipSpace());
+ Assert.assertEquals("", l1.toString());
}
public void testLFLF() {
- assertTrue(f1.hasLFLF());
- assertTrue(f2.hasLFLF());
- assertTrue(f3.hasLFLF());
-
- assertFalse(f4.hasLFLF());
- assertFalse(l1.hasLFLF());
- assertFalse(l2.hasLFLF());
- assertFalse(l3.hasLFLF());
-
- assertFalse(l10.hasLFLF());
- assertFalse(l11.hasLFLF());
- assertFalse(l12.hasLFLF());
+ Assert.assertTrue(f1.hasLFLF());
+ Assert.assertTrue(f2.hasLFLF());
+ Assert.assertTrue(f3.hasLFLF());
+
+ Assert.assertFalse(f4.hasLFLF());
+ Assert.assertFalse(l1.hasLFLF());
+ Assert.assertFalse(l2.hasLFLF());
+ Assert.assertFalse(l3.hasLFLF());
+
+ Assert.assertFalse(l10.hasLFLF());
+ Assert.assertFalse(l11.hasLFLF());
+ Assert.assertFalse(l12.hasLFLF());
}
public void testReadLine() {
- assertEquals(-1, l1.readLine(res));
- assertEquals("", res.toString());
- assertEquals("", l1.toString());
-
- assertEquals(-1, l1a.readLine(res));
- assertEquals("", res.toString());
- assertEquals("a", l1a.toString());
-
- assertEquals(0, l2.readLine(res));
- assertEquals("", l2.toString());
- assertEquals("", res.toString());
- assertEquals(0, l3.readLine(res));
- assertEquals("", l3.toString());
- assertEquals("", res.toString());
- assertEquals(0, l4.readLine(res));
- assertEquals("", res.toString());
-
- assertEquals(0, l5.readLine(res));
- assertEquals("", res.toString());
- assertEquals("a", l5.toString());
- assertEquals(0, l5_b.readLine(res));
- assertEquals("", res.toString());
- assertEquals("a", l5_b.toString());
- assertEquals(0, l5_a.readLine(res));
- assertEquals("", res.toString());
- assertEquals("a", l5_a.toString());
-
- assertEquals(1, l6.readLine(res));
- assertEquals("a", res.toString());
-
- assertEquals(4, l7.readLine(res));
- assertEquals("GET ", res.toString());
- assertEquals(5, l8.readLine(res));
- assertEquals("GET /", res.toString());
+ Assert.assertEquals(-1, l1.readLine(res));
+ Assert.assertEquals("", res.toString());
+ Assert.assertEquals("", l1.toString());
+
+ Assert.assertEquals(-1, l1a.readLine(res));
+ Assert.assertEquals("", res.toString());
+ Assert.assertEquals("a", l1a.toString());
+
+ Assert.assertEquals(0, l2.readLine(res));
+ Assert.assertEquals("", l2.toString());
+ Assert.assertEquals("", res.toString());
+ Assert.assertEquals(0, l3.readLine(res));
+ Assert.assertEquals("", l3.toString());
+ Assert.assertEquals("", res.toString());
+ Assert.assertEquals(0, l4.readLine(res));
+ Assert.assertEquals("", res.toString());
+
+ Assert.assertEquals(0, l5.readLine(res));
+ Assert.assertEquals("", res.toString());
+ Assert.assertEquals("a", l5.toString());
+ Assert.assertEquals(0, l5_b.readLine(res));
+ Assert.assertEquals("", res.toString());
+ Assert.assertEquals("a", l5_b.toString());
+ Assert.assertEquals(0, l5_a.readLine(res));
+ Assert.assertEquals("", res.toString());
+ Assert.assertEquals("a", l5_a.toString());
+
+ Assert.assertEquals(1, l6.readLine(res));
+ Assert.assertEquals("a", res.toString());
+
+ Assert.assertEquals(4, l7.readLine(res));
+ Assert.assertEquals("GET ", res.toString());
+ Assert.assertEquals(5, l8.readLine(res));
+ Assert.assertEquals("GET /", res.toString());
}
}
Modified:
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/CBufferTest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/CBufferTest.java?rev=1815090&r1=1815089&r2=1815090&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/CBufferTest.java
(original)
+++
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/CBufferTest.java
Mon Nov 13 12:00:30 2017
@@ -10,7 +10,7 @@ public class CBufferTest extends TestCas
public void extTest(String path, String exp) {
CBuffer.newInstance().append(path).getExtension(ext, '/', '.');
- assertEquals(exp, ext.toString());
+ Assert.assertEquals(exp, ext.toString());
}
public void testExt() {
Modified:
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/UEncoderTest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/UEncoderTest.java?rev=1815090&r1=1815089&r2=1815090&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/UEncoderTest.java
(original)
+++
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/io/UEncoderTest.java
Mon Nov 13 12:00:30 2017
@@ -18,20 +18,20 @@ public class UEncoderTest extends TestCa
public void testEncodeURL() {
String eurl1=encodeURL("test");
- assertEquals("test", eurl1);
+ Assert.assertEquals("test", eurl1);
eurl1=encodeURL("/test");
- assertEquals("/test", eurl1);
+ Assert.assertEquals("/test", eurl1);
// safe ranges
eurl1=encodeURL("test$-_.");
- assertEquals("test$-_.", eurl1);
+ Assert.assertEquals("test$-_.", eurl1);
eurl1=encodeURL("test$-_.!*'(),");
- assertEquals("test$-_.!*'(),", eurl1);
+ Assert.assertEquals("test$-_.!*'(),", eurl1);
eurl1=encodeURL("//test");
- assertEquals("//test", eurl1);
+ Assert.assertEquals("//test", eurl1);
}
public String encodeURL(String uri) {
Modified:
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/load/LiveHttpThreadedTest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/load/LiveHttpThreadedTest.java?rev=1815090&r1=1815089&r2=1815090&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/load/LiveHttpThreadedTest.java
(original)
+++
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/load/LiveHttpThreadedTest.java
Mon Nov 13 12:00:30 2017
@@ -188,8 +188,8 @@ public class LiveHttpThreadedTest extend
", connections: " +
clientCon.getConnectionPool().getSocketCount() +
", avg: " + (time / reqCnt));
- assertEquals(reqCnt, ok.get());
- assertEquals(0, tr.errors.get());
+ Assert.assertEquals(reqCnt, ok.get());
+ Assert.assertEquals(0, tr.errors.get());
}
RequestCompleted reqCallback = new RequestCompleted() {
@@ -275,7 +275,7 @@ public class LiveHttpThreadedTest extend
}
};
tr.run();
- assertEquals(0, tr.errors.get());
+ Assert.assertEquals(0, tr.errors.get());
long time = (System.currentTimeMillis() - t0);
System.err.println("====== " + test + " threads: " + thr + ", req:
" +
Modified:
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/proxy/ProxyTest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/proxy/ProxyTest.java?rev=1815090&r1=1815089&r2=1815090&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/proxy/ProxyTest.java
(original)
+++
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/proxy/ProxyTest.java
Mon Nov 13 12:00:30 2017
@@ -37,57 +37,57 @@ public class ProxyTest extends TestCase
public void xtestRequestSlowChunked() throws Exception {
resStr =
TestMain.get("http://localhost:8903/sleep/1c";).toString();
- assertEquals("sleep 1csleep 1c", resStr);
+ Assert.assertEquals("sleep 1csleep 1c", resStr);
}
public void testSingleRequest() throws Exception {
String resStr =
TestMain.get("http://localhost:8903/hello";).toString();
- assertEquals("Hello world", resStr);
+ Assert.assertEquals("Hello world", resStr);
}
public void test2Requests() throws Exception {
String resStr =
TestMain.get("http://localhost:8903/hello";).toString();
- assertEquals("Hello world", resStr);
+ Assert.assertEquals("Hello world", resStr);
resStr =
TestMain.get("http://localhost:8903/hello?a=b";).toString();
- assertEquals("Hello world", resStr);
+ Assert.assertEquals("Hello world", resStr);
}
public void testRequestSimple() throws Exception {
resStr =
TestMain.get("http://localhost:8903/hello";).toString();
- assertEquals("Hello world", resStr);
+ Assert.assertEquals("Hello world", resStr);
resStr =
TestMain.get("http://localhost:8903/hello";).toString();
- assertEquals("Hello world", resStr);
+ Assert.assertEquals("Hello world", resStr);
resStr =
TestMain.get("http://localhost:8903/hello";).toString();
- assertEquals(resStr, "Hello world");
+ Assert.assertEquals(resStr, "Hello world");
}
public void testExtAdapter() throws Exception {
String res =
TestMain.get("http://www.apache.org/";).toString();
- assertTrue(res.indexOf("Apache") > 0);
+ Assert.assertTrue(res.indexOf("Apache") > 0);
Thread.currentThread().sleep(100);
// second time - are we reusing ?
res =
TestMain.get("http://www.apache.org/";).toString();
- assertTrue(res.indexOf("Apache") > 0);
+ Assert.assertTrue(res.indexOf("Apache") > 0);
}
public void testStaticAdapter() throws Exception {
- assertEquals("Hello world",
+ Assert.assertEquals("Hello world",
TestMain.get("http://localhost:8802/hello";).toString());
- assertEquals("Hello world2",
+ Assert.assertEquals("Hello world2",
TestMain.get("http://localhost:8802/2nd";).toString());
}
@@ -97,7 +97,7 @@ public class ProxyTest extends TestCase
String resStr =
TestMain.get("http://localhost:8903/echo/foo?q=a&b";)
.toString();
- assertTrue(resStr, resStr.indexOf("foo?q=a&b") > 0);
+ Assert.assertTrue(resStr, resStr.indexOf("foo?q=a&b") > 0);
}
@@ -106,8 +106,8 @@ public class ProxyTest extends TestCase
String resStr =
TestMain.get("http://localhost:8903/chunked/test";)
.toString();
- assertEquals(4, resStr.length());
- assertTrue(resStr.indexOf("AAA") >= 0);
+ Assert.assertEquals(4, resStr.length());
+ Assert.assertTrue(resStr.indexOf("AAA") >= 0);
}
@@ -115,6 +115,6 @@ public class ProxyTest extends TestCase
// Slow
String resStr =
TestMain.get("http://localhost:8903/sleep/1";).toString();
- assertEquals("sleep 1sleep 1", resStr.toString());
+ Assert.assertEquals("sleep 1sleep 1", resStr.toString());
}
}
Modified:
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/proxy/SmallProxyTest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/proxy/SmallProxyTest.java?rev=1815090&r1=1815089&r2=1815090&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/proxy/SmallProxyTest.java
(original)
+++
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/proxy/SmallProxyTest.java
Mon Nov 13 12:00:30 2017
@@ -101,9 +101,9 @@ public class SmallProxyTest extends Test
// wait response...
// http.sendBody.close();
String res = net.out.toString();
- assertTrue(res.indexOf("Hi\nworld\n") > 0);
- assertTrue(res.indexOf("HTTP/1.0 200 OK") == 0);
- assertTrue(res.indexOf("tomcatproxy") > 0);
+ Assert.assertTrue(res.indexOf("Hi\nworld\n") > 0);
+ Assert.assertTrue(res.indexOf("HTTP/1.0 200 OK") == 0);
+ Assert.assertTrue(res.indexOf("tomcatproxy") > 0);
}
}
Modified:
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/util/UEncoderTest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/util/UEncoderTest.java?rev=1815090&r1=1815089&r2=1815090&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/util/UEncoderTest.java
(original)
+++
tomcat/tc8.0.x/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/util/UEncoderTest.java
Mon Nov 13 12:00:30 2017
@@ -30,20 +30,20 @@ public class UEncoderTest extends TestCa
public void testEncodeURL() {
String eurl1=enc.encodeURL("test");
- assertEquals("test", eurl1);
+ Assert.assertEquals("test", eurl1);
eurl1=enc.encodeURL("/test");
- assertEquals("/test", eurl1);
+ Assert.assertEquals("/test", eurl1);
// safe ranges
eurl1=enc.encodeURL("test$-_.");
- assertEquals("test$-_.", eurl1);
+ Assert.assertEquals("test$-_.", eurl1);
eurl1=enc.encodeURL("test$-_.!*'(),");
- assertEquals("test$-_.!*'(),", eurl1);
+ Assert.assertEquals("test$-_.!*'(),", eurl1);
eurl1=enc.encodeURL("//test");
- assertEquals("//test", eurl1);
+ Assert.assertEquals("//test", eurl1);
}
Modified: tomcat/tc8.0.x/trunk/test/javax/el/TestCompositeELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/javax/el/TestCompositeELResolver.java?rev=1815090&r1=1815089&r2=1815090&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/test/javax/el/TestCompositeELResolver.java (original)
+++ tomcat/tc8.0.x/trunk/test/javax/el/TestCompositeELResolver.java Mon Nov 13
12:00:30 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.0.x/trunk/test/javax/servlet/jsp/TestPageContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/javax/servlet/jsp/TestPageContext.java?rev=1815090&r1=1815089&r2=1815090&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/test/javax/servlet/jsp/TestPageContext.java (original)
+++ tomcat/tc8.0.x/trunk/test/javax/servlet/jsp/TestPageContext.java Mon Nov 13
12:00:30 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.0.x/trunk/test/org/apache/catalina/ant/TestDeployTask.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/ant/TestDeployTask.java?rev=1815090&r1=1815089&r2=1815090&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/test/org/apache/catalina/ant/TestDeployTask.java
(original)
+++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/ant/TestDeployTask.java Mon
Nov 13 12:00:30 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.0.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java?rev=1815090&r1=1815089&r2=1815090&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
Mon Nov 13 12:00:30 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;
@@ -212,8 +209,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)
@@ -235,11 +232,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
@@ -253,11 +250,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.0.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java?rev=1815090&r1=1815089&r2=1815090&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.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.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;
@@ -268,28 +265,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();
}
@@ -330,8 +327,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);
@@ -348,13 +345,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();
@@ -364,8 +361,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);
@@ -377,7 +374,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
@@ -410,8 +407,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();
}
}
@@ -624,7 +621,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 + "]");
@@ -757,8 +754,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;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
