You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2017/11/13 12:32:27 UTC
svn commit: r1815093 [3/6] - in /tomcat/tc7.0.x/trunk:
modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/ test/javax/el/
test/javax/servlet/jsp/ test/org/apache/catalina/ant/
test/org/apache/catalina/authenticator/ test/org/apache/catalina/co...
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java Mon Nov 13 12:32:26 2017
@@ -25,8 +25,7 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import static org.junit.Assert.fail;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.Context;
@@ -64,7 +63,7 @@ public class TestWebappClassLoaderMemory
TaskServlet.TIMER_THREAD_NAME.equals(thread.getName())) {
thread.join(5000);
if (thread.isAlive()) {
- fail("Timer thread still running");
+ Assert.fail("Timer thread still running");
}
}
}
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java Mon Nov 13 12:32:26 2017
@@ -24,13 +24,9 @@ import java.lang.instrument.ClassFileTra
import java.lang.reflect.Method;
import java.security.ProtectionDomain;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.fail;
-
import org.junit.After;
import org.junit.AfterClass;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -84,8 +80,8 @@ public class TestWebappClassLoaderWeavin
this.tomcat.start();
ClassLoader loader = this.context.getLoader().getClassLoader();
- assertNotNull("The class loader should not be null.", loader);
- assertSame("The class loader is not correct.", WebappClassLoader.class, loader.getClass());
+ Assert.assertNotNull("The class loader should not be null.", loader);
+ Assert.assertSame("The class loader is not correct.", WebappClassLoader.class, loader.getClass());
this.loader = (WebappClassLoader) loader;
@@ -111,10 +107,10 @@ public class TestWebappClassLoaderWeavin
public void testNoWeaving() throws Exception {
String result = invokeDoMethodOnClass(this.loader, "TesterNeverWeavedClass");
- assertEquals("The first result is not correct.", "This will never be weaved.", result);
+ Assert.assertEquals("The first result is not correct.", "This will never be weaved.", result);
result = invokeDoMethodOnClass(this.loader, "TesterUnweavedClass");
- assertEquals("The second result is not correct.", "Hello, Unweaved World!", result);
+ Assert.assertEquals("The second result is not correct.", "Hello, Unweaved World!", result);
}
@@ -123,17 +119,17 @@ public class TestWebappClassLoaderWeavin
try {
this.loader.addTransformer(null);
- fail("Expected exception IllegalArgumentException, got no exception.");
+ Assert.fail("Expected exception IllegalArgumentException, got no exception.");
} catch (IllegalArgumentException ignore) {
// good
}
// class loading should still work, no weaving
String result = invokeDoMethodOnClass(this.loader, "TesterNeverWeavedClass");
- assertEquals("The first result is not correct.", "This will never be weaved.", result);
+ Assert.assertEquals("The first result is not correct.", "This will never be weaved.", result);
result = invokeDoMethodOnClass(this.loader, "TesterUnweavedClass");
- assertEquals("The second result is not correct.", "Hello, Unweaved World!", result);
+ Assert.assertEquals("The second result is not correct.", "Hello, Unweaved World!", result);
}
@@ -143,10 +139,10 @@ public class TestWebappClassLoaderWeavin
this.loader.addTransformer(new ReplacementTransformer(WEAVED_REPLACEMENT_1));
String result = invokeDoMethodOnClass(this.loader, "TesterNeverWeavedClass");
- assertEquals("The first result is not correct.", "This will never be weaved.", result);
+ Assert.assertEquals("The first result is not correct.", "This will never be weaved.", result);
result = invokeDoMethodOnClass(this.loader, "TesterUnweavedClass");
- assertEquals("The second result is not correct.", "Hello, Weaver #1!", result);
+ Assert.assertEquals("The second result is not correct.", "Hello, Weaver #1!", result);
}
@@ -156,10 +152,10 @@ public class TestWebappClassLoaderWeavin
this.loader.addTransformer(new ReplacementTransformer(WEAVED_REPLACEMENT_2));
String result = invokeDoMethodOnClass(this.loader, "TesterNeverWeavedClass");
- assertEquals("The first result is not correct.", "This will never be weaved.", result);
+ Assert.assertEquals("The first result is not correct.", "This will never be weaved.", result);
result = invokeDoMethodOnClass(this.loader, "TesterUnweavedClass");
- assertEquals("The second result is not correct.", "Hello, Weaver #2!", result);
+ Assert.assertEquals("The second result is not correct.", "Hello, Weaver #2!", result);
}
@@ -170,10 +166,10 @@ public class TestWebappClassLoaderWeavin
this.loader.addTransformer(new ReplacementTransformer(WEAVED_REPLACEMENT_2));
String result = invokeDoMethodOnClass(this.loader, "TesterNeverWeavedClass");
- assertEquals("The first result is not correct.", "This will never be weaved.", result);
+ Assert.assertEquals("The first result is not correct.", "This will never be weaved.", result);
result = invokeDoMethodOnClass(this.loader, "TesterUnweavedClass");
- assertEquals("The second result is not correct.", "Hello, Weaver #2!", result);
+ Assert.assertEquals("The second result is not correct.", "Hello, Weaver #2!", result);
}
@@ -184,10 +180,10 @@ public class TestWebappClassLoaderWeavin
this.loader.addTransformer(new ReplacementTransformer(WEAVED_REPLACEMENT_1));
String result = invokeDoMethodOnClass(this.loader, "TesterNeverWeavedClass");
- assertEquals("The first result is not correct.", "This will never be weaved.", result);
+ Assert.assertEquals("The first result is not correct.", "This will never be weaved.", result);
result = invokeDoMethodOnClass(this.loader, "TesterUnweavedClass");
- assertEquals("The second result is not correct.", "Hello, Weaver #1!", result);
+ Assert.assertEquals("The second result is not correct.", "Hello, Weaver #1!", result);
}
@@ -199,10 +195,10 @@ public class TestWebappClassLoaderWeavin
this.loader.removeTransformer(removed);
String result = invokeDoMethodOnClass(this.loader, "TesterNeverWeavedClass");
- assertEquals("The first result is not correct.", "This will never be weaved.", result);
+ Assert.assertEquals("The first result is not correct.", "This will never be weaved.", result);
result = invokeDoMethodOnClass(this.loader, "TesterUnweavedClass");
- assertEquals("The second result is not correct.", "Hello, Unweaved World!", result);
+ Assert.assertEquals("The second result is not correct.", "Hello, Unweaved World!", result);
}
@@ -216,10 +212,10 @@ public class TestWebappClassLoaderWeavin
this.loader.removeTransformer(removed);
String result = invokeDoMethodOnClass(this.loader, "TesterNeverWeavedClass");
- assertEquals("The first result is not correct.", "This will never be weaved.", result);
+ Assert.assertEquals("The first result is not correct.", "This will never be weaved.", result);
result = invokeDoMethodOnClass(this.loader, "TesterUnweavedClass");
- assertEquals("The second result is not correct.", "Hello, Weaver #1!", result);
+ Assert.assertEquals("The second result is not correct.", "Hello, Weaver #1!", result);
}
@@ -233,10 +229,10 @@ public class TestWebappClassLoaderWeavin
this.loader.removeTransformer(removed);
String result = invokeDoMethodOnClass(this.loader, "TesterNeverWeavedClass");
- assertEquals("The first result is not correct.", "This will never be weaved.", result);
+ Assert.assertEquals("The first result is not correct.", "This will never be weaved.", result);
result = invokeDoMethodOnClass(this.loader, "TesterUnweavedClass");
- assertEquals("The second result is not correct.", "Hello, Weaver #2!", result);
+ Assert.assertEquals("The second result is not correct.", "Hello, Weaver #2!", result);
}
@@ -248,47 +244,47 @@ public class TestWebappClassLoaderWeavin
this.loader.addTransformer(new ReplacementTransformer(WEAVED_REPLACEMENT_2));
String result = invokeDoMethodOnClass(this.loader, "TesterNeverWeavedClass");
- assertEquals("The first result is not correct.", "This will never be weaved.", result);
+ Assert.assertEquals("The first result is not correct.", "This will never be weaved.", result);
result = invokeDoMethodOnClass(this.loader, "TesterUnweavedClass");
- assertEquals("The second result is not correct.", "Hello, Weaver #2!", result);
+ Assert.assertEquals("The second result is not correct.", "Hello, Weaver #2!", result);
WebappClassLoader copiedLoader = this.loader.copyWithoutTransformers();
result = invokeDoMethodOnClass(copiedLoader, "TesterNeverWeavedClass");
- assertEquals("The third result is not correct.", "This will never be weaved.", result);
+ Assert.assertEquals("The third result is not correct.", "This will never be weaved.", result);
result = invokeDoMethodOnClass(copiedLoader, "TesterUnweavedClass");
- assertEquals("The fourth result is not correct.", "Hello, Unweaved World!", result);
+ Assert.assertEquals("The fourth result is not correct.", "Hello, Unweaved World!", result);
- assertEquals("getAntiJARLocking did not match.",
+ Assert.assertEquals("getAntiJARLocking did not match.",
Boolean.valueOf(this.loader.getAntiJARLocking()),
Boolean.valueOf(copiedLoader.getAntiJARLocking()));
- assertEquals("getClearReferencesHttpClientKeepAliveThread did not match.",
+ Assert.assertEquals("getClearReferencesHttpClientKeepAliveThread did not match.",
Boolean.valueOf(this.loader.getClearReferencesHttpClientKeepAliveThread()),
Boolean.valueOf(copiedLoader.getClearReferencesHttpClientKeepAliveThread()));
- assertEquals("getClearReferencesLogFactoryRelease did not match.",
+ Assert.assertEquals("getClearReferencesLogFactoryRelease did not match.",
Boolean.valueOf(this.loader.getClearReferencesLogFactoryRelease()),
Boolean.valueOf(copiedLoader.getClearReferencesLogFactoryRelease()));
- assertEquals("getClearReferencesStatic did not match.",
+ Assert.assertEquals("getClearReferencesStatic did not match.",
Boolean.valueOf(this.loader.getClearReferencesStatic()),
Boolean.valueOf(copiedLoader.getClearReferencesStatic()));
- assertEquals("getClearReferencesStopThreads did not match.",
+ Assert.assertEquals("getClearReferencesStopThreads did not match.",
Boolean.valueOf(this.loader.getClearReferencesStopThreads()),
Boolean.valueOf(copiedLoader.getClearReferencesStopThreads()));
- assertEquals("getClearReferencesStopTimerThreads did not match.",
+ Assert.assertEquals("getClearReferencesStopTimerThreads did not match.",
Boolean.valueOf(this.loader.getClearReferencesStopTimerThreads()),
Boolean.valueOf(copiedLoader.getClearReferencesStopTimerThreads()));
- assertEquals("getContextName did not match.", this.loader.getContextName(),
+ Assert.assertEquals("getContextName did not match.", this.loader.getContextName(),
copiedLoader.getContextName());
- assertEquals("getDelegate did not match.",
+ Assert.assertEquals("getDelegate did not match.",
Boolean.valueOf(this.loader.getDelegate()),
Boolean.valueOf(copiedLoader.getDelegate()));
- assertEquals("getJarPath did not match.", this.loader.getJarPath(),
+ Assert.assertEquals("getJarPath did not match.", this.loader.getJarPath(),
copiedLoader.getJarPath());
- assertEquals("getURLs did not match.", this.loader.getURLs().length,
+ Assert.assertEquals("getURLs did not match.", this.loader.getURLs().length,
copiedLoader.getURLs().length);
- assertSame("getParent did not match.", this.loader.getParent(), copiedLoader.getParent());
+ Assert.assertSame("getParent did not match.", this.loader.getParent(), copiedLoader.getParent());
}
@@ -325,7 +321,7 @@ public class TestWebappClassLoaderWeavin
throws Exception {
Class<?> c = loader.findClass("org.apache.catalina.loader." + className);
- assertNotNull("The loaded class should not be null.", c);
+ Assert.assertNotNull("The loaded class should not be null.", c);
Method m = c.getMethod("doMethod");
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/mbeans/TestRegistration.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/mbeans/TestRegistration.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/mbeans/TestRegistration.java Mon Nov 13 12:32:26 2017
@@ -27,10 +27,7 @@ import java.util.Set;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import static org.junit.Assert.assertEquals;
-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;
@@ -151,16 +148,16 @@ public class TestRegistration extends To
// Verify there are no Catalina or Tomcat MBeans
Set<ObjectName> onames = mbeanServer.queryNames(new ObjectName("Catalina:*"), null);
log.info(MBeanDumper.dumpBeans(mbeanServer, onames));
- assertEquals("Unexpected: " + onames, 0, onames.size());
+ Assert.assertEquals("Unexpected: " + onames, 0, onames.size());
onames = mbeanServer.queryNames(new ObjectName("Tomcat:*"), null);
log.info(MBeanDumper.dumpBeans(mbeanServer, onames));
- assertEquals("Unexpected: " + onames, 0, onames.size());
+ Assert.assertEquals("Unexpected: " + onames, 0, onames.size());
final Tomcat tomcat = getTomcatInstance();
final File contextDir = new File(getTemporaryDirectory(), "webappFoo");
addDeleteOnTearDown(contextDir);
if (!contextDir.mkdirs() && !contextDir.isDirectory()) {
- fail("Failed to create: [" + contextDir.toString() + "]");
+ Assert.fail("Failed to create: [" + contextDir.toString() + "]");
}
Context ctx = tomcat.addContext(contextName, contextDir.getAbsolutePath());
@@ -181,7 +178,7 @@ public class TestRegistration extends To
// Verify there are no Catalina MBeans
onames = mbeanServer.queryNames(new ObjectName("Catalina:*"), null);
log.info(MBeanDumper.dumpBeans(mbeanServer, onames));
- assertEquals("Found: " + onames, 0, onames.size());
+ Assert.assertEquals("Found: " + onames, 0, onames.size());
// Verify there are the correct Tomcat MBeans
onames = mbeanServer.queryNames(new ObjectName("Tomcat:*"), null);
@@ -211,18 +208,18 @@ public class TestRegistration extends To
// Did we find all expected MBeans?
ArrayList<String> missing = new ArrayList<String>(expected);
missing.removeAll(found);
- assertTrue("Missing Tomcat MBeans: " + missing, missing.isEmpty());
+ Assert.assertTrue("Missing Tomcat MBeans: " + missing, missing.isEmpty());
// Did we find any unexpected MBeans?
List<String> additional = found;
additional.removeAll(expected);
- assertTrue("Unexpected Tomcat MBeans: " + additional, additional.isEmpty());
+ Assert.assertTrue("Unexpected Tomcat MBeans: " + additional, additional.isEmpty());
tomcat.stop();
// There should still be some Tomcat MBeans
onames = mbeanServer.queryNames(new ObjectName("Tomcat:*"), null);
- assertTrue("No Tomcat MBeans", onames.size() > 0);
+ Assert.assertTrue("No Tomcat MBeans", onames.size() > 0);
// add a new host
StandardHost host = new StandardHost();
@@ -232,7 +229,7 @@ public class TestRegistration extends To
final File contextDir2 = new File(getTemporaryDirectory(), "webappFoo2");
addDeleteOnTearDown(contextDir2);
if (!contextDir2.mkdirs() && !contextDir2.isDirectory()) {
- fail("Failed to create: [" + contextDir2.toString() + "]");
+ Assert.fail("Failed to create: [" + contextDir2.toString() + "]");
}
tomcat.addContext(host, contextName + "2", contextDir2.getAbsolutePath());
@@ -243,10 +240,10 @@ public class TestRegistration extends To
// There should be no Catalina MBeans and no Tomcat MBeans
onames = mbeanServer.queryNames(new ObjectName("Catalina:*"), null);
log.info(MBeanDumper.dumpBeans(mbeanServer, onames));
- assertEquals("Remaining: " + onames, 0, onames.size());
+ Assert.assertEquals("Remaining: " + onames, 0, onames.size());
onames = mbeanServer.queryNames(new ObjectName("Tomcat:*"), null);
log.info(MBeanDumper.dumpBeans(mbeanServer, onames));
- assertEquals("Remaining: " + onames, 0, onames.size());
+ Assert.assertEquals("Remaining: " + onames, 0, onames.size());
}
}
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java Mon Nov 13 12:32:26 2017
@@ -31,16 +31,10 @@ import java.util.TimeZone;
import javax.servlet.http.HttpServletResponse;
-import static org.junit.Assert.assertEquals;
-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 static org.apache.catalina.startup.SimpleHttpClient.CRLF;
-
import org.apache.catalina.Context;
import org.apache.catalina.Wrapper;
import org.apache.catalina.deploy.ErrorPage;
@@ -71,23 +65,23 @@ public class TestDefaultServlet extends
int rc =getUrl("http://localhost:" + getPort() + contextPath +
"/WEB-INF/web.xml", res, null);
- assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+ Assert.assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
rc =getUrl("http://localhost:" + getPort() + contextPath +
"/WEB-INF/doesntexistanywhere", res, null);
- assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+ Assert.assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
rc =getUrl("http://localhost:" + getPort() + contextPath +
"/WEB-INF/", res, null);
- assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+ Assert.assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
rc =getUrl("http://localhost:" + getPort() + contextPath +
"/META-INF/MANIFEST.MF", res, null);
- assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+ Assert.assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
rc =getUrl("http://localhost:" + getPort() + contextPath +
"/META-INF/doesntexistanywhere", res, null);
- assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+ Assert.assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
}
@@ -122,23 +116,23 @@ public class TestDefaultServlet extends
int rc =getUrl("http://localhost:" + getPort() + contextPath +
"/static/WEB-INF/web.xml", res, null);
- assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+ Assert.assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
rc =getUrl("http://localhost:" + getPort() + contextPath +
"/static/WEB-INF/doesntexistanywhere", res, null);
- assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+ Assert.assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
- assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+ Assert.assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
rc =getUrl("http://localhost:" + getPort() + contextPath +
"/static/WEB-INF/", res, null);
- assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+ Assert.assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
rc =getUrl("http://localhost:" + getPort() + contextPath +
"/static/META-INF/MANIFEST.MF", res, null);
- assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+ Assert.assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
rc =getUrl("http://localhost:" + getPort() + contextPath +
"/static/META-INF/doesntexistanywhere", res, null);
- assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+ Assert.assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
// Make sure DefaultServlet is serving resources relative to the
// context root regardless of where the it is mapped
@@ -146,18 +140,18 @@ public class TestDefaultServlet extends
final ByteChunk rootResource = new ByteChunk();
rc =getUrl("http://localhost:" + getPort() + contextPath +
"/index.html", rootResource, null);
- assertEquals(HttpServletResponse.SC_OK, rc);
+ Assert.assertEquals(HttpServletResponse.SC_OK, rc);
final ByteChunk subpathResource = new ByteChunk();
rc =getUrl("http://localhost:" + getPort() + contextPath +
"/servlets/index.html", subpathResource, null);
- assertEquals(HttpServletResponse.SC_OK, rc);
+ Assert.assertEquals(HttpServletResponse.SC_OK, rc);
- assertFalse(rootResource.toString().equals(subpathResource.toString()));
+ Assert.assertFalse(rootResource.toString().equals(subpathResource.toString()));
rc =getUrl("http://localhost:" + getPort() + contextPath +
"/static/index.html", res, null);
- assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+ Assert.assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
}
@@ -195,8 +189,8 @@ public class TestDefaultServlet extends
"GET /MyApp/missing HTTP/1.0" +CRLF + CRLF });
client.connect();
client.processRequest();
- assertTrue(client.isResponse404());
- assertEquals("It is 404.html", client.getResponseBody());
+ Assert.assertTrue(client.isResponse404());
+ Assert.assertEquals("It is 404.html", client.getResponseBody());
SimpleDateFormat format = new SimpleDateFormat(
"EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US);
@@ -214,8 +208,8 @@ public class TestDefaultServlet extends
"If-Modified-Since: " + tomorrow + CRLF + CRLF });
client.connect();
client.processRequest();
- assertTrue(client.isResponse404());
- assertEquals("It is 404.html", client.getResponseBody());
+ Assert.assertTrue(client.isResponse404());
+ Assert.assertEquals("It is 404.html", client.getResponseBody());
// https://bz.apache.org/bugzilla/show_bug.cgi?id=50413#c6
//
@@ -227,8 +221,8 @@ public class TestDefaultServlet extends
"Range: bytes=0-100" + CRLF + CRLF });
client.connect();
client.processRequest();
- assertTrue(client.isResponse404());
- assertEquals("It is 404.html", client.getResponseBody());
+ Assert.assertTrue(client.isResponse404());
+ Assert.assertEquals("It is 404.html", client.getResponseBody());
}
/*
@@ -241,7 +235,7 @@ public class TestDefaultServlet extends
File webInf = new File(appDir, "WEB-INF");
addDeleteOnTearDown(appDir);
if (!webInf.mkdirs() && !webInf.isDirectory()) {
- fail("Unable to create directory [" + webInf + "]");
+ Assert.fail("Unable to create directory [" + webInf + "]");
}
Writer w = new OutputStreamWriter(new FileOutputStream(new File(appDir,
"WEB-INF/web.xml")), "UTF-8");
@@ -273,7 +267,7 @@ public class TestDefaultServlet extends
"GET /MyApp/missing HTTP/1.0" + CRLF + CRLF });
client.connect();
client.processRequest();
- assertTrue(client.isResponse404());
+ Assert.assertTrue(client.isResponse404());
}
/*
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/servlets/TestWebdavServlet.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/servlets/TestWebdavServlet.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/servlets/TestWebdavServlet.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/servlets/TestWebdavServlet.java Mon Nov 13 12:32:26 2017
@@ -23,8 +23,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletResponse;
-import static org.junit.Assert.assertEquals;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.startup.Tomcat;
@@ -56,23 +55,23 @@ public class TestWebdavServlet extends T
int rc =getUrl("http://localhost:" + getPort() + contextPath +
"/WEB-INF/web.xml", res, null);
- assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+ Assert.assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
rc =getUrl("http://localhost:" + getPort() + contextPath +
"/WEB-INF/doesntexistanywhere", res, null);
- assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+ Assert.assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
rc =getUrl("http://localhost:" + getPort() + contextPath +
"/WEB-INF/", res, null);
- assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+ Assert.assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
rc =getUrl("http://localhost:" + getPort() + contextPath +
"/META-INF/MANIFEST.MF", res, null);
- assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+ Assert.assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
rc =getUrl("http://localhost:" + getPort() + contextPath +
"/META-INF/doesntexistanywhere", res, null);
- assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+ Assert.assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
}
@@ -104,41 +103,41 @@ public class TestWebdavServlet extends T
int rc =getUrl("http://localhost:" + getPort() + contextPath +
"/webdav/WEB-INF/web.xml", res, null);
- assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+ Assert.assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
rc =getUrl("http://localhost:" + getPort() + contextPath +
"/webdav/WEB-INF/doesntexistanywhere", res, null);
- assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+ Assert.assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
- assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+ Assert.assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
rc =getUrl("http://localhost:" + getPort() + contextPath +
"/webdav/WEB-INF/", res, null);
- assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+ Assert.assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
rc =getUrl("http://localhost:" + getPort() + contextPath +
"/webdav/META-INF/MANIFEST.MF", res, null);
- assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+ Assert.assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
rc =getUrl("http://localhost:" + getPort() + contextPath +
"/webdav/META-INF/doesntexistanywhere", res, null);
- assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+ Assert.assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
// Make sure WebdavServlet is serving resources
// relative to the map/mount point
final ByteChunk rootResource = new ByteChunk();
rc =getUrl("http://localhost:" + getPort() + contextPath +
"/index.html", rootResource, null);
- assertEquals(HttpServletResponse.SC_OK, rc);
+ Assert.assertEquals(HttpServletResponse.SC_OK, rc);
final ByteChunk subpathResource = new ByteChunk();
rc =getUrl("http://localhost:" + getPort() + contextPath +
"/webdav/index.html", subpathResource, null);
- assertEquals(HttpServletResponse.SC_OK, rc);
+ Assert.assertEquals(HttpServletResponse.SC_OK, rc);
- assertEquals(rootResource.toString(), subpathResource.toString());
+ Assert.assertEquals(rootResource.toString(), subpathResource.toString());
rc =getUrl("http://localhost:" + getPort() + contextPath +
"/webdav/static/index.html", res, null);
- assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+ Assert.assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
}
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/session/Benchmarks.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/session/Benchmarks.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/session/Benchmarks.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/session/Benchmarks.java Mon Nov 13 12:32:26 2017
@@ -22,8 +22,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.security.SecureRandom;
-import static org.junit.Assert.fail;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.LifecycleException;
@@ -105,7 +104,7 @@ public class Benchmarks {
threads[i].join();
} catch (InterruptedException e) {
e.printStackTrace();
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
long end = System.currentTimeMillis();
@@ -201,7 +200,7 @@ public class Benchmarks {
threads[i].join();
} catch (InterruptedException e) {
e.printStackTrace();
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
long end = System.currentTimeMillis();
@@ -286,7 +285,7 @@ public class Benchmarks {
threads[i].join();
} catch (InterruptedException e) {
e.printStackTrace();
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
long end = System.currentTimeMillis();
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/session/Threading.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/session/Threading.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/session/Threading.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/session/Threading.java Mon Nov 13 12:32:26 2017
@@ -20,8 +20,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
-import static org.junit.Assert.fail;
-
+import org.junit.Assert;
import org.junit.Test;
/**
@@ -81,11 +80,11 @@ public class Threading {
try {
threads[i].join();
if (runnables[i].isfailed()) {
- fail();
+ Assert.fail();
}
} catch (InterruptedException e) {
e.printStackTrace();
- fail(e.getMessage());
+ Assert.fail(e.getMessage());
}
}
long end = System.currentTimeMillis();
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/LoggingBaseTest.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/LoggingBaseTest.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/LoggingBaseTest.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/LoggingBaseTest.java Mon Nov 13 12:32:26 2017
@@ -20,9 +20,8 @@ import java.io.File;
import java.util.ArrayList;
import java.util.List;
-import static org.junit.Assert.fail;
-
import org.junit.After;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Rule;
@@ -109,7 +108,7 @@ public abstract class LoggingBaseTest {
// Create catalina.base directory
tempDir = new File(System.getProperty("tomcat.test.temp", "output/tmp"));
if (!tempDir.mkdirs() && !tempDir.isDirectory()) {
- fail("Unable to create temporary directory for test");
+ Assert.fail("Unable to create temporary directory for test");
}
System.setProperty("catalina.base", tempDir.getAbsolutePath());
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java Mon Nov 13 12:32:26 2017
@@ -29,12 +29,7 @@ import javax.servlet.ServletContainerIni
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.Container;
@@ -59,23 +54,23 @@ public class TestContextConfigAnnotation
ContextConfig config = new ContextConfig();
File pFile = paramClassResource(
"org/apache/catalina/startup/ParamServlet");
- assertTrue(pFile.exists());
+ Assert.assertTrue(pFile.exists());
config.processAnnotationsFile(pFile, webxml, false);
ServletDef servletDef = webxml.getServlets().get("param");
- assertNotNull(servletDef);
- assertEquals("Hello", servletDef.getParameterMap().get("foo"));
- assertEquals("World!", servletDef.getParameterMap().get("bar"));
- assertEquals("param", webxml.getServletMappings().get(
+ Assert.assertNotNull(servletDef);
+ Assert.assertEquals("Hello", servletDef.getParameterMap().get("foo"));
+ Assert.assertEquals("World!", servletDef.getParameterMap().get("bar"));
+ Assert.assertEquals("param", webxml.getServletMappings().get(
"/annotation/overwrite"));
- assertEquals("param", servletDef.getDescription());
- assertEquals("param", servletDef.getDisplayName());
- assertEquals("paramLarge.png", servletDef.getLargeIcon());
- assertEquals("paramSmall.png", servletDef.getSmallIcon());
- assertEquals(Boolean.FALSE, servletDef.getAsyncSupported());
- assertEquals(Integer.valueOf(0), servletDef.getLoadOnStartup());
- assertNull(servletDef.getEnabled());
- assertNull(servletDef.getJspFile());
+ Assert.assertEquals("param", servletDef.getDescription());
+ Assert.assertEquals("param", servletDef.getDisplayName());
+ Assert.assertEquals("paramLarge.png", servletDef.getLargeIcon());
+ Assert.assertEquals("paramSmall.png", servletDef.getSmallIcon());
+ Assert.assertEquals(Boolean.FALSE, servletDef.getAsyncSupported());
+ Assert.assertEquals(Integer.valueOf(0), servletDef.getLoadOnStartup());
+ Assert.assertNull(servletDef.getEnabled());
+ Assert.assertNull(servletDef.getJspFile());
}
@@ -98,25 +93,25 @@ public class TestContextConfigAnnotation
ContextConfig config = new ContextConfig();
File pFile = paramClassResource(
"org/apache/catalina/startup/ParamServlet");
- assertTrue(pFile.exists());
+ Assert.assertTrue(pFile.exists());
config.processAnnotationsFile(pFile, webxml, false);
- assertEquals(servletDef, webxml.getServlets().get("param"));
+ Assert.assertEquals(servletDef, webxml.getServlets().get("param"));
- assertEquals("tomcat", servletDef.getParameterMap().get("foo"));
- assertEquals("param", webxml.getServletMappings().get("/param"));
+ Assert.assertEquals("tomcat", servletDef.getParameterMap().get("foo"));
+ Assert.assertEquals("param", webxml.getServletMappings().get("/param"));
// annotation mapping not added s. Servlet Spec 3.0 (Nov 2009)
// 8.2.3.3.iv page 81
- assertNull(webxml.getServletMappings().get("/annotation/overwrite"));
+ Assert.assertNull(webxml.getServletMappings().get("/annotation/overwrite"));
- assertEquals("Description", servletDef.getDescription());
- assertEquals("DisplayName", servletDef.getDisplayName());
- assertEquals("LargeIcon", servletDef.getLargeIcon());
- assertEquals("SmallIcon", servletDef.getSmallIcon());
- assertEquals(Boolean.TRUE, servletDef.getAsyncSupported());
- assertEquals(Integer.valueOf(1), servletDef.getLoadOnStartup());
- assertNull(servletDef.getEnabled());
- assertNull(servletDef.getJspFile());
+ Assert.assertEquals("Description", servletDef.getDescription());
+ Assert.assertEquals("DisplayName", servletDef.getDisplayName());
+ Assert.assertEquals("LargeIcon", servletDef.getLargeIcon());
+ Assert.assertEquals("SmallIcon", servletDef.getSmallIcon());
+ Assert.assertEquals(Boolean.TRUE, servletDef.getAsyncSupported());
+ Assert.assertEquals(Integer.valueOf(1), servletDef.getLoadOnStartup());
+ Assert.assertNull(servletDef.getEnabled());
+ Assert.assertNull(servletDef.getJspFile());
}
@Test
@@ -125,15 +120,15 @@ public class TestContextConfigAnnotation
ContextConfig config = new ContextConfig();
File pFile = paramClassResource(
"org/apache/catalina/startup/NoMappingParamServlet");
- assertTrue(pFile.exists());
+ Assert.assertTrue(pFile.exists());
config.processAnnotationsFile(pFile, webxml, false);
ServletDef servletDef = webxml.getServlets().get("param1");
- assertNull(servletDef);
+ Assert.assertNull(servletDef);
webxml.addServletMapping("/param", "param1");
config.processAnnotationsFile(pFile, webxml, false);
servletDef = webxml.getServlets().get("param1");
- assertNull(servletDef);
+ Assert.assertNull(servletDef);
}
@@ -151,13 +146,13 @@ public class TestContextConfigAnnotation
ContextConfig config = new ContextConfig();
File pFile = paramClassResource(
"org/apache/catalina/startup/NoMappingParamServlet");
- assertTrue(pFile.exists());
+ Assert.assertTrue(pFile.exists());
config.processAnnotationsFile(pFile, webxml, false);
- assertEquals("tomcat", servletDef.getParameterMap().get("foo"));
- assertEquals("World!", servletDef.getParameterMap().get("bar"));
+ Assert.assertEquals("tomcat", servletDef.getParameterMap().get("foo"));
+ Assert.assertEquals("World!", servletDef.getParameterMap().get("bar"));
ServletDef servletDef1 = webxml.getServlets().get("param1");
- assertNotNull(servletDef1);
- assertEquals(servletDef, servletDef1);
+ Assert.assertNotNull(servletDef1);
+ Assert.assertEquals(servletDef, servletDef1);
}
@Test
@@ -166,15 +161,15 @@ public class TestContextConfigAnnotation
ContextConfig config = new ContextConfig();
File pFile = paramClassResource(
"org/apache/catalina/startup/DuplicateMappingParamServlet");
- assertTrue(pFile.exists());
+ Assert.assertTrue(pFile.exists());
try {
config.processAnnotationsFile(pFile, webxml, false);
- fail();
+ Assert.fail();
} catch (IllegalArgumentException ex) {
// ignore
}
ServletDef servletDef = webxml.getServlets().get("param");
- assertNull(servletDef);
+ Assert.assertNull(servletDef);
}
@Test
@@ -188,8 +183,8 @@ public class TestContextConfigAnnotation
"org/apache/catalina/startup/ParamFilter");
config.processAnnotationsFile(fFile, webxml, false);
FilterDef fdef = webxml.getFilters().get("paramFilter");
- assertNotNull(fdef);
- assertEquals("Servlet says: ",fdef.getParameterMap().get("message"));
+ Assert.assertNotNull(fdef);
+ Assert.assertEquals("Servlet says: ",fdef.getParameterMap().get("message"));
}
@Test
@@ -220,30 +215,30 @@ public class TestContextConfigAnnotation
"org/apache/catalina/startup/ParamFilter");
config.processAnnotationsFile(fFile, webxml, false);
FilterDef fdef = webxml.getFilters().get("paramFilter");
- assertNotNull(fdef);
- assertEquals(filterDef,fdef);
- assertEquals("tomcat",fdef.getParameterMap().get("message"));
+ Assert.assertNotNull(fdef);
+ Assert.assertEquals(filterDef,fdef);
+ Assert.assertEquals("tomcat",fdef.getParameterMap().get("message"));
Set<FilterMap> filterMappings = webxml.getFilterMappings();
- assertTrue(filterMappings.contains(filterMap));
+ Assert.assertTrue(filterMappings.contains(filterMap));
// annotation mapping not added s. Servlet Spec 3.0 (Nov 2009)
// 8.2.3.3.vi page 81
String[] urlPatterns = filterMap.getURLPatterns();
- assertNotNull(urlPatterns);
- assertEquals(1,urlPatterns.length);
- assertEquals("/param1",urlPatterns[0]);
+ Assert.assertNotNull(urlPatterns);
+ Assert.assertEquals(1,urlPatterns.length);
+ Assert.assertEquals("/param1",urlPatterns[0]);
// check simple Parameter
- assertEquals("Description", fdef.getDescription());
- assertEquals("DisplayName", fdef.getDisplayName());
- assertEquals("LargeIcon", fdef.getLargeIcon());
- assertEquals("SmallIcon", fdef.getSmallIcon());
+ Assert.assertEquals("Description", fdef.getDescription());
+ Assert.assertEquals("DisplayName", fdef.getDisplayName());
+ Assert.assertEquals("LargeIcon", fdef.getLargeIcon());
+ Assert.assertEquals("SmallIcon", fdef.getSmallIcon());
// FIXME: Strange why servletDef is Boolean and FilterDef is String?
- assertEquals("true", fdef.getAsyncSupported());
+ Assert.assertEquals("true", fdef.getAsyncSupported());
String[] dis = filterMap.getDispatcherNames();
- assertEquals(2, dis.length);
- assertEquals(DispatcherType.ERROR.toString(),dis[0]);
- assertEquals(DispatcherType.ASYNC.toString(),dis[1]);
+ Assert.assertEquals(2, dis.length);
+ Assert.assertEquals(DispatcherType.ERROR.toString(),dis[0]);
+ Assert.assertEquals(DispatcherType.ASYNC.toString(),dis[1]);
}
@@ -253,15 +248,15 @@ public class TestContextConfigAnnotation
ContextConfig config = new ContextConfig();
File pFile = paramClassResource(
"org/apache/catalina/startup/DuplicateMappingParamFilter");
- assertTrue(pFile.exists());
+ Assert.assertTrue(pFile.exists());
try {
config.processAnnotationsFile(pFile, webxml, false);
- fail();
+ Assert.fail();
} catch (IllegalArgumentException ex) {
// ignore
}
FilterDef filterDef = webxml.getFilters().get("paramD");
- assertNull(filterDef);
+ Assert.assertNull(filterDef);
}
@Test
@@ -306,9 +301,9 @@ public class TestContextConfigAnnotation
config.processAnnotationsFile(file, ignore, false);
// Check right number of classes were noted to be handled
- assertEquals(0, config.initializerClassMap.get(sciNone).size());
- assertEquals(2, config.initializerClassMap.get(sciServlet).size());
- assertEquals(4, config.initializerClassMap.get(sciObject).size());
+ Assert.assertEquals(0, config.initializerClassMap.get(sciNone).size());
+ Assert.assertEquals(2, config.initializerClassMap.get(sciServlet).size());
+ Assert.assertEquals(4, config.initializerClassMap.get(sciObject).size());
}
private static final class SCI implements ServletContainerInitializer {
@@ -363,7 +358,7 @@ public class TestContextConfigAnnotation
*/
private File paramClassResource(String className) throws URISyntaxException {
URL url = getClass().getClassLoader().getResource(className + ".class");
- assertNotNull(url);
+ Assert.assertNotNull(url);
File file = new File(url.toURI());
return file;
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestListener.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestListener.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestListener.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestListener.java Mon Nov 13 12:32:26 2017
@@ -24,9 +24,7 @@ import javax.servlet.ServletContextEvent
import javax.servlet.ServletContextListener;
import javax.servlet.ServletException;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.Context;
@@ -47,7 +45,7 @@ public class TestListener extends Tomcat
context.addServletContainerInitializer(new SCI(), null);
tomcat.start();
- assertTrue(SCL.initialized);
+ Assert.assertTrue(SCL.initialized);
}
/**
@@ -68,7 +66,7 @@ public class TestListener extends Tomcat
tomcat.start();
//check that the ServletContainerInitializer wasn't initialized.
- assertFalse(SCL3.initialized);
+ Assert.assertFalse(SCL3.initialized);
}
public static class SCI implements ServletContainerInitializer {
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java Mon Nov 13 12:32:26 2017
@@ -38,12 +38,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.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
import org.junit.Assert;
import org.junit.Test;
@@ -260,7 +254,7 @@ public class TestTomcat extends TomcatBa
tomcat.start();
ByteChunk res = getUrl("http://localhost:" + getPort() + "/");
- assertEquals("Hello world", res.toString());
+ Assert.assertEquals("Hello world", res.toString());
}
@Test
@@ -276,7 +270,7 @@ public class TestTomcat extends TomcatBa
ByteChunk res = getUrl("http://localhost:" + getPort() +
"/examples/servlets/servlet/HelloWorldExample");
String text = res.toString();
- assertTrue(text, text.indexOf("<a href=\"../helloworld.html\">") > 0);
+ Assert.assertTrue(text, text.indexOf("<a href=\"../helloworld.html\">") > 0);
}
@Test
@@ -292,7 +286,7 @@ public class TestTomcat extends TomcatBa
ByteChunk res = getUrl("http://localhost:" + getPort() +
"/examples/jsp/jsp2/el/basic-arithmetic.jsp");
String text = res.toString();
- assertTrue(text, text.indexOf("<td>${(1==2) ? 3 : 4}</td>") > 0);
+ Assert.assertTrue(text, text.indexOf("<td>${(1==2) ? 3 : 4}</td>") > 0);
}
@Test
@@ -310,7 +304,7 @@ public class TestTomcat extends TomcatBa
tomcat.start();
ByteChunk res = getUrl("http://localhost:" + getPort() + "/");
- assertEquals("Hello world", res.toString());
+ Assert.assertEquals("Hello world", res.toString());
}
@Test
@@ -351,7 +345,7 @@ public class TestTomcat extends TomcatBa
tomcat.start();
ByteChunk res = getUrl("http://localhost:" + getPort() + "/");
- assertEquals("Hello, Tomcat User", res.toString());
+ Assert.assertEquals("Hello, Tomcat User", res.toString());
}
/**
@@ -387,7 +381,7 @@ public class TestTomcat extends TomcatBa
tomcat.start();
ByteChunk res = getUrl("http://localhost:" + getPort() + "/");
- assertEquals("Hello, Tomcat User", res.toString());
+ Assert.assertEquals("Hello, Tomcat User", res.toString());
}
@@ -414,8 +408,8 @@ public class TestTomcat extends TomcatBa
int rc =getUrl("http://localhost:" + getPort() + contextPath +
"/testGetResource", res, null);
- assertEquals(HttpServletResponse.SC_OK, rc);
- assertTrue(res.toString().contains("<?xml version=\"1.0\" "));
+ Assert.assertEquals(HttpServletResponse.SC_OK, rc);
+ Assert.assertTrue(res.toString().contains("<?xml version=\"1.0\" "));
}
@Test
@@ -434,7 +428,7 @@ public class TestTomcat extends TomcatBa
ex.printStackTrace();
e = ex;
}
- assertNull(e);
+ Assert.assertNull(e);
}
@Test
@@ -451,33 +445,33 @@ public class TestTomcat extends TomcatBa
tomcat.start();
ByteChunk res = getUrl("http://localhost:" + getPort() + "/");
- assertEquals("OK", res.toString());
+ Assert.assertEquals("OK", res.toString());
- assertEquals(1, initCount.getCallCount());
+ Assert.assertEquals(1, initCount.getCallCount());
}
@Test
public void testGetWebappConfigFileFromDirectory() {
Tomcat tomcat = new Tomcat();
- assertNotNull(tomcat.getWebappConfigFile("test/deployment/dirContext", ""));
+ Assert.assertNotNull(tomcat.getWebappConfigFile("test/deployment/dirContext", ""));
}
@Test
public void testGetWebappConfigFileFromDirectoryNegative() {
Tomcat tomcat = new Tomcat();
- assertNull(tomcat.getWebappConfigFile("test/deployment/dirNoContext", ""));
+ Assert.assertNull(tomcat.getWebappConfigFile("test/deployment/dirNoContext", ""));
}
@Test
public void testGetWebappConfigFileFromJar() {
Tomcat tomcat = new Tomcat();
- assertNotNull(tomcat.getWebappConfigFile("test/deployment/context.war", ""));
+ Assert.assertNotNull(tomcat.getWebappConfigFile("test/deployment/context.war", ""));
}
@Test
public void testGetWebappConfigFileFromJarNegative() {
Tomcat tomcat = new Tomcat();
- assertNull(tomcat.getWebappConfigFile("test/deployment/noContext.war", ""));
+ Assert.assertNull(tomcat.getWebappConfigFile("test/deployment/noContext.war", ""));
}
@Test
@@ -490,7 +484,7 @@ public class TestTomcat extends TomcatBa
tomcat.start();
- assertEquals("WAR_CONTEXT", context.getSessionCookieName());
+ Assert.assertEquals("WAR_CONTEXT", context.getSessionCookieName());
}
@Test
@@ -501,7 +495,7 @@ public class TestTomcat extends TomcatBa
Context context = tomcat.addWebapp(null,
"/test", appFile.getAbsolutePath());
- assertEquals(StandardContext.class.getName(), context.getClass()
+ Assert.assertEquals(StandardContext.class.getName(), context.getClass()
.getName());
}
@@ -516,7 +510,7 @@ public class TestTomcat extends TomcatBa
try {
File appFile = new File("test/deployment/context.war");
tomcat.addWebapp(null, "/test", appFile.getAbsolutePath());
- fail();
+ Assert.fail();
} catch (IllegalArgumentException e) {
// OK
}
@@ -535,7 +529,7 @@ public class TestTomcat extends TomcatBa
Context context = tomcat.addWebapp(null, "/test",
appFile.getAbsolutePath());
- assertEquals(ReplicatedContext.class.getName(), context.getClass()
+ Assert.assertEquals(ReplicatedContext.class.getName(), context.getClass()
.getName());
}
@@ -552,7 +546,7 @@ public class TestTomcat extends TomcatBa
Context context = tomcat.addWebapp(host, "/test",
appFile.getAbsolutePath());
- assertEquals(ReplicatedContext.class.getName(), context.getClass()
+ Assert.assertEquals(ReplicatedContext.class.getName(), context.getClass()
.getName());
}
@@ -562,7 +556,7 @@ public class TestTomcat extends TomcatBa
// No file system docBase required
Context ctx = tomcat.addContext(null, "", null);
- assertEquals(StandardContext.class.getName(), ctx.getClass().getName());
+ Assert.assertEquals(StandardContext.class.getName(), ctx.getClass().getName());
}
@Test
@@ -576,7 +570,7 @@ public class TestTomcat extends TomcatBa
// No file system docBase required
try {
tomcat.addContext(null, "", null);
- fail();
+ Assert.fail();
} catch (IllegalArgumentException e) {
// OK
}
@@ -593,7 +587,7 @@ public class TestTomcat extends TomcatBa
// No file system docBase required
Context ctx = tomcat.addContext(host, "", null);
- assertEquals(ReplicatedContext.class.getName(), ctx.getClass()
+ Assert.assertEquals(ReplicatedContext.class.getName(), ctx.getClass()
.getName());
}
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestTomcatClassLoader.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestTomcatClassLoader.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestTomcatClassLoader.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestTomcatClassLoader.java Mon Nov 13 12:32:26 2017
@@ -26,8 +26,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;
@@ -49,7 +48,7 @@ public class TestTomcatClassLoader exten
tomcat.start();
ByteChunk res = getUrl("http://localhost:" + getPort() + "/");
- assertEquals("WEBAPP,SYSTEM,OTHER,", res.toString());
+ Assert.assertEquals("WEBAPP,SYSTEM,OTHER,", res.toString());
}
@Test
@@ -72,7 +71,7 @@ public class TestTomcatClassLoader exten
tomcat.start();
ByteChunk res = getUrl("http://localhost:" + getPort() + "/");
- assertEquals("WEBAPP,CUSTOM,SYSTEM,OTHER,", res.toString());
+ Assert.assertEquals("WEBAPP,CUSTOM,SYSTEM,OTHER,", res.toString());
}
private static final class ClassLoaderReport extends HttpServlet {
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestWebRuleSet.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestWebRuleSet.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestWebRuleSet.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestWebRuleSet.java Mon Nov 13 12:32:26 2017
@@ -21,10 +21,7 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.deploy.WebXml;
@@ -50,7 +47,7 @@ public class TestWebRuleSet {
WebXml webXml = new WebXml();
parse(webXml, "web-fragment-1name.xml", true, true);
- assertEquals("name1", webXml.getName());
+ Assert.assertEquals("name1", webXml.getName());
}
@@ -66,8 +63,8 @@ public class TestWebRuleSet {
WebXml webXml = new WebXml();
parse(webXml, "web-fragment-1ordering.xml", true, true);
- assertEquals(1, webXml.getBeforeOrdering().size());
- assertTrue(webXml.getBeforeOrdering().contains("bar"));
+ Assert.assertEquals(1, webXml.getBeforeOrdering().size());
+ Assert.assertTrue(webXml.getBeforeOrdering().contains("bar"));
}
@@ -83,8 +80,8 @@ public class TestWebRuleSet {
WebXml webXml = new WebXml();
parse(webXml, "web-1ordering.xml", false, true);
- assertEquals(1, webXml.getAbsoluteOrdering().size());
- assertTrue(webXml.getAbsoluteOrdering().contains("bar"));
+ Assert.assertEquals(1, webXml.getAbsoluteOrdering().size());
+ Assert.assertTrue(webXml.getAbsoluteOrdering().contains("bar"));
}
@@ -161,9 +158,9 @@ public class TestWebRuleSet {
}
if (expected) {
- assertTrue(result);
+ Assert.assertTrue(result);
} else {
- assertFalse(result);
+ Assert.assertFalse(result);
}
}
}
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java Mon Nov 13 12:32:26 2017
@@ -37,8 +37,6 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import static org.junit.Assert.fail;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -98,7 +96,7 @@ public abstract class TomcatBaseTest ext
File appBase = new File(getTemporaryDirectory(), "webapps");
if (!appBase.exists() && !appBase.mkdir()) {
- fail("Unable to create appBase for test");
+ Assert.fail("Unable to create appBase for test");
}
tomcat = new TomcatWithFastSessionIDs();
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java Mon Nov 13 12:32:26 2017
@@ -18,9 +18,8 @@ package org.apache.catalina.tribes.group
import java.util.ArrayList;
-import static org.junit.Assert.assertEquals;
-
import org.junit.After;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -77,7 +76,7 @@ public class TestGroupChannelMemberArriv
for (int i = listeners.length - 1; i >= 0; i--) {
TestMbrListener listener = listeners[i];
synchronized (listener.members) {
- assertEquals("Checking member arrival length (" + listener.name
+ Assert.assertEquals("Checking member arrival length (" + listener.name
+ ")", channels.length - 1, listener.members.size());
}
}
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java Mon Nov 13 12:32:26 2017
@@ -16,10 +16,8 @@
*/
package org.apache.catalina.tribes.group;
-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;
@@ -72,7 +70,7 @@ public class TestGroupChannelOptionFlag
}catch ( ChannelException x ) {
if ( x.getMessage().indexOf("option flag conflict") >= 0 ) error = true;
}
- assertTrue(error);
+ Assert.assertTrue(error);
}
@Test
@@ -93,7 +91,7 @@ public class TestGroupChannelOptionFlag
}catch ( ChannelException x ) {
if ( x.getMessage().indexOf("option flag conflict") >= 0 ) error = true;
}
- assertFalse(error);
+ Assert.assertFalse(error);
}
public static class TestInterceptor extends ChannelInterceptorBase {
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java Mon Nov 13 12:32:26 2017
@@ -22,9 +22,8 @@ import java.util.HashMap;
import java.util.Random;
import java.util.concurrent.atomic.AtomicInteger;
-import static org.junit.Assert.fail;
-
import org.junit.After;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -79,7 +78,7 @@ public class TestGroupChannelSenderConne
while ((countReceived = getReceivedMessageCount()) != n) {
long time = System.currentTimeMillis();
if ((time - startTime) > sleep) {
- fail("Only " + countReceived + " out of " + n
+ Assert.fail("Only " + countReceived + " out of " + n
+ " messages have been received in " + (sleep / 1000)
+ " seconds");
break;
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java Mon Nov 13 12:32:26 2017
@@ -16,9 +16,8 @@
*/
package org.apache.catalina.tribes.group;
-import static org.junit.Assert.assertEquals;
-
import org.junit.After;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -58,7 +57,7 @@ public class TestGroupChannelStartStop {
channel.start(Channel.DEFAULT);
count++;
} catch ( Exception x){x.printStackTrace();}
- assertEquals(count,2);
+ Assert.assertEquals(count,2);
channel.stop(Channel.DEFAULT);
}
@@ -83,7 +82,7 @@ public class TestGroupChannelStartStop {
} catch ( Exception x){
// expected
}
- assertEquals(count,1);
+ Assert.assertEquals(count,1);
channel.stop(Channel.DEFAULT);
//double the membership sender
count = 0;
@@ -98,7 +97,7 @@ public class TestGroupChannelStartStop {
} catch ( Exception x){
// expected
}
- assertEquals(count,1);
+ Assert.assertEquals(count,1);
channel.stop(Channel.DEFAULT);
count = 0;
@@ -112,7 +111,7 @@ public class TestGroupChannelStartStop {
} catch ( Exception x){
// expected
}
- assertEquals(count,1);
+ Assert.assertEquals(count,1);
channel.stop(Channel.DEFAULT);
count = 0;
@@ -126,7 +125,7 @@ public class TestGroupChannelStartStop {
} catch ( Exception x){
// expected
}
- assertEquals(count,1);
+ Assert.assertEquals(count,1);
channel.stop(Channel.DEFAULT);
}
@@ -144,7 +143,7 @@ public class TestGroupChannelStartStop {
} catch ( Exception x){
// expected
}
- assertEquals(count,2);
+ Assert.assertEquals(count,2);
channel.stop(Channel.DEFAULT);
}
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java Mon Nov 13 12:32:26 2017
@@ -18,9 +18,8 @@ package org.apache.catalina.tribes.group
import java.util.ArrayList;
-import static org.junit.Assert.assertEquals;
-
import org.junit.After;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -77,7 +76,9 @@ public class TestDomainFilterInterceptor
for (int i=0; i<threads.length; i++ ) threads[i].start();
for (int i=0; i<threads.length; i++ ) threads[i].join();
System.out.println("All channels started.");
- for (int i=listeners.length-1; i>=0; i-- ) assertEquals("Checking member arrival length",0,listeners[i].members.size());
+ for (int i=listeners.length-1; i>=0; i-- ) {
+ Assert.assertEquals("Checking member arrival length",0,listeners[i].members.size());
+ }
}
@After
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestGzipInterceptor.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestGzipInterceptor.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestGzipInterceptor.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestGzipInterceptor.java Mon Nov 13 12:32:26 2017
@@ -18,8 +18,7 @@ package org.apache.catalina.tribes.group
import java.util.Arrays;
-import static org.junit.Assert.assertTrue;
-
+import org.junit.Assert;
import org.junit.Test;
public class TestGzipInterceptor {
@@ -64,6 +63,6 @@ public class TestGzipInterceptor {
Arrays.fill(data, (byte)1);
byte[] compress = GzipInterceptor.compress(data);
byte[] result = GzipInterceptor.decompress(compress);
- assertTrue(Arrays.equals(data, result));
+ Assert.assertTrue(Arrays.equals(data, result));
}
}
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java Mon Nov 13 12:32:26 2017
@@ -16,9 +16,8 @@
*/
package org.apache.catalina.tribes.group.interceptors;
-import static org.junit.Assert.assertEquals;
-
import org.junit.After;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -72,7 +71,7 @@ public class TestNonBlockingCoordinator
public void testCoord1() throws Exception {
int expectedCount = channels[0].getMembers().length;
for (int i = 1; i < CHANNEL_COUNT; i++) {
- assertEquals("Message count expected to be equal.", expectedCount,
+ Assert.assertEquals("Message count expected to be equal.", expectedCount,
channels[i].getMembers().length);
}
Member member = coordinators[0].getCoordinator();
@@ -86,7 +85,7 @@ public class TestNonBlockingCoordinator
}
}
for (int i = 0; i < CHANNEL_COUNT; i++) {
- assertEquals(member, coordinators[i].getCoordinator());
+ Assert.assertEquals(member, coordinators[i].getCoordinator());
}
System.out.println("Coordinator[1] is:" + member);
}
@@ -114,7 +113,7 @@ public class TestNonBlockingCoordinator
member = coordinators[index].getCoordinator();
for (int i = 1; i < CHANNEL_COUNT; i++) {
if (i != dead) {
- assertEquals(member, coordinators[i].getCoordinator());
+ Assert.assertEquals(member, coordinators[i].getCoordinator());
}
}
System.out.println("Coordinator[2b] is:" + member);
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java Mon Nov 13 12:32:26 2017
@@ -21,10 +21,8 @@ import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.atomic.AtomicInteger;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.fail;
-
import org.junit.After;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -93,7 +91,7 @@ public class TestOrderInterceptor {
}
Thread.sleep(5000);
for ( int i=0; i<test.length; i++ ) {
- assertFalse(test[i].fail);
+ Assert.assertFalse(test[i].fail);
}
}
@@ -127,12 +125,12 @@ public class TestOrderInterceptor {
threads[i].join();
}
if (!exceptionQueue.isEmpty()) {
- fail("Exception while sending in threads: "
+ Assert.fail("Exception while sending in threads: "
+ exceptionQueue.remove().toString());
}
Thread.sleep(5000);
for ( int i=0; i<test.length; i++ ) {
- assertFalse(test[i].fail);
+ Assert.assertFalse(test[i].fail);
}
}
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java Mon Nov 13 12:32:26 2017
@@ -18,10 +18,8 @@ package org.apache.catalina.tribes.group
import java.util.ArrayList;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
import org.junit.After;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -81,16 +79,16 @@ public class TestTcpFailureDetector {
channel1.start(Channel.DEFAULT);
channel2.start(Channel.DEFAULT);
//Thread.sleep(1000);
- assertEquals("Expecting member count to be equal",mbrlist1.members.size(),mbrlist2.members.size());
+ Assert.assertEquals("Expecting member count to be equal",mbrlist1.members.size(),mbrlist2.members.size());
channel2.stop(Channel.SND_RX_SEQ);
ByteMessage msg = new ByteMessage(new byte[1024]);
try {
channel1.send(channel1.getMembers(), msg, 0);
- fail("Message send should have failed.");
+ Assert.fail("Message send should have failed.");
} catch ( ChannelException x ) {
// Ignore
}
- assertEquals("Expecting member count to not be equal",mbrlist1.members.size()+1,mbrlist2.members.size());
+ Assert.assertEquals("Expecting member count to not be equal",mbrlist1.members.size()+1,mbrlist2.members.size());
channel1.stop(Channel.DEFAULT);
channel2.stop(Channel.DEFAULT);
}
@@ -106,7 +104,7 @@ public class TestTcpFailureDetector {
channel2.stop(Channel.SND_RX_SEQ);
channel2.start(Channel.MBR_TX_SEQ);
//Thread.sleep(1000);
- assertEquals("Expecting member count to not be equal",mbrlist1.members.size()+1,mbrlist2.members.size());
+ Assert.assertEquals("Expecting member count to not be equal",mbrlist1.members.size()+1,mbrlist2.members.size());
channel1.stop(Channel.DEFAULT);
channel2.stop(Channel.DEFAULT);
}
@@ -118,15 +116,15 @@ public class TestTcpFailureDetector {
channel1.start(Channel.DEFAULT);
channel2.start(Channel.DEFAULT);
//Thread.sleep(1000);
- assertEquals("Expecting member count to be equal",mbrlist1.members.size(),mbrlist2.members.size());
+ Assert.assertEquals("Expecting member count to be equal",mbrlist1.members.size(),mbrlist2.members.size());
channel2.stop(Channel.MBR_TX_SEQ);
ByteMessage msg = new ByteMessage(new byte[1024]);
try {
Thread.sleep(5000);
- assertEquals("Expecting member count to be equal",mbrlist1.members.size(),mbrlist2.members.size());
+ Assert.assertEquals("Expecting member count to be equal",mbrlist1.members.size(),mbrlist2.members.size());
channel1.send(channel1.getMembers(), msg, 0);
} catch ( ChannelException x ) {
- fail("Message send should have succeeded.");
+ Assert.fail("Message send should have succeeded.");
}
channel1.stop(Channel.DEFAULT);
channel2.stop(Channel.DEFAULT);
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java Mon Nov 13 12:32:26 2017
@@ -16,10 +16,7 @@
*/
package org.apache.catalina.tribes.io;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
+import org.junit.Assert;
import org.junit.Test;
public class TestXByteBuffer {
@@ -27,7 +24,7 @@ public class TestXByteBuffer {
@Test
public void testEmptyArray() throws Exception {
Object obj = XByteBuffer.deserialize(new byte[0]);
- assertNull(obj);
+ Assert.assertNull(obj);
}
@Test
@@ -35,7 +32,7 @@ public class TestXByteBuffer {
String test = "This is as test.";
byte[] msg = XByteBuffer.serialize(test);
Object obj = XByteBuffer.deserialize(msg);
- assertTrue(obj instanceof String);
- assertEquals(test, obj);
+ Assert.assertTrue(obj instanceof String);
+ Assert.assertEquals(test, obj);
}
}
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/membership/TestMemberImplSerialization.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/membership/TestMemberImplSerialization.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/membership/TestMemberImplSerialization.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/membership/TestMemberImplSerialization.java Mon Nov 13 12:32:26 2017
@@ -18,9 +18,7 @@ package org.apache.catalina.tribes.membe
import java.util.Arrays;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -59,13 +57,13 @@ public class TestMemberImplSerialization
@Test
public void testCompare() throws Exception {
- assertTrue(m1.equals(m2));
- assertTrue(m2.equals(m1));
- assertTrue(p1.equals(m2));
- assertFalse(m1.equals(p2));
- assertFalse(m1.equals(p2));
- assertFalse(m2.equals(p2));
- assertFalse(p1.equals(p2));
+ Assert.assertTrue(m1.equals(m2));
+ Assert.assertTrue(m2.equals(m1));
+ Assert.assertTrue(p1.equals(m2));
+ Assert.assertFalse(m1.equals(p2));
+ Assert.assertFalse(m1.equals(p2));
+ Assert.assertFalse(m2.equals(p2));
+ Assert.assertFalse(p1.equals(p2));
}
@Test
@@ -76,8 +74,8 @@ public class TestMemberImplSerialization
MemberImpl a1 = MemberImpl.getMember(md1);
MemberImpl a2 = MemberImpl.getMember(md2);
- assertTrue(a1.getUdpPort()==a2.getUdpPort());
- assertTrue(a1.getUdpPort()==udpPort);
+ Assert.assertTrue(a1.getUdpPort()==a2.getUdpPort());
+ Assert.assertTrue(a1.getUdpPort()==udpPort);
}
@Test
@@ -85,23 +83,23 @@ public class TestMemberImplSerialization
MemberImpl m = m1;
byte[] md1 = m.getData(false,true);
byte[] mda1 = m.getData(false,false);
- assertTrue(Arrays.equals(md1,mda1));
- assertTrue(md1==mda1);
+ Assert.assertTrue(Arrays.equals(md1,mda1));
+ Assert.assertTrue(md1==mda1);
mda1 = m.getData(true,true);
MemberImpl ma1 = MemberImpl.getMember(mda1);
- assertTrue(compareMembers(m,ma1));
+ Assert.assertTrue(compareMembers(m,ma1));
mda1 = p1.getData(false);
- assertFalse(Arrays.equals(md1,mda1));
+ Assert.assertFalse(Arrays.equals(md1,mda1));
ma1 = MemberImpl.getMember(mda1);
- assertTrue(compareMembers(p1,ma1));
+ Assert.assertTrue(compareMembers(p1,ma1));
md1 = m.getData(true,true);
Thread.sleep(50);
mda1 = m.getData(true,true);
MemberImpl a1 = MemberImpl.getMember(md1);
MemberImpl a2 = MemberImpl.getMember(mda1);
- assertTrue(a1.equals(a2));
- assertFalse(Arrays.equals(md1,mda1));
+ Assert.assertTrue(a1.equals(a2));
+ Assert.assertFalse(Arrays.equals(md1,mda1));
}
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java Mon Nov 13 12:32:26 2017
@@ -20,9 +20,8 @@ import java.io.Serializable;
import java.util.Arrays;
import java.util.Random;
-import static org.junit.Assert.assertEquals;
-
import org.junit.After;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -95,7 +94,7 @@ public class TestDataIntegrity {
long start = System.currentTimeMillis();
while ( (System.currentTimeMillis()-start)<15000 && msgCount*threadCount!=listener1.count) Thread.sleep(500);
System.err.println("Finished NO_ACK ["+listener1.count+"]");
- assertEquals("Checking success messages.",msgCount*threadCount,listener1.count);
+ Assert.assertEquals("Checking success messages.",msgCount*threadCount,listener1.count);
}
@Test
@@ -123,7 +122,7 @@ public class TestDataIntegrity {
long start = System.currentTimeMillis();
while ( (System.currentTimeMillis()-start)<25000 && msgCount*threadCount!=listener1.count) Thread.sleep(500);
System.err.println("Finished ASYNC MULTI THREAD ["+listener1.count+"]");
- assertEquals("Checking success messages.",msgCount*threadCount,listener1.count);
+ Assert.assertEquals("Checking success messages.",msgCount*threadCount,listener1.count);
}
@Test
@@ -134,7 +133,7 @@ public class TestDataIntegrity {
long start = System.currentTimeMillis();
while ( (System.currentTimeMillis()-start)<5000 && msgCount!=listener1.count) Thread.sleep(500);
System.err.println("Finished ASYNC");
- assertEquals("Checking success messages.",msgCount,listener1.count);
+ Assert.assertEquals("Checking success messages.",msgCount,listener1.count);
}
@Test
@@ -143,7 +142,7 @@ public class TestDataIntegrity {
for (int i=0; i<msgCount; i++) channel1.send(new Member[] {channel2.getLocalMember(false)},Data.createRandomData(),Channel.SEND_OPTIONS_USE_ACK);
Thread.sleep(250);
System.err.println("Finished ACK");
- assertEquals("Checking success messages.",msgCount,listener1.count);
+ Assert.assertEquals("Checking success messages.",msgCount,listener1.count);
}
@Test
@@ -152,7 +151,7 @@ public class TestDataIntegrity {
for (int i=0; i<msgCount; i++) channel1.send(new Member[] {channel2.getLocalMember(false)},Data.createRandomData(),Channel.SEND_OPTIONS_SYNCHRONIZED_ACK|Channel.SEND_OPTIONS_USE_ACK);
Thread.sleep(250);
System.err.println("Finished SYNC_ACK");
- assertEquals("Checking success messages.",msgCount,listener1.count);
+ Assert.assertEquals("Checking success messages.",msgCount,listener1.count);
}
public static class Listener implements ChannelListener {
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java Mon Nov 13 12:32:26 2017
@@ -22,9 +22,8 @@ import java.util.Random;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
-import static org.junit.Assert.assertEquals;
-
import org.junit.After;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -91,7 +90,7 @@ public class TestMulticastPackages {
channel1.send(new Member[] {channel2.getLocalMember(false)}, Data.createRandomData(1024),Channel.SEND_OPTIONS_MULTICAST);
Thread.sleep(500);
System.err.println("Finished Single package NO_ACK ["+listener1.count+"]");
- assertEquals("Checking success messages.",1,listener1.count.get());
+ Assert.assertEquals("Checking success messages.",1,listener1.count.get());
}
@@ -141,7 +140,7 @@ public class TestMulticastPackages {
System.out.println("Sent "+counter.get()+ " messages. Received "+listener1.count+" Highest msg received:"+listener1.maxIdx);
System.out.print("Missing messages:");
printMissingMsgs(listener1.nrs,counter.get());
- assertEquals("Checking success messages.",msgCount*threadCount,listener1.count.get());
+ Assert.assertEquals("Checking success messages.",msgCount*threadCount,listener1.count.get());
}
@Test
@@ -152,7 +151,7 @@ public class TestMulticastPackages {
long start = System.currentTimeMillis();
while ( (System.currentTimeMillis()-start)<5000 && msgCount!=listener1.count.get()) Thread.sleep(500);
System.err.println("Finished ASYNC");
- assertEquals("Checking success messages.",msgCount,listener1.count.get());
+ Assert.assertEquals("Checking success messages.",msgCount,listener1.count.get());
}
@Test
@@ -161,7 +160,7 @@ public class TestMulticastPackages {
for (int i=0; i<msgCount; i++) channel1.send(new Member[] {channel2.getLocalMember(false)},Data.createRandomData(1024),Channel.SEND_OPTIONS_USE_ACK|Channel.SEND_OPTIONS_MULTICAST);
Thread.sleep(250);
System.err.println("Finished ACK");
- assertEquals("Checking success messages.",msgCount,listener1.count.get());
+ Assert.assertEquals("Checking success messages.",msgCount,listener1.count.get());
}
@Test
@@ -170,7 +169,7 @@ public class TestMulticastPackages {
for (int i=0; i<msgCount; i++) channel1.send(new Member[] {channel2.getLocalMember(false)},Data.createRandomData(1024),Channel.SEND_OPTIONS_SYNCHRONIZED_ACK|Channel.SEND_OPTIONS_USE_ACK|Channel.SEND_OPTIONS_MULTICAST);
Thread.sleep(250);
System.err.println("Finished SYNC_ACK");
- assertEquals("Checking success messages.",msgCount,listener1.count.get());
+ Assert.assertEquals("Checking success messages.",msgCount,listener1.count.get());
}
public static class Listener implements ChannelListener {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org