Modified: tomcat/tc8.0.x/trunk/test/org/apache/el/lang/TestELArithmetic.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/el/lang/TestELArithmetic.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/el/lang/TestELArithmetic.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/el/lang/TestELArithmetic.java Mon Nov 13 12:00:30 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.0.x/trunk/test/org/apache/el/lang/TestELSupport.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/el/lang/TestELSupport.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/el/lang/TestELSupport.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/el/lang/TestELSupport.java Mon Nov 13 12:00:30 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.0.x/trunk/test/org/apache/el/parser/TestELParser.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/el/parser/TestELParser.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/el/parser/TestELParser.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/el/parser/TestELParser.java Mon Nov 13 12:00:30 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/tc8.0.x/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java Mon Nov 13 12:00:30 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.0.x/trunk/test/org/apache/jasper/compiler/TestCompiler.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/jasper/compiler/TestCompiler.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/jasper/compiler/TestCompiler.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/jasper/compiler/TestCompiler.java Mon Nov 13 12:00:30 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.startup.Tomcat; @@ -49,7 +47,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 @@ -67,7 +65,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 @@ -165,7 +163,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 @@ -194,12 +192,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.0.x/trunk/test/org/apache/jasper/compiler/TestGenerator.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/jasper/compiler/TestGenerator.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/jasper/compiler/TestGenerator.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/jasper/compiler/TestGenerator.java Mon Nov 13 12:00:30 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.0.x/trunk/test/org/apache/jasper/compiler/TestJspConfig.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/jasper/compiler/TestJspConfig.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/jasper/compiler/TestJspConfig.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/jasper/compiler/TestJspConfig.java Mon Nov 13 12:00:30 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,8 +84,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 @@ -105,7 +104,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 @@ -124,7 +123,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 @@ -143,6 +142,6 @@ 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.0.x/trunk/test/org/apache/jasper/compiler/TestParser.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/jasper/compiler/TestParser.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/jasper/compiler/TestParser.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/jasper/compiler/TestParser.java Mon Nov 13 12:00:30 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.0.x/trunk/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java Mon Nov 13 12:00:30 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.0.x/trunk/test/org/apache/jasper/compiler/TestScriptingVariabler.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/jasper/compiler/TestScriptingVariabler.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/jasper/compiler/TestScriptingVariabler.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/jasper/compiler/TestScriptingVariabler.java Mon Nov 13 12:00:30 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); } } Modified: tomcat/tc8.0.x/trunk/test/org/apache/jasper/compiler/TestValidator.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/jasper/compiler/TestValidator.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/jasper/compiler/TestValidator.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/jasper/compiler/TestValidator.java Mon Nov 13 12:00:30 2017 @@ -24,9 +24,7 @@ import javax.servlet.http.HttpServletRes import javax.servlet.jsp.JspException; import javax.servlet.jsp.tagext.TagSupport; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - +import org.junit.Assert; import org.junit.Test; import org.apache.catalina.startup.Tomcat; @@ -42,7 +40,7 @@ public class TestValidator extends Tomca int rc = getUrl("http://localhost:"; + getPort() + "/test/bug47331.jsp", new ByteChunk(), null); - assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc); + Assert.assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc); } @Test @@ -61,13 +59,13 @@ public class TestValidator extends Tomca String result = res.toString(); - assertTrue(result.indexOf("<p>${'00-hello world'}</p>") > 0); - assertTrue(result.indexOf("<p>#{'01-hello world'}</p>") > 0); - assertTrue(result.indexOf("<p>${'02-hello world'}</p>") > 0); - assertTrue(result.indexOf("<p>#{'03-hello world'}</p>") > 0); - assertTrue(result.indexOf("<p>${'04-hello world'}</p>") > 0); - assertTrue(result.indexOf("<p>#{'05-hello world'}</p>") > 0); - assertTrue(result.indexOf("<p>${'06-hello world'}</p>") > 0); + Assert.assertTrue(result.indexOf("<p>${'00-hello world'}</p>") > 0); + Assert.assertTrue(result.indexOf("<p>#{'01-hello world'}</p>") > 0); + Assert.assertTrue(result.indexOf("<p>${'02-hello world'}</p>") > 0); + Assert.assertTrue(result.indexOf("<p>#{'03-hello world'}</p>") > 0); + Assert.assertTrue(result.indexOf("<p>${'04-hello world'}</p>") > 0); + Assert.assertTrue(result.indexOf("<p>#{'05-hello world'}</p>") > 0); + Assert.assertTrue(result.indexOf("<p>${'06-hello world'}</p>") > 0); } @Test @@ -86,13 +84,13 @@ public class TestValidator extends Tomca String result = res.toString(); - assertTrue(result.indexOf("<p>${'00-hello world'}</p>") > 0); - assertTrue(result.indexOf("<p>#{'01-hello world'}</p>") > 0); - assertTrue(result.indexOf("<p>${'02-hello world'}</p>") > 0); - assertTrue(result.indexOf("<p>#{'03-hello world'}</p>") > 0); - assertTrue(result.indexOf("<p>${'04-hello world'}</p>") > 0); - assertTrue(result.indexOf("<p>#{'05-hello world'}</p>") > 0); - assertTrue(result.indexOf("<p>${'06-hello world'}</p>") > 0); + Assert.assertTrue(result.indexOf("<p>${'00-hello world'}</p>") > 0); + Assert.assertTrue(result.indexOf("<p>#{'01-hello world'}</p>") > 0); + Assert.assertTrue(result.indexOf("<p>${'02-hello world'}</p>") > 0); + Assert.assertTrue(result.indexOf("<p>#{'03-hello world'}</p>") > 0); + Assert.assertTrue(result.indexOf("<p>${'04-hello world'}</p>") > 0); + Assert.assertTrue(result.indexOf("<p>#{'05-hello world'}</p>") > 0); + Assert.assertTrue(result.indexOf("<p>${'06-hello world'}</p>") > 0); } @Test @@ -111,13 +109,13 @@ public class TestValidator extends Tomca String result = res.toString(); - assertTrue(result.indexOf("<p>00-hello world</p>") > 0); - assertTrue(result.indexOf("<p>#{'01-hello world'}</p>") > 0); - assertTrue(result.indexOf("<p>02-hello world</p>") > 0); - assertTrue(result.indexOf("<p>#{'03-hello world'}</p>") > 0); - assertTrue(result.indexOf("<p>04-hello world</p>") > 0); - assertTrue(result.indexOf("<p>#{'05-hello world'}</p>") > 0); - assertTrue(result.indexOf("<p>06-hello world</p>") > 0); + Assert.assertTrue(result.indexOf("<p>00-hello world</p>") > 0); + Assert.assertTrue(result.indexOf("<p>#{'01-hello world'}</p>") > 0); + Assert.assertTrue(result.indexOf("<p>02-hello world</p>") > 0); + Assert.assertTrue(result.indexOf("<p>#{'03-hello world'}</p>") > 0); + Assert.assertTrue(result.indexOf("<p>04-hello world</p>") > 0); + Assert.assertTrue(result.indexOf("<p>#{'05-hello world'}</p>") > 0); + Assert.assertTrue(result.indexOf("<p>06-hello world</p>") > 0); } @Test @@ -136,13 +134,13 @@ public class TestValidator extends Tomca String result = res.toString(); - assertTrue(result.indexOf("<p>00-hello world</p>") > 0); - assertTrue(result.indexOf("<p>#{'01-hello world'}</p>") > 0); - assertTrue(result.indexOf("<p>02-hello world</p>") > 0); - assertTrue(result.indexOf("<p>#{'03-hello world'}</p>") > 0); - assertTrue(result.indexOf("<p>04-hello world</p>") > 0); - assertTrue(result.indexOf("<p>#{'05-hello world'}</p>") > 0); - assertTrue(result.indexOf("<p>06-hello world</p>") > 0); + Assert.assertTrue(result.indexOf("<p>00-hello world</p>") > 0); + Assert.assertTrue(result.indexOf("<p>#{'01-hello world'}</p>") > 0); + Assert.assertTrue(result.indexOf("<p>02-hello world</p>") > 0); + Assert.assertTrue(result.indexOf("<p>#{'03-hello world'}</p>") > 0); + Assert.assertTrue(result.indexOf("<p>04-hello world</p>") > 0); + Assert.assertTrue(result.indexOf("<p>#{'05-hello world'}</p>") > 0); + Assert.assertTrue(result.indexOf("<p>06-hello world</p>") > 0); } @Test @@ -161,13 +159,13 @@ public class TestValidator extends Tomca String result = res.toString(); - assertTrue(result.indexOf("<p>00-hello world</p>") > 0); - assertTrue(result.indexOf("<p>#{'01-hello world'}</p>") > 0); - assertTrue(result.indexOf("<p>02-hello world</p>") > 0); - assertTrue(result.indexOf("<p>#{'03-hello world'}</p>") > 0); - assertTrue(result.indexOf("<p>04-hello world</p>") > 0); - assertTrue(result.indexOf("<p>#{'05-hello world'}</p>") > 0); - assertTrue(result.indexOf("<p>06-hello world</p>") > 0); + Assert.assertTrue(result.indexOf("<p>00-hello world</p>") > 0); + Assert.assertTrue(result.indexOf("<p>#{'01-hello world'}</p>") > 0); + Assert.assertTrue(result.indexOf("<p>02-hello world</p>") > 0); + Assert.assertTrue(result.indexOf("<p>#{'03-hello world'}</p>") > 0); + Assert.assertTrue(result.indexOf("<p>04-hello world</p>") > 0); + Assert.assertTrue(result.indexOf("<p>#{'05-hello world'}</p>") > 0); + Assert.assertTrue(result.indexOf("<p>06-hello world</p>") > 0); } @Test @@ -186,13 +184,13 @@ public class TestValidator extends Tomca String result = res.toString(); - assertTrue(result.indexOf("<p>00-hello world</p>") > 0); - assertTrue(result.indexOf("<p>#{'01-hello world'}</p>") > 0); - assertTrue(result.indexOf("<p>02-hello world</p>") > 0); - assertTrue(result.indexOf("<p>#{'03-hello world'}</p>") > 0); - assertTrue(result.indexOf("<p>04-hello world</p>") > 0); - assertTrue(result.indexOf("<p>#{'05-hello world'}</p>") > 0); - assertTrue(result.indexOf("<p>06-hello world</p>") > 0); + Assert.assertTrue(result.indexOf("<p>00-hello world</p>") > 0); + Assert.assertTrue(result.indexOf("<p>#{'01-hello world'}</p>") > 0); + Assert.assertTrue(result.indexOf("<p>02-hello world</p>") > 0); + Assert.assertTrue(result.indexOf("<p>#{'03-hello world'}</p>") > 0); + Assert.assertTrue(result.indexOf("<p>04-hello world</p>") > 0); + Assert.assertTrue(result.indexOf("<p>#{'05-hello world'}</p>") > 0); + Assert.assertTrue(result.indexOf("<p>06-hello world</p>") > 0); } public static class Echo extends TagSupport { Modified: tomcat/tc8.0.x/trunk/test/org/apache/jasper/util/TestFastRemovalDequeue.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/jasper/util/TestFastRemovalDequeue.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/jasper/util/TestFastRemovalDequeue.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/jasper/util/TestFastRemovalDequeue.java Mon Nov 13 12:00:30 2017 @@ -16,9 +16,7 @@ */ package org.apache.jasper.util; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; - +import org.junit.Assert; import org.junit.Test; @@ -34,9 +32,9 @@ public class TestFastRemovalDequeue { Object r = q.pop(); - assertEquals(o1, r); - assertNull(q.first); - assertNull(q.last); + Assert.assertEquals(o1, r); + Assert.assertNull(q.first); + Assert.assertNull(q.last); } @@ -50,20 +48,20 @@ public class TestFastRemovalDequeue { q.push(o1); q.push(o2); - assertEquals(o2, q.first.getContent()); - assertEquals(o1, q.last.getContent()); + Assert.assertEquals(o2, q.first.getContent()); + Assert.assertEquals(o1, q.last.getContent()); Object r1 = q.pop(); - assertEquals(o1, r1); - assertEquals(o2, q.first.getContent()); - assertEquals(o2, q.last.getContent()); + Assert.assertEquals(o1, r1); + Assert.assertEquals(o2, q.first.getContent()); + Assert.assertEquals(o2, q.last.getContent()); Object r2 = q.pop(); - assertEquals(o2, r2); - assertNull(q.first); - assertNull(q.last); + Assert.assertEquals(o2, r2); + Assert.assertNull(q.first); + Assert.assertNull(q.last); } @@ -77,9 +75,9 @@ public class TestFastRemovalDequeue { Object r = q.pop(); - assertEquals(o1, r); - assertNull(q.first); - assertNull(q.last); + Assert.assertEquals(o1, r); + Assert.assertNull(q.first); + Assert.assertNull(q.last); } @@ -93,20 +91,20 @@ public class TestFastRemovalDequeue { q.unpop(o1); q.unpop(o2); - assertEquals(o1, q.first.getContent()); - assertEquals(o2, q.last.getContent()); + Assert.assertEquals(o1, q.first.getContent()); + Assert.assertEquals(o2, q.last.getContent()); Object r2 = q.pop(); - assertEquals(o2, r2); - assertEquals(o1, q.first.getContent()); - assertEquals(o1, q.last.getContent()); + Assert.assertEquals(o2, r2); + Assert.assertEquals(o1, q.first.getContent()); + Assert.assertEquals(o1, q.last.getContent()); Object r1 = q.pop(); - assertEquals(o1, r1); - assertNull(q.first); - assertNull(q.last); + Assert.assertEquals(o1, r1); + Assert.assertNull(q.first); + Assert.assertNull(q.last); } @@ -120,9 +118,9 @@ public class TestFastRemovalDequeue { Object r = q.unpush(); - assertEquals(o1, r); - assertNull(q.first); - assertNull(q.last); + Assert.assertEquals(o1, r); + Assert.assertNull(q.first); + Assert.assertNull(q.last); } @@ -136,20 +134,20 @@ public class TestFastRemovalDequeue { q.push(o1); q.push(o2); - assertEquals(o2, q.first.getContent()); - assertEquals(o1, q.last.getContent()); + Assert.assertEquals(o2, q.first.getContent()); + Assert.assertEquals(o1, q.last.getContent()); Object r2 = q.unpush(); - assertEquals(o2, r2); - assertEquals(o1, q.first.getContent()); - assertEquals(o1, q.last.getContent()); + Assert.assertEquals(o2, r2); + Assert.assertEquals(o1, q.first.getContent()); + Assert.assertEquals(o1, q.last.getContent()); Object r1 = q.unpush(); - assertEquals(o1, r1); - assertNull(q.first); - assertNull(q.last); + Assert.assertEquals(o1, r1); + Assert.assertNull(q.first); + Assert.assertNull(q.last); } @@ -161,12 +159,12 @@ public class TestFastRemovalDequeue { FastRemovalDequeue<Object>.Entry e1 = q.push(o1); - assertEquals(o1, e1.getContent()); + Assert.assertEquals(o1, e1.getContent()); q.remove(e1); - assertNull(q.first); - assertNull(q.last); + Assert.assertNull(q.first); + Assert.assertNull(q.last); } @@ -180,20 +178,20 @@ public class TestFastRemovalDequeue { FastRemovalDequeue<Object>.Entry e1 = q.push(o1); FastRemovalDequeue<Object>.Entry e2 = q.push(o2); - assertEquals(o1, e1.getContent()); - assertEquals(o2, e2.getContent()); + Assert.assertEquals(o1, e1.getContent()); + Assert.assertEquals(o2, e2.getContent()); - assertEquals(o2, q.first.getContent()); - assertEquals(o1, q.last.getContent()); + Assert.assertEquals(o2, q.first.getContent()); + Assert.assertEquals(o1, q.last.getContent()); q.remove(e1); - assertEquals(o2, q.first.getContent()); - assertEquals(o2, q.last.getContent()); + Assert.assertEquals(o2, q.first.getContent()); + Assert.assertEquals(o2, q.last.getContent()); q.remove(e2); - assertNull(q.first); - assertNull(q.last); + Assert.assertNull(q.first); + Assert.assertNull(q.last); } } Modified: tomcat/tc8.0.x/trunk/test/org/apache/juli/TestFileHandler.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/juli/TestFileHandler.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/juli/TestFileHandler.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/juli/TestFileHandler.java Mon Nov 13 12:00:30 2017 @@ -25,10 +25,8 @@ import java.nio.file.Path; import java.text.SimpleDateFormat; import java.util.Calendar; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import org.junit.After; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -47,7 +45,7 @@ public class TestFileHandler { public void setUp() throws Exception { File logsBase = new File(System.getProperty("tomcat.test.temp", "output/tmp")); if (!logsBase.mkdirs() && !logsBase.isDirectory()) { - fail("Unable to create logs directory."); + Assert.fail("Unable to create logs directory."); } Path logsBasePath = FileSystems.getDefault().getPath(logsBase.getAbsolutePath()); logsDir = Files.createTempDirectory(logsBasePath, "test").toFile(); @@ -85,7 +83,7 @@ public class TestFileHandler { Thread.sleep(1000); - assertTrue(logsDir.list().length == 16); + Assert.assertTrue(logsDir.list().length == 16); } @SuppressWarnings("unused") @@ -100,7 +98,7 @@ public class TestFileHandler { Thread.sleep(1000); - assertTrue(logsDir.list().length == 16); + Assert.assertTrue(logsDir.list().length == 16); } @SuppressWarnings("unused") @@ -112,7 +110,7 @@ public class TestFileHandler { Thread.sleep(1000); - assertTrue(logsDir.list().length == 17); + Assert.assertTrue(logsDir.list().length == 17); } private void generateLogFiles(File dir, String prefix, String sufix, int amount) Modified: tomcat/tc8.0.x/trunk/test/org/apache/juli/TestFileHandlerNonRotatable.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/juli/TestFileHandlerNonRotatable.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/juli/TestFileHandlerNonRotatable.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/juli/TestFileHandlerNonRotatable.java Mon Nov 13 12:00:30 2017 @@ -19,9 +19,8 @@ package org.apache.juli; import java.io.File; import java.net.URLDecoder; -import static org.junit.Assert.assertTrue; - import org.junit.After; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -56,7 +55,7 @@ public class TestFileHandlerNonRotatable "juli.", ".log"); File logFile = new File(this.getTemporaryDirectory(), "juli.log"); - assertTrue(logFile.exists()); + Assert.assertTrue(logFile.exists()); } @Test @@ -65,7 +64,7 @@ public class TestFileHandlerNonRotatable "juli.", "log"); File logFile = new File(this.getTemporaryDirectory(), "juli.log"); - assertTrue(logFile.exists()); + Assert.assertTrue(logFile.exists()); } @Test @@ -74,6 +73,6 @@ public class TestFileHandlerNonRotatable "juli", ".log"); File logFile = new File(this.getTemporaryDirectory(), "juli.log"); - assertTrue(logFile.exists()); + Assert.assertTrue(logFile.exists()); } } \ No newline at end of file Modified: tomcat/tc8.0.x/trunk/test/org/apache/naming/resources/TestNamingContext.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/naming/resources/TestNamingContext.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/naming/resources/TestNamingContext.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/naming/resources/TestNamingContext.java Mon Nov 13 12:00:30 2017 @@ -31,9 +31,6 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import org.junit.Assert; import org.junit.Test; @@ -86,7 +83,7 @@ public class TestNamingContext extends T } else { expected = "NOTEQUAL"; } - assertEquals(expected, bc.toString()); + Assert.assertEquals(expected, bc.toString()); } @@ -139,7 +136,7 @@ public class TestNamingContext extends T tomcat.start(); ByteChunk bc = getUrl("http://localhost:"; + getPort() + "/"); - assertEquals("org.apache.naming.resources.TesterObject", bc.toString()); + Assert.assertEquals("org.apache.naming.resources.TesterObject", bc.toString()); } public static final class Bug23950Servlet extends HttpServlet { @@ -191,7 +188,7 @@ public class TestNamingContext extends T tomcat.start(); ByteChunk bc = getUrl("http://localhost:"; + getPort() + "/"); - assertEquals("value", bc.toString()); + Assert.assertEquals("value", bc.toString()); } public static final class Bug50351Servlet extends HttpServlet { @@ -245,10 +242,10 @@ public class TestNamingContext extends T ByteChunk bc = new ByteChunk(); int rc = getUrl("http://localhost:"; + getPort() + "/", bc, null); - assertEquals(200, rc); - assertTrue(bc.toString().contains(Bug51744Servlet.EXPECTED)); + Assert.assertEquals(200, rc); + Assert.assertTrue(bc.toString().contains(Bug51744Servlet.EXPECTED)); if (exceptionOnFailedWrite) { - assertTrue(bc.toString().contains(Bug51744Servlet.ERROR_MESSAGE)); + Assert.assertTrue(bc.toString().contains(Bug51744Servlet.ERROR_MESSAGE)); } } @@ -308,8 +305,8 @@ public class TestNamingContext extends T ByteChunk bc = new ByteChunk(); int rc = getUrl("http://localhost:"; + getPort() + "/", bc, null); - assertEquals(200, rc); - assertTrue(bc.toString().contains("truetrue")); + Assert.assertEquals(200, rc); + Assert.assertTrue(bc.toString().contains("truetrue")); } public static final class Bug52830Servlet extends HttpServlet { Modified: tomcat/tc8.0.x/trunk/test/org/apache/naming/resources/TestWarDirContext.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/naming/resources/TestWarDirContext.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/naming/resources/TestWarDirContext.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/naming/resources/TestWarDirContext.java Mon Nov 13 12:00:30 2017 @@ -18,8 +18,7 @@ package org.apache.naming.resources; import java.io.File; -import static org.junit.Assert.assertEquals; - +import org.junit.Assert; import org.junit.Test; import org.apache.catalina.core.JreMemoryLeakPreventionListener; @@ -60,7 +59,7 @@ public class TestWarDirContext extends T ByteChunk bc = getUrl("http://localhost:"; + getPort() + "/test/warDirContext.jsp"); - assertEquals("<p>java.lang.ClassNotFoundException</p>", + Assert.assertEquals("<p>java.lang.ClassNotFoundException</p>", bc.toString()); } @@ -86,13 +85,13 @@ public class TestWarDirContext extends T // Should be found in resources.jar ByteChunk bc = getUrl("http://localhost:"; + getPort() + "/test/'singlequote.jsp"); - assertEquals("<p>'singlequote.jsp in resources.jar</p>", + Assert.assertEquals("<p>'singlequote.jsp in resources.jar</p>", bc.toString()); // Should be found in file system bc = getUrl("http://localhost:"; + getPort() + "/test/'singlequote2.jsp"); - assertEquals("<p>'singlequote2.jsp in file system</p>", + Assert.assertEquals("<p>'singlequote2.jsp in file system</p>", bc.toString()); } @@ -118,13 +117,13 @@ public class TestWarDirContext extends T // Should be found in resources.jar ByteChunk bc = getUrl("http://localhost:"; + getPort() + "/test/'singlequote.jsp"); - assertEquals("<p>'singlequote.jsp in resources.jar</p>", + Assert.assertEquals("<p>'singlequote.jsp in resources.jar</p>", bc.toString()); // Should be found in file system bc = getUrl("http://localhost:"; + getPort() + "/test/'singlequote2.jsp"); - assertEquals("<p>'singlequote2.jsp in file system</p>", + Assert.assertEquals("<p>'singlequote2.jsp in file system</p>", bc.toString()); } } Modified: tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java Mon Nov 13 12:00:30 2017 @@ -19,9 +19,7 @@ package org.apache.tomcat.util.buf; import java.io.UnsupportedEncodingException; import java.util.Arrays; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - +import org.junit.Assert; import org.junit.Test; /** @@ -34,7 +32,7 @@ public class TestByteChunk { String string = "HTTP/1.1 100 Continue\r\n"; byte[] bytes = ByteChunk.convertToBytes(string); byte[] expected = string.getBytes("ISO-8859-1"); - assertTrue(Arrays.equals(bytes, expected)); + Assert.assertTrue(Arrays.equals(bytes, expected)); } /* @@ -53,23 +51,23 @@ public class TestByteChunk { final int len = bytes.length; // indexOf() does not work outside of 0-127 - assertEquals(5, ByteChunk.findByte(bytes, 0, len, (byte) '\u00a0')); - assertEquals(-1, ByteChunk.indexOf(bytes, 0, len, '\u00a0')); + Assert.assertEquals(5, ByteChunk.findByte(bytes, 0, len, (byte) '\u00a0')); + Assert.assertEquals(-1, ByteChunk.indexOf(bytes, 0, len, '\u00a0')); - assertEquals(0, ByteChunk.findByte(bytes, 0, len, (byte) 'H')); - assertEquals(0, ByteChunk.indexOf(bytes, 0, len, 'H')); + Assert.assertEquals(0, ByteChunk.findByte(bytes, 0, len, (byte) 'H')); + Assert.assertEquals(0, ByteChunk.indexOf(bytes, 0, len, 'H')); - assertEquals(len - 1, ByteChunk.findByte(bytes, 0, len, (byte) 'd')); - assertEquals(len - 1, ByteChunk.indexOf(bytes, 0, len, 'd')); + Assert.assertEquals(len - 1, ByteChunk.findByte(bytes, 0, len, (byte) 'd')); + Assert.assertEquals(len - 1, ByteChunk.indexOf(bytes, 0, len, 'd')); - assertEquals(-1, ByteChunk.findByte(bytes, 0, len, (byte) 'x')); - assertEquals(-1, ByteChunk.indexOf(bytes, 0, len, 'x')); + Assert.assertEquals(-1, ByteChunk.findByte(bytes, 0, len, (byte) 'x')); + Assert.assertEquals(-1, ByteChunk.indexOf(bytes, 0, len, 'x')); - assertEquals(7, ByteChunk.findByte(bytes, 5, len, (byte) 'o')); - assertEquals(7, ByteChunk.indexOf(bytes, 5, len, 'o')); + Assert.assertEquals(7, ByteChunk.findByte(bytes, 5, len, (byte) 'o')); + Assert.assertEquals(7, ByteChunk.indexOf(bytes, 5, len, 'o')); - assertEquals(-1, ByteChunk.findByte(bytes, 2, 5, (byte) 'w')); - assertEquals(-1, ByteChunk.indexOf(bytes, 5, 5, 'w')); + Assert.assertEquals(-1, ByteChunk.findByte(bytes, 2, 5, (byte) 'w')); + Assert.assertEquals(-1, ByteChunk.indexOf(bytes, 5, 5, 'w')); } @Test @@ -80,18 +78,18 @@ public class TestByteChunk { ByteChunk bc = new ByteChunk(); bc.setBytes(bytes, 0, len); - assertEquals(0, bc.indexOf('H', 0)); - assertEquals(6, bc.indexOf('w', 0)); + Assert.assertEquals(0, bc.indexOf('H', 0)); + Assert.assertEquals(6, bc.indexOf('w', 0)); // Does not work outside of 0-127 - assertEquals(-1, bc.indexOf('\u00a0', 0)); + Assert.assertEquals(-1, bc.indexOf('\u00a0', 0)); bc.setBytes(bytes, 6, 5); - assertEquals(1, bc.indexOf('o', 0)); + Assert.assertEquals(1, bc.indexOf('o', 0)); bc.setBytes(bytes, 6, 2); - assertEquals(0, bc.indexOf('w', 0)); - assertEquals(-1, bc.indexOf('d', 0)); + Assert.assertEquals(0, bc.indexOf('w', 0)); + Assert.assertEquals(-1, bc.indexOf('d', 0)); } @Test @@ -102,21 +100,21 @@ public class TestByteChunk { ByteChunk bc = new ByteChunk(); bc.setBytes(bytes, 0, len); - assertEquals(0, bc.indexOf("Hello", 0, "Hello".length(), 0)); - assertEquals(2, bc.indexOf("ll", 0, 2, 0)); - assertEquals(2, bc.indexOf("Hello", 2, 2, 0)); + Assert.assertEquals(0, bc.indexOf("Hello", 0, "Hello".length(), 0)); + Assert.assertEquals(2, bc.indexOf("ll", 0, 2, 0)); + Assert.assertEquals(2, bc.indexOf("Hello", 2, 2, 0)); - assertEquals(7, bc.indexOf("o", 0, 1, 5)); + Assert.assertEquals(7, bc.indexOf("o", 0, 1, 5)); // Does not work outside of 0-127 - assertEquals(-1, bc.indexOf("\u00a0", 0, 1, 0)); + Assert.assertEquals(-1, bc.indexOf("\u00a0", 0, 1, 0)); bc.setBytes(bytes, 6, 5); - assertEquals(1, bc.indexOf("o", 0, 1, 0)); + Assert.assertEquals(1, bc.indexOf("o", 0, 1, 0)); bc.setBytes(bytes, 6, 2); - assertEquals(0, bc.indexOf("wo", 0, 1, 0)); - assertEquals(-1, bc.indexOf("d", 0, 1, 0)); + Assert.assertEquals(0, bc.indexOf("wo", 0, 1, 0)); + Assert.assertEquals(-1, bc.indexOf("d", 0, 1, 0)); } @Test @@ -124,15 +122,15 @@ public class TestByteChunk { byte[] bytes = "Hello\u00a0world".getBytes("ISO-8859-1"); final int len = bytes.length; - assertEquals(0, ByteChunk.findBytes(bytes, 0, len, new byte[] { 'H' })); - assertEquals(5, ByteChunk.findBytes(bytes, 0, len, new byte[] { + Assert.assertEquals(0, ByteChunk.findBytes(bytes, 0, len, new byte[] { 'H' })); + Assert.assertEquals(5, ByteChunk.findBytes(bytes, 0, len, new byte[] { (byte) '\u00a0', 'x' })); - assertEquals(5, ByteChunk.findBytes(bytes, 0, len - 4, new byte[] { + Assert.assertEquals(5, ByteChunk.findBytes(bytes, 0, len - 4, new byte[] { 'x', (byte) '\u00a0' })); - assertEquals(len - 1, ByteChunk.findBytes(bytes, 2, len, new byte[] { + Assert.assertEquals(len - 1, ByteChunk.findBytes(bytes, 2, len, new byte[] { 'x', 'd' })); - assertEquals(1, ByteChunk.findBytes(bytes, 0, len, new byte[] { 'o', + Assert.assertEquals(1, ByteChunk.findBytes(bytes, 0, len, new byte[] { 'o', 'e' })); - assertEquals(-1, ByteChunk.findBytes(bytes, 2, 5, new byte[] { 'w' })); + Assert.assertEquals(-1, ByteChunk.findBytes(bytes, 2, 5, new byte[] { 'w' })); } } Modified: tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/buf/TestUEncoder.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/buf/TestUEncoder.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/buf/TestUEncoder.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/buf/TestUEncoder.java Mon Nov 13 12:00:30 2017 @@ -19,9 +19,7 @@ package org.apache.tomcat.util.buf; import java.io.IOException; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - +import org.junit.Assert; import org.junit.Test; import org.apache.tomcat.util.buf.UEncoder.SafeCharsSet; @@ -36,17 +34,17 @@ public class TestUEncoder { UEncoder urlEncoder = new UEncoder(); String s = "a/b/c/d+e.class"; - assertTrue(urlEncoder.encodeURL(s, 0, s.length()).equals( + Assert.assertTrue(urlEncoder.encodeURL(s, 0, s.length()).equals( "a%2fb%2fc%2fd%2be.class")); - assertTrue(urlEncoder.encodeURL(s, 2, s.length() - 2).equals( + Assert.assertTrue(urlEncoder.encodeURL(s, 2, s.length() - 2).equals( "b%2fc%2fd%2be.cla")); urlEncoder.addSafeCharacter('+'); - assertTrue(urlEncoder.encodeURL(s, 0, s.length()).equals( + Assert.assertTrue(urlEncoder.encodeURL(s, 0, s.length()).equals( "a%2fb%2fc%2fd+e.class")); s = new String(new char[] { 0xD801, 0xDC01 }); - assertTrue(urlEncoder.encodeURL(s, 0, s.length()) + Assert.assertTrue(urlEncoder.encodeURL(s, 0, s.length()) .equals("%f0%90%90%81")); } @@ -55,20 +53,20 @@ public class TestUEncoder { UEncoder urlEncoder = new UEncoder(SafeCharsSet.WITH_SLASH); String s = "a+b/c/d+e.class"; - assertTrue(urlEncoder.encodeURL(s, 0, s.length()).equals( + Assert.assertTrue(urlEncoder.encodeURL(s, 0, s.length()).equals( "a%2bb/c/d%2be.class")); - assertTrue(urlEncoder.encodeURL(s, 2, s.length() - 2).equals( + Assert.assertTrue(urlEncoder.encodeURL(s, 2, s.length() - 2).equals( "b/c/d%2be.cla")); try { urlEncoder.addSafeCharacter('+'); - fail(); + Assert.fail(); } catch (IllegalStateException e) { // OK } s = new String(new char[] { 0xD801, 0xDC01 }); - assertTrue(urlEncoder.encodeURL(s, 0, s.length()) + Assert.assertTrue(urlEncoder.encodeURL(s, 0, s.length()) .equals("%f0%90%90%81")); } Modified: tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/descriptor/web/TestSecurityConstraint.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/descriptor/web/TestSecurityConstraint.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/descriptor/web/TestSecurityConstraint.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/descriptor/web/TestSecurityConstraint.java Mon Nov 13 12:00:30 2017 @@ -25,11 +25,6 @@ import javax.servlet.ServletSecurityElem import javax.servlet.annotation.ServletSecurity; import javax.servlet.annotation.ServletSecurity.EmptyRoleSemantic; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import org.junit.Assert; import org.junit.Test; @@ -99,7 +94,7 @@ public class TestSecurityConstraint { element = new ServletSecurityElement(); result = SecurityConstraint.createConstraints(element, URL_PATTERN); - assertEquals(0, result.length); + Assert.assertEquals(0, result.length); // Example 13-2 // @ServletSecurity( @@ -110,11 +105,11 @@ public class TestSecurityConstraint { ServletSecurity.TransportGuarantee.CONFIDENTIAL)); result = SecurityConstraint.createConstraints(element, URL_PATTERN); - assertEquals(1, result.length); - assertFalse(result[0].getAuthConstraint()); - assertTrue(result[0].findCollections()[0].findPattern(URL_PATTERN)); - assertEquals(0, result[0].findCollections()[0].findMethods().length); - assertEquals(ServletSecurity.TransportGuarantee.CONFIDENTIAL.name(), + Assert.assertEquals(1, result.length); + Assert.assertFalse(result[0].getAuthConstraint()); + Assert.assertTrue(result[0].findCollections()[0].findPattern(URL_PATTERN)); + Assert.assertEquals(0, result[0].findCollections()[0].findMethods().length); + Assert.assertEquals(ServletSecurity.TransportGuarantee.CONFIDENTIAL.name(), result[0].getUserConstraint()); // Example 13-3 @@ -123,11 +118,11 @@ public class TestSecurityConstraint { new HttpConstraintElement(EmptyRoleSemantic.DENY)); result = SecurityConstraint.createConstraints(element, URL_PATTERN); - assertEquals(1, result.length); - assertTrue(result[0].getAuthConstraint()); - assertTrue(result[0].findCollections()[0].findPattern(URL_PATTERN)); - assertEquals(0, result[0].findCollections()[0].findMethods().length); - assertEquals(ServletSecurity.TransportGuarantee.NONE.name(), + Assert.assertEquals(1, result.length); + Assert.assertTrue(result[0].getAuthConstraint()); + Assert.assertTrue(result[0].findCollections()[0].findPattern(URL_PATTERN)); + Assert.assertEquals(0, result[0].findCollections()[0].findMethods().length); + Assert.assertEquals(ServletSecurity.TransportGuarantee.NONE.name(), result[0].getUserConstraint()); // Example 13-4 @@ -136,13 +131,13 @@ public class TestSecurityConstraint { ServletSecurity.TransportGuarantee.NONE, ROLE1)); result = SecurityConstraint.createConstraints(element, URL_PATTERN); - assertEquals(1, result.length); - assertTrue(result[0].getAuthConstraint()); - assertEquals(1, result[0].findAuthRoles().length); - assertTrue(result[0].findAuthRole(ROLE1)); - assertTrue(result[0].findCollections()[0].findPattern(URL_PATTERN)); - assertEquals(0, result[0].findCollections()[0].findMethods().length); - assertEquals(ServletSecurity.TransportGuarantee.NONE.name(), + Assert.assertEquals(1, result.length); + Assert.assertTrue(result[0].getAuthConstraint()); + Assert.assertEquals(1, result[0].findAuthRoles().length); + Assert.assertTrue(result[0].findAuthRole(ROLE1)); + Assert.assertTrue(result[0].findCollections()[0].findPattern(URL_PATTERN)); + Assert.assertEquals(0, result[0].findCollections()[0].findMethods().length); + Assert.assertEquals(ServletSecurity.TransportGuarantee.NONE.name(), result[0].getUserConstraint()); // Example 13-5 @@ -162,22 +157,22 @@ public class TestSecurityConstraint { element = new ServletSecurityElement(hmces); result = SecurityConstraint.createConstraints(element, URL_PATTERN); - assertEquals(2, result.length); + Assert.assertEquals(2, result.length); for (int i = 0; i < 2; i++) { - assertTrue(result[i].getAuthConstraint()); - assertEquals(1, result[i].findAuthRoles().length); - assertTrue(result[i].findAuthRole(ROLE1)); - assertTrue(result[i].findCollections()[0].findPattern(URL_PATTERN)); - assertEquals(1, result[i].findCollections()[0].findMethods().length); + Assert.assertTrue(result[i].getAuthConstraint()); + Assert.assertEquals(1, result[i].findAuthRoles().length); + Assert.assertTrue(result[i].findAuthRole(ROLE1)); + Assert.assertTrue(result[i].findCollections()[0].findPattern(URL_PATTERN)); + Assert.assertEquals(1, result[i].findCollections()[0].findMethods().length); String method = result[i].findCollections()[0].findMethods()[0]; if ("GET".equals(method)) { - assertEquals(ServletSecurity.TransportGuarantee.NONE.name(), + Assert.assertEquals(ServletSecurity.TransportGuarantee.NONE.name(), result[i].getUserConstraint()); } else if ("POST".equals(method)) { - assertEquals(ServletSecurity.TransportGuarantee.CONFIDENTIAL.name(), + Assert.assertEquals(ServletSecurity.TransportGuarantee.CONFIDENTIAL.name(), result[i].getUserConstraint()); } else { - fail("Unexpected method :[" + method + "]"); + Assert.fail("Unexpected method :[" + method + "]"); } } @@ -193,23 +188,23 @@ public class TestSecurityConstraint { hmces); result = SecurityConstraint.createConstraints(element, URL_PATTERN); - assertEquals(2, result.length); + Assert.assertEquals(2, result.length); for (int i = 0; i < 2; i++) { - assertTrue(result[i].findCollections()[0].findPattern(URL_PATTERN)); + Assert.assertTrue(result[i].findCollections()[0].findPattern(URL_PATTERN)); if (result[i].findCollections()[0].findMethods().length == 1) { - assertEquals("GET", + Assert.assertEquals("GET", result[i].findCollections()[0].findMethods()[0]); - assertFalse(result[i].getAuthConstraint()); + Assert.assertFalse(result[i].getAuthConstraint()); } else if (result[i].findCollections()[0].findOmittedMethods().length == 1) { - assertEquals("GET", + Assert.assertEquals("GET", result[i].findCollections()[0].findOmittedMethods()[0]); - assertTrue(result[i].getAuthConstraint()); - assertEquals(1, result[i].findAuthRoles().length); - assertEquals(ROLE1, result[i].findAuthRoles()[0]); + Assert.assertTrue(result[i].getAuthConstraint()); + Assert.assertEquals(1, result[i].findAuthRoles().length); + Assert.assertEquals(ROLE1, result[i].findAuthRoles()[0]); } else { - fail("Unexpected number of methods defined"); + Assert.fail("Unexpected number of methods defined"); } - assertEquals(ServletSecurity.TransportGuarantee.NONE.name(), + Assert.assertEquals(ServletSecurity.TransportGuarantee.NONE.name(), result[i].getUserConstraint()); } @@ -227,24 +222,24 @@ public class TestSecurityConstraint { hmces); result = SecurityConstraint.createConstraints(element, URL_PATTERN); - assertEquals(2, result.length); + Assert.assertEquals(2, result.length); for (int i = 0; i < 2; i++) { - assertTrue(result[i].findCollections()[0].findPattern(URL_PATTERN)); + Assert.assertTrue(result[i].findCollections()[0].findPattern(URL_PATTERN)); if (result[i].findCollections()[0].findMethods().length == 1) { - assertEquals("TRACE", + Assert.assertEquals("TRACE", result[i].findCollections()[0].findMethods()[0]); - assertTrue(result[i].getAuthConstraint()); - assertEquals(0, result[i].findAuthRoles().length); + Assert.assertTrue(result[i].getAuthConstraint()); + Assert.assertEquals(0, result[i].findAuthRoles().length); } else if (result[i].findCollections()[0].findOmittedMethods().length == 1) { - assertEquals("TRACE", + Assert.assertEquals("TRACE", result[i].findCollections()[0].findOmittedMethods()[0]); - assertTrue(result[i].getAuthConstraint()); - assertEquals(1, result[i].findAuthRoles().length); - assertEquals(ROLE1, result[i].findAuthRoles()[0]); + Assert.assertTrue(result[i].getAuthConstraint()); + Assert.assertEquals(1, result[i].findAuthRoles().length); + Assert.assertEquals(ROLE1, result[i].findAuthRoles()[0]); } else { - fail("Unexpected number of methods defined"); + Assert.fail("Unexpected number of methods defined"); } - assertEquals(ServletSecurity.TransportGuarantee.NONE.name(), + Assert.assertEquals(ServletSecurity.TransportGuarantee.NONE.name(), result[i].getUserConstraint()); } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
