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 11:25:52 UTC
svn commit: r1815083 [6/6] - in /tomcat/tc8.5.x/trunk:
modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/
modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/ test/javax/el/
test/javax/servlet/jsp/ test/org/apache/catalina/ant/ test/o...
Modified: tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestValidator.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestValidator.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestValidator.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestValidator.java Mon Nov 13 11:25:51 2017
@@ -24,9 +24,7 @@ import javax.servlet.http.HttpServletRes
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.TagSupport;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.startup.Tomcat;
@@ -42,7 +40,7 @@ public class TestValidator extends Tomca
int rc = getUrl("http://localhost:" + getPort() +
"/test/bug47331.jsp", new ByteChunk(), null);
- assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc);
+ Assert.assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc);
}
@Test
@@ -61,13 +59,13 @@ public class TestValidator extends Tomca
String result = res.toString();
- assertTrue(result.indexOf("<p>${'00-hello world'}</p>") > 0);
- assertTrue(result.indexOf("<p>#{'01-hello world'}</p>") > 0);
- assertTrue(result.indexOf("<p>${'02-hello world'}</p>") > 0);
- assertTrue(result.indexOf("<p>#{'03-hello world'}</p>") > 0);
- assertTrue(result.indexOf("<p>${'04-hello world'}</p>") > 0);
- assertTrue(result.indexOf("<p>#{'05-hello world'}</p>") > 0);
- assertTrue(result.indexOf("<p>${'06-hello world'}</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>${'00-hello world'}</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>#{'01-hello world'}</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>${'02-hello world'}</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>#{'03-hello world'}</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>${'04-hello world'}</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>#{'05-hello world'}</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>${'06-hello world'}</p>") > 0);
}
@Test
@@ -86,13 +84,13 @@ public class TestValidator extends Tomca
String result = res.toString();
- assertTrue(result.indexOf("<p>${'00-hello world'}</p>") > 0);
- assertTrue(result.indexOf("<p>#{'01-hello world'}</p>") > 0);
- assertTrue(result.indexOf("<p>${'02-hello world'}</p>") > 0);
- assertTrue(result.indexOf("<p>#{'03-hello world'}</p>") > 0);
- assertTrue(result.indexOf("<p>${'04-hello world'}</p>") > 0);
- assertTrue(result.indexOf("<p>#{'05-hello world'}</p>") > 0);
- assertTrue(result.indexOf("<p>${'06-hello world'}</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>${'00-hello world'}</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>#{'01-hello world'}</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>${'02-hello world'}</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>#{'03-hello world'}</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>${'04-hello world'}</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>#{'05-hello world'}</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>${'06-hello world'}</p>") > 0);
}
@Test
@@ -111,13 +109,13 @@ public class TestValidator extends Tomca
String result = res.toString();
- assertTrue(result.indexOf("<p>00-hello world</p>") > 0);
- assertTrue(result.indexOf("<p>#{'01-hello world'}</p>") > 0);
- assertTrue(result.indexOf("<p>02-hello world</p>") > 0);
- assertTrue(result.indexOf("<p>#{'03-hello world'}</p>") > 0);
- assertTrue(result.indexOf("<p>04-hello world</p>") > 0);
- assertTrue(result.indexOf("<p>#{'05-hello world'}</p>") > 0);
- assertTrue(result.indexOf("<p>06-hello world</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>00-hello world</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>#{'01-hello world'}</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>02-hello world</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>#{'03-hello world'}</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>04-hello world</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>#{'05-hello world'}</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>06-hello world</p>") > 0);
}
@Test
@@ -136,13 +134,13 @@ public class TestValidator extends Tomca
String result = res.toString();
- assertTrue(result.indexOf("<p>00-hello world</p>") > 0);
- assertTrue(result.indexOf("<p>#{'01-hello world'}</p>") > 0);
- assertTrue(result.indexOf("<p>02-hello world</p>") > 0);
- assertTrue(result.indexOf("<p>#{'03-hello world'}</p>") > 0);
- assertTrue(result.indexOf("<p>04-hello world</p>") > 0);
- assertTrue(result.indexOf("<p>#{'05-hello world'}</p>") > 0);
- assertTrue(result.indexOf("<p>06-hello world</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>00-hello world</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>#{'01-hello world'}</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>02-hello world</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>#{'03-hello world'}</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>04-hello world</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>#{'05-hello world'}</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>06-hello world</p>") > 0);
}
@Test
@@ -161,13 +159,13 @@ public class TestValidator extends Tomca
String result = res.toString();
- assertTrue(result.indexOf("<p>00-hello world</p>") > 0);
- assertTrue(result.indexOf("<p>#{'01-hello world'}</p>") > 0);
- assertTrue(result.indexOf("<p>02-hello world</p>") > 0);
- assertTrue(result.indexOf("<p>#{'03-hello world'}</p>") > 0);
- assertTrue(result.indexOf("<p>04-hello world</p>") > 0);
- assertTrue(result.indexOf("<p>#{'05-hello world'}</p>") > 0);
- assertTrue(result.indexOf("<p>06-hello world</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>00-hello world</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>#{'01-hello world'}</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>02-hello world</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>#{'03-hello world'}</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>04-hello world</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>#{'05-hello world'}</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>06-hello world</p>") > 0);
}
@Test
@@ -186,13 +184,13 @@ public class TestValidator extends Tomca
String result = res.toString();
- assertTrue(result.indexOf("<p>00-hello world</p>") > 0);
- assertTrue(result.indexOf("<p>#{'01-hello world'}</p>") > 0);
- assertTrue(result.indexOf("<p>02-hello world</p>") > 0);
- assertTrue(result.indexOf("<p>#{'03-hello world'}</p>") > 0);
- assertTrue(result.indexOf("<p>04-hello world</p>") > 0);
- assertTrue(result.indexOf("<p>#{'05-hello world'}</p>") > 0);
- assertTrue(result.indexOf("<p>06-hello world</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>00-hello world</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>#{'01-hello world'}</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>02-hello world</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>#{'03-hello world'}</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>04-hello world</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>#{'05-hello world'}</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>06-hello world</p>") > 0);
}
public static class Echo extends TagSupport {
Modified: tomcat/tc8.5.x/trunk/test/org/apache/jasper/util/TestFastRemovalDequeue.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/jasper/util/TestFastRemovalDequeue.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/jasper/util/TestFastRemovalDequeue.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/jasper/util/TestFastRemovalDequeue.java Mon Nov 13 11:25:51 2017
@@ -16,9 +16,7 @@
*/
package org.apache.jasper.util;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
+import org.junit.Assert;
import org.junit.Test;
@@ -34,9 +32,9 @@ public class TestFastRemovalDequeue {
Object r = q.pop();
- assertEquals(o1, r);
- assertNull(q.first);
- assertNull(q.last);
+ Assert.assertEquals(o1, r);
+ Assert.assertNull(q.first);
+ Assert.assertNull(q.last);
}
@@ -50,20 +48,20 @@ public class TestFastRemovalDequeue {
q.push(o1);
q.push(o2);
- assertEquals(o2, q.first.getContent());
- assertEquals(o1, q.last.getContent());
+ Assert.assertEquals(o2, q.first.getContent());
+ Assert.assertEquals(o1, q.last.getContent());
Object r1 = q.pop();
- assertEquals(o1, r1);
- assertEquals(o2, q.first.getContent());
- assertEquals(o2, q.last.getContent());
+ Assert.assertEquals(o1, r1);
+ Assert.assertEquals(o2, q.first.getContent());
+ Assert.assertEquals(o2, q.last.getContent());
Object r2 = q.pop();
- assertEquals(o2, r2);
- assertNull(q.first);
- assertNull(q.last);
+ Assert.assertEquals(o2, r2);
+ Assert.assertNull(q.first);
+ Assert.assertNull(q.last);
}
@@ -77,9 +75,9 @@ public class TestFastRemovalDequeue {
Object r = q.pop();
- assertEquals(o1, r);
- assertNull(q.first);
- assertNull(q.last);
+ Assert.assertEquals(o1, r);
+ Assert.assertNull(q.first);
+ Assert.assertNull(q.last);
}
@@ -93,20 +91,20 @@ public class TestFastRemovalDequeue {
q.unpop(o1);
q.unpop(o2);
- assertEquals(o1, q.first.getContent());
- assertEquals(o2, q.last.getContent());
+ Assert.assertEquals(o1, q.first.getContent());
+ Assert.assertEquals(o2, q.last.getContent());
Object r2 = q.pop();
- assertEquals(o2, r2);
- assertEquals(o1, q.first.getContent());
- assertEquals(o1, q.last.getContent());
+ Assert.assertEquals(o2, r2);
+ Assert.assertEquals(o1, q.first.getContent());
+ Assert.assertEquals(o1, q.last.getContent());
Object r1 = q.pop();
- assertEquals(o1, r1);
- assertNull(q.first);
- assertNull(q.last);
+ Assert.assertEquals(o1, r1);
+ Assert.assertNull(q.first);
+ Assert.assertNull(q.last);
}
@@ -120,9 +118,9 @@ public class TestFastRemovalDequeue {
Object r = q.unpush();
- assertEquals(o1, r);
- assertNull(q.first);
- assertNull(q.last);
+ Assert.assertEquals(o1, r);
+ Assert.assertNull(q.first);
+ Assert.assertNull(q.last);
}
@@ -136,20 +134,20 @@ public class TestFastRemovalDequeue {
q.push(o1);
q.push(o2);
- assertEquals(o2, q.first.getContent());
- assertEquals(o1, q.last.getContent());
+ Assert.assertEquals(o2, q.first.getContent());
+ Assert.assertEquals(o1, q.last.getContent());
Object r2 = q.unpush();
- assertEquals(o2, r2);
- assertEquals(o1, q.first.getContent());
- assertEquals(o1, q.last.getContent());
+ Assert.assertEquals(o2, r2);
+ Assert.assertEquals(o1, q.first.getContent());
+ Assert.assertEquals(o1, q.last.getContent());
Object r1 = q.unpush();
- assertEquals(o1, r1);
- assertNull(q.first);
- assertNull(q.last);
+ Assert.assertEquals(o1, r1);
+ Assert.assertNull(q.first);
+ Assert.assertNull(q.last);
}
@@ -161,12 +159,12 @@ public class TestFastRemovalDequeue {
FastRemovalDequeue<Object>.Entry e1 = q.push(o1);
- assertEquals(o1, e1.getContent());
+ Assert.assertEquals(o1, e1.getContent());
q.remove(e1);
- assertNull(q.first);
- assertNull(q.last);
+ Assert.assertNull(q.first);
+ Assert.assertNull(q.last);
}
@@ -180,20 +178,20 @@ public class TestFastRemovalDequeue {
FastRemovalDequeue<Object>.Entry e1 = q.push(o1);
FastRemovalDequeue<Object>.Entry e2 = q.push(o2);
- assertEquals(o1, e1.getContent());
- assertEquals(o2, e2.getContent());
+ Assert.assertEquals(o1, e1.getContent());
+ Assert.assertEquals(o2, e2.getContent());
- assertEquals(o2, q.first.getContent());
- assertEquals(o1, q.last.getContent());
+ Assert.assertEquals(o2, q.first.getContent());
+ Assert.assertEquals(o1, q.last.getContent());
q.remove(e1);
- assertEquals(o2, q.first.getContent());
- assertEquals(o2, q.last.getContent());
+ Assert.assertEquals(o2, q.first.getContent());
+ Assert.assertEquals(o2, q.last.getContent());
q.remove(e2);
- assertNull(q.first);
- assertNull(q.last);
+ Assert.assertNull(q.first);
+ Assert.assertNull(q.last);
}
}
Modified: tomcat/tc8.5.x/trunk/test/org/apache/juli/TestFileHandler.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/juli/TestFileHandler.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/juli/TestFileHandler.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/juli/TestFileHandler.java Mon Nov 13 11:25:51 2017
@@ -25,10 +25,8 @@ import java.nio.file.Path;
import java.text.SimpleDateFormat;
import java.util.Calendar;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
import org.junit.After;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -47,7 +45,7 @@ public class TestFileHandler {
public void setUp() throws Exception {
File logsBase = new File(System.getProperty("tomcat.test.temp", "output/tmp"));
if (!logsBase.mkdirs() && !logsBase.isDirectory()) {
- fail("Unable to create logs directory.");
+ Assert.fail("Unable to create logs directory.");
}
Path logsBasePath = FileSystems.getDefault().getPath(logsBase.getAbsolutePath());
logsDir = Files.createTempDirectory(logsBasePath, "test").toFile();
@@ -85,7 +83,7 @@ public class TestFileHandler {
Thread.sleep(1000);
- assertTrue(logsDir.list().length == 16);
+ Assert.assertTrue(logsDir.list().length == 16);
}
@SuppressWarnings("unused")
@@ -100,7 +98,7 @@ public class TestFileHandler {
Thread.sleep(1000);
- assertTrue(logsDir.list().length == 16);
+ Assert.assertTrue(logsDir.list().length == 16);
}
@SuppressWarnings("unused")
@@ -112,7 +110,7 @@ public class TestFileHandler {
Thread.sleep(1000);
- assertTrue(logsDir.list().length == 17);
+ Assert.assertTrue(logsDir.list().length == 17);
}
private void generateLogFiles(File dir, String prefix, String sufix, int amount)
Modified: tomcat/tc8.5.x/trunk/test/org/apache/juli/TestFileHandlerNonRotatable.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/juli/TestFileHandlerNonRotatable.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/juli/TestFileHandlerNonRotatable.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/juli/TestFileHandlerNonRotatable.java Mon Nov 13 11:25:51 2017
@@ -19,9 +19,8 @@ package org.apache.juli;
import java.io.File;
import java.net.URLDecoder;
-import static org.junit.Assert.assertTrue;
-
import org.junit.After;
+import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -56,7 +55,7 @@ public class TestFileHandlerNonRotatable
"juli.", ".log");
File logFile = new File(this.getTemporaryDirectory(), "juli.log");
- assertTrue(logFile.exists());
+ Assert.assertTrue(logFile.exists());
}
@Test
@@ -65,7 +64,7 @@ public class TestFileHandlerNonRotatable
"juli.", "log");
File logFile = new File(this.getTemporaryDirectory(), "juli.log");
- assertTrue(logFile.exists());
+ Assert.assertTrue(logFile.exists());
}
@Test
@@ -74,6 +73,6 @@ public class TestFileHandlerNonRotatable
"juli", ".log");
File logFile = new File(this.getTemporaryDirectory(), "juli.log");
- assertTrue(logFile.exists());
+ Assert.assertTrue(logFile.exists());
}
}
\ No newline at end of file
Modified: tomcat/tc8.5.x/trunk/test/org/apache/naming/resources/TestNamingContext.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/naming/resources/TestNamingContext.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/naming/resources/TestNamingContext.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/naming/resources/TestNamingContext.java Mon Nov 13 11:25:51 2017
@@ -31,9 +31,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;
@@ -86,7 +83,7 @@ public class TestNamingContext extends T
} else {
expected = "NOTEQUAL";
}
- assertEquals(expected, bc.toString());
+ Assert.assertEquals(expected, bc.toString());
}
@@ -139,7 +136,7 @@ public class TestNamingContext extends T
tomcat.start();
ByteChunk bc = getUrl("http://localhost:" + getPort() + "/");
- assertEquals("org.apache.naming.resources.TesterObject", bc.toString());
+ Assert.assertEquals("org.apache.naming.resources.TesterObject", bc.toString());
}
public static final class Bug23950Servlet extends HttpServlet {
@@ -191,7 +188,7 @@ public class TestNamingContext extends T
tomcat.start();
ByteChunk bc = getUrl("http://localhost:" + getPort() + "/");
- assertEquals("value", bc.toString());
+ Assert.assertEquals("value", bc.toString());
}
public static final class Bug50351Servlet extends HttpServlet {
@@ -245,10 +242,10 @@ public class TestNamingContext extends T
ByteChunk bc = new ByteChunk();
int rc = getUrl("http://localhost:" + getPort() + "/", bc, null);
- assertEquals(200, rc);
- assertTrue(bc.toString().contains(Bug51744Servlet.EXPECTED));
+ Assert.assertEquals(200, rc);
+ Assert.assertTrue(bc.toString().contains(Bug51744Servlet.EXPECTED));
if (exceptionOnFailedWrite) {
- assertTrue(bc.toString().contains(Bug51744Servlet.ERROR_MESSAGE));
+ Assert.assertTrue(bc.toString().contains(Bug51744Servlet.ERROR_MESSAGE));
}
}
@@ -308,8 +305,8 @@ public class TestNamingContext extends T
ByteChunk bc = new ByteChunk();
int rc = getUrl("http://localhost:" + getPort() + "/", bc, null);
- assertEquals(200, rc);
- assertTrue(bc.toString().contains("truetrue"));
+ Assert.assertEquals(200, rc);
+ Assert.assertTrue(bc.toString().contains("truetrue"));
}
public static final class Bug52830Servlet extends HttpServlet {
Modified: tomcat/tc8.5.x/trunk/test/org/apache/naming/resources/TestWarDirContext.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/naming/resources/TestWarDirContext.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/naming/resources/TestWarDirContext.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/naming/resources/TestWarDirContext.java Mon Nov 13 11:25:51 2017
@@ -18,8 +18,7 @@ package org.apache.naming.resources;
import java.io.File;
-import static org.junit.Assert.assertEquals;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.core.JreMemoryLeakPreventionListener;
@@ -60,7 +59,7 @@ public class TestWarDirContext extends T
ByteChunk bc = getUrl("http://localhost:" + getPort() +
"/test/warDirContext.jsp");
- assertEquals("<p>java.lang.ClassNotFoundException</p>",
+ Assert.assertEquals("<p>java.lang.ClassNotFoundException</p>",
bc.toString());
}
@@ -86,13 +85,13 @@ public class TestWarDirContext extends T
// Should be found in resources.jar
ByteChunk bc = getUrl("http://localhost:" + getPort() +
"/test/'singlequote.jsp");
- assertEquals("<p>'singlequote.jsp in resources.jar</p>",
+ Assert.assertEquals("<p>'singlequote.jsp in resources.jar</p>",
bc.toString());
// Should be found in file system
bc = getUrl("http://localhost:" + getPort() +
"/test/'singlequote2.jsp");
- assertEquals("<p>'singlequote2.jsp in file system</p>",
+ Assert.assertEquals("<p>'singlequote2.jsp in file system</p>",
bc.toString());
}
@@ -119,13 +118,13 @@ public class TestWarDirContext extends T
// Should be found in resources.jar
ByteChunk bc = getUrl("http://localhost:" + getPort() +
"/test/'singlequote.jsp");
- assertEquals("<p>'singlequote.jsp in resources.jar</p>",
+ Assert.assertEquals("<p>'singlequote.jsp in resources.jar</p>",
bc.toString());
// Should be found in file system
bc = getUrl("http://localhost:" + getPort() +
"/test/'singlequote2.jsp");
- assertEquals("<p>'singlequote2.jsp in file system</p>",
+ Assert.assertEquals("<p>'singlequote2.jsp in file system</p>",
bc.toString());
}
}
Modified: tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java Mon Nov 13 11:25:51 2017
@@ -19,9 +19,7 @@ package org.apache.tomcat.util.buf;
import java.io.UnsupportedEncodingException;
import java.util.Arrays;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
+import org.junit.Assert;
import org.junit.Test;
/**
@@ -34,7 +32,7 @@ public class TestByteChunk {
String string = "HTTP/1.1 100 \r\n\r\n";
byte[] bytes = ByteChunk.convertToBytes(string);
byte[] expected = string.getBytes("ISO-8859-1");
- assertTrue(Arrays.equals(bytes, expected));
+ Assert.assertTrue(Arrays.equals(bytes, expected));
}
/*
@@ -53,23 +51,23 @@ public class TestByteChunk {
final int len = bytes.length;
// indexOf() does not work outside of 0-127
- assertEquals(5, ByteChunk.findByte(bytes, 0, len, (byte) '\u00a0'));
- assertEquals(-1, ByteChunk.indexOf(bytes, 0, len, '\u00a0'));
+ Assert.assertEquals(5, ByteChunk.findByte(bytes, 0, len, (byte) '\u00a0'));
+ Assert.assertEquals(-1, ByteChunk.indexOf(bytes, 0, len, '\u00a0'));
- assertEquals(0, ByteChunk.findByte(bytes, 0, len, (byte) 'H'));
- assertEquals(0, ByteChunk.indexOf(bytes, 0, len, 'H'));
+ Assert.assertEquals(0, ByteChunk.findByte(bytes, 0, len, (byte) 'H'));
+ Assert.assertEquals(0, ByteChunk.indexOf(bytes, 0, len, 'H'));
- assertEquals(len - 1, ByteChunk.findByte(bytes, 0, len, (byte) 'd'));
- assertEquals(len - 1, ByteChunk.indexOf(bytes, 0, len, 'd'));
+ Assert.assertEquals(len - 1, ByteChunk.findByte(bytes, 0, len, (byte) 'd'));
+ Assert.assertEquals(len - 1, ByteChunk.indexOf(bytes, 0, len, 'd'));
- assertEquals(-1, ByteChunk.findByte(bytes, 0, len, (byte) 'x'));
- assertEquals(-1, ByteChunk.indexOf(bytes, 0, len, 'x'));
+ Assert.assertEquals(-1, ByteChunk.findByte(bytes, 0, len, (byte) 'x'));
+ Assert.assertEquals(-1, ByteChunk.indexOf(bytes, 0, len, 'x'));
- assertEquals(7, ByteChunk.findByte(bytes, 5, len, (byte) 'o'));
- assertEquals(7, ByteChunk.indexOf(bytes, 5, len, 'o'));
+ Assert.assertEquals(7, ByteChunk.findByte(bytes, 5, len, (byte) 'o'));
+ Assert.assertEquals(7, ByteChunk.indexOf(bytes, 5, len, 'o'));
- assertEquals(-1, ByteChunk.findByte(bytes, 2, 5, (byte) 'w'));
- assertEquals(-1, ByteChunk.indexOf(bytes, 5, 5, 'w'));
+ Assert.assertEquals(-1, ByteChunk.findByte(bytes, 2, 5, (byte) 'w'));
+ Assert.assertEquals(-1, ByteChunk.indexOf(bytes, 5, 5, 'w'));
}
@Test
@@ -80,18 +78,18 @@ public class TestByteChunk {
ByteChunk bc = new ByteChunk();
bc.setBytes(bytes, 0, len);
- assertEquals(0, bc.indexOf('H', 0));
- assertEquals(6, bc.indexOf('w', 0));
+ Assert.assertEquals(0, bc.indexOf('H', 0));
+ Assert.assertEquals(6, bc.indexOf('w', 0));
// Does not work outside of 0-127
- assertEquals(-1, bc.indexOf('\u00a0', 0));
+ Assert.assertEquals(-1, bc.indexOf('\u00a0', 0));
bc.setBytes(bytes, 6, 5);
- assertEquals(1, bc.indexOf('o', 0));
+ Assert.assertEquals(1, bc.indexOf('o', 0));
bc.setBytes(bytes, 6, 2);
- assertEquals(0, bc.indexOf('w', 0));
- assertEquals(-1, bc.indexOf('d', 0));
+ Assert.assertEquals(0, bc.indexOf('w', 0));
+ Assert.assertEquals(-1, bc.indexOf('d', 0));
}
@Test
@@ -102,21 +100,21 @@ public class TestByteChunk {
ByteChunk bc = new ByteChunk();
bc.setBytes(bytes, 0, len);
- assertEquals(0, bc.indexOf("Hello", 0, "Hello".length(), 0));
- assertEquals(2, bc.indexOf("ll", 0, 2, 0));
- assertEquals(2, bc.indexOf("Hello", 2, 2, 0));
+ Assert.assertEquals(0, bc.indexOf("Hello", 0, "Hello".length(), 0));
+ Assert.assertEquals(2, bc.indexOf("ll", 0, 2, 0));
+ Assert.assertEquals(2, bc.indexOf("Hello", 2, 2, 0));
- assertEquals(7, bc.indexOf("o", 0, 1, 5));
+ Assert.assertEquals(7, bc.indexOf("o", 0, 1, 5));
// Does not work outside of 0-127
- assertEquals(-1, bc.indexOf("\u00a0", 0, 1, 0));
+ Assert.assertEquals(-1, bc.indexOf("\u00a0", 0, 1, 0));
bc.setBytes(bytes, 6, 5);
- assertEquals(1, bc.indexOf("o", 0, 1, 0));
+ Assert.assertEquals(1, bc.indexOf("o", 0, 1, 0));
bc.setBytes(bytes, 6, 2);
- assertEquals(0, bc.indexOf("wo", 0, 1, 0));
- assertEquals(-1, bc.indexOf("d", 0, 1, 0));
+ Assert.assertEquals(0, bc.indexOf("wo", 0, 1, 0));
+ Assert.assertEquals(-1, bc.indexOf("d", 0, 1, 0));
}
@Test
@@ -124,15 +122,15 @@ public class TestByteChunk {
byte[] bytes = "Hello\u00a0world".getBytes("ISO-8859-1");
final int len = bytes.length;
- assertEquals(0, ByteChunk.findBytes(bytes, 0, len, new byte[] { 'H' }));
- assertEquals(5, ByteChunk.findBytes(bytes, 0, len, new byte[] {
+ Assert.assertEquals(0, ByteChunk.findBytes(bytes, 0, len, new byte[] { 'H' }));
+ Assert.assertEquals(5, ByteChunk.findBytes(bytes, 0, len, new byte[] {
(byte) '\u00a0', 'x' }));
- assertEquals(5, ByteChunk.findBytes(bytes, 0, len - 4, new byte[] {
+ Assert.assertEquals(5, ByteChunk.findBytes(bytes, 0, len - 4, new byte[] {
'x', (byte) '\u00a0' }));
- assertEquals(len - 1, ByteChunk.findBytes(bytes, 2, len, new byte[] {
+ Assert.assertEquals(len - 1, ByteChunk.findBytes(bytes, 2, len, new byte[] {
'x', 'd' }));
- assertEquals(1, ByteChunk.findBytes(bytes, 0, len, new byte[] { 'o',
+ Assert.assertEquals(1, ByteChunk.findBytes(bytes, 0, len, new byte[] { 'o',
'e' }));
- assertEquals(-1, ByteChunk.findBytes(bytes, 2, 5, new byte[] { 'w' }));
+ Assert.assertEquals(-1, ByteChunk.findBytes(bytes, 2, 5, new byte[] { 'w' }));
}
}
Modified: tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/buf/TestUEncoder.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/buf/TestUEncoder.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/buf/TestUEncoder.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/buf/TestUEncoder.java Mon Nov 13 11:25:51 2017
@@ -19,7 +19,7 @@ package org.apache.tomcat.util.buf;
import java.io.IOException;
-import static org.junit.Assert.assertTrue;
+import org.junit.Assert;
import org.junit.Test;
import org.apache.tomcat.util.buf.UEncoder.SafeCharsSet;
@@ -34,13 +34,13 @@ public class TestUEncoder {
UEncoder urlEncoder = new UEncoder(SafeCharsSet.WITH_SLASH);
String s = "a+b/c/d+e.class";
- assertTrue(urlEncoder.encodeURL(s, 0, s.length()).equals(
+ Assert.assertTrue(urlEncoder.encodeURL(s, 0, s.length()).equals(
"a%2bb/c/d%2be.class"));
- assertTrue(urlEncoder.encodeURL(s, 2, s.length() - 2).equals(
+ Assert.assertTrue(urlEncoder.encodeURL(s, 2, s.length() - 2).equals(
"b/c/d%2be.cla"));
s = new String(new char[] { 0xD801, 0xDC01 });
- assertTrue(urlEncoder.encodeURL(s, 0, s.length())
+ Assert.assertTrue(urlEncoder.encodeURL(s, 0, s.length())
.equals("%f0%90%90%81"));
}
}
Modified: tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/descriptor/web/TestSecurityConstraint.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/descriptor/web/TestSecurityConstraint.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/descriptor/web/TestSecurityConstraint.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/descriptor/web/TestSecurityConstraint.java Mon Nov 13 11:25:51 2017
@@ -25,11 +25,6 @@ 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;
@@ -99,7 +94,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(
@@ -110,11 +105,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
@@ -123,11 +118,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
@@ -136,13 +131,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
@@ -162,22 +157,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 + "]");
}
}
@@ -193,23 +188,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());
}
@@ -227,24 +222,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/tc8.5.x/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXmlOrdering.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXmlOrdering.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXmlOrdering.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXmlOrdering.java Mon Nov 13 11:25:51 2017
@@ -24,10 +24,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;
@@ -86,12 +83,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
@@ -102,9 +99,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
@@ -124,12 +121,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
@@ -147,15 +144,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
@@ -163,8 +160,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
@@ -182,15 +179,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) {
@@ -376,33 +373,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);
}
}
@@ -423,32 +420,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);
}
}
@@ -466,14 +463,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);
}
}
@@ -491,10 +488,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);
}
}
@@ -512,10 +509,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);
}
}
@@ -533,10 +530,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);
}
}
@@ -555,13 +552,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);
}
}
@@ -585,42 +582,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);
}
}
@@ -639,15 +636,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);
}
}
@@ -666,15 +663,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);
}
}
@@ -693,7 +690,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/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestParameters.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestParameters.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestParameters.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestParameters.java Mon Nov 13 11:25:51 2017
@@ -21,13 +21,7 @@ import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.Enumeration;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
+import org.junit.Assert;
import org.junit.Test;
public class TestParameters {
@@ -79,13 +73,13 @@ public class TestParameters {
// Make sure the inner Parameter class behaves correctly
@Test
public void testInternal() {
- assertEquals("foo1=bar1", SIMPLE.toString());
+ Assert.assertEquals("foo1=bar1", SIMPLE.toString());
// Note: testing requires that ' ' is encoded as '+',
// because that is what browsers will send us.
- assertEquals("foo2=bar1&foo2=bar2&foo2=hello+world&foo2=%3F%25%40",
+ Assert.assertEquals("foo2=bar1&foo2=bar2&foo2=hello+world&foo2=%3F%25%40",
SIMPLE_MULTIPLE.toString());
- assertEquals("foo3", NO_VALUE.toString());
- assertEquals("foo4=", EMPTY_VALUE.toString());
+ Assert.assertEquals("foo3", NO_VALUE.toString());
+ Assert.assertEquals("foo4=", EMPTY_VALUE.toString());
}
private long doTestProcessParametersByteArrayIntInt(int limit,
@@ -128,13 +122,13 @@ public class TestParameters {
Parameters p = new Parameters();
String value = p.getParameter("foo");
- assertNull(value);
+ Assert.assertNull(value);
Enumeration<String> names = p.getParameterNames();
- assertFalse(names.hasMoreElements());
+ Assert.assertFalse(names.hasMoreElements());
String[] values = p.getParameterValues("foo");
- assertNull(values);
+ Assert.assertNull(values);
}
@@ -144,39 +138,39 @@ public class TestParameters {
// Empty at this point
Enumeration<String> names = p.getParameterNames();
- assertFalse(names.hasMoreElements());
+ Assert.assertFalse(names.hasMoreElements());
String[] values = p.getParameterValues("foo");
- assertNull(values);
+ Assert.assertNull(values);
// Add a parameter with two values
p.addParameter("foo", "value1");
p.addParameter("foo", "value2");
names = p.getParameterNames();
- assertTrue(names.hasMoreElements());
- assertEquals("foo", names.nextElement());
- assertFalse(names.hasMoreElements());
+ Assert.assertTrue(names.hasMoreElements());
+ Assert.assertEquals("foo", names.nextElement());
+ Assert.assertFalse(names.hasMoreElements());
values = p.getParameterValues("foo");
- assertEquals(2, values.length);
- assertEquals("value1", values[0]);
- assertEquals("value2", values[1]);
+ Assert.assertEquals(2, values.length);
+ Assert.assertEquals("value1", values[0]);
+ Assert.assertEquals("value2", values[1]);
// Add two more values
p.addParameter("foo", "value3");
p.addParameter("foo", "value4");
names = p.getParameterNames();
- assertTrue(names.hasMoreElements());
- assertEquals("foo", names.nextElement());
- assertFalse(names.hasMoreElements());
+ Assert.assertTrue(names.hasMoreElements());
+ Assert.assertEquals("foo", names.nextElement());
+ Assert.assertFalse(names.hasMoreElements());
values = p.getParameterValues("foo");
- assertEquals(4, values.length);
- assertEquals("value1", values[0]);
- assertEquals("value2", values[1]);
- assertEquals("value3", values[2]);
- assertEquals("value4", values[3]);
+ Assert.assertEquals(4, values.length);
+ Assert.assertEquals("value1", values[0]);
+ Assert.assertEquals("value2", values[1]);
+ Assert.assertEquals("value3", values[2]);
+ Assert.assertEquals("value4", values[3]);
}
@Test
@@ -187,38 +181,38 @@ public class TestParameters {
// Empty at this point
Enumeration<String> names = p.getParameterNames();
- assertFalse(names.hasMoreElements());
+ Assert.assertFalse(names.hasMoreElements());
String[] values = p.getParameterValues("foo1");
- assertNull(values);
+ Assert.assertNull(values);
// Add a parameter
p.addParameter("foo1", "value1");
names = p.getParameterNames();
- assertTrue(names.hasMoreElements());
- assertEquals("foo1", names.nextElement());
- assertFalse(names.hasMoreElements());
+ Assert.assertTrue(names.hasMoreElements());
+ Assert.assertEquals("foo1", names.nextElement());
+ Assert.assertFalse(names.hasMoreElements());
values = p.getParameterValues("foo1");
- assertEquals(1, values.length);
- assertEquals("value1", values[0]);
+ Assert.assertEquals(1, values.length);
+ Assert.assertEquals("value1", values[0]);
// Add another parameter
p.addParameter("foo2", "value2");
names = p.getParameterNames();
- assertTrue(names.hasMoreElements());
- assertEquals("foo1", names.nextElement());
- assertEquals("foo2", names.nextElement());
- assertFalse(names.hasMoreElements());
+ Assert.assertTrue(names.hasMoreElements());
+ Assert.assertEquals("foo1", names.nextElement());
+ Assert.assertEquals("foo2", names.nextElement());
+ Assert.assertFalse(names.hasMoreElements());
values = p.getParameterValues("foo1");
- assertEquals(1, values.length);
- assertEquals("value1", values[0]);
+ Assert.assertEquals(1, values.length);
+ Assert.assertEquals("value1", values[0]);
values = p.getParameterValues("foo2");
- assertEquals(1, values.length);
- assertEquals("value2", values[0]);
+ Assert.assertEquals(1, values.length);
+ Assert.assertEquals("value2", values[0]);
// Add another parameter
IllegalStateException e = null;
@@ -227,22 +221,22 @@ public class TestParameters {
} catch (IllegalStateException ise) {
e = ise;
}
- assertNotNull(e);
+ Assert.assertNotNull(e);
// Check current parameters remain unaffected
names = p.getParameterNames();
- assertTrue(names.hasMoreElements());
- assertEquals("foo1", names.nextElement());
- assertEquals("foo2", names.nextElement());
- assertFalse(names.hasMoreElements());
+ Assert.assertTrue(names.hasMoreElements());
+ Assert.assertEquals("foo1", names.nextElement());
+ Assert.assertEquals("foo2", names.nextElement());
+ Assert.assertFalse(names.hasMoreElements());
values = p.getParameterValues("foo1");
- assertEquals(1, values.length);
- assertEquals("value1", values[0]);
+ Assert.assertEquals(1, values.length);
+ Assert.assertEquals("value1", values[0]);
values = p.getParameterValues("foo2");
- assertEquals(1, values.length);
- assertEquals("value2", values[0]);
+ Assert.assertEquals(1, values.length);
+ Assert.assertEquals("value2", values[0]);
}
@@ -265,14 +259,14 @@ public class TestParameters {
match = true;
if (parameter.values.length == 0) {
// Special case
- assertArrayEquals(new String[] {""}, values);
+ Assert.assertArrayEquals(new String[] {""}, values);
} else {
- assertArrayEquals(parameter.getValues(), values);
+ Assert.assertArrayEquals(parameter.getValues(), values);
}
break;
}
}
- assertTrue(match);
+ Assert.assertTrue(match);
}
}
Modified: tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TesterParametersPerformance.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TesterParametersPerformance.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TesterParametersPerformance.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TesterParametersPerformance.java Mon Nov 13 11:25:51 2017
@@ -22,7 +22,7 @@ import java.nio.charset.StandardCharsets
import java.util.logging.Level;
import java.util.logging.LogManager;
-import static org.junit.Assert.assertEquals;
+import org.junit.Assert;
import org.junit.Test;
import org.apache.tomcat.util.buf.B2CConverter;
@@ -47,7 +47,7 @@ public class TesterParametersPerformance
}
private long doTestProcessParameters(byte[] input, int size) {
- assertEquals(input.length, 3);
+ Assert.assertEquals(input.length, 3);
Parameters p = new Parameters();
Modified: tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/parser/TestMediaType.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/parser/TestMediaType.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/parser/TestMediaType.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/parser/TestMediaType.java Mon Nov 13 11:25:51 2017
@@ -19,10 +19,6 @@ package org.apache.tomcat.util.http.pars
import java.io.IOException;
import java.io.StringReader;
-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;
@@ -138,9 +134,9 @@ public class TestMediaType {
StringReader sr = new StringReader(sb.toString());
MediaType m = MediaType.parseMediaType(sr);
- assertEquals("foo/bar; charset=UTF-8; a=b", m.toString());
- assertEquals(CHARSET, m.getCharset());
- assertEquals("foo/bar; a=b", m.toStringNoCharset());
+ Assert.assertEquals("foo/bar; charset=UTF-8; a=b", m.toString());
+ Assert.assertEquals(CHARSET, m.getCharset());
+ Assert.assertEquals("foo/bar; a=b", m.toStringNoCharset());
}
@@ -153,8 +149,8 @@ public class TestMediaType {
StringReader sr = new StringReader(sb.toString());
MediaType m = MediaType.parseMediaType(sr);
- assertEquals(CHARSET_WS, m.getCharset());
- assertEquals(TYPES.replaceAll(" ", ""),
+ Assert.assertEquals(CHARSET_WS, m.getCharset());
+ Assert.assertEquals(TYPES.replaceAll(" ", ""),
m.toStringNoCharset());
}
@@ -169,23 +165,23 @@ public class TestMediaType {
MediaType m = MediaType.parseMediaType(sr);
// Check the types
- assertEquals("multipart", m.getType());
- assertEquals("related", m.getSubtype());
+ Assert.assertEquals("multipart", m.getType());
+ Assert.assertEquals("related", m.getSubtype());
// Check the parameters
- assertTrue(m.getParameterCount() == 3);
+ Assert.assertTrue(m.getParameterCount() == 3);
- assertEquals("1_4F50BD36_CDF8C28", m.getParameterValue("boundary"));
- assertEquals("\"<31671603.smil>\"", m.getParameterValue("Start"));
- assertEquals("\"application/smil;charset=UTF-8\"",
+ Assert.assertEquals("1_4F50BD36_CDF8C28", m.getParameterValue("boundary"));
+ Assert.assertEquals("\"<31671603.smil>\"", m.getParameterValue("Start"));
+ Assert.assertEquals("\"application/smil;charset=UTF-8\"",
m.getParameterValue("Type"));
String expected = "multipart/related; boundary=1_4F50BD36_CDF8C28; " +
"start=\"<31671603.smil>\"; " +
"type=\"application/smil;charset=UTF-8\"";
- assertEquals(expected, m.toString());
- assertEquals(expected, m.toStringNoCharset());
- assertNull(m.getCharset());
+ Assert.assertEquals(expected, m.toString());
+ Assert.assertEquals(expected, m.toStringNoCharset());
+ Assert.assertNull(m.getCharset());
}
@@ -197,18 +193,18 @@ public class TestMediaType {
MediaType m = MediaType.parseMediaType(sr);
// Check the types
- assertEquals("text", m.getType());
- assertEquals("html", m.getSubtype());
+ Assert.assertEquals("text", m.getType());
+ Assert.assertEquals("html", m.getSubtype());
// Check the parameters
- assertTrue(m.getParameterCount() == 2);
+ Assert.assertTrue(m.getParameterCount() == 2);
- assertEquals("", m.getParameterValue("UTF-8"));
- assertEquals("UTF-8", m.getCharset());
+ Assert.assertEquals("", m.getParameterValue("UTF-8"));
+ Assert.assertEquals("UTF-8", m.getCharset());
// Note: Invalid input is filtered out
- assertEquals("text/html; charset=UTF-8", m.toString());
- assertEquals("UTF-8", m.getCharset());
+ Assert.assertEquals("text/html; charset=UTF-8", m.toString());
+ Assert.assertEquals("UTF-8", m.getCharset());
}
@@ -219,15 +215,15 @@ public class TestMediaType {
StringReader sr = new StringReader(input);
MediaType m = MediaType.parseMediaType(sr);
- assertEquals("text", m.getType());
- assertEquals("html", m.getSubtype());
+ Assert.assertEquals("text", m.getType());
+ Assert.assertEquals("html", m.getSubtype());
- assertTrue(m.getParameterCount() == 1);
+ Assert.assertTrue(m.getParameterCount() == 1);
- assertEquals("UTF-8", m.getParameterValue("charset"));
- assertEquals("UTF-8", m.getCharset());
+ Assert.assertEquals("UTF-8", m.getParameterValue("charset"));
+ Assert.assertEquals("UTF-8", m.getCharset());
- assertEquals("text/html; charset=UTF-8", m.toString());
+ Assert.assertEquals("text/html; charset=UTF-8", m.toString());
}
@@ -249,15 +245,15 @@ public class TestMediaType {
MediaType m = MediaType.parseMediaType(sr);
// Check all expected parameters are present
- assertTrue(m.getParameterCount() == parameters.length);
+ Assert.assertTrue(m.getParameterCount() == parameters.length);
// Check the types
- assertEquals(TYPE.trim(), m.getType());
- assertEquals(SUBTYPE.trim(), m.getSubtype());
+ Assert.assertEquals(TYPE.trim(), m.getType());
+ Assert.assertEquals(SUBTYPE.trim(), m.getSubtype());
// Check the parameters
for (int i = 0; i < parameters.length; i++) {
- assertEquals(parameters[i].getValue().trim(),
+ Assert.assertEquals(parameters[i].getValue().trim(),
m.getParameterValue(parameters[i].getName().trim()));
}
}
Modified: tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TestSsl.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TestSsl.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TestSsl.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/TestSsl.java Mon Nov 13 11:25:51 2017
@@ -65,7 +65,7 @@ public class TestSsl extends TomcatBaseT
ByteChunk res = getUrl("https://localhost:" + getPort() +
"/examples/servlets/servlet/HelloWorldExample");
Assert.assertTrue(res.toString().indexOf("<a href=\"../helloworld.html\">") > 0);
- Assert. assertTrue("Checking no client issuer has been requested",
+ Assert.assertTrue("Checking no client issuer has been requested",
TesterSupport.getLastClientAuthRequestedIssuerCount() == 0);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org