You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2017/11/13 12:32:27 UTC
svn commit: r1815093 [5/6] - in /tomcat/tc7.0.x/trunk:
modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/ test/javax/el/
test/javax/servlet/jsp/ test/org/apache/catalina/ant/
test/org/apache/catalina/authenticator/ test/org/apache/catalina/co...
Modified: tomcat/tc7.0.x/trunk/test/org/apache/el/TestELEvaluation.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/el/TestELEvaluation.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/el/TestELEvaluation.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/el/TestELEvaluation.java Mon Nov 13 12:32:26 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(o1, o2);
int i2 = ELSupport.compare(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/tc7.0.x/trunk/test/org/apache/el/TestELInJsp.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/el/TestELInJsp.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/el/TestELInJsp.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/el/TestELInJsp.java Mon Nov 13 12:32:26 2017
@@ -18,8 +18,6 @@ package org.apache.el;
import java.io.File;
-import static org.junit.Assert.assertTrue;
-
import org.junit.Assert;
import org.junit.Test;
@@ -562,6 +560,6 @@ public class TestELInJsp extends TomcatB
// Assertion for text contained with <p></p>, e.g. 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/tc7.0.x/trunk/test/org/apache/el/TestMethodExpressionImpl.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/el/TestMethodExpressionImpl.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/el/TestMethodExpressionImpl.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/el/TestMethodExpressionImpl.java Mon Nov 13 12:32:26 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;
@@ -98,8 +94,8 @@ public class TestMethodExpressionImpl {
context, "${beanB.sayHello('JUnit')}", String.class,
new Class<?>[] { String.class });
- assertFalse(me1.isParmetersProvided());
- assertTrue(me2.isParmetersProvided());
+ Assert.assertFalse(me1.isParmetersProvided());
+ Assert.assertTrue(me2.isParmetersProvided());
}
@Test
@@ -119,15 +115,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 }));
}
@@ -140,7 +136,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
@@ -148,7 +144,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
@@ -156,7 +152,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
@@ -165,7 +161,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
@@ -174,7 +170,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
@@ -182,7 +178,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
@@ -190,7 +186,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
@@ -198,7 +194,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
@@ -212,7 +208,7 @@ public class TestMethodExpressionImpl {
e = e1;
}
// Expected to fail
- assertNotNull(e);
+ Assert.assertNotNull(e);
}
@Test
@@ -223,7 +219,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
@@ -231,7 +227,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
@@ -242,7 +238,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
@@ -256,7 +252,7 @@ public class TestMethodExpressionImpl {
e = e1;
}
// Expected to fail
- assertNotNull(e);
+ Assert.assertNotNull(e);
}
@Test
@@ -270,7 +266,7 @@ public class TestMethodExpressionImpl {
e = e1;
}
// Expected to fail
- assertNotNull(e);
+ Assert.assertNotNull(e);
}
@Test
@@ -278,7 +274,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
@@ -286,7 +282,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
@@ -300,7 +296,7 @@ public class TestMethodExpressionImpl {
e = e1;
}
// Expected to fail
- assertNotNull(e);
+ Assert.assertNotNull(e);
}
@Test
@@ -308,7 +304,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
@@ -316,7 +312,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
@@ -330,7 +326,7 @@ public class TestMethodExpressionImpl {
e = e1;
}
// Expected to fail
- assertNotNull(e);
+ Assert.assertNotNull(e);
}
@Test
@@ -338,7 +334,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
@@ -346,7 +342,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());
}
/*
@@ -362,7 +358,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
@@ -372,7 +368,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
@@ -380,7 +376,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
@@ -388,7 +384,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
@@ -396,7 +392,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
@@ -404,7 +400,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
@@ -417,7 +413,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
@@ -430,7 +426,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);
}
@@ -448,7 +444,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
@@ -465,7 +461,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);
}
@@ -474,7 +470,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());
}
@@ -483,7 +479,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());
}
@@ -492,7 +488,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());
}
@@ -501,7 +497,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());
}
@@ -533,14 +529,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/tc7.0.x/trunk/test/org/apache/el/TestValueExpressionImpl.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/el/TestValueExpressionImpl.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/el/TestValueExpressionImpl.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/el/TestValueExpressionImpl.java Mon Nov 13 12:32:26 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,6 +237,6 @@ 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);
}
}
Modified: tomcat/tc7.0.x/trunk/test/org/apache/el/lang/TestELArithmetic.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/el/lang/TestELArithmetic.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/el/lang/TestELArithmetic.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/el/lang/TestELArithmetic.java Mon Nov 13 12:32:26 2017
@@ -19,8 +19,7 @@ package org.apache.el.lang;
import java.math.BigDecimal;
import java.math.BigInteger;
-import static org.junit.Assert.assertEquals;
-
+import org.junit.Assert;
import org.junit.Test;
public class TestELArithmetic {
@@ -30,69 +29,69 @@ public class TestELArithmetic {
@Test
public void testAdd() throws Exception {
- assertEquals("1000000000000000000001.1",
+ Assert.assertEquals("1000000000000000000001.1",
String.valueOf(ELArithmetic.add(a, b)));
}
@Test
public void testSubtract() throws Exception {
- assertEquals("-999999999999999999998.9",
+ Assert.assertEquals("-999999999999999999998.9",
String.valueOf(ELArithmetic.subtract(a, b)));
}
@Test
public void testMultiply() throws Exception {
- assertEquals("1100000000000000000000.0",
+ Assert.assertEquals("1100000000000000000000.0",
String.valueOf(ELArithmetic.multiply(a, b)));
}
@Test
public void testDivide() throws Exception {
- assertEquals("0.0",
+ Assert.assertEquals("0.0",
String.valueOf(ELArithmetic.divide(a, b)));
}
@Test
public void testMod() throws Exception {
- assertEquals("1.1",
+ Assert.assertEquals("1.1",
String.valueOf(ELArithmetic.mod(a, b)));
}
@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/tc7.0.x/trunk/test/org/apache/el/lang/TestELSupport.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/el/lang/TestELSupport.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/el/lang/TestELSupport.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/el/lang/TestELSupport.java Mon Nov 13 12:32:26 2017
@@ -22,17 +22,13 @@ import java.math.BigInteger;
import javax.el.ELException;
-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("01", Long.valueOf(1)));
+ Assert.assertTrue(ELSupport.equals("01", Long.valueOf(1)));
}
@Test
@@ -81,13 +77,13 @@ public class TestELSupport {
public void testCoerceIntegerToNumber() {
Integer input = Integer.valueOf(4390241);
Object output = ELSupport.coerceToType(input, Number.class);
- assertEquals(input, output);
+ Assert.assertEquals(input, output);
}
@Test
public void testCoerceNullToNumber() {
Object output = ELSupport.coerceToType(null, Number.class);
- assertEquals(Long.valueOf(0), output);
+ Assert.assertEquals(Long.valueOf(0), output);
}
@Test
@@ -96,7 +92,7 @@ public class TestELSupport {
try {
output = ELSupport.coerceToEnum(TestEnumA.VALA1, TestEnumA.class);
} finally {
- assertEquals(TestEnumA.VALA1, output);
+ Assert.assertEquals(TestEnumA.VALA1, output);
}
}
@@ -108,7 +104,7 @@ public class TestELSupport {
} catch (ELException ele) {
// Ignore
}
- assertNull(output);
+ Assert.assertNull(output);
}
@Test
@@ -119,7 +115,7 @@ public class TestELSupport {
} catch (ELException ele) {
// Ignore
}
- assertNull(output);
+ Assert.assertNull(output);
}
@Test
@@ -236,7 +232,7 @@ public class TestELSupport {
}
private static void testIsSame(Object value) {
- assertEquals(value, ELSupport.coerceToNumber(value, value.getClass()));
+ Assert.assertEquals(value, ELSupport.coerceToNumber(value, value.getClass()));
}
private static enum TestEnumA {
Modified: tomcat/tc7.0.x/trunk/test/org/apache/el/parser/TestELParser.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/el/parser/TestELParser.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/el/parser/TestELParser.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/el/parser/TestELParser.java Mon Nov 13 12:32:26 2017
@@ -22,9 +22,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.Test;
import org.apache.jasper.el.ELContextImpl;
@@ -79,7 +77,7 @@ public class TestELParser {
} catch (ELException ele) {
e = ele;
}
- assertNotNull(e);
+ Assert.assertNotNull(e);
}
@Test
@@ -100,7 +98,7 @@ public class TestELParser {
} catch (ELException ele) {
e = ele;
}
- assertNotNull(e);
+ Assert.assertNotNull(e);
}
@@ -196,7 +194,7 @@ public class TestELParser {
context, expr.toString(), String.class);
String result = (String) ve.getValue(context);
- assertEquals("true", result);
+ Assert.assertEquals("true", result);
}
@Test
@@ -213,10 +211,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) {
@@ -227,6 +225,6 @@ public class TestELParser {
context, expression, String.class);
String result = (String) ve.getValue(context);
- assertEquals(expected, result);
+ Assert.assertEquals(expected, result);
}
}
Modified: tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java Mon Nov 13 12:32:26 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/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestCompiler.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestCompiler.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestCompiler.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestCompiler.java Mon Nov 13 12:32:26 2017
@@ -22,9 +22,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
import org.junit.Assert;
import org.junit.Test;
@@ -55,7 +52,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
@@ -77,7 +74,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
@@ -207,7 +204,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
@@ -258,6 +255,6 @@ public class TestCompiler extends Tomcat
/** 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/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestGenerator.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestGenerator.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestGenerator.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestGenerator.java Mon Nov 13 12:32:26 2017
@@ -31,9 +31,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;
@@ -88,7 +85,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
@@ -105,7 +102,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
@@ -127,7 +124,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
@@ -244,7 +241,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++;
}
}
@@ -252,7 +249,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
@@ -338,7 +335,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/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestJspConfig.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestJspConfig.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestJspConfig.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestJspConfig.java Mon Nov 13 12:32:26 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;
@@ -45,8 +44,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
@@ -65,8 +64,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
@@ -85,7 +84,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
@@ -104,7 +103,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/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestParser.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestParser.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestParser.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestParser.java Mon Nov 13 12:32:26 2017
@@ -20,9 +20,6 @@ import java.io.File;
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;
@@ -135,7 +132,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
@@ -152,7 +149,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
@@ -171,7 +168,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");
}
@@ -191,7 +188,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");
}
@@ -211,7 +208,7 @@ public class TestParser extends TomcatBa
"/test/bug49nnn/bug49297MultiplePageEncoding1.jsp", res,
new HashMap<String,List<String>>());
- assertEquals(500, sc);
+ Assert.assertEquals(500, sc);
}
@Test
@@ -230,7 +227,7 @@ public class TestParser extends TomcatBa
"/test/bug49nnn/bug49297MultiplePageEncoding2.jsp", res,
new HashMap<String,List<String>>());
- assertEquals(500, sc);
+ Assert.assertEquals(500, sc);
}
@Test
@@ -249,7 +246,7 @@ public class TestParser extends TomcatBa
"/test/bug49nnn/bug49297MultiplePageEncoding3.jsp", res,
new HashMap<String,List<String>>());
- assertEquals(500, sc);
+ Assert.assertEquals(500, sc);
}
@Test
@@ -268,7 +265,7 @@ public class TestParser extends TomcatBa
"/test/bug49nnn/bug49297MultiplePageEncoding4.jsp", res,
new HashMap<String,List<String>>());
- assertEquals(500, sc);
+ Assert.assertEquals(500, sc);
}
@Test
@@ -287,7 +284,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");
}
@@ -420,6 +417,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/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java Mon Nov 13 12:32:26 2017
@@ -21,9 +21,7 @@ import java.io.File;
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.Tomcat;
@@ -145,7 +143,7 @@ public class TestParserNoStrictWhitespac
new HashMap<String,List<String>>());
- assertEquals(200, sc);
+ Assert.assertEquals(200, sc);
assertEcho(res.toString(), "Hello World");
}
@@ -163,11 +161,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/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestScriptingVariabler.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestScriptingVariabler.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestScriptingVariabler.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestScriptingVariabler.java Mon Nov 13 12:32:26 2017
@@ -25,8 +25,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.Tomcat;
@@ -53,7 +52,7 @@ public class TestScriptingVariabler exte
}
// Should not fail
- assertNull(e);
+ Assert.assertNull(e);
}
public static class Bug48616aTag extends TagSupport {
@@ -96,7 +95,7 @@ public class TestScriptingVariabler exte
}
// Should not fail
- assertNull(e);
+ Assert.assertNull(e);
}
@Test
@@ -118,6 +117,6 @@ public class TestScriptingVariabler exte
}
// Should not fail
- assertNull(e);
+ Assert.assertNull(e);
}
}
Modified: tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestValidator.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestValidator.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestValidator.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestValidator.java Mon Nov 13 12:32:26 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;
@@ -49,7 +47,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
@@ -68,13 +66,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
@@ -93,13 +91,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
@@ -118,13 +116,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
@@ -143,13 +141,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/tc7.0.x/trunk/test/org/apache/jasper/util/TestFastRemovalDequeue.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/jasper/util/TestFastRemovalDequeue.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/jasper/util/TestFastRemovalDequeue.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/jasper/util/TestFastRemovalDequeue.java Mon Nov 13 12:32:26 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/tc7.0.x/trunk/test/org/apache/juli/TestFileHandler.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/juli/TestFileHandler.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/juli/TestFileHandler.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/juli/TestFileHandler.java Mon Nov 13 12:32:26 2017
@@ -22,10 +22,8 @@ import java.io.IOException;
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;
@@ -45,7 +43,7 @@ public class TestFileHandler {
File logsBase = new File(System.getProperty("tomcat.test.temp", "output/tmp"));
logsDir = new File(logsBase, "test-" + System.currentTimeMillis());
if (!logsDir.mkdirs() && !logsDir.isDirectory()) {
- fail("Unable to create logs directory.");
+ Assert.fail("Unable to create logs directory.");
}
generateLogFiles(logsDir, PREFIX_1, SUFIX_2, 3);
@@ -81,7 +79,7 @@ public class TestFileHandler {
Thread.sleep(1000);
- assertTrue(logsDir.list().length == 16);
+ Assert.assertTrue(logsDir.list().length == 16);
}
@SuppressWarnings("unused")
@@ -96,7 +94,7 @@ public class TestFileHandler {
Thread.sleep(1000);
- assertTrue(logsDir.list().length == 16);
+ Assert.assertTrue(logsDir.list().length == 16);
}
@SuppressWarnings("unused")
@@ -108,7 +106,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/tc7.0.x/trunk/test/org/apache/juli/TestFileHandlerNonRotatable.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/juli/TestFileHandlerNonRotatable.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/juli/TestFileHandlerNonRotatable.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/juli/TestFileHandlerNonRotatable.java Mon Nov 13 12:32:26 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/tc7.0.x/trunk/test/org/apache/naming/resources/TestDirContextURLStreamHandlerFactory.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/naming/resources/TestDirContextURLStreamHandlerFactory.java?rev=1815093&r1=1815092&r2=1815093&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/naming/resources/TestDirContextURLStreamHandlerFactory.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/naming/resources/TestDirContextURLStreamHandlerFactory.java Mon Nov 13 12:32:26 2017
@@ -21,9 +21,7 @@ import java.net.URL;
import java.net.URLStreamHandler;
import java.net.URLStreamHandlerFactory;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
+import org.junit.Assert;
import org.junit.Test;
public class TestDirContextURLStreamHandlerFactory {
@@ -39,7 +37,7 @@ public class TestDirContextURLStreamHand
} catch (MalformedURLException ignore) {
// Ignore
}
- assertNull(url);
+ Assert.assertNull(url);
// Set the factory
URL.setURLStreamHandlerFactory(
@@ -51,7 +49,7 @@ public class TestDirContextURLStreamHand
} catch (MalformedURLException ignore) {
// Ignore
}
- assertNull(url);
+ Assert.assertNull(url);
// Register a user factory
DirContextURLStreamHandlerFactory.addUserFactory(
@@ -63,7 +61,7 @@ public class TestDirContextURLStreamHand
} catch (MalformedURLException ignore) {
// Ignore
}
- assertNotNull(url);
+ Assert.assertNotNull(url);
}
public static class FooURLStreamHandlerFactory
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org