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 [5/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/coyote/http11/TestHttp11Processor.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/TestHttp11Processor.java Mon Nov 13 11:25:51 2017
@@ -45,11 +45,6 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
import org.junit.Assert;
import org.junit.Assume;
import org.junit.Test;
@@ -99,7 +94,7 @@ public class TestHttp11Processor extends
// Expected response is a 200 response followed by an incomplete chunked
// body.
- assertTrue(client.isResponse200());
+ Assert.assertTrue(client.isResponse200());
// Should use chunked encoding
String transferEncoding = null;
for (String header : client.getResponseHeaders()) {
@@ -109,9 +104,9 @@ public class TestHttp11Processor extends
}
Assert.assertEquals("chunked", transferEncoding);
// There should not be an end chunk
- assertFalse(client.getResponseBody().endsWith("0"));
+ Assert.assertFalse(client.getResponseBody().endsWith("0"));
// The last portion of text should be there
- assertTrue(client.getResponseBody().endsWith("line03"));
+ Assert.assertTrue(client.getResponseBody().endsWith("line03"));
}
private static class ResponseWithErrorServlet extends HttpServlet {
@@ -165,7 +160,7 @@ public class TestHttp11Processor extends
client.connect();
client.processRequest();
- assertTrue(client.isResponse417());
+ Assert.assertTrue(client.isResponse417());
}
@@ -188,7 +183,7 @@ public class TestHttp11Processor extends
client.connect();
client.processRequest();
- assertTrue(client.isResponse501());
+ Assert.assertTrue(client.isResponse501());
}
@@ -211,7 +206,7 @@ public class TestHttp11Processor extends
client.connect();
client.processRequest();
- assertTrue(client.isResponse501());
+ Assert.assertTrue(client.isResponse501());
}
@@ -251,8 +246,8 @@ public class TestHttp11Processor extends
client.connect();
client.processRequest();
- assertTrue(client.isResponse200());
- assertTrue(client.getResponseBody().contains("test - data"));
+ Assert.assertTrue(client.isResponse200());
+ Assert.assertTrue(client.getResponseBody().contains("test - data"));
}
@@ -276,8 +271,8 @@ public class TestHttp11Processor extends
client.connect();
client.processRequest();
- assertTrue(client.isResponse200());
- assertTrue(client.getResponseBody().contains("test - data"));
+ Assert.assertTrue(client.isResponse200());
+ Assert.assertTrue(client.getResponseBody().contains("test - data"));
}
@@ -300,7 +295,7 @@ public class TestHttp11Processor extends
client.connect();
client.processRequest();
- assertTrue(client.isResponse501());
+ Assert.assertTrue(client.isResponse501());
}
@@ -323,7 +318,7 @@ public class TestHttp11Processor extends
client.connect();
client.processRequest();
- assertTrue(client.isResponse501());
+ Assert.assertTrue(client.isResponse501());
}
@@ -374,16 +369,16 @@ public class TestHttp11Processor extends
// Now read the first response
client.readResponse(true);
- assertFalse(client.isResponse50x());
- assertTrue(client.isResponse200());
- assertEquals("OK", client.getResponseBody());
+ Assert.assertFalse(client.isResponse50x());
+ Assert.assertTrue(client.isResponse200());
+ Assert.assertEquals("OK", client.getResponseBody());
// Read the second response. No need to sleep, read will block until
// there is data to process
client.readResponse(true);
- assertFalse(client.isResponse50x());
- assertTrue(client.isResponse200());
- assertEquals("OK", client.getResponseBody());
+ Assert.assertFalse(client.isResponse50x());
+ Assert.assertTrue(client.isResponse200());
+ Assert.assertEquals("OK", client.getResponseBody());
}
@@ -405,11 +400,11 @@ public class TestHttp11Processor extends
int rc = getUrl("http://localhost:" + getPort() + "/test", responseBody,
responseHeaders);
- assertEquals(HttpServletResponse.SC_OK, rc);
- assertTrue(responseHeaders.containsKey("Transfer-Encoding"));
+ Assert.assertEquals(HttpServletResponse.SC_OK, rc);
+ Assert.assertTrue(responseHeaders.containsKey("Transfer-Encoding"));
List<String> encodings = responseHeaders.get("Transfer-Encoding");
- assertEquals(1, encodings.size());
- assertEquals("chunked", encodings.get(0));
+ Assert.assertEquals(1, encodings.size());
+ Assert.assertEquals("chunked", encodings.get(0));
}
@Test
@@ -433,16 +428,16 @@ public class TestHttp11Processor extends
int rc = getUrl("http://localhost:" + getPort() + "/test", responseBody,
responseHeaders);
- assertEquals(HttpServletResponse.SC_OK, rc);
+ Assert.assertEquals(HttpServletResponse.SC_OK, rc);
- assertTrue(responseHeaders.containsKey("Connection"));
+ Assert.assertTrue(responseHeaders.containsKey("Connection"));
List<String> connections = responseHeaders.get("Connection");
- assertEquals(1, connections.size());
- assertEquals("close", connections.get(0));
+ Assert.assertEquals(1, connections.size());
+ Assert.assertEquals("close", connections.get(0));
- assertFalse(responseHeaders.containsKey("Transfer-Encoding"));
+ Assert.assertFalse(responseHeaders.containsKey("Transfer-Encoding"));
- assertEquals("OK", responseBody.toString());
+ Assert.assertEquals("OK", responseBody.toString());
}
@Test
@@ -472,11 +467,11 @@ public class TestHttp11Processor extends
int rc = getUrl("http://localhost:" + getPort() + "/test", responseBody,
responseHeaders);
- assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc);
+ Assert.assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc);
if (responseBody.getLength() > 0) {
// It will be >0 if the standard error page handling has been
// triggered
- assertFalse(responseBody.toString().contains("FAIL"));
+ Assert.assertFalse(responseBody.toString().contains("FAIL"));
}
}
@@ -750,14 +745,14 @@ public class TestHttp11Processor extends
client.connect();
client.doRequest();
- assertTrue(client.getResponseLine(), client.isResponse200());
- assertTrue(client.isResponseBodyOK());
+ Assert.assertTrue(client.getResponseLine(), client.isResponse200());
+ Assert.assertTrue(client.isResponseBodyOK());
// Do the request again to ensure that the remaining body was swallowed
client.resetResponse();
client.processRequest();
- assertTrue(client.isResponse200());
- assertTrue(client.isResponseBodyOK());
+ Assert.assertTrue(client.isResponse200());
+ Assert.assertTrue(client.isResponseBodyOK());
client.disconnect();
}
@@ -862,9 +857,9 @@ public class TestHttp11Processor extends
int rc = headUrl("http://localhost:" + getPort() + "/test", responseBody,
responseHeaders);
- assertEquals(HttpServletResponse.SC_OK, rc);
- assertEquals(0, responseBody.getLength());
- assertFalse(responseHeaders.containsKey("Content-Length"));
+ Assert.assertEquals(HttpServletResponse.SC_OK, rc);
+ Assert.assertEquals(0, responseBody.getLength());
+ Assert.assertFalse(responseHeaders.containsKey("Content-Length"));
}
@@ -996,10 +991,10 @@ public class TestHttp11Processor extends
Map<String,List<String>> responseHeaders = new HashMap<>();
int rc = getUrl("http://localhost:" + getPort() + "/test", responseBody, responseHeaders);
- assertEquals(HttpServletResponse.SC_RESET_CONTENT, rc);
- assertNotNull(responseHeaders.get("Content-Length"));
- assertTrue("0".equals(responseHeaders.get("Content-Length").get(0)));
- assertTrue(responseBody.getLength() == 0);
+ Assert.assertEquals(HttpServletResponse.SC_RESET_CONTENT, rc);
+ Assert.assertNotNull(responseHeaders.get("Content-Length"));
+ Assert.assertTrue("0".equals(responseHeaders.get("Content-Length").get(0)));
+ Assert.assertTrue(responseBody.getLength() == 0);
}
private static final class Bug61086Servlet extends HttpServlet {
@@ -1046,7 +1041,7 @@ public class TestHttp11Processor extends
client.processRequest();
// Expected response is a 400 response.
- assertTrue(client.isResponse400());
+ Assert.assertTrue(client.isResponse400());
}
/*
@@ -1082,7 +1077,7 @@ public class TestHttp11Processor extends
client.processRequest();
// Expected response is a 400 response.
- assertTrue(client.isResponse400());
+ Assert.assertTrue(client.isResponse400());
}
@Test
@@ -1113,7 +1108,7 @@ public class TestHttp11Processor extends
client.processRequest();
// Expected response is a 400 response.
- assertTrue(client.isResponse400());
+ Assert.assertTrue(client.isResponse400());
}
@Test
@@ -1147,7 +1142,7 @@ public class TestHttp11Processor extends
client.processRequest();
// Expected response is a 400 response.
- assertTrue(client.isResponse400());
+ Assert.assertTrue(client.isResponse400());
}
@Test
@@ -1181,7 +1176,7 @@ public class TestHttp11Processor extends
client.processRequest();
// Expected response is a 400 response.
- assertTrue(client.isResponse400());
+ Assert.assertTrue(client.isResponse400());
}
@Test
@@ -1215,7 +1210,7 @@ public class TestHttp11Processor extends
client.processRequest();
// Expected response is a 400 response.
- assertTrue(client.isResponse400());
+ Assert.assertTrue(client.isResponse400());
}
/*
@@ -1250,7 +1245,7 @@ public class TestHttp11Processor extends
client.processRequest();
// Expected response is a 200 response.
- assertTrue(client.isResponse200());
+ Assert.assertTrue(client.isResponse200());
}
/*
@@ -1285,7 +1280,7 @@ public class TestHttp11Processor extends
client.processRequest();
// Expected response is a 200 response.
- assertTrue(client.isResponse200());
+ Assert.assertTrue(client.isResponse200());
}
/*
@@ -1321,6 +1316,6 @@ public class TestHttp11Processor extends
client.processRequest();
// Expected response is a 200 response.
- assertTrue(client.isResponse200());
+ Assert.assertTrue(client.isResponse200());
}
}
Modified: tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java Mon Nov 13 11:25:51 2017
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.coyote.http11.filters;
import java.io.IOException;
@@ -26,11 +25,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.assertNull;
-import static org.junit.Assert.assertTrue;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.Context;
@@ -147,17 +142,17 @@ public class TestChunkedInputFilter exte
}
if (expectPass) {
- assertTrue(client.isResponse200());
- assertEquals("nullnull7TestValue1TestValue2",
+ Assert.assertTrue(client.isResponse200());
+ Assert.assertEquals("nullnull7TestValue1TestValue2",
client.getResponseBody());
- assertNull(processException);
- assertFalse(servlet.getExceptionDuringRead());
+ Assert.assertNull(processException);
+ Assert.assertFalse(servlet.getExceptionDuringRead());
} else {
if (processException == null) {
- assertTrue(client.getResponseLine(), client.isResponse500());
+ Assert.assertTrue(client.getResponseLine(), client.isResponse500());
} else {
// Use fall-back for checking the error occurred
- assertTrue(servlet.getExceptionDuringRead());
+ Assert.assertTrue(servlet.getExceptionDuringRead());
}
}
}
@@ -201,7 +196,7 @@ public class TestChunkedInputFilter exte
client.processRequest();
// Expected to fail because the trailers are longer
// than the set limit of 10 bytes
- assertTrue(client.isResponse500());
+ Assert.assertTrue(client.isResponse500());
}
@@ -267,9 +262,9 @@ public class TestChunkedInputFilter exte
client.processRequest();
if (ok) {
- assertTrue(client.isResponse200());
+ Assert.assertTrue(client.isResponse200());
} else {
- assertTrue(client.isResponse500());
+ Assert.assertTrue(client.isResponse500());
}
}
@@ -307,7 +302,7 @@ public class TestChunkedInputFilter exte
client.connect();
client.processRequest();
- assertEquals("nullnull7nullnull", client.getResponseBody());
+ Assert.assertEquals("nullnull7nullnull", client.getResponseBody());
}
@Test
@@ -411,20 +406,20 @@ public class TestChunkedInputFilter exte
}
if (expectPass) {
if (expectReadWholeBody) {
- assertNull(processException);
+ Assert.assertNull(processException);
}
if (processException == null) {
- assertTrue(client.getResponseLine(), client.isResponse200());
- assertEquals(String.valueOf(expectReadCount),
+ Assert.assertTrue(client.getResponseLine(), client.isResponse200());
+ Assert.assertEquals(String.valueOf(expectReadCount),
client.getResponseBody());
}
- assertEquals(expectReadCount, servlet.getCountRead());
+ Assert.assertEquals(expectReadCount, servlet.getCountRead());
} else {
if (processException == null) {
- assertTrue(client.getResponseLine(), client.isResponse500());
+ Assert.assertTrue(client.getResponseLine(), client.isResponse500());
}
- assertEquals(0, servlet.getCountRead());
- assertTrue(servlet.getExceptionDuringRead());
+ Assert.assertEquals(0, servlet.getCountRead());
+ Assert.assertTrue(servlet.getExceptionDuringRead());
}
}
Modified: tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/filters/TestGzipOutputFilter.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/filters/TestGzipOutputFilter.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/filters/TestGzipOutputFilter.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/filters/TestGzipOutputFilter.java Mon Nov 13 11:25:51 2017
@@ -21,8 +21,7 @@ import java.io.ByteArrayOutputStream;
import java.nio.ByteBuffer;
import java.util.zip.GZIPOutputStream;
-import static org.junit.Assert.assertTrue;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.coyote.Response;
@@ -82,6 +81,6 @@ public class TestGzipOutputFilter {
byte[] dataExpected = gbos.toByteArray();
// most of the data should have been flushed out
- assertTrue(dataFound.length >= (dataExpected.length - 20));
+ Assert.assertTrue(dataFound.length >= (dataExpected.length - 20));
}
}
Modified: tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java Mon Nov 13 11:25:51 2017
@@ -43,7 +43,6 @@ import org.junit.Assert;
import org.junit.Test;
import static org.apache.catalina.startup.SimpleHttpClient.CRLF;
-
import org.apache.catalina.Context;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
Modified: tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java Mon Nov 13 11:25:51 2017
@@ -42,7 +42,6 @@ import org.junit.Assume;
import org.junit.Test;
import static org.apache.catalina.startup.SimpleHttpClient.CRLF;
-
import org.apache.catalina.Context;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
Modified: tomcat/tc8.5.x/trunk/test/org/apache/el/TestELEvaluation.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/el/TestELEvaluation.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/el/TestELEvaluation.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/el/TestELEvaluation.java Mon Nov 13 11:25:51 2017
@@ -23,11 +23,6 @@ import java.util.Date;
import javax.el.ELException;
import javax.el.ValueExpression;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
import org.junit.Assert;
import org.junit.Test;
@@ -47,22 +42,22 @@ public class TestELEvaluation {
*/
@Test
public void testBug42565() {
- assertEquals("false", evaluateExpression("${false?true:false}"));
- assertEquals("false", evaluateExpression("${false?true: false}"));
- assertEquals("false", evaluateExpression("${false?true :false}"));
- assertEquals("false", evaluateExpression("${false?true : false}"));
- assertEquals("false", evaluateExpression("${false? true:false}"));
- assertEquals("false", evaluateExpression("${false? true: false}"));
- assertEquals("false", evaluateExpression("${false? true :false}"));
- assertEquals("false", evaluateExpression("${false? true : false}"));
- assertEquals("false", evaluateExpression("${false ?true:false}"));
- assertEquals("false", evaluateExpression("${false ?true: false}"));
- assertEquals("false", evaluateExpression("${false ?true :false}"));
- assertEquals("false", evaluateExpression("${false ?true : false}"));
- assertEquals("false", evaluateExpression("${false ? true:false}"));
- assertEquals("false", evaluateExpression("${false ? true: false}"));
- assertEquals("false", evaluateExpression("${false ? true :false}"));
- assertEquals("false", evaluateExpression("${false ? true : false}"));
+ Assert.assertEquals("false", evaluateExpression("${false?true:false}"));
+ Assert.assertEquals("false", evaluateExpression("${false?true: false}"));
+ Assert.assertEquals("false", evaluateExpression("${false?true :false}"));
+ Assert.assertEquals("false", evaluateExpression("${false?true : false}"));
+ Assert.assertEquals("false", evaluateExpression("${false? true:false}"));
+ Assert.assertEquals("false", evaluateExpression("${false? true: false}"));
+ Assert.assertEquals("false", evaluateExpression("${false? true :false}"));
+ Assert.assertEquals("false", evaluateExpression("${false? true : false}"));
+ Assert.assertEquals("false", evaluateExpression("${false ?true:false}"));
+ Assert.assertEquals("false", evaluateExpression("${false ?true: false}"));
+ Assert.assertEquals("false", evaluateExpression("${false ?true :false}"));
+ Assert.assertEquals("false", evaluateExpression("${false ?true : false}"));
+ Assert.assertEquals("false", evaluateExpression("${false ? true:false}"));
+ Assert.assertEquals("false", evaluateExpression("${false ? true: false}"));
+ Assert.assertEquals("false", evaluateExpression("${false ? true :false}"));
+ Assert.assertEquals("false", evaluateExpression("${false ? true : false}"));
}
@@ -71,27 +66,27 @@ public class TestELEvaluation {
*/
@Test
public void testBug44994() {
- assertEquals("none", evaluateExpression(
+ Assert.assertEquals("none", evaluateExpression(
"${0 lt 0 ? 1 lt 0 ? 'many': 'one': 'none'}"));
- assertEquals("one", evaluateExpression(
+ Assert.assertEquals("one", evaluateExpression(
"${0 lt 1 ? 1 lt 1 ? 'many': 'one': 'none'}"));
- assertEquals("many", evaluateExpression(
+ Assert.assertEquals("many", evaluateExpression(
"${0 lt 2 ? 1 lt 2 ? 'many': 'one': 'none'}"));
}
@Test
public void testParserBug45511() {
// Test cases provided by OP
- assertEquals("true", evaluateExpression("${empty ('')}"));
- assertEquals("true", evaluateExpression("${empty('')}"));
- assertEquals("false", evaluateExpression("${(true) and (false)}"));
- assertEquals("false", evaluateExpression("${(true)and(false)}"));
+ Assert.assertEquals("true", evaluateExpression("${empty ('')}"));
+ Assert.assertEquals("true", evaluateExpression("${empty('')}"));
+ Assert.assertEquals("false", evaluateExpression("${(true) and (false)}"));
+ Assert.assertEquals("false", evaluateExpression("${(true)and(false)}"));
}
@Test
public void testBug48112() {
// bug 48112
- assertEquals("{world}", evaluateExpression("${fn:trim('{world}')}"));
+ Assert.assertEquals("{world}", evaluateExpression("${fn:trim('{world}')}"));
}
@Test
@@ -100,30 +95,30 @@ public class TestELEvaluation {
// list and looking at the spec to find some edge cases
// '\' is only an escape character inside a StringLiteral
- assertEquals("\\\\", evaluateExpression("\\\\"));
+ Assert.assertEquals("\\\\", evaluateExpression("\\\\"));
/*
* LiteralExpressions can only contain ${ or #{ if escaped with \
* \ is not an escape character in any other circumstances including \\
*/
- assertEquals("\\", evaluateExpression("\\"));
- assertEquals("$", evaluateExpression("$"));
- assertEquals("#", evaluateExpression("#"));
- assertEquals("\\$", evaluateExpression("\\$"));
- assertEquals("\\#", evaluateExpression("\\#"));
- assertEquals("\\\\$", evaluateExpression("\\\\$"));
- assertEquals("\\\\#", evaluateExpression("\\\\#"));
- assertEquals("${", evaluateExpression("\\${"));
- assertEquals("#{", evaluateExpression("\\#{"));
- assertEquals("\\${", evaluateExpression("\\\\${"));
- assertEquals("\\#{", evaluateExpression("\\\\#{"));
+ Assert.assertEquals("\\", evaluateExpression("\\"));
+ Assert.assertEquals("$", evaluateExpression("$"));
+ Assert.assertEquals("#", evaluateExpression("#"));
+ Assert.assertEquals("\\$", evaluateExpression("\\$"));
+ Assert.assertEquals("\\#", evaluateExpression("\\#"));
+ Assert.assertEquals("\\\\$", evaluateExpression("\\\\$"));
+ Assert.assertEquals("\\\\#", evaluateExpression("\\\\#"));
+ Assert.assertEquals("${", evaluateExpression("\\${"));
+ Assert.assertEquals("#{", evaluateExpression("\\#{"));
+ Assert.assertEquals("\\${", evaluateExpression("\\\\${"));
+ Assert.assertEquals("\\#{", evaluateExpression("\\\\#{"));
// '\' is only an escape for '${' and '#{'.
- assertEquals("\\$", evaluateExpression("\\$"));
- assertEquals("${", evaluateExpression("\\${"));
- assertEquals("\\$a", evaluateExpression("\\$a"));
- assertEquals("\\a", evaluateExpression("\\a"));
- assertEquals("\\\\", evaluateExpression("\\\\"));
+ Assert.assertEquals("\\$", evaluateExpression("\\$"));
+ Assert.assertEquals("${", evaluateExpression("\\${"));
+ Assert.assertEquals("\\$a", evaluateExpression("\\$a"));
+ Assert.assertEquals("\\a", evaluateExpression("\\a"));
+ Assert.assertEquals("\\\\", evaluateExpression("\\\\"));
}
@Test
@@ -133,10 +128,10 @@ public class TestELEvaluation {
// The only characters that can be escaped inside a String literal
// are \ " and '. # and $ are not escaped inside a String literal.
- assertEquals("\\", evaluateExpression("${'\\\\'}"));
- assertEquals("\\", evaluateExpression("${\"\\\\\"}"));
- assertEquals("\\\"'$#", evaluateExpression("${'\\\\\\\"\\'$#'}"));
- assertEquals("\\\"'$#", evaluateExpression("${\"\\\\\\\"\\'$#\"}"));
+ Assert.assertEquals("\\", evaluateExpression("${'\\\\'}"));
+ Assert.assertEquals("\\", evaluateExpression("${\"\\\\\"}"));
+ Assert.assertEquals("\\\"'$#", evaluateExpression("${'\\\\\\\"\\'$#'}"));
+ Assert.assertEquals("\\\"'$#", evaluateExpression("${\"\\\\\\\"\\'$#\"}"));
// Trying to quote # or $ should throw an error
Exception e = null;
@@ -145,34 +140,34 @@ public class TestELEvaluation {
} catch (ELException el) {
e = el;
}
- assertNotNull(e);
+ Assert.assertNotNull(e);
- assertEquals("\\$", evaluateExpression("${'\\\\$'}"));
- assertEquals("\\\\$", evaluateExpression("${'\\\\\\\\$'}"));
+ Assert.assertEquals("\\$", evaluateExpression("${'\\\\$'}"));
+ Assert.assertEquals("\\\\$", evaluateExpression("${'\\\\\\\\$'}"));
// Can use ''' inside '"' when quoting with '"' and vice versa without
// escaping
- assertEquals("\\\"", evaluateExpression("${'\\\\\"'}"));
- assertEquals("\"\\", evaluateExpression("${'\"\\\\'}"));
- assertEquals("\\'", evaluateExpression("${'\\\\\\''}"));
- assertEquals("'\\", evaluateExpression("${'\\'\\\\'}"));
- assertEquals("\\'", evaluateExpression("${\"\\\\'\"}"));
- assertEquals("'\\", evaluateExpression("${\"'\\\\\"}"));
- assertEquals("\\\"", evaluateExpression("${\"\\\\\\\"\"}"));
- assertEquals("\"\\", evaluateExpression("${\"\\\"\\\\\"}"));
+ Assert.assertEquals("\\\"", evaluateExpression("${'\\\\\"'}"));
+ Assert.assertEquals("\"\\", evaluateExpression("${'\"\\\\'}"));
+ Assert.assertEquals("\\'", evaluateExpression("${'\\\\\\''}"));
+ Assert.assertEquals("'\\", evaluateExpression("${'\\'\\\\'}"));
+ Assert.assertEquals("\\'", evaluateExpression("${\"\\\\'\"}"));
+ Assert.assertEquals("'\\", evaluateExpression("${\"'\\\\\"}"));
+ Assert.assertEquals("\\\"", evaluateExpression("${\"\\\\\\\"\"}"));
+ Assert.assertEquals("\"\\", evaluateExpression("${\"\\\"\\\\\"}"));
}
@Test
public void testMultipleEscaping() throws Exception {
- assertEquals("''", evaluateExpression("${\"\'\'\"}"));
+ Assert.assertEquals("''", evaluateExpression("${\"\'\'\"}"));
}
private void compareBoth(String msg, int expected, Object o1, Object o2){
int i1 = ELSupport.compare(null, o1, o2);
int i2 = ELSupport.compare(null, o2, o1);
- assertEquals(msg,expected, i1);
- assertEquals(msg,expected, -i2);
+ Assert.assertEquals(msg,expected, i1);
+ Assert.assertEquals(msg,expected, -i2);
}
@Test
@@ -184,11 +179,11 @@ public class TestELEvaluation {
compareBoth("Date(0) should be less than Date(1)",-1, new Date(0), new Date(1));
try {
compareBoth("Should not compare",0, new Date(), new File(""));
- fail("Expecting ClassCastException");
+ Assert.fail("Expecting ClassCastException");
} catch (ClassCastException expected) {
// Expected
}
- assertTrue(null == null);
+ Assert.assertTrue(null == null);
}
/**
@@ -203,7 +198,7 @@ public class TestELEvaluation {
} catch (ELException el) {
e = el;
}
- assertNotNull(e);
+ Assert.assertNotNull(e);
}
@Test
Modified: tomcat/tc8.5.x/trunk/test/org/apache/el/TestMethodExpressionImpl.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/el/TestMethodExpressionImpl.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/el/TestMethodExpressionImpl.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/el/TestMethodExpressionImpl.java Mon Nov 13 11:25:51 2017
@@ -22,11 +22,7 @@ import javax.el.ExpressionFactory;
import javax.el.MethodExpression;
import javax.el.ValueExpression;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -92,8 +88,8 @@ public class TestMethodExpressionImpl {
context, "${beanB.sayHello('JUnit')}", String.class,
new Class<?>[] { String.class });
- assertFalse(me1.isParametersProvided());
- assertTrue(me2.isParametersProvided());
+ Assert.assertFalse(me1.isParametersProvided());
+ Assert.assertTrue(me2.isParametersProvided());
}
@Test
@@ -107,15 +103,15 @@ public class TestMethodExpressionImpl {
context, "${beanB.sayHello}", String.class,
new Class<?>[] { String.class });
- assertEquals("B", me1.invoke(context, null));
- assertEquals("Hello JUnit from B", me2.invoke(context, null));
- assertEquals("Hello JUnit from B",
+ Assert.assertEquals("B", me1.invoke(context, null));
+ Assert.assertEquals("Hello JUnit from B", me2.invoke(context, null));
+ Assert.assertEquals("Hello JUnit from B",
me2.invoke(context, new Object[] { "JUnit2" }));
- assertEquals("Hello JUnit2 from B",
+ Assert.assertEquals("Hello JUnit2 from B",
me3.invoke(context, new Object[] { "JUnit2" }));
- assertEquals("Hello JUnit from B",
+ Assert.assertEquals("Hello JUnit from B",
me2.invoke(context, new Object[] { null }));
- assertEquals("Hello from B",
+ Assert.assertEquals("Hello from B",
me3.invoke(context, new Object[] { null }));
}
@@ -128,7 +124,7 @@ public class TestMethodExpressionImpl {
ValueExpression ve = factory.createValueExpression(context,
"${beanA.bean.name}", String.class);
Object r = ve.getValue(context);
- assertEquals("BB", r);
+ Assert.assertEquals("BB", r);
}
@Test
@@ -136,7 +132,7 @@ public class TestMethodExpressionImpl {
MethodExpression me2 = factory.createMethodExpression(context,
"${beanC.sayHello(beanA,beanB)}", null , null);
Object r2 = me2.invoke(context, null);
- assertEquals("AB: Hello A from B", r2.toString());
+ Assert.assertEquals("AB: Hello A from B", r2.toString());
}
@Test
@@ -144,7 +140,7 @@ public class TestMethodExpressionImpl {
MethodExpression me3 = factory.createMethodExpression(context,
"${beanC.sayHello(beanA,beanB)}", String.class , null);
Object r3 = me3.invoke(context, null);
- assertEquals("AB: Hello A from B", r3.toString());
+ Assert.assertEquals("AB: Hello A from B", r3.toString());
}
@Test
@@ -153,7 +149,7 @@ public class TestMethodExpressionImpl {
"${beanC.sayHello(beanA,beanB)}", null ,
new Class<?>[] {TesterBeanA.class, TesterBeanB.class});
Object r4 = me4.invoke(context, null);
- assertEquals("AB: Hello A from B", r4.toString());
+ Assert.assertEquals("AB: Hello A from B", r4.toString());
}
@Test
@@ -162,7 +158,7 @@ public class TestMethodExpressionImpl {
"${beanC.sayHello(beanA,beanB)}", String.class ,
new Class<?>[] {TesterBeanA.class, TesterBeanB.class});
Object r5 = me5.invoke(context, null);
- assertEquals("AB: Hello A from B", r5.toString());
+ Assert.assertEquals("AB: Hello A from B", r5.toString());
}
@Test
@@ -170,7 +166,7 @@ public class TestMethodExpressionImpl {
MethodExpression me6 = factory.createMethodExpression(context,
"${beanC.sayHello(beanA,beanBB)}", null , null);
Object r6 = me6.invoke(context, null);
- assertEquals("ABB: Hello A from BB", r6.toString());
+ Assert.assertEquals("ABB: Hello A from BB", r6.toString());
}
@Test
@@ -178,7 +174,7 @@ public class TestMethodExpressionImpl {
MethodExpression me7 = factory.createMethodExpression(context,
"${beanC.sayHello(beanA,beanBBB)}", null , null);
Object r7 = me7.invoke(context, null);
- assertEquals("ABB: Hello A from BBB", r7.toString());
+ Assert.assertEquals("ABB: Hello A from BBB", r7.toString());
}
@Test
@@ -186,7 +182,7 @@ public class TestMethodExpressionImpl {
MethodExpression me8 = factory.createMethodExpression(context,
"${beanC.sayHello(beanAA,beanB)}", null , null);
Object r8 = me8.invoke(context, null);
- assertEquals("AAB: Hello AA from B", r8.toString());
+ Assert.assertEquals("AAB: Hello AA from B", r8.toString());
}
@Test
@@ -200,7 +196,7 @@ public class TestMethodExpressionImpl {
e = e1;
}
// Expected to fail
- assertNotNull(e);
+ Assert.assertNotNull(e);
}
@Test
@@ -211,7 +207,7 @@ public class TestMethodExpressionImpl {
MethodExpression me10 = factory.createMethodExpression(context,
"${beanC.sayHello(beanAA,beanBBB)}", null , null);
Object r10 = me10.invoke(context, null);
- assertEquals("AAB: Hello AA from BBB", r10.toString());
+ Assert.assertEquals("AAB: Hello AA from BBB", r10.toString());
}
@Test
@@ -219,7 +215,7 @@ public class TestMethodExpressionImpl {
MethodExpression me11 = factory.createMethodExpression(context,
"${beanC.sayHello(beanAAA,beanB)}", null , null);
Object r11 = me11.invoke(context, null);
- assertEquals("AAB: Hello AAA from B", r11.toString());
+ Assert.assertEquals("AAB: Hello AAA from B", r11.toString());
}
@Test
@@ -230,7 +226,7 @@ public class TestMethodExpressionImpl {
MethodExpression me12 = factory.createMethodExpression(context,
"${beanC.sayHello(beanAAA,beanBB)}", null , null);
Object r12 = me12.invoke(context, null);
- assertEquals("ABB: Hello AAA from BB", r12.toString());
+ Assert.assertEquals("ABB: Hello AAA from BB", r12.toString());
}
@Test
@@ -244,7 +240,7 @@ public class TestMethodExpressionImpl {
e = e1;
}
// Expected to fail
- assertNotNull(e);
+ Assert.assertNotNull(e);
}
@Test
@@ -258,7 +254,7 @@ public class TestMethodExpressionImpl {
e = e1;
}
// Expected to fail
- assertNotNull(e);
+ Assert.assertNotNull(e);
}
@Test
@@ -266,7 +262,7 @@ public class TestMethodExpressionImpl {
MethodExpression me2 = factory.createMethodExpression(context,
"${beanC.sayHello(beanA,beanBB,beanBB)}", null , null);
Object r2 = me2.invoke(context, null);
- assertEquals("ABB[]: Hello A from BB, BB", r2.toString());
+ Assert.assertEquals("ABB[]: Hello A from BB, BB", r2.toString());
}
@Test
@@ -274,7 +270,7 @@ public class TestMethodExpressionImpl {
MethodExpression me3 = factory.createMethodExpression(context,
"${beanC.sayHello(beanA,beanBBB,beanBBB)}", null , null);
Object r3 = me3.invoke(context, null);
- assertEquals("ABB[]: Hello A from BBB, BBB", r3.toString());
+ Assert.assertEquals("ABB[]: Hello A from BBB, BBB", r3.toString());
}
@Test
@@ -288,7 +284,7 @@ public class TestMethodExpressionImpl {
e = e1;
}
// Expected to fail
- assertNotNull(e);
+ Assert.assertNotNull(e);
}
@Test
@@ -296,7 +292,7 @@ public class TestMethodExpressionImpl {
MethodExpression me5 = factory.createMethodExpression(context,
"${beanC.sayHello(beanAA,beanBB,beanBB)}", null , null);
Object r5 = me5.invoke(context, null);
- assertEquals("ABB[]: Hello AA from BB, BB", r5.toString());
+ Assert.assertEquals("ABB[]: Hello AA from BB, BB", r5.toString());
}
@Test
@@ -304,7 +300,7 @@ public class TestMethodExpressionImpl {
MethodExpression me6 = factory.createMethodExpression(context,
"${beanC.sayHello(beanAA,beanBBB,beanBBB)}", null , null);
Object r6 = me6.invoke(context, null);
- assertEquals("ABB[]: Hello AA from BBB, BBB", r6.toString());
+ Assert.assertEquals("ABB[]: Hello AA from BBB, BBB", r6.toString());
}
@Test
@@ -318,7 +314,7 @@ public class TestMethodExpressionImpl {
e = e1;
}
// Expected to fail
- assertNotNull(e);
+ Assert.assertNotNull(e);
}
@Test
@@ -326,7 +322,7 @@ public class TestMethodExpressionImpl {
MethodExpression me8 = factory.createMethodExpression(context,
"${beanC.sayHello(beanAAA,beanBB,beanBB)}", null , null);
Object r8 = me8.invoke(context, null);
- assertEquals("ABB[]: Hello AAA from BB, BB", r8.toString());
+ Assert.assertEquals("ABB[]: Hello AAA from BB, BB", r8.toString());
}
@Test
@@ -334,7 +330,7 @@ public class TestMethodExpressionImpl {
MethodExpression me9 = factory.createMethodExpression(context,
"${beanC.sayHello(beanAAA,beanBBB,beanBBB)}", null , null);
Object r9 = me9.invoke(context, null);
- assertEquals("ABB[]: Hello AAA from BBB, BBB", r9.toString());
+ Assert.assertEquals("ABB[]: Hello AAA from BBB, BBB", r9.toString());
}
/*
@@ -350,7 +346,7 @@ public class TestMethodExpressionImpl {
me.invoke(context, null);
ValueExpression ve = factory.createValueExpression(context,
"#{beanA.name}", java.lang.String.class);
- assertEquals("New value", ve.getValue(context));
+ Assert.assertEquals("New value", ve.getValue(context));
}
@Test
@@ -360,7 +356,7 @@ public class TestMethodExpressionImpl {
me.invoke(context, null);
ValueExpression ve = factory.createValueExpression(context,
"#{beanA.valLong}", java.lang.String.class);
- assertEquals("5", ve.getValue(context));
+ Assert.assertEquals("5", ve.getValue(context));
}
@Test
@@ -368,7 +364,7 @@ public class TestMethodExpressionImpl {
MethodExpression me1 = factory.createMethodExpression(context,
"${beanB.sayHello()}", null, null);
String actual = (String) me1.invoke(context, null);
- assertEquals("Hello from B", actual);
+ Assert.assertEquals("Hello from B", actual);
}
@Test
@@ -376,7 +372,7 @@ public class TestMethodExpressionImpl {
MethodExpression me1 = factory.createMethodExpression(context,
"${beanB.sayHello('Tomcat')}", null, null);
String actual = (String) me1.invoke(context, null);
- assertEquals("Hello Tomcat from B", actual);
+ Assert.assertEquals("Hello Tomcat from B", actual);
}
@Test
@@ -384,7 +380,7 @@ public class TestMethodExpressionImpl {
ValueExpression ve = factory.createValueExpression(context,
"#{beanAA.name.contains(beanA.name)}", java.lang.Boolean.class);
Boolean actual = (Boolean) ve.getValue(context);
- assertEquals(Boolean.TRUE, actual);
+ Assert.assertEquals(Boolean.TRUE, actual);
}
@Test
@@ -392,7 +388,7 @@ public class TestMethodExpressionImpl {
ValueExpression ve = factory.createValueExpression(context,
"#{beanA.name.contains(beanAA.name)}", java.lang.Boolean.class);
Boolean actual = (Boolean) ve.getValue(context);
- assertEquals(Boolean.FALSE, actual);
+ Assert.assertEquals(Boolean.FALSE, actual);
}
@Test
@@ -405,7 +401,7 @@ public class TestMethodExpressionImpl {
MethodExpression me1 = factory.createMethodExpression(context,
"${beanA.bean.sayHello()}", null, null);
String actual = (String) me1.invoke(context, null);
- assertEquals("Hello from BB", actual);
+ Assert.assertEquals("Hello from BB", actual);
}
@Test
@@ -418,7 +414,7 @@ public class TestMethodExpressionImpl {
ValueExpression ve = factory.createValueExpression(context,
"#{beanEnum.lastSubmitted}", TesterEnum.class);
TesterEnum actual = (TesterEnum) ve.getValue(context);
- assertEquals(TesterEnum.APPLE, actual);
+ Assert.assertEquals(TesterEnum.APPLE, actual);
}
@@ -436,7 +432,7 @@ public class TestMethodExpressionImpl {
ValueExpression ve = factory.createValueExpression(context,
"#{beanA.getBean().name}", java.lang.String.class);
String actual = (String) ve.getValue(context);
- assertEquals(BUG53792, actual);
+ Assert.assertEquals(BUG53792, actual);
}
@Test
@@ -453,7 +449,7 @@ public class TestMethodExpressionImpl {
ValueExpression ve = factory.createValueExpression(context,
"#{beanA.getBean().name.length()}", java.lang.Integer.class);
Integer actual = (Integer) ve.getValue(context);
- assertEquals(Integer.valueOf(BUG53792.length()), actual);
+ Assert.assertEquals(Integer.valueOf(BUG53792.length()), actual);
}
@@ -462,7 +458,7 @@ public class TestMethodExpressionImpl {
MethodExpression me = factory.createMethodExpression(context,
"#{beanB.sayHello().length()}", null, new Class<?>[] {});
Integer result = (Integer) me.invoke(context, null);
- assertEquals(beanB.sayHello().length(), result.intValue());
+ Assert.assertEquals(beanB.sayHello().length(), result.intValue());
}
@@ -471,7 +467,7 @@ public class TestMethodExpressionImpl {
MethodExpression me = factory.createMethodExpression(context,
"#{beanB.sayHello().length()}", null, new Class<?>[] {});
Integer result = (Integer) me.invoke(context, new Object[] { "foo" });
- assertEquals(beanB.sayHello().length(), result.intValue());
+ Assert.assertEquals(beanB.sayHello().length(), result.intValue());
}
@@ -480,7 +476,7 @@ public class TestMethodExpressionImpl {
MethodExpression me = factory.createMethodExpression(context,
"${beanAA.echo1('Hello World!')}", null , null);
Object r = me.invoke(context, null);
- assertEquals("AA1Hello World!", r.toString());
+ Assert.assertEquals("AA1Hello World!", r.toString());
}
@@ -489,7 +485,7 @@ public class TestMethodExpressionImpl {
MethodExpression me = factory.createMethodExpression(context,
"${beanAA.echo2('Hello World!')}", null , null);
Object r = me.invoke(context, null);
- assertEquals("AA2Hello World!", r.toString());
+ Assert.assertEquals("AA2Hello World!", r.toString());
}
@@ -521,14 +517,14 @@ public class TestMethodExpressionImpl {
MethodExpression me = factory.createMethodExpression(context,
"${beanB.echo}", null , new Class[]{String.class});
Object r = me.invoke(context, new String[] { "aaa" });
- assertEquals("aaa", r.toString());
+ Assert.assertEquals("aaa", r.toString());
}
@Test
public void testBug57855e() {
MethodExpression me = factory.createMethodExpression(context,
"${beanB.echo}", null , new Class[]{String.class});
Object r = me.invoke(context, new String[] { "aaa", "bbb" });
- assertEquals("aaa, bbb", r.toString());
+ Assert.assertEquals("aaa, bbb", r.toString());
}
Modified: tomcat/tc8.5.x/trunk/test/org/apache/el/TestValueExpressionImpl.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/el/TestValueExpressionImpl.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/el/TestValueExpressionImpl.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/el/TestValueExpressionImpl.java Mon Nov 13 11:25:51 2017
@@ -28,9 +28,7 @@ import javax.el.ExpressionFactory;
import javax.el.ValueExpression;
import javax.el.ValueReference;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.jasper.el.ELContextImpl;
@@ -53,14 +51,14 @@ public class TestValueExpressionImpl {
// First check the basics work
String result = (String) ve.getValue(context);
- assertEquals("Tomcat", result);
+ Assert.assertEquals("Tomcat", result);
// Now check the value reference
ValueReference vr = ve.getValueReference(context);
- assertNotNull(vr);
+ Assert.assertNotNull(vr);
- assertEquals(beanB, vr.getBase());
- assertEquals("name", vr.getProperty());
+ Assert.assertEquals(beanB, vr.getBase());
+ Assert.assertEquals("name", vr.getProperty());
}
@Test
@@ -85,10 +83,10 @@ public class TestValueExpressionImpl {
// Now check the value reference
ValueReference vr = ve.getValueReference(context);
- assertNotNull(vr);
+ Assert.assertNotNull(vr);
- assertEquals(beanB, vr.getBase());
- assertEquals("name", vr.getProperty());
+ Assert.assertEquals(beanB, vr.getBase());
+ Assert.assertEquals("name", vr.getProperty());
}
@Test
@@ -110,14 +108,14 @@ public class TestValueExpressionImpl {
// First check the basics work
String result = (String) ve.getValue(context);
- assertEquals("Tomcat", result);
+ Assert.assertEquals("Tomcat", result);
// Now check the value reference
ValueReference vr = ve.getValueReference(context);
- assertNotNull(vr);
+ Assert.assertNotNull(vr);
- assertEquals(beanB, vr.getBase());
- assertEquals("name", vr.getProperty());
+ Assert.assertEquals(beanB, vr.getBase());
+ Assert.assertEquals("name", vr.getProperty());
}
@Test
@@ -135,12 +133,12 @@ public class TestValueExpressionImpl {
ValueExpression ve1 = factory.createValueExpression(
context, "${testEnum}", String.class);
String result1 = (String) ve1.getValue(context);
- assertEquals("APPLE", result1);
+ Assert.assertEquals("APPLE", result1);
ValueExpression ve2 = factory.createValueExpression(
context, "foo${testEnum}bar", String.class);
String result2 = (String) ve2.getValue(context);
- assertEquals("fooAPPLEbar", result2);
+ Assert.assertEquals("fooAPPLEbar", result2);
}
@Test
@@ -162,12 +160,12 @@ public class TestValueExpressionImpl {
ValueExpression ve1 = factory.createValueExpression(
context, "${map.key1}", Object.class);
ve1.setValue(context, o2);
- assertEquals(o2, ve1.getValue(context));
+ Assert.assertEquals(o2, ve1.getValue(context));
ValueExpression ve2 = factory.createValueExpression(
context, "${map.key2}", Object.class);
ve2.setValue(context, o1);
- assertEquals(o1, ve2.getValue(context));
+ Assert.assertEquals(o1, ve2.getValue(context));
}
@Test
@@ -189,12 +187,12 @@ public class TestValueExpressionImpl {
ValueExpression ve1 = factory.createValueExpression(
context, "${list[0]}", Object.class);
ve1.setValue(context, o2);
- assertEquals(o2, ve1.getValue(context));
+ Assert.assertEquals(o2, ve1.getValue(context));
ValueExpression ve2 = factory.createValueExpression(
context, "${list[1]}", Object.class);
ve2.setValue(context, o1);
- assertEquals(o1, ve2.getValue(context));
+ Assert.assertEquals(o1, ve2.getValue(context));
}
@@ -217,7 +215,7 @@ public class TestValueExpressionImpl {
context, "${beanA.valList.size()}", Integer.class);
Integer result = (Integer) ve.getValue(context);
- assertEquals(Integer.valueOf(0), result);
+ Assert.assertEquals(Integer.valueOf(0), result);
}
@@ -239,7 +237,7 @@ public class TestValueExpressionImpl {
context, "${list.size()}", Integer.class);
Integer result = (Integer) ve.getValue(context);
- assertEquals(Integer.valueOf(0), result);
+ Assert.assertEquals(Integer.valueOf(0), result);
}
@@ -259,11 +257,11 @@ public class TestValueExpressionImpl {
// First check the basics work
String result = (String) ve.getValue(context);
- assertEquals("Tomcat", result);
+ Assert.assertEquals("Tomcat", result);
// Now set the value to null
ve.setValue(context, null);
- assertEquals("", beanB.getName());
+ Assert.assertEquals("", beanB.getName());
}
}
Modified: tomcat/tc8.5.x/trunk/test/org/apache/el/lang/TestELArithmetic.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/el/lang/TestELArithmetic.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/el/lang/TestELArithmetic.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/el/lang/TestELArithmetic.java Mon Nov 13 11:25:51 2017
@@ -21,8 +21,6 @@ import java.math.BigInteger;
import javax.el.ELProcessor;
-import static org.junit.Assert.assertEquals;
-
import org.junit.Assert;
import org.junit.Test;
@@ -33,7 +31,7 @@ public class TestELArithmetic {
@Test
public void testAdd01() throws Exception {
- assertEquals("1000000000000000000001.1",
+ Assert.assertEquals("1000000000000000000001.1",
String.valueOf(ELArithmetic.add(a, b)));
}
@@ -46,7 +44,7 @@ public class TestELArithmetic {
@Test
public void testSubtract01() throws Exception {
- assertEquals("-999999999999999999998.9",
+ Assert.assertEquals("-999999999999999999998.9",
String.valueOf(ELArithmetic.subtract(a, b)));
}
@@ -59,7 +57,7 @@ public class TestELArithmetic {
@Test
public void testMultiply01() throws Exception {
- assertEquals("1100000000000000000000.0",
+ Assert.assertEquals("1100000000000000000000.0",
String.valueOf(ELArithmetic.multiply(a, b)));
}
@@ -72,7 +70,7 @@ public class TestELArithmetic {
@Test
public void testDivide01() throws Exception {
- assertEquals("0.0",
+ Assert.assertEquals("0.0",
String.valueOf(ELArithmetic.divide(a, b)));
}
@@ -85,7 +83,7 @@ public class TestELArithmetic {
@Test
public void testMod01() throws Exception {
- assertEquals("1.1",
+ Assert.assertEquals("1.1",
String.valueOf(ELArithmetic.mod(a, b)));
}
@@ -105,38 +103,38 @@ public class TestELArithmetic {
@Test
public void testBug47371bigDecimal() throws Exception {
- assertEquals(BigDecimal.valueOf(1),
+ Assert.assertEquals(BigDecimal.valueOf(1),
ELArithmetic.add("", BigDecimal.valueOf(1)));
}
@Test
public void testBug47371double() throws Exception {
- assertEquals(Double.valueOf(7), ELArithmetic.add("", Double.valueOf(7)));
+ Assert.assertEquals(Double.valueOf(7), ELArithmetic.add("", Double.valueOf(7)));
}
@Test
public void testBug47371doubleString() throws Exception {
- assertEquals(Double.valueOf(2), ELArithmetic.add("", "2."));
+ Assert.assertEquals(Double.valueOf(2), ELArithmetic.add("", "2."));
}
@Test
public void testBug47371bigInteger() throws Exception {
- assertEquals(BigInteger.valueOf(0),
+ Assert.assertEquals(BigInteger.valueOf(0),
ELArithmetic.multiply("", BigInteger.valueOf(1)));
}
@Test
public void testBug47371long() throws Exception {
- assertEquals(Long.valueOf(1), ELArithmetic.add("", Integer.valueOf(1)));
+ Assert.assertEquals(Long.valueOf(1), ELArithmetic.add("", Integer.valueOf(1)));
}
@Test
public void testBug47371long2() throws Exception {
- assertEquals(Long.valueOf(-3), ELArithmetic.subtract("1", "4"));
+ Assert.assertEquals(Long.valueOf(-3), ELArithmetic.subtract("1", "4"));
}
@Test
public void testBug47371doubleString2() throws Exception {
- assertEquals(Double.valueOf(2), ELArithmetic.add("1.", "1"));
+ Assert.assertEquals(Double.valueOf(2), ELArithmetic.add("1.", "1"));
}
}
Modified: tomcat/tc8.5.x/trunk/test/org/apache/el/lang/TestELSupport.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/el/lang/TestELSupport.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/el/lang/TestELSupport.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/el/lang/TestELSupport.java Mon Nov 13 11:25:51 2017
@@ -23,17 +23,13 @@ import java.math.BigInteger;
import javax.el.ELException;
import javax.el.ELManager;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
import org.junit.Assert;
import org.junit.Test;
public class TestELSupport {
@Test
public void testEquals() {
- assertTrue(ELSupport.equals(null, "01", Long.valueOf(1)));
+ Assert.assertTrue(ELSupport.equals(null, "01", Long.valueOf(1)));
}
@Test
@@ -82,13 +78,13 @@ public class TestELSupport {
public void testCoerceIntegerToNumber() {
Integer input = Integer.valueOf(4390241);
Object output = ELSupport.coerceToType(null, input, Number.class);
- assertEquals(input, output);
+ Assert.assertEquals(input, output);
}
@Test
public void testCoerceNullToNumber() {
Object output = ELSupport.coerceToType(null, null, Number.class);
- assertNull(output);
+ Assert.assertNull(output);
}
@Test
@@ -97,7 +93,7 @@ public class TestELSupport {
try {
output = ELSupport.coerceToEnum(null, TestEnumA.VALA1, TestEnumA.class);
} finally {
- assertEquals(TestEnumA.VALA1, output);
+ Assert.assertEquals(TestEnumA.VALA1, output);
}
}
@@ -109,7 +105,7 @@ public class TestELSupport {
} catch (ELException ele) {
// Ignore
}
- assertNull(output);
+ Assert.assertNull(output);
}
@Test
@@ -120,7 +116,7 @@ public class TestELSupport {
} catch (ELException ele) {
// Ignore
}
- assertNull(output);
+ Assert.assertNull(output);
}
@Test
@@ -267,7 +263,7 @@ public class TestELSupport {
}
private static void testIsSame(Object value) {
- assertEquals(value, ELSupport.coerceToNumber(null, value, value.getClass()));
+ Assert.assertEquals(value, ELSupport.coerceToNumber(null, value, value.getClass()));
}
private static enum TestEnumA {
Modified: tomcat/tc8.5.x/trunk/test/org/apache/el/parser/TestELParser.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/el/parser/TestELParser.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/el/parser/TestELParser.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/el/parser/TestELParser.java Mon Nov 13 11:25:51 2017
@@ -24,9 +24,7 @@ import javax.el.ELException;
import javax.el.ExpressionFactory;
import javax.el.ValueExpression;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
+import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
@@ -83,7 +81,7 @@ public class TestELParser {
} catch (ELException ele) {
e = ele;
}
- assertNotNull(e);
+ Assert.assertNotNull(e);
}
@Test
@@ -104,7 +102,7 @@ public class TestELParser {
} catch (ELException ele) {
e = ele;
}
- assertNotNull(e);
+ Assert.assertNotNull(e);
}
@@ -200,7 +198,7 @@ public class TestELParser {
context, expr.toString(), String.class);
String result = (String) ve.getValue(context);
- assertEquals("true", result);
+ Assert.assertEquals("true", result);
}
@Test
@@ -217,10 +215,10 @@ public class TestELParser {
"${(myBean.int1 > 1 and myBean.myBool) or "+
"((myBean.myBool or myBean.myBool1) and myBean.int1 > 1)}",
Boolean.class);
- assertEquals(Boolean.FALSE, ve.getValue(context));
+ Assert.assertEquals(Boolean.FALSE, ve.getValue(context));
beanC.setInt1(2);
beanC.setMyBool1(true);
- assertEquals(Boolean.TRUE, ve.getValue(context));
+ Assert.assertEquals(Boolean.TRUE, ve.getValue(context));
}
private void testExpression(String expression, String expected) {
@@ -231,7 +229,7 @@ public class TestELParser {
context, expression, String.class);
String result = (String) ve.getValue(context);
- assertEquals(expected, result);
+ Assert.assertEquals(expected, result);
}
/*
Modified: tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java Mon Nov 13 11:25:51 2017
@@ -19,8 +19,7 @@ package org.apache.jasper.compiler;
import javax.el.ValueExpression;
-import static org.junit.Assert.assertEquals;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.el.ExpressionFactoryImpl;
@@ -39,22 +38,22 @@ public class TestAttributeParser {
*/
@Test
public void testBug42565() {
- assertEquals("false", evalAttr("${false?true:false}", '\"'));
- assertEquals("false", evalAttr("${false?true: false}", '\"'));
- assertEquals("false", evalAttr("${false?true :false}", '\"'));
- assertEquals("false", evalAttr("${false?true : false}", '\"'));
- assertEquals("false", evalAttr("${false? true:false}", '\"'));
- assertEquals("false", evalAttr("${false? true: false}", '\"'));
- assertEquals("false", evalAttr("${false? true :false}", '\"'));
- assertEquals("false", evalAttr("${false? true : false}", '\"'));
- assertEquals("false", evalAttr("${false ?true:false}", '\"'));
- assertEquals("false", evalAttr("${false ?true: false}", '\"'));
- assertEquals("false", evalAttr("${false ?true :false}", '\"'));
- assertEquals("false", evalAttr("${false ?true : false}", '\"'));
- assertEquals("false", evalAttr("${false ? true:false}", '\"'));
- assertEquals("false", evalAttr("${false ? true: false}", '\"'));
- assertEquals("false", evalAttr("${false ? true :false}", '\"'));
- assertEquals("false", evalAttr("${false ? true : false}", '\"'));
+ Assert.assertEquals("false", evalAttr("${false?true:false}", '\"'));
+ Assert.assertEquals("false", evalAttr("${false?true: false}", '\"'));
+ Assert.assertEquals("false", evalAttr("${false?true :false}", '\"'));
+ Assert.assertEquals("false", evalAttr("${false?true : false}", '\"'));
+ Assert.assertEquals("false", evalAttr("${false? true:false}", '\"'));
+ Assert.assertEquals("false", evalAttr("${false? true: false}", '\"'));
+ Assert.assertEquals("false", evalAttr("${false? true :false}", '\"'));
+ Assert.assertEquals("false", evalAttr("${false? true : false}", '\"'));
+ Assert.assertEquals("false", evalAttr("${false ?true:false}", '\"'));
+ Assert.assertEquals("false", evalAttr("${false ?true: false}", '\"'));
+ Assert.assertEquals("false", evalAttr("${false ?true :false}", '\"'));
+ Assert.assertEquals("false", evalAttr("${false ?true : false}", '\"'));
+ Assert.assertEquals("false", evalAttr("${false ? true:false}", '\"'));
+ Assert.assertEquals("false", evalAttr("${false ? true: false}", '\"'));
+ Assert.assertEquals("false", evalAttr("${false ? true :false}", '\"'));
+ Assert.assertEquals("false", evalAttr("${false ? true : false}", '\"'));
}
@@ -65,11 +64,11 @@ public class TestAttributeParser {
*/
@Test
public void testBug44994() {
- assertEquals("none",
+ Assert.assertEquals("none",
evalAttr("${0 lt 0 ? 1 lt 0 ? 'many': 'one': 'none'}", '\"'));
- assertEquals("one",
+ Assert.assertEquals("one",
evalAttr("${0 lt 1 ? 1 lt 1 ? 'many': 'one': 'none'}", '\"'));
- assertEquals("many",
+ Assert.assertEquals("many",
evalAttr("${0 lt 2 ? 1 lt 2 ? 'many': 'one': 'none'}", '\"'));
}
@@ -82,40 +81,40 @@ public class TestAttributeParser {
@Test
public void testBug45015() {
// Warning: Java String quoting vs. JSP attribute quoting
- assertEquals("hello 'world'", evalAttr("hello 'world'", '\"'));
- assertEquals("hello 'world", evalAttr("hello 'world", '\"'));
- assertEquals("hello world'", evalAttr("hello world'", '\"'));
- assertEquals("hello world'", evalAttr("hello world\\'", '\"'));
- assertEquals("hello world\"", evalAttr("hello world\\\"", '\"'));
- assertEquals("hello \"world\"", evalAttr("hello \"world\"", '\"'));
- assertEquals("hello \"world", evalAttr("hello \"world", '\"'));
- assertEquals("hello world\"", evalAttr("hello world\"", '\"'));
- assertEquals("hello world'", evalAttr("hello world\\'", '\"'));
- assertEquals("hello world\"", evalAttr("hello world\\\"", '\"'));
-
- assertEquals("hello 'world'", evalAttr("hello 'world'", '\''));
- assertEquals("hello 'world", evalAttr("hello 'world", '\''));
- assertEquals("hello world'", evalAttr("hello world'", '\''));
- assertEquals("hello world'", evalAttr("hello world\\'", '\''));
- assertEquals("hello world\"", evalAttr("hello world\\\"", '\''));
- assertEquals("hello \"world\"", evalAttr("hello \"world\"", '\''));
- assertEquals("hello \"world", evalAttr("hello \"world", '\''));
- assertEquals("hello world\"", evalAttr("hello world\"", '\''));
- assertEquals("hello world'", evalAttr("hello world\\'", '\''));
- assertEquals("hello world\"", evalAttr("hello world\\\"", '\''));
+ Assert.assertEquals("hello 'world'", evalAttr("hello 'world'", '\"'));
+ Assert.assertEquals("hello 'world", evalAttr("hello 'world", '\"'));
+ Assert.assertEquals("hello world'", evalAttr("hello world'", '\"'));
+ Assert.assertEquals("hello world'", evalAttr("hello world\\'", '\"'));
+ Assert.assertEquals("hello world\"", evalAttr("hello world\\\"", '\"'));
+ Assert.assertEquals("hello \"world\"", evalAttr("hello \"world\"", '\"'));
+ Assert.assertEquals("hello \"world", evalAttr("hello \"world", '\"'));
+ Assert.assertEquals("hello world\"", evalAttr("hello world\"", '\"'));
+ Assert.assertEquals("hello world'", evalAttr("hello world\\'", '\"'));
+ Assert.assertEquals("hello world\"", evalAttr("hello world\\\"", '\"'));
+
+ Assert.assertEquals("hello 'world'", evalAttr("hello 'world'", '\''));
+ Assert.assertEquals("hello 'world", evalAttr("hello 'world", '\''));
+ Assert.assertEquals("hello world'", evalAttr("hello world'", '\''));
+ Assert.assertEquals("hello world'", evalAttr("hello world\\'", '\''));
+ Assert.assertEquals("hello world\"", evalAttr("hello world\\\"", '\''));
+ Assert.assertEquals("hello \"world\"", evalAttr("hello \"world\"", '\''));
+ Assert.assertEquals("hello \"world", evalAttr("hello \"world", '\''));
+ Assert.assertEquals("hello world\"", evalAttr("hello world\"", '\''));
+ Assert.assertEquals("hello world'", evalAttr("hello world\\'", '\''));
+ Assert.assertEquals("hello world\"", evalAttr("hello world\\\"", '\''));
}
@Test
public void testBug45451() {
- assertEquals("2", evalAttr("${1+1}", '\"'));
- assertEquals("${1+1}", evalAttr("\\${1+1}", '\"'));
- assertEquals("\\2", evalAttr("\\\\${1+1}", '\"'));
+ Assert.assertEquals("2", evalAttr("${1+1}", '\"'));
+ Assert.assertEquals("${1+1}", evalAttr("\\${1+1}", '\"'));
+ Assert.assertEquals("\\2", evalAttr("\\\\${1+1}", '\"'));
}
@Test
public void testBug49081() {
- assertEquals("#2", evalAttr("#${1+1}", '\"'));
+ Assert.assertEquals("#2", evalAttr("#${1+1}", '\"'));
}
@Test
@@ -125,18 +124,18 @@ public class TestAttributeParser {
// '\' is only an escape character inside a StringLiteral
// Attribute escaping does not apply inside EL expressions
- assertEquals("\\", evalAttr("${'\\\\'}", '\"'));
+ Assert.assertEquals("\\", evalAttr("${'\\\\'}", '\"'));
// Can use ''' inside '"' when quoting with '"' and vice versa without
// escaping
- assertEquals("\\\"", evalAttr("${'\\\\\"'}", '\"'));
- assertEquals("\"\\", evalAttr("${'\\\"\\\\'}", '\"'));
- assertEquals("\\'", evalAttr("${'\\\\\\''}", '\"'));
- assertEquals("'\\", evalAttr("${'\\'\\\\'}", '\"'));
+ Assert.assertEquals("\\\"", evalAttr("${'\\\\\"'}", '\"'));
+ Assert.assertEquals("\"\\", evalAttr("${'\\\"\\\\'}", '\"'));
+ Assert.assertEquals("\\'", evalAttr("${'\\\\\\''}", '\"'));
+ Assert.assertEquals("'\\", evalAttr("${'\\'\\\\'}", '\"'));
// Quoting <% and %>
- assertEquals("hello <% world", evalAttr("hello <\\% world", '\"'));
- assertEquals("hello %> world", evalAttr("hello %> world", '\"'));
+ Assert.assertEquals("hello <% world", evalAttr("hello <\\% world", '\"'));
+ Assert.assertEquals("hello %> world", evalAttr("hello %> world", '\"'));
// Test that the end of literal in EL expression is recognized in
// parseEL(), be it quoted with single or double quotes. That is, that
@@ -148,16 +147,16 @@ public class TestAttributeParser {
// inside of parseEL it will be printed as \${, thus preventing the EL
// expression that follows from being evaluated.
//
- assertEquals("foo\\bar\\baz", evalAttr("${\'foo\'}\\\\${\'bar\'}\\\\${\'baz\'}", '\"'));
- assertEquals("foo\\bar\\baz", evalAttr("${\'foo\'}\\\\${\"bar\"}\\\\${\'baz\'}", '\"'));
- assertEquals("foo\\bar\\baz", evalAttr("${\"foo\"}\\\\${\'bar\'}\\\\${\"baz\"}", '\"'));
+ Assert.assertEquals("foo\\bar\\baz", evalAttr("${\'foo\'}\\\\${\'bar\'}\\\\${\'baz\'}", '\"'));
+ Assert.assertEquals("foo\\bar\\baz", evalAttr("${\'foo\'}\\\\${\"bar\"}\\\\${\'baz\'}", '\"'));
+ Assert.assertEquals("foo\\bar\\baz", evalAttr("${\"foo\"}\\\\${\'bar\'}\\\\${\"baz\"}", '\"'));
}
@Test
public void testScriptExpressionLiterals() {
- assertEquals(" \"hello world\" ", parseScriptExpression(
+ Assert.assertEquals(" \"hello world\" ", parseScriptExpression(
" \"hello world\" ", (char) 0));
- assertEquals(" \"hello \\\"world\" ", parseScriptExpression(
+ Assert.assertEquals(" \"hello \\\"world\" ", parseScriptExpression(
" \"hello \\\\\"world\" ", (char) 0));
}
Modified: tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestCompiler.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestCompiler.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestCompiler.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestCompiler.java Mon Nov 13 11:25:51 2017
@@ -23,9 +23,7 @@ import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.Context;
@@ -50,7 +48,7 @@ public class TestCompiler extends Tomcat
assertEcho(result, "OK");
// Check content type
- assertTrue(headers.get("Content-Type").get(0).startsWith("text/html"));
+ Assert.assertTrue(headers.get("Content-Type").get(0).startsWith("text/html"));
}
@Test
@@ -68,7 +66,7 @@ public class TestCompiler extends Tomcat
assertEcho(result, "OK");
// Check content type
- assertTrue(headers.get("Content-Type").get(0).startsWith("text/plain"));
+ Assert.assertTrue(headers.get("Content-Type").get(0).startsWith("text/plain"));
}
@Test
@@ -166,7 +164,7 @@ public class TestCompiler extends Tomcat
ByteChunk res = new ByteChunk();
int rc = getUrl("http://localhost:" + getPort() +
"/test/bug53257/foo%2525bar.jsp", res, null);
- assertEquals(404, rc);
+ Assert.assertEquals(404, rc);
}
@Test
@@ -197,12 +195,12 @@ public class TestCompiler extends Tomcat
Pattern coda = Pattern.compile(
"(.*This is a coda\\.){2}.*",
Pattern.MULTILINE|Pattern.DOTALL);
- assertTrue(prelude.matcher(result).matches());
- assertTrue(coda.matcher(result).matches());
+ Assert.assertTrue(prelude.matcher(result).matches());
+ Assert.assertTrue(coda.matcher(result).matches());
}
/** Assertion for text printed by tags:echo */
private static void assertEcho(String result, String expected) {
- assertTrue(result, result.indexOf("<p>" + expected + "</p>") > 0);
+ Assert.assertTrue(result, result.indexOf("<p>" + expected + "</p>") > 0);
}
}
Modified: tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestGenerator.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestGenerator.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestGenerator.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestGenerator.java Mon Nov 13 11:25:51 2017
@@ -30,9 +30,6 @@ import javax.servlet.jsp.tagext.TagExtra
import javax.servlet.jsp.tagext.TagSupport;
import javax.servlet.jsp.tagext.VariableInfo;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
import org.junit.Assert;
import org.junit.Test;
@@ -71,7 +68,7 @@ public class TestGenerator extends Tomca
int rc = getUrl("http://localhost:" + getPort() +
"/test/bug45nnn/bug45015b.jsp", new ByteChunk(), null);
- assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc);
+ Assert.assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc);
}
@Test
@@ -81,7 +78,7 @@ public class TestGenerator extends Tomca
int rc = getUrl("http://localhost:" + getPort() +
"/test/bug45nnn/bug45015c.jsp", new ByteChunk(), null);
- assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc);
+ Assert.assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc);
}
@Test
@@ -91,7 +88,7 @@ public class TestGenerator extends Tomca
int rc = getUrl("http://localhost:" + getPort() +
"/test/bug48nnn/bug48701-fail.jsp", new ByteChunk(), null);
- assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc);
+ Assert.assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc);
}
@Test
@@ -197,7 +194,7 @@ public class TestGenerator extends Tomca
int i = 0;
for (String line : lines) {
if (line.length() > 0) {
- assertEquals(expected[i], line);
+ Assert.assertEquals(expected[i], line);
i++;
}
}
@@ -205,7 +202,7 @@ public class TestGenerator extends Tomca
/** Assertion for text printed by tags:echo */
private static void assertEcho(String result, String expected) {
- assertTrue(result.indexOf("<p>" + expected + "</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>" + expected + "</p>") > 0);
}
@Test
@@ -278,7 +275,7 @@ public class TestGenerator extends Tomca
}
String result = res.toString();
- assertTrue(result.startsWith("0 Hello world!\n"));
- assertTrue(result.endsWith("999 Hello world!\n"));
+ Assert.assertTrue(result.startsWith("0 Hello world!\n"));
+ Assert.assertTrue(result.endsWith("999 Hello world!\n"));
}
}
Modified: tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestJspConfig.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestJspConfig.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestJspConfig.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestJspConfig.java Mon Nov 13 11:25:51 2017
@@ -19,8 +19,7 @@ package org.apache.jasper.compiler;
import java.io.File;
-import static org.junit.Assert.assertTrue;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.startup.Tomcat;
@@ -44,8 +43,8 @@ public class TestJspConfig extends Tomca
String result = res.toString();
- assertTrue(result.indexOf("<p>00-${'hello world'}</p>") > 0);
- assertTrue(result.indexOf("<p>01-#{'hello world'}</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>00-${'hello world'}</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>01-#{'hello world'}</p>") > 0);
}
@Test
@@ -64,8 +63,8 @@ public class TestJspConfig extends Tomca
String result = res.toString();
- assertTrue(result.indexOf("<p>00-${'hello world'}</p>") > 0);
- assertTrue(result.indexOf("<p>01-#{'hello world'}</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>00-${'hello world'}</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>01-#{'hello world'}</p>") > 0);
}
@Test
@@ -83,8 +82,8 @@ public class TestJspConfig extends Tomca
String result = res.toString();
- assertTrue(result.indexOf("<p>00-hello world</p>") > 0);
- assertTrue(result.indexOf("<p>01-#{'hello world'}</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>00-hello world</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>01-#{'hello world'}</p>") > 0);
}
@Test
@@ -102,7 +101,7 @@ public class TestJspConfig extends Tomca
String result = res.toString();
- assertTrue(result.indexOf("<p>00-hello world</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>00-hello world</p>") > 0);
}
@Test
@@ -120,7 +119,7 @@ public class TestJspConfig extends Tomca
String result = res.toString();
- assertTrue(result.indexOf("<p>00-hello world</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>00-hello world</p>") > 0);
}
@Test
@@ -138,7 +137,7 @@ public class TestJspConfig extends Tomca
String result = res.toString();
- assertTrue(result.indexOf("<p>00-hello world</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>00-hello world</p>") > 0);
}
}
Modified: tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestParser.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestParser.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestParser.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestParser.java Mon Nov 13 11:25:51 2017
@@ -19,9 +19,6 @@ package org.apache.jasper.compiler;
import java.util.HashMap;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
import org.junit.Assert;
import org.junit.Test;
@@ -106,7 +103,7 @@ public class TestParser extends TomcatBa
"/test/bug49nnn/bug49297NoSpace.jsp", new ByteChunk(),
new HashMap<String,List<String>>());
- assertEquals(500, sc);
+ Assert.assertEquals(500, sc);
}
@Test
@@ -117,7 +114,7 @@ public class TestParser extends TomcatBa
"/test/bug49nnn/bug49297DuplicateAttr.jsp", new ByteChunk(),
new HashMap<String,List<String>>());
- assertEquals(500, sc);
+ Assert.assertEquals(500, sc);
}
@Test
@@ -129,7 +126,7 @@ public class TestParser extends TomcatBa
"/test/bug49nnn/bug49297MultipleImport1.jsp", res,
new HashMap<String,List<String>>());
- assertEquals(200, sc);
+ Assert.assertEquals(200, sc);
assertEcho(res.toString(), "OK");
}
@@ -142,7 +139,7 @@ public class TestParser extends TomcatBa
"/test/bug49nnn/bug49297MultipleImport2.jsp", res,
new HashMap<String,List<String>>());
- assertEquals(200, sc);
+ Assert.assertEquals(200, sc);
assertEcho(res.toString(), "OK");
}
@@ -155,7 +152,7 @@ public class TestParser extends TomcatBa
"/test/bug49nnn/bug49297MultiplePageEncoding1.jsp", res,
new HashMap<String,List<String>>());
- assertEquals(500, sc);
+ Assert.assertEquals(500, sc);
}
@Test
@@ -167,7 +164,7 @@ public class TestParser extends TomcatBa
"/test/bug49nnn/bug49297MultiplePageEncoding2.jsp", res,
new HashMap<String,List<String>>());
- assertEquals(500, sc);
+ Assert.assertEquals(500, sc);
}
@Test
@@ -179,7 +176,7 @@ public class TestParser extends TomcatBa
"/test/bug49nnn/bug49297MultiplePageEncoding3.jsp", res,
new HashMap<String,List<String>>());
- assertEquals(500, sc);
+ Assert.assertEquals(500, sc);
}
@Test
@@ -191,7 +188,7 @@ public class TestParser extends TomcatBa
"/test/bug49nnn/bug49297MultiplePageEncoding4.jsp", res,
new HashMap<String,List<String>>());
- assertEquals(500, sc);
+ Assert.assertEquals(500, sc);
}
@Test
@@ -203,7 +200,7 @@ public class TestParser extends TomcatBa
"/test/bug49nnn/bug49297Tag.jsp", res,
new HashMap<String,List<String>>());
- assertEquals(200, sc);
+ Assert.assertEquals(200, sc);
assertEcho(res.toString(), "OK");
}
@@ -301,6 +298,6 @@ public class TestParser extends TomcatBa
/** Assertion for text printed by tags:echo */
private static void assertEcho(String result, String expected) {
- assertTrue(result.indexOf("<p>" + expected + "</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>" + expected + "</p>") > 0);
}
}
Modified: tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java Mon Nov 13 11:25:51 2017
@@ -20,9 +20,7 @@ package org.apache.jasper.compiler;
import java.util.HashMap;
import java.util.List;
-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.TomcatBaseTest;
@@ -116,7 +114,7 @@ public class TestParserNoStrictWhitespac
new HashMap<String,List<String>>());
- assertEquals(200, sc);
+ Assert.assertEquals(200, sc);
assertEcho(res.toString(), "Hello World");
}
@@ -128,11 +126,11 @@ public class TestParserNoStrictWhitespac
"/test/bug49nnn/bug49297DuplicateAttr.jsp", new ByteChunk(),
new HashMap<String,List<String>>());
- assertEquals(500, sc);
+ Assert.assertEquals(500, sc);
}
/** Assertion for text printed by tags:echo */
private static void assertEcho(String result, String expected) {
- assertTrue(result.indexOf("<p>" + expected + "</p>") > 0);
+ Assert.assertTrue(result.indexOf("<p>" + expected + "</p>") > 0);
}
}
Modified: tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestScriptingVariabler.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestScriptingVariabler.java?rev=1815083&r1=1815082&r2=1815083&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestScriptingVariabler.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestScriptingVariabler.java Mon Nov 13 11:25:51 2017
@@ -24,8 +24,7 @@ import javax.servlet.jsp.tagext.TagExtra
import javax.servlet.jsp.tagext.TagSupport;
import javax.servlet.jsp.tagext.VariableInfo;
-import static org.junit.Assert.assertNull;
-
+import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.startup.TomcatBaseTest;
@@ -44,7 +43,7 @@ public class TestScriptingVariabler exte
}
// Should not fail
- assertNull(e);
+ Assert.assertNull(e);
}
public static class Bug48616aTag extends TagSupport {
@@ -80,7 +79,7 @@ public class TestScriptingVariabler exte
}
// Should not fail
- assertNull(e);
+ Assert.assertNull(e);
}
@Test
@@ -95,6 +94,6 @@ public class TestScriptingVariabler exte
}
// Should not fail
- assertNull(e);
+ Assert.assertNull(e);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org