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 [2/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/core/TestStandardContext.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestStandardContext.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestStandardContext.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestStandardContext.java Mon Nov 13 12:32:26 2017
@@ -44,12 +44,6 @@ import javax.servlet.http.HttpServletRes
import org.hamcrest.CoreMatchers;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
import org.junit.Assert;
import org.junit.Test;
@@ -92,7 +86,7 @@ public class TestStandardContext extends
File docBase = new File(tomcat.getHost().getAppBase(), "ROOT");
if (!docBase.mkdirs() && !docBase.isDirectory()) {
- fail("Unable to create docBase");
+ Assert.fail("Unable to create docBase");
}
Context root = tomcat.addContext("", "ROOT");
@@ -106,11 +100,11 @@ public class TestStandardContext extends
client.connect();
client.processRequest();
- assertTrue(client.isResponse404());
+ Assert.assertTrue(client.isResponse404());
// Context failed to start. This checks that automatic transition
// from FAILED to STOPPED state was successful.
- assertEquals(LifecycleState.STOPPED, root.getState());
+ Assert.assertEquals(LifecycleState.STOPPED, root.getState());
// Prepare context for the second attempt
// Configuration was cleared on stop() thanks to
@@ -121,8 +115,8 @@ public class TestStandardContext extends
// The same request is processed successfully
client.connect();
client.processRequest();
- assertTrue(client.isResponse200());
- assertEquals(Bug46243Filter.class.getName()
+ Assert.assertTrue(client.isResponse200());
+ Assert.assertEquals(Bug46243Filter.class.getName()
+ HelloWorldServlet.RESPONSE_TEXT, client.getResponseBody());
}
@@ -202,21 +196,21 @@ public class TestStandardContext extends
try {
context.start();
- fail();
+ Assert.fail();
} catch (LifecycleException ex) {
// As expected
}
- assertEquals(LifecycleState.FAILED, context.getState());
+ Assert.assertEquals(LifecycleState.FAILED, context.getState());
// The second attempt
loader.setFail(false);
context.start();
- assertEquals(LifecycleState.STARTED, context.getState());
+ Assert.assertEquals(LifecycleState.STARTED, context.getState());
// Using a test from testBug49922() to check that the webapp is running
ByteChunk result = getUrl("http://localhost:" + getPort() +
"/bug49922/target");
- assertEquals("Target", result.toString());
+ Assert.assertEquals("Target", result.toString());
}
@Test
@@ -238,21 +232,21 @@ public class TestStandardContext extends
try {
context.start();
- fail();
+ Assert.fail();
} catch (LifecycleException ex) {
// As expected
}
- assertEquals(LifecycleState.FAILED, context.getState());
+ Assert.assertEquals(LifecycleState.FAILED, context.getState());
// The second attempt
listener.setFail(false);
context.start();
- assertEquals(LifecycleState.STARTED, context.getState());
+ Assert.assertEquals(LifecycleState.STARTED, context.getState());
// Using a test from testBug49922() to check that the webapp is running
ByteChunk result = getUrl("http://localhost:" + getPort() +
"/bug49922/target");
- assertEquals("Target", result.toString());
+ Assert.assertEquals("Target", result.toString());
}
private static class FailingWebappLoader extends WebappLoader {
@@ -301,39 +295,39 @@ public class TestStandardContext extends
// Check filter and servlet aren't called
int rc = getUrl("http://localhost:" + getPort() +
"/bug49922/foo", result, null);
- assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
- assertTrue(result.getLength() > 0);
+ Assert.assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+ Assert.assertTrue(result.getLength() > 0);
// Check extension mapping works
result = getUrl("http://localhost:" + getPort() + "/foo.do");
- assertEquals("FilterServlet", result.toString());
+ Assert.assertEquals("FilterServlet", result.toString());
// Check path mapping works
result = getUrl("http://localhost:" + getPort() + "/bug49922/servlet");
- assertEquals("FilterServlet", result.toString());
+ Assert.assertEquals("FilterServlet", result.toString());
// Check servlet name mapping works
result = getUrl("http://localhost:" + getPort() + "/foo.od");
- assertEquals("FilterServlet", result.toString());
+ Assert.assertEquals("FilterServlet", result.toString());
// Check filter is only called once
result = getUrl("http://localhost:" + getPort() +
"/bug49922/servlet/foo.do");
- assertEquals("FilterServlet", result.toString());
+ Assert.assertEquals("FilterServlet", result.toString());
result = getUrl("http://localhost:" + getPort() +
"/bug49922/servlet/foo.od");
- assertEquals("FilterServlet", result.toString());
+ Assert.assertEquals("FilterServlet", result.toString());
// Check dispatcher mapping
result = getUrl("http://localhost:" + getPort() +
"/bug49922/target");
- assertEquals("Target", result.toString());
+ Assert.assertEquals("Target", result.toString());
result = getUrl("http://localhost:" + getPort() +
"/bug49922/forward");
- assertEquals("FilterTarget", result.toString());
+ Assert.assertEquals("FilterTarget", result.toString());
result = getUrl("http://localhost:" + getPort() +
"/bug49922/include");
- assertEquals("IncludeFilterTarget", result.toString());
+ Assert.assertEquals("IncludeFilterTarget", result.toString());
}
@@ -446,8 +440,8 @@ public class TestStandardContext extends
bc, null);
// Check for a 401
- assertNotSame("OK", bc.toString());
- assertEquals(401, rc);
+ Assert.assertNotSame("OK", bc.toString());
+ Assert.assertEquals(401, rc);
}
public static final class Bug50015SCI
@@ -514,8 +508,8 @@ public class TestStandardContext extends
ctx.stop();
// Make sure that init() and destroy() were called correctly
- assertTrue(sci.getServlet().isOk());
- assertTrue(loadOnStartUp == sci.getServlet().isInitCalled());
+ Assert.assertTrue(sci.getServlet().isOk());
+ Assert.assertTrue(loadOnStartUp == sci.getServlet().isInitCalled());
}
public static final class Bug51376SCI
@@ -604,7 +598,7 @@ public class TestStandardContext extends
// Make sure non-multipart works properly
client.doRequest("/regular", false, false);
- assertEquals("Incorrect response for GET request",
+ Assert.assertEquals("Incorrect response for GET request",
"parts=0",
client.getResponseBody());
@@ -613,7 +607,7 @@ public class TestStandardContext extends
// Make sure regular multipart works properly
client.doRequest("/multipart", false, true); // send multipart request
- assertEquals("Regular multipart doesn't work",
+ Assert.assertEquals("Regular multipart doesn't work",
"parts=1",
client.getResponseBody());
@@ -623,7 +617,7 @@ public class TestStandardContext extends
// We expect that no parts will be available
client.doRequest("/regular", false, true); // send multipart request
- assertEquals("Incorrect response for non-configured casual multipart request",
+ Assert.assertEquals("Incorrect response for non-configured casual multipart request",
"parts=0", // multipart request should be ignored
client.getResponseBody());
@@ -634,7 +628,7 @@ public class TestStandardContext extends
// there is no @MultipartConfig
client.doRequest("/regular", true, true); // send multipart request
- assertEquals("Incorrect response for configured casual multipart request",
+ Assert.assertEquals("Incorrect response for configured casual multipart request",
"parts=1",
client.getResponseBody());
@@ -820,13 +814,13 @@ public class TestStandardContext extends
// first we test the flag itself, which can be set on the Host and
// Context
- assertFalse(context.getComputedFailCtxIfServletStartFails());
+ Assert.assertFalse(context.getComputedFailCtxIfServletStartFails());
StandardHost host = (StandardHost) tomcat.getHost();
host.setFailCtxIfServletStartFails(true);
- assertTrue(context.getComputedFailCtxIfServletStartFails());
+ Assert.assertTrue(context.getComputedFailCtxIfServletStartFails());
context.setFailCtxIfServletStartFails(Boolean.FALSE);
- assertFalse("flag on Context should override Host config",
+ Assert.assertFalse("flag on Context should override Host config",
context.getComputedFailCtxIfServletStartFails());
// second, we test the actual effect of the flag on the startup
@@ -835,11 +829,11 @@ public class TestStandardContext extends
servlet.setLoadOnStartup(1);
tomcat.start();
- assertTrue("flag false should not fail deployment", context.getState()
+ Assert.assertTrue("flag false should not fail deployment", context.getState()
.isAvailable());
tomcat.stop();
- assertFalse(context.getState().isAvailable());
+ Assert.assertFalse(context.getState().isAvailable());
host.removeChild(context);
context = (StandardContext) tomcat.addContext("",
@@ -848,7 +842,7 @@ public class TestStandardContext extends
new FailingStartupServlet());
servlet.setLoadOnStartup(1);
tomcat.start();
- assertFalse("flag true should fail deployment", context.getState()
+ Assert.assertFalse("flag true should fail deployment", context.getState()
.isAvailable());
}
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java Mon Nov 13 12:32:26 2017
@@ -28,8 +28,7 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import static org.junit.Assert.assertTrue;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.startup.Tomcat;
@@ -58,9 +57,9 @@ public class TestStandardContextAliases
String result = res.toString();
- assertTrue(result.indexOf("00-PASS") > -1);
- assertTrue(result.indexOf("01-PASS") > -1);
- assertTrue(result.indexOf("02-PASS") > -1);
+ Assert.assertTrue(result.indexOf("00-PASS") > -1);
+ Assert.assertTrue(result.indexOf("01-PASS") > -1);
+ Assert.assertTrue(result.indexOf("02-PASS") > -1);
}
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestStandardContextResources.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestStandardContextResources.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestStandardContextResources.java Mon Nov 13 12:32:26 2017
@@ -32,9 +32,6 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
import org.junit.Assert;
import org.junit.Test;
@@ -99,7 +96,7 @@ public class TestStandardContextResource
}
int index = orderedLibs.indexOf("resources.jar");
int index2 = orderedLibs.indexOf("resources2.jar");
- assertTrue(orderedLibs.toString(), index >= 0 && index2 >= 0
+ Assert.assertTrue(orderedLibs.toString(), index >= 0 && index2 >= 0
&& index < index2);
}
@@ -140,8 +137,8 @@ public class TestStandardContextResource
StandardContext ctx = (StandardContext) tomcat.addWebapp(null, "/test",
appDir.getAbsolutePath());
LifecycleListener[] listener = ctx.findLifecycleListeners();
- assertEquals(3,listener.length);
- assertTrue(listener[1] instanceof ContextConfig);
+ Assert.assertEquals(3,listener.length);
+ Assert.assertTrue(listener[1] instanceof ContextConfig);
ContextConfig config = new ContextConfig() {
@Override
protected WebXml createWebXml() {
@@ -164,7 +161,7 @@ public class TestStandardContextResource
"<p>resourceB.jsp in resources.jar</p>");
// Check ordering, for BZ 54391
- assertEquals(Arrays.asList("resources.jar", "resources2.jar"), ctx
+ Assert.assertEquals(Arrays.asList("resources.jar", "resources2.jar"), ctx
.getServletContext().getAttribute(ServletContext.ORDERED_LIBS));
ctx.stop();
@@ -197,7 +194,7 @@ public class TestStandardContextResource
"<p>resourceB.jsp in resources2.jar</p>");
// Check ordering, for BZ 54391
- assertEquals(Arrays.asList("resources2.jar", "resources.jar"), ctx
+ Assert.assertEquals(Arrays.asList("resources2.jar", "resources.jar"), ctx
.getServletContext().getAttribute(ServletContext.ORDERED_LIBS));
}
@@ -307,11 +304,11 @@ public class TestStandardContextResource
ByteChunk res = new ByteChunk();
int sc = getUrl("http://localhost:" + getPort() + pageUrl, res, null);
- assertEquals(expectedStatus, sc);
+ Assert.assertEquals(expectedStatus, sc);
if (expectedStatus == 200) {
String result = res.toString();
- assertTrue(result, result.indexOf(expectedBody) > 0);
+ Assert.assertTrue(result, result.indexOf(expectedBody) > 0);
}
}
}
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestStandardContextValve.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestStandardContextValve.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestStandardContextValve.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestStandardContextValve.java Mon Nov 13 12:32:26 2017
@@ -25,7 +25,7 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import static org.junit.Assert.assertEquals;
+import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.Context;
@@ -79,8 +79,8 @@ public class TestStandardContextValve ex
i--;
}
- assertEquals(Response.SC_NOT_FOUND, rc);
- assertEquals("InitErrorDestroy", trace.toString());
+ Assert.assertEquals(Response.SC_NOT_FOUND, rc);
+ Assert.assertEquals("InitErrorDestroy", trace.toString());
}
@Test
@@ -129,8 +129,8 @@ public class TestStandardContextValve ex
i--;
}
- assertEquals(Response.SC_NOT_FOUND, rc);
- assertEquals("InitErrorDestroy", trace.toString());
+ Assert.assertEquals(Response.SC_NOT_FOUND, rc);
+ Assert.assertEquals("InitErrorDestroy", trace.toString());
}
private static class Bug51653ErrorTrigger extends HttpServlet {
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestStandardWrapper.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestStandardWrapper.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestStandardWrapper.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestStandardWrapper.java Mon Nov 13 12:32:26 2017
@@ -43,10 +43,7 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.Context;
@@ -112,8 +109,8 @@ public class TestStandardWrapper extends
"/testStandardWrapper/securityAnnotationsWebXmlPriority",
bc, null, null);
- assertTrue(bc.getLength() > 0);
- assertEquals(403, rc);
+ Assert.assertTrue(bc.getLength() > 0);
+ Assert.assertEquals(403, rc);
}
@Test
@@ -133,8 +130,8 @@ public class TestStandardWrapper extends
"/testStandardWrapper/securityAnnotationsMetaDataPriority",
bc, null, null);
- assertEquals("OK", bc.toString());
- assertEquals(200, rc);
+ Assert.assertEquals("OK", bc.toString());
+ Assert.assertEquals(200, rc);
}
@Test
@@ -162,8 +159,8 @@ public class TestStandardWrapper extends
rc = getUrl("http://localhost:" + getPort() + "/",
bc, null, null);
- assertTrue(bc.getLength() > 0);
- assertEquals(403, rc);
+ Assert.assertTrue(bc.getLength() > 0);
+ Assert.assertEquals(403, rc);
}
@Test
@@ -181,16 +178,16 @@ public class TestStandardWrapper extends
rc = getUrl("http://localhost:" + getPort() + "/protected.jsp",
bc, null, null);
- assertTrue(bc.getLength() > 0);
- assertEquals(403, rc);
+ Assert.assertTrue(bc.getLength() > 0);
+ Assert.assertEquals(403, rc);
bc.recycle();
rc = getUrl("http://localhost:" + getPort() + "/unprotected.jsp",
bc, null, null);
- assertEquals(200, rc);
- assertTrue(bc.toString().contains("00-OK"));
+ Assert.assertEquals(200, rc);
+ Assert.assertTrue(bc.toString().contains("00-OK"));
}
private void doTestSecurityAnnotationsAddServlet(boolean useCreateServlet)
@@ -213,11 +210,11 @@ public class TestStandardWrapper extends
rc = getUrl("http://localhost:" + getPort() + "/", bc, null, null);
if (useCreateServlet) {
- assertTrue(bc.getLength() > 0);
- assertEquals(403, rc);
+ Assert.assertTrue(bc.getLength() > 0);
+ Assert.assertEquals(403, rc);
} else {
- assertEquals("OK", bc.toString());
- assertEquals(200, rc);
+ Assert.assertEquals("OK", bc.toString());
+ Assert.assertEquals(200, rc);
}
}
@@ -266,11 +263,11 @@ public class TestStandardWrapper extends
}
if (expect200) {
- assertEquals("OK", bc.toString());
- assertEquals(200, rc);
+ Assert.assertEquals("OK", bc.toString());
+ Assert.assertEquals(200, rc);
} else {
- assertTrue(bc.getLength() > 0);
- assertEquals(403, rc);
+ Assert.assertTrue(bc.getLength() > 0);
+ Assert.assertEquals(403, rc);
}
}
@@ -397,9 +394,9 @@ public class TestStandardWrapper extends
// Check the result
for (int i = 0; i < BUG51445_THREAD_COUNT; i ++) {
String[] results = threads[i].getResult().split(",");
- assertEquals(2, results.length);
- assertEquals("10", results[0]);
- assertFalse(servlets.contains(results[1]));
+ Assert.assertEquals(2, results.length);
+ Assert.assertEquals("10", results[0]);
+ Assert.assertFalse(servlets.contains(results[1]));
servlets.add(results[1]);
}
}
@@ -442,9 +439,9 @@ public class TestStandardWrapper extends
// Check the result
for (int i = 0; i < BUG51445_THREAD_COUNT; i ++) {
String[] results = threads[i].getResult().split(",");
- assertEquals(2, results.length);
- assertEquals("10", results[0]);
- assertFalse(servlets.contains(results[1]));
+ Assert.assertEquals(2, results.length);
+ Assert.assertEquals("10", results[0]);
+ Assert.assertFalse(servlets.contains(results[1]));
servlets.add(results[1]);
}
}
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestSwallowAbortedUploads.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestSwallowAbortedUploads.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestSwallowAbortedUploads.java Mon Nov 13 12:32:26 2017
@@ -34,9 +34,6 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.Part;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
import org.junit.Assert;
import org.junit.Test;
@@ -93,9 +90,9 @@ public class TestSwallowAbortedUploads e
log.info("Unlimited, swallow enabled");
AbortedUploadClient client = new AbortedUploadClient();
Exception ex = doAbortedUploadTest(client, false, true);
- assertNull("Unlimited upload with swallow enabled generates client exception",
+ Assert.assertNull("Unlimited upload with swallow enabled generates client exception",
ex);
- assertTrue("Unlimited upload with swallow enabled returns error status code",
+ Assert.assertTrue("Unlimited upload with swallow enabled returns error status code",
client.isResponse200());
client.reset();
}
@@ -105,9 +102,9 @@ public class TestSwallowAbortedUploads e
log.info("Unlimited, swallow disabled");
AbortedUploadClient client = new AbortedUploadClient();
Exception ex = doAbortedUploadTest(client, false, false);
- assertNull("Unlimited upload with swallow disabled generates client exception",
+ Assert.assertNull("Unlimited upload with swallow disabled generates client exception",
ex);
- assertTrue("Unlimited upload with swallow disabled returns error status code",
+ Assert.assertTrue("Unlimited upload with swallow disabled returns error status code",
client.isResponse200());
client.reset();
}
@@ -117,9 +114,9 @@ public class TestSwallowAbortedUploads e
log.info("Limited, swallow enabled");
AbortedUploadClient client = new AbortedUploadClient();
Exception ex = doAbortedUploadTest(client, true, true);
- assertNull("Limited upload with swallow enabled generates client exception",
+ Assert.assertNull("Limited upload with swallow enabled generates client exception",
ex);
- assertTrue("Limited upload with swallow enabled returns non-500 status code",
+ Assert.assertTrue("Limited upload with swallow enabled returns non-500 status code",
client.isResponse500());
client.reset();
}
@@ -129,7 +126,7 @@ public class TestSwallowAbortedUploads e
log.info("Limited, swallow disabled");
AbortedUploadClient client = new AbortedUploadClient();
Exception ex = doAbortedUploadTest(client, true, false);
- assertTrue("Limited upload with swallow disabled does not generate client exception",
+ Assert.assertTrue("Limited upload with swallow disabled does not generate client exception",
ex != null && ex instanceof java.net.SocketException);
client.reset();
}
@@ -139,9 +136,9 @@ public class TestSwallowAbortedUploads e
log.info("Aborted (OK), swallow enabled");
AbortedPOSTClient client = new AbortedPOSTClient();
Exception ex = doAbortedPOSTTest(client, HttpServletResponse.SC_OK, true);
- assertNull("Unlimited upload with swallow enabled generates client exception",
+ Assert.assertNull("Unlimited upload with swallow enabled generates client exception",
ex);
- assertTrue("Unlimited upload with swallow enabled returns error status code",
+ Assert.assertTrue("Unlimited upload with swallow enabled returns error status code",
client.isResponse200());
client.reset();
}
@@ -151,9 +148,9 @@ public class TestSwallowAbortedUploads e
log.info("Aborted (OK), swallow disabled");
AbortedPOSTClient client = new AbortedPOSTClient();
Exception ex = doAbortedPOSTTest(client, HttpServletResponse.SC_OK, false);
- assertNull("Unlimited upload with swallow disabled generates client exception",
+ Assert.assertNull("Unlimited upload with swallow disabled generates client exception",
ex);
- assertTrue("Unlimited upload with swallow disabled returns error status code",
+ Assert.assertTrue("Unlimited upload with swallow disabled returns error status code",
client.isResponse200());
client.reset();
}
@@ -163,9 +160,9 @@ public class TestSwallowAbortedUploads e
log.info("Aborted (413), swallow enabled");
AbortedPOSTClient client = new AbortedPOSTClient();
Exception ex = doAbortedPOSTTest(client, HttpServletResponse.SC_REQUEST_ENTITY_TOO_LARGE, true);
- assertNull("Limited upload with swallow enabled generates client exception",
+ Assert.assertNull("Limited upload with swallow enabled generates client exception",
ex);
- assertTrue("Limited upload with swallow enabled returns error status code",
+ Assert.assertTrue("Limited upload with swallow enabled returns error status code",
client.isResponse413());
client.reset();
}
@@ -175,7 +172,7 @@ public class TestSwallowAbortedUploads e
log.info("Aborted (413), swallow disabled");
AbortedPOSTClient client = new AbortedPOSTClient();
Exception ex = doAbortedPOSTTest(client, HttpServletResponse.SC_REQUEST_ENTITY_TOO_LARGE, false);
- assertTrue("Limited upload with swallow disabled does not generate client exception",
+ Assert.assertTrue("Limited upload with swallow disabled does not generate client exception",
ex != null && ex instanceof java.net.SocketException);
client.reset();
}
@@ -445,7 +442,7 @@ public class TestSwallowAbortedUploads e
Exception readEx = null;
String responseLine = null;
Socket conn = null;
-
+
try {
conn = new Socket("localhost", getPort());
Writer writer = new OutputStreamWriter(
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/deploy/TestSecurityConstraint.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/deploy/TestSecurityConstraint.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/deploy/TestSecurityConstraint.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/deploy/TestSecurityConstraint.java Mon Nov 13 12:32:26 2017
@@ -25,11 +25,7 @@ import javax.servlet.ServletSecurityElem
import javax.servlet.annotation.ServletSecurity;
import javax.servlet.annotation.ServletSecurity.EmptyRoleSemantic;
-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;
public class TestSecurityConstraint {
@@ -53,7 +49,7 @@ public class TestSecurityConstraint {
element = new ServletSecurityElement();
result = SecurityConstraint.createConstraints(element, URL_PATTERN);
- assertEquals(0, result.length);
+ Assert.assertEquals(0, result.length);
// Example 13-2
// @ServletSecurity(
@@ -64,11 +60,11 @@ public class TestSecurityConstraint {
ServletSecurity.TransportGuarantee.CONFIDENTIAL));
result = SecurityConstraint.createConstraints(element, URL_PATTERN);
- assertEquals(1, result.length);
- assertFalse(result[0].getAuthConstraint());
- assertTrue(result[0].findCollections()[0].findPattern(URL_PATTERN));
- assertEquals(0, result[0].findCollections()[0].findMethods().length);
- assertEquals(ServletSecurity.TransportGuarantee.CONFIDENTIAL.name(),
+ Assert.assertEquals(1, result.length);
+ Assert.assertFalse(result[0].getAuthConstraint());
+ Assert.assertTrue(result[0].findCollections()[0].findPattern(URL_PATTERN));
+ Assert.assertEquals(0, result[0].findCollections()[0].findMethods().length);
+ Assert.assertEquals(ServletSecurity.TransportGuarantee.CONFIDENTIAL.name(),
result[0].getUserConstraint());
// Example 13-3
@@ -77,11 +73,11 @@ public class TestSecurityConstraint {
new HttpConstraintElement(EmptyRoleSemantic.DENY));
result = SecurityConstraint.createConstraints(element, URL_PATTERN);
- assertEquals(1, result.length);
- assertTrue(result[0].getAuthConstraint());
- assertTrue(result[0].findCollections()[0].findPattern(URL_PATTERN));
- assertEquals(0, result[0].findCollections()[0].findMethods().length);
- assertEquals(ServletSecurity.TransportGuarantee.NONE.name(),
+ Assert.assertEquals(1, result.length);
+ Assert.assertTrue(result[0].getAuthConstraint());
+ Assert.assertTrue(result[0].findCollections()[0].findPattern(URL_PATTERN));
+ Assert.assertEquals(0, result[0].findCollections()[0].findMethods().length);
+ Assert.assertEquals(ServletSecurity.TransportGuarantee.NONE.name(),
result[0].getUserConstraint());
// Example 13-4
@@ -90,13 +86,13 @@ public class TestSecurityConstraint {
ServletSecurity.TransportGuarantee.NONE, ROLE1));
result = SecurityConstraint.createConstraints(element, URL_PATTERN);
- assertEquals(1, result.length);
- assertTrue(result[0].getAuthConstraint());
- assertEquals(1, result[0].findAuthRoles().length);
- assertTrue(result[0].findAuthRole(ROLE1));
- assertTrue(result[0].findCollections()[0].findPattern(URL_PATTERN));
- assertEquals(0, result[0].findCollections()[0].findMethods().length);
- assertEquals(ServletSecurity.TransportGuarantee.NONE.name(),
+ Assert.assertEquals(1, result.length);
+ Assert.assertTrue(result[0].getAuthConstraint());
+ Assert.assertEquals(1, result[0].findAuthRoles().length);
+ Assert.assertTrue(result[0].findAuthRole(ROLE1));
+ Assert.assertTrue(result[0].findCollections()[0].findPattern(URL_PATTERN));
+ Assert.assertEquals(0, result[0].findCollections()[0].findMethods().length);
+ Assert.assertEquals(ServletSecurity.TransportGuarantee.NONE.name(),
result[0].getUserConstraint());
// Example 13-5
@@ -116,22 +112,22 @@ public class TestSecurityConstraint {
element = new ServletSecurityElement(hmces);
result = SecurityConstraint.createConstraints(element, URL_PATTERN);
- assertEquals(2, result.length);
+ Assert.assertEquals(2, result.length);
for (int i = 0; i < 2; i++) {
- assertTrue(result[i].getAuthConstraint());
- assertEquals(1, result[i].findAuthRoles().length);
- assertTrue(result[i].findAuthRole(ROLE1));
- assertTrue(result[i].findCollections()[0].findPattern(URL_PATTERN));
- assertEquals(1, result[i].findCollections()[0].findMethods().length);
+ Assert.assertTrue(result[i].getAuthConstraint());
+ Assert.assertEquals(1, result[i].findAuthRoles().length);
+ Assert.assertTrue(result[i].findAuthRole(ROLE1));
+ Assert.assertTrue(result[i].findCollections()[0].findPattern(URL_PATTERN));
+ Assert.assertEquals(1, result[i].findCollections()[0].findMethods().length);
String method = result[i].findCollections()[0].findMethods()[0];
if ("GET".equals(method)) {
- assertEquals(ServletSecurity.TransportGuarantee.NONE.name(),
+ Assert.assertEquals(ServletSecurity.TransportGuarantee.NONE.name(),
result[i].getUserConstraint());
} else if ("POST".equals(method)) {
- assertEquals(ServletSecurity.TransportGuarantee.CONFIDENTIAL.name(),
+ Assert.assertEquals(ServletSecurity.TransportGuarantee.CONFIDENTIAL.name(),
result[i].getUserConstraint());
} else {
- fail("Unexpected method :[" + method + "]");
+ Assert.fail("Unexpected method :[" + method + "]");
}
}
@@ -147,23 +143,23 @@ public class TestSecurityConstraint {
hmces);
result = SecurityConstraint.createConstraints(element, URL_PATTERN);
- assertEquals(2, result.length);
+ Assert.assertEquals(2, result.length);
for (int i = 0; i < 2; i++) {
- assertTrue(result[i].findCollections()[0].findPattern(URL_PATTERN));
+ Assert.assertTrue(result[i].findCollections()[0].findPattern(URL_PATTERN));
if (result[i].findCollections()[0].findMethods().length == 1) {
- assertEquals("GET",
+ Assert.assertEquals("GET",
result[i].findCollections()[0].findMethods()[0]);
- assertFalse(result[i].getAuthConstraint());
+ Assert.assertFalse(result[i].getAuthConstraint());
} else if (result[i].findCollections()[0].findOmittedMethods().length == 1) {
- assertEquals("GET",
+ Assert.assertEquals("GET",
result[i].findCollections()[0].findOmittedMethods()[0]);
- assertTrue(result[i].getAuthConstraint());
- assertEquals(1, result[i].findAuthRoles().length);
- assertEquals(ROLE1, result[i].findAuthRoles()[0]);
+ Assert.assertTrue(result[i].getAuthConstraint());
+ Assert.assertEquals(1, result[i].findAuthRoles().length);
+ Assert.assertEquals(ROLE1, result[i].findAuthRoles()[0]);
} else {
- fail("Unexpected number of methods defined");
+ Assert.fail("Unexpected number of methods defined");
}
- assertEquals(ServletSecurity.TransportGuarantee.NONE.name(),
+ Assert.assertEquals(ServletSecurity.TransportGuarantee.NONE.name(),
result[i].getUserConstraint());
}
@@ -181,24 +177,24 @@ public class TestSecurityConstraint {
hmces);
result = SecurityConstraint.createConstraints(element, URL_PATTERN);
- assertEquals(2, result.length);
+ Assert.assertEquals(2, result.length);
for (int i = 0; i < 2; i++) {
- assertTrue(result[i].findCollections()[0].findPattern(URL_PATTERN));
+ Assert.assertTrue(result[i].findCollections()[0].findPattern(URL_PATTERN));
if (result[i].findCollections()[0].findMethods().length == 1) {
- assertEquals("TRACE",
+ Assert.assertEquals("TRACE",
result[i].findCollections()[0].findMethods()[0]);
- assertTrue(result[i].getAuthConstraint());
- assertEquals(0, result[i].findAuthRoles().length);
+ Assert.assertTrue(result[i].getAuthConstraint());
+ Assert.assertEquals(0, result[i].findAuthRoles().length);
} else if (result[i].findCollections()[0].findOmittedMethods().length == 1) {
- assertEquals("TRACE",
+ Assert.assertEquals("TRACE",
result[i].findCollections()[0].findOmittedMethods()[0]);
- assertTrue(result[i].getAuthConstraint());
- assertEquals(1, result[i].findAuthRoles().length);
- assertEquals(ROLE1, result[i].findAuthRoles()[0]);
+ Assert.assertTrue(result[i].getAuthConstraint());
+ Assert.assertEquals(1, result[i].findAuthRoles().length);
+ Assert.assertEquals(ROLE1, result[i].findAuthRoles()[0]);
} else {
- fail("Unexpected number of methods defined");
+ Assert.fail("Unexpected number of methods defined");
}
- assertEquals(ServletSecurity.TransportGuarantee.NONE.name(),
+ Assert.assertEquals(ServletSecurity.TransportGuarantee.NONE.name(),
result[i].getUserConstraint());
}
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/deploy/TestWebXmlOrdering.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/deploy/TestWebXmlOrdering.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/deploy/TestWebXmlOrdering.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/deploy/TestWebXmlOrdering.java Mon Nov 13 12:32:26 2017
@@ -25,10 +25,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-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.Before;
import org.junit.Test;
@@ -87,12 +84,12 @@ public class TestWebXmlOrdering {
Set<WebXml> ordered = WebXml.orderWebFragments(app, fragments, null);
Iterator<WebXml> iter = ordered.iterator();
- assertEquals(c,iter.next());
- assertEquals(a,iter.next());
- assertEquals(b,iter.next());
- assertEquals(e,iter.next());
- assertEquals(d,iter.next());
- assertFalse(iter.hasNext());
+ Assert.assertEquals(c,iter.next());
+ Assert.assertEquals(a,iter.next());
+ Assert.assertEquals(b,iter.next());
+ Assert.assertEquals(e,iter.next());
+ Assert.assertEquals(d,iter.next());
+ Assert.assertFalse(iter.hasNext());
}
@Test
@@ -103,9 +100,9 @@ public class TestWebXmlOrdering {
Set<WebXml> ordered = WebXml.orderWebFragments(app, fragments, null);
Iterator<WebXml> iter = ordered.iterator();
- assertEquals(c,iter.next());
- assertEquals(a,iter.next());
- assertFalse(iter.hasNext());
+ Assert.assertEquals(c,iter.next());
+ Assert.assertEquals(a,iter.next());
+ Assert.assertFalse(iter.hasNext());
}
@Test
@@ -125,12 +122,12 @@ public class TestWebXmlOrdering {
Iterator<WebXml> iter = ordered.iterator();
while (others.size() > 0) {
WebXml o = iter.next();
- assertTrue(others.contains(o));
+ Assert.assertTrue(others.contains(o));
others.remove(o);
}
- assertEquals(b,iter.next());
- assertEquals(d,iter.next());
- assertFalse(iter.hasNext());
+ Assert.assertEquals(b,iter.next());
+ Assert.assertEquals(d,iter.next());
+ Assert.assertFalse(iter.hasNext());
}
@Test
@@ -148,15 +145,15 @@ public class TestWebXmlOrdering {
Set<WebXml> ordered = WebXml.orderWebFragments(app, fragments, null);
Iterator<WebXml> iter = ordered.iterator();
- assertEquals(b,iter.next());
+ Assert.assertEquals(b,iter.next());
while (others.size() > 0) {
WebXml o = iter.next();
- assertTrue(others.contains(o));
+ Assert.assertTrue(others.contains(o));
others.remove(o);
}
- assertEquals(d,iter.next());
- assertFalse(iter.hasNext());
+ Assert.assertEquals(d,iter.next());
+ Assert.assertFalse(iter.hasNext());
}
@Test
@@ -164,8 +161,8 @@ public class TestWebXmlOrdering {
app.addAbsoluteOrdering("a");
app.addAbsoluteOrdering("z");
Set<WebXml> ordered = WebXml.orderWebFragments(app, fragments, null);
- assertEquals(1,ordered.size());
- assertEquals(fragments.get("a"),ordered.toArray()[0]);
+ Assert.assertEquals(1,ordered.size());
+ Assert.assertEquals(fragments.get("a"),ordered.toArray()[0]);
}
@Test
@@ -183,15 +180,15 @@ public class TestWebXmlOrdering {
Set<WebXml> ordered = WebXml.orderWebFragments(app, fragments, null);
Iterator<WebXml> iter = ordered.iterator();
- assertEquals(b,iter.next());
- assertEquals(d,iter.next());
+ Assert.assertEquals(b,iter.next());
+ Assert.assertEquals(d,iter.next());
while (others.size() > 0) {
WebXml o = iter.next();
- assertTrue(others.contains(o));
+ Assert.assertTrue(others.contains(o));
others.remove(o);
}
- assertFalse(iter.hasNext());
+ Assert.assertFalse(iter.hasNext());
}
private void doRelativeOrderingTest(RelativeOrderingTestRunner runner) {
@@ -377,33 +374,33 @@ public class TestWebXmlOrdering {
// check the tests are complete this way.
//a.addAfterOrderingOthers();
- assertTrue(order, posA > posB);
- assertTrue(order, posA > posC);
- assertTrue(order, posA > posD);
- assertTrue(order, posA > posE);
- assertTrue(order, posA > posF);
+ Assert.assertTrue(order, posA > posB);
+ Assert.assertTrue(order, posA > posC);
+ Assert.assertTrue(order, posA > posD);
+ Assert.assertTrue(order, posA > posE);
+ Assert.assertTrue(order, posA > posF);
// a.addAfterOrdering("c");
- assertTrue(order, posA > posC);
+ Assert.assertTrue(order, posA > posC);
// b.addBeforeOrderingOthers();
- assertTrue(order, posB < posC);
+ Assert.assertTrue(order, posB < posC);
// c.addAfterOrderingOthers();
- assertTrue(order, posC > posB);
- assertTrue(order, posC > posD);
- assertTrue(order, posC > posE);
- assertTrue(order, posC > posF);
+ Assert.assertTrue(order, posC > posB);
+ Assert.assertTrue(order, posC > posD);
+ Assert.assertTrue(order, posC > posE);
+ Assert.assertTrue(order, posC > posF);
// f.addBeforeOrderingOthers();
- assertTrue(order, posF < posA);
- assertTrue(order, posF < posB);
- assertTrue(order, posF < posC);
- assertTrue(order, posF < posD);
- assertTrue(order, posF < posE);
+ Assert.assertTrue(order, posF < posA);
+ Assert.assertTrue(order, posF < posB);
+ Assert.assertTrue(order, posF < posC);
+ Assert.assertTrue(order, posF < posD);
+ Assert.assertTrue(order, posF < posE);
// f.addBeforeOrdering("b");
- assertTrue(order, posF < posB);
+ Assert.assertTrue(order, posF < posB);
}
}
@@ -424,32 +421,32 @@ public class TestWebXmlOrdering {
// check the tests are complete this way.
// a.addAfterOrderingOthers();
- assertTrue(order, posA > posB);
- assertTrue(order, posA > posE);
- assertTrue(order, posA > posF);
+ Assert.assertTrue(order, posA > posB);
+ Assert.assertTrue(order, posA > posE);
+ Assert.assertTrue(order, posA > posF);
// a.addBeforeOrdering("c");
- assertTrue(order, posC > posA);
- assertTrue(order, posC > posB);
- assertTrue(order, posC > posE);
- assertTrue(order, posC > posF);
+ Assert.assertTrue(order, posC > posA);
+ Assert.assertTrue(order, posC > posB);
+ Assert.assertTrue(order, posC > posE);
+ Assert.assertTrue(order, posC > posF);
// b.addBeforeOrderingOthers();
- assertTrue(order, posB < posA);
- assertTrue(order, posB < posC);
- assertTrue(order, posB < posD);
- assertTrue(order, posB < posF);
+ Assert.assertTrue(order, posB < posA);
+ Assert.assertTrue(order, posB < posC);
+ Assert.assertTrue(order, posB < posD);
+ Assert.assertTrue(order, posB < posF);
// d.addAfterOrderingOthers();
- assertTrue(order, posD > posB);
- assertTrue(order, posD > posE);
- assertTrue(order, posD > posF);
+ Assert.assertTrue(order, posD > posB);
+ Assert.assertTrue(order, posD > posE);
+ Assert.assertTrue(order, posD > posF);
// e.addBeforeOrderingOthers();
- assertTrue(order, posE < posA);
- assertTrue(order, posE < posC);
- assertTrue(order, posE < posD);
- assertTrue(order, posE < posF);
+ Assert.assertTrue(order, posE < posA);
+ Assert.assertTrue(order, posE < posC);
+ Assert.assertTrue(order, posE < posD);
+ Assert.assertTrue(order, posE < posF);
}
}
@@ -467,14 +464,14 @@ public class TestWebXmlOrdering {
// check the tests are complete this way.
// a.addAfterOrdering("b");
- assertTrue(order, posA > posB);
+ Assert.assertTrue(order, posA > posB);
// c.addBeforeOrderingOthers();
- assertTrue(order, posC < posA);
- assertTrue(order, posC < posB);
- assertTrue(order, posC < posD);
- assertTrue(order, posC < posE);
- assertTrue(order, posC < posF);
+ Assert.assertTrue(order, posC < posA);
+ Assert.assertTrue(order, posC < posB);
+ Assert.assertTrue(order, posC < posD);
+ Assert.assertTrue(order, posC < posE);
+ Assert.assertTrue(order, posC < posF);
}
}
@@ -492,10 +489,10 @@ public class TestWebXmlOrdering {
// check the tests are complete this way.
// b.addAfterOrdering("a");
- assertTrue(order, posB > posA);
+ Assert.assertTrue(order, posB > posA);
// c.addAfterOrdering("b");
- assertTrue(order, posC > posB);
+ Assert.assertTrue(order, posC > posB);
}
}
@@ -513,10 +510,10 @@ public class TestWebXmlOrdering {
// check the tests are complete this way.
// b.addBeforeOrdering("a");
- assertTrue(order, posB < posA);
+ Assert.assertTrue(order, posB < posA);
// c.addBeforeOrdering("b");
- assertTrue(order, posC < posB);
+ Assert.assertTrue(order, posC < posB);
}
}
@@ -534,10 +531,10 @@ public class TestWebXmlOrdering {
// check the tests are complete this way.
// b.addBeforeOrdering("a");
- assertTrue(order, posB < posA);
+ Assert.assertTrue(order, posB < posA);
//b.addAfterOrdering("c");
- assertTrue(order, posB > posC);
+ Assert.assertTrue(order, posB > posC);
}
}
@@ -556,13 +553,13 @@ public class TestWebXmlOrdering {
// check the tests are complete this way.
// b.addBeforeOrdering("a");
- assertTrue(order, posB < posA);
+ Assert.assertTrue(order, posB < posA);
// c.addBeforeOrdering("b");
- assertTrue(order, posC < posB);
+ Assert.assertTrue(order, posC < posB);
// a.addAfterOrdering("c");
- assertTrue(order, posA > posC);
+ Assert.assertTrue(order, posA > posC);
}
}
@@ -586,42 +583,42 @@ public class TestWebXmlOrdering {
// check the tests are complete this way.
// a.addBeforeOrderingOthers();
- assertTrue(order, posA < posB);
- assertTrue(order, posA < posC);
- assertTrue(order, posA < posD);
- assertTrue(order, posA < posE);
- assertTrue(order, posA < posF);
+ Assert.assertTrue(order, posA < posB);
+ Assert.assertTrue(order, posA < posC);
+ Assert.assertTrue(order, posA < posD);
+ Assert.assertTrue(order, posA < posE);
+ Assert.assertTrue(order, posA < posF);
// a.addBeforeOrdering("b");
- assertTrue(order, posA < posB);
+ Assert.assertTrue(order, posA < posB);
// b.addBeforeOrderingOthers();
- assertTrue(order, posB < posC);
- assertTrue(order, posB < posD);
- assertTrue(order, posB < posE);
- assertTrue(order, posB < posF);
+ Assert.assertTrue(order, posB < posC);
+ Assert.assertTrue(order, posB < posD);
+ Assert.assertTrue(order, posB < posE);
+ Assert.assertTrue(order, posB < posF);
// c.addAfterOrdering("b");
- assertTrue(order, posC > posB);
+ Assert.assertTrue(order, posC > posB);
// d.addAfterOrdering("c");
- assertTrue(order, posD > posC);
+ Assert.assertTrue(order, posD > posC);
// e.addAfterOrderingOthers();
- assertTrue(order, posE > posA);
- assertTrue(order, posE > posB);
- assertTrue(order, posE > posC);
- assertTrue(order, posE > posD);
+ Assert.assertTrue(order, posE > posA);
+ Assert.assertTrue(order, posE > posB);
+ Assert.assertTrue(order, posE > posC);
+ Assert.assertTrue(order, posE > posD);
// f.addAfterOrderingOthers();
- assertTrue(order, posF > posA);
- assertTrue(order, posF > posB);
- assertTrue(order, posF > posC);
- assertTrue(order, posF > posD);
- assertTrue(order, posF > posE);
+ Assert.assertTrue(order, posF > posA);
+ Assert.assertTrue(order, posF > posB);
+ Assert.assertTrue(order, posF > posC);
+ Assert.assertTrue(order, posF > posD);
+ Assert.assertTrue(order, posF > posE);
// f.addAfterOrdering("e");
- assertTrue(order, posF > posE);
+ Assert.assertTrue(order, posF > posE);
}
}
@@ -640,15 +637,15 @@ public class TestWebXmlOrdering {
// check the tests are complete this way.
// a.addBeforeOrderingOthers();
- assertTrue(order, posA < posD);
- assertTrue(order, posA < posE);
- assertTrue(order, posA < posF);
+ Assert.assertTrue(order, posA < posD);
+ Assert.assertTrue(order, posA < posE);
+ Assert.assertTrue(order, posA < posF);
// b.addBeforeOrdering("a");
- assertTrue(order, posB < posA);
+ Assert.assertTrue(order, posB < posA);
// c.addBeforeOrdering("b");
- assertTrue(order, posC < posB);
+ Assert.assertTrue(order, posC < posB);
}
}
@@ -667,15 +664,15 @@ public class TestWebXmlOrdering {
// check the tests are complete this way.
// a.addAfterOrderingOthers();
- assertTrue(order, posA > posD);
- assertTrue(order, posA > posE);
- assertTrue(order, posA > posF);
+ Assert.assertTrue(order, posA > posD);
+ Assert.assertTrue(order, posA > posE);
+ Assert.assertTrue(order, posA > posF);
// b.addAfterOrdering("a");
- assertTrue(order, posB > posA);
+ Assert.assertTrue(order, posB > posA);
// c.addAfterOrdering("b");
- assertTrue(order, posC > posB);
+ Assert.assertTrue(order, posC > posB);
}
}
@@ -694,7 +691,7 @@ public class TestWebXmlOrdering {
// check the tests are complete this way.
// a.addAfterOrdering("b");
- assertTrue(order, posA > posB);
+ Assert.assertTrue(order, posA > posB);
}
}
}
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestAddCharSetFilter.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestAddCharSetFilter.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestAddCharSetFilter.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestAddCharSetFilter.java Mon Nov 13 12:32:26 2017
@@ -28,8 +28,7 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import static org.junit.Assert.assertEquals;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.Context;
@@ -118,9 +117,9 @@ public class TestAddCharSetFilter extend
getUrl("http://localhost:" + getPort() + "/", new ByteChunk(), headers);
List<String> ctHeaders = headers.get("Content-Type");
- assertEquals(1, ctHeaders.size());
+ Assert.assertEquals(1, ctHeaders.size());
String ct = ctHeaders.get(0);
- assertEquals("text/plain;charset=" + expected, ct);
+ Assert.assertEquals("text/plain;charset=" + expected, ct);
}
private static class CharsetServlet extends HttpServlet {
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter.java Mon Nov 13 12:32:26 2017
@@ -24,10 +24,7 @@ import java.io.ObjectOutputStream;
import javax.servlet.http.HttpServletResponse;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.filters.CsrfPreventionFilter.LruCache;
@@ -44,25 +41,25 @@ public class TestCsrfPreventionFilter ex
@Test
public void testAddNonceNoQueryNoAnchor() throws Exception {
- assertEquals("/test?" + RESULT_NONCE ,
+ Assert.assertEquals("/test?" + RESULT_NONCE ,
wrapper.encodeRedirectURL("/test"));
}
@Test
public void testAddNonceQueryNoAnchor() throws Exception {
- assertEquals("/test?a=b&" + RESULT_NONCE ,
+ Assert.assertEquals("/test?a=b&" + RESULT_NONCE ,
wrapper.encodeRedirectURL("/test?a=b"));
}
@Test
public void testAddNonceNoQueryAnchor() throws Exception {
- assertEquals("/test?" + RESULT_NONCE + "#c",
+ Assert.assertEquals("/test?" + RESULT_NONCE + "#c",
wrapper.encodeRedirectURL("/test#c"));
}
@Test
public void testAddNonceQueryAnchor() throws Exception {
- assertEquals("/test?a=b&" + RESULT_NONCE + "#c",
+ Assert.assertEquals("/test?a=b&" + RESULT_NONCE + "#c",
wrapper.encodeRedirectURL("/test?a=b#c"));
}
@@ -87,13 +84,13 @@ public class TestCsrfPreventionFilter ex
LruCache<String> cache2 = (LruCache<String>) ois.readObject();
cache2.add("key7");
- assertFalse(cache2.contains("key1"));
- assertFalse(cache2.contains("key2"));
- assertTrue(cache2.contains("key3"));
- assertTrue(cache2.contains("key4"));
- assertTrue(cache2.contains("key5"));
- assertTrue(cache2.contains("key6"));
- assertTrue(cache2.contains("key7"));
+ Assert.assertFalse(cache2.contains("key1"));
+ Assert.assertFalse(cache2.contains("key2"));
+ Assert.assertTrue(cache2.contains("key3"));
+ Assert.assertTrue(cache2.contains("key4"));
+ Assert.assertTrue(cache2.contains("key5"));
+ Assert.assertTrue(cache2.contains("key6"));
+ Assert.assertTrue(cache2.contains("key7"));
}
@Test
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter2.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter2.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter2.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter2.java Mon Nov 13 12:32:26 2017
@@ -17,8 +17,7 @@
package org.apache.catalina.filters;
-import static org.junit.Assert.assertTrue;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.filters.CsrfPreventionFilter.LruCache;
@@ -34,7 +33,7 @@ public class TestCsrfPreventionFilter2 {
int threadCount = 2;
long iterationCount = 100000L;
- assertTrue(threadCount > 1);
+ Assert.assertTrue(threadCount > 1);
LruCache<String> cache = new LruCache<String>(threadCount - 1);
@@ -52,7 +51,7 @@ public class TestCsrfPreventionFilter2 {
}
for (int i = 0; i < threadCount; i++) {
- assertTrue(threads[i].getResult());
+ Assert.assertTrue(threads[i].getResult());
}
}
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestRemoteIpFilter.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestRemoteIpFilter.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestRemoteIpFilter.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestRemoteIpFilter.java Mon Nov 13 12:32:26 2017
@@ -37,10 +37,6 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-
import org.junit.Assert;
import org.junit.Test;
@@ -163,20 +159,20 @@ public class TestRemoteIpFilter extends
public void testCommaDelimitedListToStringArray() {
List<String> elements = Arrays.asList("element1", "element2", "element3");
String actual = RemoteIpFilter.listToCommaDelimitedString(elements);
- assertEquals("element1, element2, element3", actual);
+ Assert.assertEquals("element1, element2, element3", actual);
}
@Test
public void testCommaDelimitedListToStringArrayEmptyList() {
List<String> elements = new ArrayList<String>();
String actual = RemoteIpFilter.listToCommaDelimitedString(elements);
- assertEquals("", actual);
+ Assert.assertEquals("", actual);
}
@Test
public void testCommaDelimitedListToStringArrayNullList() {
String actual = RemoteIpFilter.listToCommaDelimitedString(null);
- assertEquals("", actual);
+ Assert.assertEquals("", actual);
}
@Test
@@ -185,8 +181,8 @@ public class TestRemoteIpFilter extends
request.setHeader("myheader", "lower Case");
request.setHeader("MYHEADER", "UPPER CASE");
request.setHeader("MyHeader", "Camel Case");
- assertEquals(1, request.headers.size());
- assertEquals("Camel Case", request.getHeader("myheader"));
+ Assert.assertEquals(1, request.headers.size());
+ Assert.assertEquals("Camel Case", request.getHeader("myheader"));
}
@Test
@@ -209,19 +205,19 @@ public class TestRemoteIpFilter extends
// VERIFY
boolean actualSecure = actualRequest.isSecure();
- assertFalse("request must be unsecured as header x-forwarded-proto said it is http", actualSecure);
+ Assert.assertFalse("request must be unsecured as header x-forwarded-proto said it is http", actualSecure);
String actualScheme = actualRequest.getScheme();
- assertEquals("scheme must be http as header x-forwarded-proto said it is http", "http", actualScheme);
+ Assert.assertEquals("scheme must be http as header x-forwarded-proto said it is http", "http", actualScheme);
int actualServerPort = actualRequest.getServerPort();
- assertEquals("wrong http server port", 8080, actualServerPort);
+ Assert.assertEquals("wrong http server port", 8080, actualServerPort);
String actualRemoteAddr = actualRequest.getRemoteAddr();
- assertEquals("remoteAddr", "140.211.11.130", actualRemoteAddr);
+ Assert.assertEquals("remoteAddr", "140.211.11.130", actualRemoteAddr);
String actualRemoteHost = actualRequest.getRemoteHost();
- assertEquals("remoteHost", "140.211.11.130", actualRemoteHost);
+ Assert.assertEquals("remoteHost", "140.211.11.130", actualRemoteHost);
}
@Test
@@ -242,16 +238,16 @@ public class TestRemoteIpFilter extends
// VERIFY
boolean actualSecure = actualRequest.isSecure();
- assertFalse("request must be unsecured as header x-forwarded-proto said it is http", actualSecure);
+ Assert.assertFalse("request must be unsecured as header x-forwarded-proto said it is http", actualSecure);
String actualScheme = actualRequest.getScheme();
- assertEquals("scheme must be http as header x-forwarded-proto said it is http", "http", actualScheme);
+ Assert.assertEquals("scheme must be http as header x-forwarded-proto said it is http", "http", actualScheme);
String actualRemoteAddr = actualRequest.getRemoteAddr();
- assertEquals("remoteAddr", "140.211.11.130", actualRemoteAddr);
+ Assert.assertEquals("remoteAddr", "140.211.11.130", actualRemoteAddr);
String actualRemoteHost = actualRequest.getRemoteHost();
- assertEquals("remoteHost", "140.211.11.130", actualRemoteHost);
+ Assert.assertEquals("remoteHost", "140.211.11.130", actualRemoteHost);
}
@@ -273,16 +269,16 @@ public class TestRemoteIpFilter extends
// VERIFY
String actualXForwardedFor = request.getHeader("x-forwarded-for");
- assertNull("x-forwarded-for must be null", actualXForwardedFor);
+ Assert.assertNull("x-forwarded-for must be null", actualXForwardedFor);
String actualXForwardedBy = request.getHeader("x-forwarded-by");
- assertNull("x-forwarded-by must be null", actualXForwardedBy);
+ Assert.assertNull("x-forwarded-by must be null", actualXForwardedBy);
String actualRemoteAddr = actualRequest.getRemoteAddr();
- assertEquals("remoteAddr", "192.168.0.10", actualRemoteAddr);
+ Assert.assertEquals("remoteAddr", "192.168.0.10", actualRemoteAddr);
String actualRemoteHost = actualRequest.getRemoteHost();
- assertEquals("remoteHost", "remote-host-original-value", actualRemoteHost);
+ Assert.assertEquals("remoteHost", "remote-host-original-value", actualRemoteHost);
}
@Test
@@ -305,16 +301,16 @@ public class TestRemoteIpFilter extends
// VERIFY
String actualXForwardedFor = actualRequest.getHeader("x-forwarded-for");
- assertNull("all proxies are internal, x-forwarded-for must be null", actualXForwardedFor);
+ Assert.assertNull("all proxies are internal, x-forwarded-for must be null", actualXForwardedFor);
String actualXForwardedBy = actualRequest.getHeader("x-forwarded-by");
- assertNull("all proxies are internal, x-forwarded-by must be null", actualXForwardedBy);
+ Assert.assertNull("all proxies are internal, x-forwarded-by must be null", actualXForwardedBy);
String actualRemoteAddr = actualRequest.getRemoteAddr();
- assertEquals("remoteAddr", "140.211.11.130", actualRemoteAddr);
+ Assert.assertEquals("remoteAddr", "140.211.11.130", actualRemoteAddr);
String actualRemoteHost = actualRequest.getRemoteHost();
- assertEquals("remoteHost", "140.211.11.130", actualRemoteHost);
+ Assert.assertEquals("remoteHost", "140.211.11.130", actualRemoteHost);
}
@Test
@@ -340,16 +336,16 @@ public class TestRemoteIpFilter extends
// VERIFY
String actualXForwardedFor = actualRequest.getHeader("x-forwarded-for");
- assertNull("all proxies are trusted, x-forwarded-for must be null", actualXForwardedFor);
+ Assert.assertNull("all proxies are trusted, x-forwarded-for must be null", actualXForwardedFor);
String actualXForwardedBy = actualRequest.getHeader("x-forwarded-by");
- assertEquals("all proxies are trusted, they must appear in x-forwarded-by", "proxy1, proxy2", actualXForwardedBy);
+ Assert.assertEquals("all proxies are trusted, they must appear in x-forwarded-by", "proxy1, proxy2", actualXForwardedBy);
String actualRemoteAddr = actualRequest.getRemoteAddr();
- assertEquals("remoteAddr", "140.211.11.130", actualRemoteAddr);
+ Assert.assertEquals("remoteAddr", "140.211.11.130", actualRemoteAddr);
String actualRemoteHost = actualRequest.getRemoteHost();
- assertEquals("remoteHost", "140.211.11.130", actualRemoteHost);
+ Assert.assertEquals("remoteHost", "140.211.11.130", actualRemoteHost);
}
@Test
@@ -374,16 +370,16 @@ public class TestRemoteIpFilter extends
// VERIFY
String actualXForwardedFor = actualRequest.getHeader("x-forwarded-for");
- assertNull("all proxies are trusted, x-forwarded-for must be null", actualXForwardedFor);
+ Assert.assertNull("all proxies are trusted, x-forwarded-for must be null", actualXForwardedFor);
String actualXForwardedBy = actualRequest.getHeader("x-forwarded-by");
- assertEquals("all proxies are trusted, they must appear in x-forwarded-by", "proxy1, proxy2", actualXForwardedBy);
+ Assert.assertEquals("all proxies are trusted, they must appear in x-forwarded-by", "proxy1, proxy2", actualXForwardedBy);
String actualRemoteAddr = actualRequest.getRemoteAddr();
- assertEquals("remoteAddr", "140.211.11.130", actualRemoteAddr);
+ Assert.assertEquals("remoteAddr", "140.211.11.130", actualRemoteAddr);
String actualRemoteHost = actualRequest.getRemoteHost();
- assertEquals("remoteHost", "140.211.11.130", actualRemoteHost);
+ Assert.assertEquals("remoteHost", "140.211.11.130", actualRemoteHost);
}
@Test
@@ -407,16 +403,16 @@ public class TestRemoteIpFilter extends
// VERIFY
String actualXForwardedFor = actualRequest.getHeader("x-forwarded-for");
- assertNull("all proxies are trusted, x-forwarded-for must be null", actualXForwardedFor);
+ Assert.assertNull("all proxies are trusted, x-forwarded-for must be null", actualXForwardedFor);
String actualXForwardedBy = actualRequest.getHeader("x-forwarded-by");
- assertEquals("all proxies are trusted, they must appear in x-forwarded-by", "proxy1, proxy2", actualXForwardedBy);
+ Assert.assertEquals("all proxies are trusted, they must appear in x-forwarded-by", "proxy1, proxy2", actualXForwardedBy);
String actualRemoteAddr = actualRequest.getRemoteAddr();
- assertEquals("remoteAddr", "140.211.11.130", actualRemoteAddr);
+ Assert.assertEquals("remoteAddr", "140.211.11.130", actualRemoteAddr);
String actualRemoteHost = actualRequest.getRemoteHost();
- assertEquals("remoteHost", "140.211.11.130", actualRemoteHost);
+ Assert.assertEquals("remoteHost", "140.211.11.130", actualRemoteHost);
}
@Test
@@ -439,16 +435,16 @@ public class TestRemoteIpFilter extends
// VERIFY
String actualXForwardedFor = actualRequest.getHeader("x-forwarded-for");
- assertEquals("x-forwarded-for must be unchanged", "140.211.11.130, proxy1, proxy2", actualXForwardedFor);
+ Assert.assertEquals("x-forwarded-for must be unchanged", "140.211.11.130, proxy1, proxy2", actualXForwardedFor);
String actualXForwardedBy = actualRequest.getHeader("x-forwarded-by");
- assertNull("x-forwarded-by must be null", actualXForwardedBy);
+ Assert.assertNull("x-forwarded-by must be null", actualXForwardedBy);
String actualRemoteAddr = actualRequest.getRemoteAddr();
- assertEquals("remoteAddr", "not-allowed-internal-proxy", actualRemoteAddr);
+ Assert.assertEquals("remoteAddr", "not-allowed-internal-proxy", actualRemoteAddr);
String actualRemoteHost = actualRequest.getRemoteHost();
- assertEquals("remoteHost", "not-allowed-internal-proxy-host", actualRemoteHost);
+ Assert.assertEquals("remoteHost", "not-allowed-internal-proxy-host", actualRemoteHost);
}
@Test
@@ -471,25 +467,25 @@ public class TestRemoteIpFilter extends
// VERIFY
String actualXForwardedFor = actualRequest.getHeader("x-forwarded-for");
- assertEquals("ip/host before untrusted-proxy must appear in x-forwarded-for", "140.211.11.130, proxy1", actualXForwardedFor);
+ Assert.assertEquals("ip/host before untrusted-proxy must appear in x-forwarded-for", "140.211.11.130, proxy1", actualXForwardedFor);
String actualXForwardedBy = actualRequest.getHeader("x-forwarded-by");
- assertEquals("ip/host after untrusted-proxy must appear in x-forwarded-by", "proxy2", actualXForwardedBy);
+ Assert.assertEquals("ip/host after untrusted-proxy must appear in x-forwarded-by", "proxy2", actualXForwardedBy);
String actualRemoteAddr = actualRequest.getRemoteAddr();
- assertEquals("remoteAddr", "untrusted-proxy", actualRemoteAddr);
+ Assert.assertEquals("remoteAddr", "untrusted-proxy", actualRemoteAddr);
String actualRemoteHost = actualRequest.getRemoteHost();
- assertEquals("remoteHost", "untrusted-proxy", actualRemoteHost);
+ Assert.assertEquals("remoteHost", "untrusted-proxy", actualRemoteHost);
}
@Test
public void testListToCommaDelimitedString() {
String[] actual = RemoteIpFilter.commaDelimitedListToStringArray("element1, element2, element3");
String[] expected = new String[] { "element1", "element2", "element3" };
- assertEquals(expected.length, actual.length);
+ Assert.assertEquals(expected.length, actual.length);
for (int i = 0; i < actual.length; i++) {
- assertEquals(expected[i], actual[i]);
+ Assert.assertEquals(expected[i], actual[i]);
}
}
@@ -497,9 +493,9 @@ public class TestRemoteIpFilter extends
public void testListToCommaDelimitedStringMixedSpaceChars() {
String[] actual = RemoteIpFilter.commaDelimitedListToStringArray("element1 , element2,\t element3");
String[] expected = new String[] { "element1", "element2", "element3" };
- assertEquals(expected.length, actual.length);
+ Assert.assertEquals(expected.length, actual.length);
for (int i = 0; i < actual.length; i++) {
- assertEquals(expected[i], actual[i]);
+ Assert.assertEquals(expected[i], actual[i]);
}
}
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestRestCsrfPreventionFilter.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestRestCsrfPreventionFilter.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestRestCsrfPreventionFilter.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestRestCsrfPreventionFilter.java Mon Nov 13 12:32:26 2017
@@ -29,9 +29,7 @@ import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -262,24 +260,24 @@ public class TestRestCsrfPreventionFilte
}
private void verifyContinueChain() {
- assertTrue(filterChain.isVisited());
+ Assert.assertTrue(filterChain.isVisited());
}
private void verifyContinueChainNonceAvailable() {
- assertTrue(NONCE.equals(response.getHeader(Constants.CSRF_REST_NONCE_HEADER_NAME)));
+ Assert.assertTrue(NONCE.equals(response.getHeader(Constants.CSRF_REST_NONCE_HEADER_NAME)));
verifyContinueChain();
}
private void verifyContinueChainNonceNotAvailable() {
- assertNull(response.getHeader(Constants.CSRF_REST_NONCE_HEADER_NAME));
+ Assert.assertNull(response.getHeader(Constants.CSRF_REST_NONCE_HEADER_NAME));
verifyContinueChain();
}
private void verifyDenyResponse(int statusCode) {
- assertTrue(Constants.CSRF_REST_NONCE_HEADER_REQUIRED_VALUE.equals(response
+ Assert.assertTrue(Constants.CSRF_REST_NONCE_HEADER_REQUIRED_VALUE.equals(response
.getHeader(Constants.CSRF_REST_NONCE_HEADER_NAME)));
- assertTrue(statusCode == response.getStatus());
- assertTrue(!filterChain.isVisited());
+ Assert.assertTrue(statusCode == response.getStatus());
+ Assert.assertTrue(!filterChain.isVisited());
}
private static class TesterFilterChain implements FilterChain {
@@ -343,7 +341,7 @@ public class TestRestCsrfPreventionFilte
private static class TesterSession implements HttpSession {
Map<String,Object> attributes = new HashMap<String, Object>();
-
+
@Override
public long getCreationTime() {
return 0;
@@ -424,6 +422,6 @@ public class TestRestCsrfPreventionFilte
public boolean isNew() {
return false;
}
-
+
}
}
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestRestCsrfPreventionFilter2.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestRestCsrfPreventionFilter2.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestRestCsrfPreventionFilter2.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestRestCsrfPreventionFilter2.java Mon Nov 13 12:32:26 2017
@@ -27,11 +27,7 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.Context;
@@ -221,21 +217,21 @@ public class TestRestCsrfPreventionFilte
rc = postUrl(body, HTTP_PREFIX + getPort() + uri, bc, reqHeaders, respHeaders);
}
- assertEquals(expectedRC, rc);
+ Assert.assertEquals(expectedRC, rc);
if (expectedRC == HttpServletResponse.SC_OK) {
- assertEquals(expectedResponse, bc.toString());
+ Assert.assertEquals(expectedResponse, bc.toString());
List<String> newCookies = respHeaders.get(SERVER_COOKIE_HEADER);
saveCookies(newCookies);
}
if (!expectCsrfRH) {
- assertNull(respHeaders.get(Constants.CSRF_REST_NONCE_HEADER_NAME));
+ Assert.assertNull(respHeaders.get(Constants.CSRF_REST_NONCE_HEADER_NAME));
} else {
List<String> respHeaderValue = respHeaders.get(Constants.CSRF_REST_NONCE_HEADER_NAME);
- assertNotNull(respHeaderValue);
+ Assert.assertNotNull(respHeaderValue);
if (expectedCsrfRHV != null) {
- assertTrue(respHeaderValue.contains(expectedCsrfRHV));
+ Assert.assertTrue(respHeaderValue.contains(expectedCsrfRHV));
} else {
validNonce = respHeaderValue.get(0);
}
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/ha/session/TestSerializablePrincipal.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/ha/session/TestSerializablePrincipal.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/ha/session/TestSerializablePrincipal.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/ha/session/TestSerializablePrincipal.java Mon Nov 13 12:32:26 2017
@@ -27,10 +27,7 @@ import java.io.ObjectOutputStream;
import java.util.ArrayList;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.fail;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.realm.GenericPrincipal;
@@ -47,7 +44,7 @@ public class TestSerializablePrincipal
File 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");
}
// Create the Principal to serialize
@@ -64,7 +61,7 @@ public class TestSerializablePrincipal
file = File.createTempFile("ser", null, tempDir);
} catch (IOException e) {
e.printStackTrace();
- fail("ioe creating temporary file");
+ Assert.fail("ioe creating temporary file");
}
GenericPrincipal gpNew = null;
@@ -78,10 +75,10 @@ public class TestSerializablePrincipal
SerializablePrincipal.writePrincipal(gpOriginal, oos);
} catch (FileNotFoundException e) {
e.printStackTrace();
- fail("fnfe creating object output stream");
+ Assert.fail("fnfe creating object output stream");
} catch (IOException e) {
e.printStackTrace();
- fail("ioe serializing principal");
+ Assert.fail("ioe serializing principal");
} finally {
if (oos != null) {
try {
@@ -108,13 +105,13 @@ public class TestSerializablePrincipal
gpNew = SerializablePrincipal.readPrincipal(ois);
} catch (FileNotFoundException e) {
e.printStackTrace();
- fail("fnfe reading object output stream");
+ Assert.fail("fnfe reading object output stream");
} catch (IOException e) {
e.printStackTrace();
- fail("ioe de-serializing principal");
+ Assert.fail("ioe de-serializing principal");
} catch (ClassNotFoundException e) {
e.printStackTrace();
- fail("cnfe de-serializing principal");
+ Assert.fail("cnfe de-serializing principal");
} finally {
if (ois != null) {
try {
@@ -138,20 +135,20 @@ public class TestSerializablePrincipal
}
// Now test how similar original and de-serialized versions are
- assertEquals("User names different", gpOriginal.getName(),
+ Assert.assertEquals("User names different", gpOriginal.getName(),
gpNew.getName());
- assertEquals("Passwords different", gpOriginal.getPassword(),
+ Assert.assertEquals("Passwords different", gpOriginal.getPassword(),
gpNew.getPassword());
- assertEquals("Number of roles different", gpOriginal.getRoles().length,
+ Assert.assertEquals("Number of roles different", gpOriginal.getRoles().length,
gpNew.getRoles().length);
for (int i = 0; i < gpOriginal.getRoles().length; i++) {
- assertEquals("Role name index " + i + "different",
+ Assert.assertEquals("Role name index " + i + "different",
gpOriginal.getRoles()[i], gpNew.getRoles()[i]);
}
// These are the key tests for bug 43840
- assertNotSame("Inner principal not present", gpNew,
+ Assert.assertNotSame("Inner principal not present", gpNew,
gpNew.getUserPrincipal());
- assertEquals("Inner user names are different", tpOriginal.getName(),
+ Assert.assertEquals("Inner user names are different", tpOriginal.getName(),
gpNew.getUserPrincipal().getName());
}
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestVirtualContext.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestVirtualContext.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestVirtualContext.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestVirtualContext.java Mon Nov 13 12:32:26 2017
@@ -25,9 +25,6 @@ import java.io.InputStream;
import java.util.Arrays;
import java.util.HashSet;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
import org.junit.Assert;
import org.junit.Test;
@@ -130,19 +127,19 @@ public class TestVirtualContext extends
getUrl(
"http://localhost:" + getPort() +
"/test/classpathGetResources.jsp?path=rsrc/").toString();
- assertTrue(
+ Assert.assertTrue(
allUrls,
allUrls.indexOf("/test/webapp-3.0-virtual-webapp/src/main/webapp/WEB-INF/classes/rsrc") > 0);
- assertTrue(
+ Assert.assertTrue(
allUrls,
allUrls.indexOf("/test/webapp-3.0-virtual-webapp/src/main/webapp2/WEB-INF/classes/rsrc") > 0);
- assertTrue(
+ Assert.assertTrue(
allUrls,
allUrls.indexOf("/test/webapp-3.0-virtual-webapp/src/main/webapp/WEB-INF/lib/rsrc.jar!/rsrc") > 0);
- assertTrue(
+ Assert.assertTrue(
allUrls,
allUrls.indexOf("/test/webapp-3.0-virtual-webapp/target/classes/rsrc") > 0);
- assertTrue(
+ Assert.assertTrue(
allUrls,
allUrls.indexOf("/test/webapp-3.0-virtual-library/target/classes/rsrc") > 0);
@@ -155,7 +152,7 @@ public class TestVirtualContext extends
getUrl(
"http://localhost:" + getPort() +
"/test/classpathGetResources.jsp?path=rsrc2/").toString();
- assertTrue(
+ Assert.assertTrue(
allRsrsc2ClasspathUrls,
allRsrsc2ClasspathUrls.indexOf("/test/webapp-3.0-virtual-webapp/src/main/webapp2/WEB-INF/classes/rsrc2") > 0);
@@ -198,13 +195,13 @@ public class TestVirtualContext extends
getUrl(
"http://localhost:" + getPort() +
"/test/contextGetResourcePaths.jsp?path=/rsrc/").toString();
- assertTrue(
+ Assert.assertTrue(
allRsrcPaths,
allRsrcPaths.indexOf("/rsrc/resourceF.properties") > 0);
- assertTrue(
+ Assert.assertTrue(
allRsrcPaths,
allRsrcPaths.indexOf("/rsrc/resourceE.properties") > 0);
- assertTrue(
+ Assert.assertTrue(
allRsrcPaths,
allRsrcPaths.indexOf("/rsrc/resourceH.properties") > 0);
@@ -217,7 +214,7 @@ public class TestVirtualContext extends
getUrl(
"http://localhost:" + getPort() +
"/test/contextGetResourcePaths.jsp?path=/rsrc2/").toString();
- assertTrue(
+ Assert.assertTrue(
allRsrc2Paths,
allRsrc2Paths.indexOf("/rsrc2/resourceJ.properties") > 0);
@@ -321,11 +318,11 @@ public class TestVirtualContext extends
int sc = getUrl("http://localhost:" + getPort() + pageUrl, res, 10000,
null, null);
- assertEquals(expectedStatus, sc);
+ Assert.assertEquals(expectedStatus, sc);
if (expectedStatus == 200) {
String result = res.toString();
- assertTrue(result, result.indexOf(expectedBody) >= 0);
+ Assert.assertTrue(result, result.indexOf(expectedBody) >= 0);
}
}
}
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestVirtualWebappLoader.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestVirtualWebappLoader.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestVirtualWebappLoader.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestVirtualWebappLoader.java Mon Nov 13 12:32:26 2017
@@ -18,10 +18,7 @@ package org.apache.catalina.loader;
import java.io.File;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.core.StandardContext;
@@ -34,8 +31,8 @@ public class TestVirtualWebappLoader ext
@Test
public void testModified() throws Exception {
WebappLoader loader = new WebappLoader();
- assertNull(loader.getClassLoader());
- assertFalse(loader.modified());
+ Assert.assertNull(loader.getClassLoader());
+ Assert.assertFalse(loader.modified());
}
@Test
@@ -56,16 +53,16 @@ public class TestVirtualWebappLoader ext
loader.setVirtualClasspath(dir.getAbsolutePath() + "/*.jar");
loader.start();
String[] repos = loader.getRepositories();
- assertEquals(2,repos.length);
+ Assert.assertEquals(2,repos.length);
loader.stop();
// ToDo: Why doesn't remove repositories?
repos = loader.getRepositories();
- assertEquals(2, repos.length);
+ Assert.assertEquals(2, repos.length);
// no leak
loader.start();
repos = loader.getRepositories();
- assertEquals(2,repos.length);
+ Assert.assertEquals(2,repos.length);
// clear loader
ctx.setLoader(null);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org