This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 91365f8e27349c177bc0f7028c194aa62ffabfcb
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jun 14 12:05:27 2023 +0100
Code clean-up - formatting. No fucntional change.
---
test/org/apache/jasper/compiler/Dumper.java | 20 +++--
.../jasper/compiler/TestAttributeParser.java | 39 ++++------
test/org/apache/jasper/compiler/TestCompiler.java | 41 ++++------
.../jasper/compiler/TestELInterpreterFactory.java | 8 +-
test/org/apache/jasper/compiler/TestELParser.java | 26 +++----
.../jasper/compiler/TestEncodingDetector.java | 39 +++++-----
test/org/apache/jasper/compiler/TestGenerator.java | 60 +++++----------
test/org/apache/jasper/compiler/TestJspConfig.java | 36 ++++-----
.../jasper/compiler/TestJspDocumentParser.java | 17 ++---
test/org/apache/jasper/compiler/TestJspReader.java | 3 +-
test/org/apache/jasper/compiler/TestJspUtil.java | 2 +-
.../compiler/TestJspUtilMakeJavaPackage.java | 26 +++----
test/org/apache/jasper/compiler/TestNode.java | 4 +-
.../jasper/compiler/TestNodeIntegration.java | 6 +-
test/org/apache/jasper/compiler/TestParser.java | 89 ++++++++--------------
.../compiler/TestParserNoStrictWhitespace.java | 5 +-
.../jasper/compiler/TestScriptingVariabler.java | 5 +-
.../apache/jasper/compiler/TestSmapStratum.java | 2 +
.../jasper/compiler/TestTagLibraryInfoImpl.java | 6 +-
.../jasper/compiler/TestTagPluginManager.java | 15 ++--
test/org/apache/jasper/compiler/TestValidator.java | 57 +++++---------
.../apache/jasper/compiler/TesterValidator.java | 15 ++--
22 files changed, 200 insertions(+), 321 deletions(-)
diff --git a/test/org/apache/jasper/compiler/Dumper.java
b/test/org/apache/jasper/compiler/Dumper.java
index afa55bbaa3..b94811a6b5 100644
--- a/test/org/apache/jasper/compiler/Dumper.java
+++ b/test/org/apache/jasper/compiler/Dumper.java
@@ -26,13 +26,12 @@ class Dumper {
private String getAttributes(Attributes attrs) {
if (attrs == null) {
- return "";
+ return "";
}
StringBuilder buf = new StringBuilder();
- for (int i=0; i < attrs.getLength(); i++) {
- buf.append(" " + attrs.getQName(i) + "=\""
- + attrs.getValue(i) + "\"");
+ for (int i = 0; i < attrs.getLength(); i++) {
+ buf.append(" " + attrs.getQName(i) + "=\"" + attrs.getValue(i)
+ "\"");
}
return buf.toString();
}
@@ -51,17 +50,16 @@ class Dumper {
}
}
- private void printAttributes(String prefix, Attributes attrs,
- String suffix) {
+ private void printAttributes(String prefix, Attributes attrs, String
suffix) {
printString(prefix, getAttributes(attrs), suffix);
}
private void dumpBody(Node n) throws JasperException {
Node.Nodes page = n.getBody();
if (page != null) {
-// indent++;
+ // indent++;
page.visit(this);
-// indent--;
+ // indent--;
}
}
@@ -157,7 +155,7 @@ class Dumper {
@Override
public void visit(Node.ELExpression n) throws JasperException {
- printString( "${" + n.getText() + "}" );
+ printString("${" + n.getText() + "}");
}
@Override
@@ -170,7 +168,7 @@ class Dumper {
@Override
public void visit(Node.UninterpretedTag n) throws JasperException {
String tag = n.getQName();
- printAttributes("<"+tag, n.getAttributes(), ">");
+ printAttributes("<" + tag, n.getAttributes(), ">");
dumpBody(n);
printString("</" + tag + ">");
}
@@ -181,7 +179,7 @@ class Dumper {
}
private void printIndent() {
- for (int i=0; i < indent; i++) {
+ for (int i = 0; i < indent; i++) {
System.out.print(" ");
}
}
diff --git a/test/org/apache/jasper/compiler/TestAttributeParser.java
b/test/org/apache/jasper/compiler/TestAttributeParser.java
index 7fc0d29813..b9854f9ff1 100644
--- a/test/org/apache/jasper/compiler/TestAttributeParser.java
+++ b/test/org/apache/jasper/compiler/TestAttributeParser.java
@@ -26,14 +26,13 @@ import org.apache.el.TesterFunctions;
import org.apache.jasper.el.ELContextImpl;
/**
- * Test the EL processing from JSP attributes. Similar tests may be found in
- * {@link org.apache.el.TestELEvaluation} and {@link
org.apache.el.TestELInJsp}.
+ * Test the EL processing from JSP attributes. Similar tests may be found in
{@link org.apache.el.TestELEvaluation} and
+ * {@link org.apache.el.TestELInJsp}.
*/
public class TestAttributeParser {
/**
- * Test use of spaces in ternary expressions. This was primarily an EL
- * parser bug.
+ * Test use of spaces in ternary expressions. This was primarily an EL
parser bug.
*/
@Test
public void testBug42565() {
@@ -57,25 +56,20 @@ public class TestAttributeParser {
/**
- * Test use nested ternary expressions. Full tests in
- * {@link org.apache.el.TestELEvaluation}. This is just a smoke test to
- * ensure JSP attribute processing doesn't cause any additional issues.
+ * Test use nested ternary expressions. Full tests in {@link
org.apache.el.TestELEvaluation}. This is just a smoke
+ * test to ensure JSP attribute processing doesn't cause any additional
issues.
*/
@Test
public void testBug44994() {
- Assert.assertEquals("none",
- evalAttr("${0 lt 0 ? 1 lt 0 ? 'many': 'one': 'none'}", '\"'));
- Assert.assertEquals("one",
- evalAttr("${0 lt 1 ? 1 lt 1 ? 'many': 'one': 'none'}", '\"'));
- Assert.assertEquals("many",
- evalAttr("${0 lt 2 ? 1 lt 2 ? 'many': 'one': 'none'}", '\"'));
+ Assert.assertEquals("none", evalAttr("${0 lt 0 ? 1 lt 0 ? 'many':
'one': 'none'}", '\"'));
+ Assert.assertEquals("one", evalAttr("${0 lt 1 ? 1 lt 1 ? 'many':
'one': 'none'}", '\"'));
+ Assert.assertEquals("many", evalAttr("${0 lt 2 ? 1 lt 2 ? 'many':
'one': 'none'}", '\"'));
}
/**
- * Test the quoting requirements of JSP attributes. This doesn't make use
of
- * EL. See {@link #testBug45451()} for a test that combines JSP attribute
- * quoting and EL quoting.
+ * Test the quoting requirements of JSP attributes. This doesn't make use
of EL. See {@link #testBug45451()} for a
+ * test that combines JSP attribute quoting and EL quoting.
*/
@Test
public void testBug45015() {
@@ -153,10 +147,8 @@ public class TestAttributeParser {
@Test
public void testScriptExpressionLiterals() {
- Assert.assertEquals(" \"hello world\" ", parseScriptExpression(
- " \"hello world\" ", (char) 0));
- Assert.assertEquals(" \"hello \\\"world\" ", parseScriptExpression(
- " \"hello \\\\\"world\" ", (char) 0));
+ Assert.assertEquals(" \"hello world\" ", parseScriptExpression("
\"hello world\" ", (char) 0));
+ Assert.assertEquals(" \"hello \\\"world\" ", parseScriptExpression("
\"hello \\\\\"world\" ", (char) 0));
}
private String evalAttr(String expression, char quote) {
@@ -165,14 +157,11 @@ public class TestAttributeParser {
ELContextImpl ctx = new ELContextImpl();
ctx.setFunctionMapper(new TesterFunctions.FMapper());
ValueExpression ve = exprFactory.createValueExpression(ctx,
- AttributeParser.getUnquoted(expression, quote, false, false,
- false, false),
- String.class);
+ AttributeParser.getUnquoted(expression, quote, false, false,
false, false), String.class);
return (String) ve.getValue(ctx);
}
private String parseScriptExpression(String expression, char quote) {
- return AttributeParser.getUnquoted(expression, quote, false, false,
- false, false);
+ return AttributeParser.getUnquoted(expression, quote, false, false,
false, false);
}
}
diff --git a/test/org/apache/jasper/compiler/TestCompiler.java
b/test/org/apache/jasper/compiler/TestCompiler.java
index b8911894a1..9f439b9774 100644
--- a/test/org/apache/jasper/compiler/TestCompiler.java
+++ b/test/org/apache/jasper/compiler/TestCompiler.java
@@ -39,8 +39,7 @@ public class TestCompiler extends TomcatBaseTest {
ByteChunk res = new ByteChunk();
Map<String,List<String>> headers = new HashMap<>();
- getUrl("http://localhost:"; + getPort() +
"/test/bug49nnn/bug49726a.jsp",
- res, headers);
+ getUrl("http://localhost:"; + getPort() +
"/test/bug49nnn/bug49726a.jsp", res, headers);
// Check request completed
String result = res.toString();
@@ -58,8 +57,7 @@ public class TestCompiler extends TomcatBaseTest {
ByteChunk res = new ByteChunk();
Map<String,List<String>> headers = new HashMap<>();
- getUrl("http://localhost:"; + getPort() +
"/test/bug49nnn/bug49726b.jsp",
- res, headers);
+ getUrl("http://localhost:"; + getPort() +
"/test/bug49nnn/bug49726b.jsp", res, headers);
// Check request completed
String result = res.toString();
@@ -75,8 +73,7 @@ public class TestCompiler extends TomcatBaseTest {
getTomcatInstanceTestWebapp(false, true);
// foo;bar.jsp
- ByteChunk res = getUrl("http://localhost:"; + getPort() +
- "/test/bug53257/foo%3bbar.jsp");
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/bug53257/foo%3bbar.jsp");
// Check request completed
String result = res.toString();
@@ -87,8 +84,7 @@ public class TestCompiler extends TomcatBaseTest {
public void testBug53257b() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- ByteChunk res = getUrl("http://localhost:"; + getPort() +
- "/test/bug53257/foo&bar.jsp");
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/bug53257/foo&bar.jsp");
// Check request completed
String result = res.toString();
@@ -100,8 +96,7 @@ public class TestCompiler extends TomcatBaseTest {
getTomcatInstanceTestWebapp(false, true);
// foo#bar.jsp
- ByteChunk res = getUrl("http://localhost:"; + getPort() +
- "/test/bug53257/foo%23bar.jsp");
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/bug53257/foo%23bar.jsp");
// Check request completed
String result = res.toString();
@@ -113,8 +108,7 @@ public class TestCompiler extends TomcatBaseTest {
getTomcatInstanceTestWebapp(false, true);
// foo%bar.jsp
- ByteChunk res = getUrl("http://localhost:"; + getPort() +
- "/test/bug53257/foo%25bar.jsp");
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/bug53257/foo%25bar.jsp");
// Check request completed
String result = res.toString();
@@ -125,8 +119,7 @@ public class TestCompiler extends TomcatBaseTest {
public void testBug53257e() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- ByteChunk res = getUrl("http://localhost:"; + getPort() +
- "/test/bug53257/foo+bar.jsp");
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/bug53257/foo+bar.jsp");
// Check request completed
String result = res.toString();
@@ -137,8 +130,7 @@ public class TestCompiler extends TomcatBaseTest {
public void testBug53257f() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- ByteChunk res = getUrl("http://localhost:"; + getPort() +
- "/test/bug53257/foo%20bar.jsp");
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/bug53257/foo%20bar.jsp");
// Check request completed
String result = res.toString();
@@ -149,8 +141,7 @@ public class TestCompiler extends TomcatBaseTest {
public void testBug53257g() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- ByteChunk res = getUrl("http://localhost:"; + getPort() +
- "/test/bug53257/foo%20bar/foobar.jsp");
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/bug53257/foo%20bar/foobar.jsp");
// Check request completed
String result = res.toString();
@@ -163,8 +154,7 @@ public class TestCompiler extends TomcatBaseTest {
// Check that URL decoding is not done twice
ByteChunk res = new ByteChunk();
- int rc = getUrl("http://localhost:"; + getPort() +
- "/test/bug53257/foo%2525bar.jsp", res, null);
+ int rc = getUrl("http://localhost:"; + getPort() +
"/test/bug53257/foo%2525bar.jsp", res, null);
Assert.assertEquals(404, rc);
}
@@ -187,15 +177,10 @@ public class TestCompiler extends TomcatBaseTest {
public void testBug55262() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- ByteChunk res = getUrl("http://localhost:"; + getPort() +
- "/test/bug5nnnn/bug55262.jsp");
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/bug5nnnn/bug55262.jsp");
String result = res.toString();
- Pattern prelude = Pattern.compile(
- "(.*This is a prelude\\.){2}.*",
- Pattern.MULTILINE | Pattern.DOTALL);
- Pattern coda = Pattern.compile(
- "(.*This is a coda\\.){2}.*",
- Pattern.MULTILINE|Pattern.DOTALL);
+ Pattern prelude = Pattern.compile("(.*This is a prelude\\.){2}.*",
Pattern.MULTILINE | Pattern.DOTALL);
+ Pattern coda = Pattern.compile("(.*This is a coda\\.){2}.*",
Pattern.MULTILINE | Pattern.DOTALL);
Assert.assertTrue(prelude.matcher(result).matches());
Assert.assertTrue(coda.matcher(result).matches());
}
diff --git a/test/org/apache/jasper/compiler/TestELInterpreterFactory.java
b/test/org/apache/jasper/compiler/TestELInterpreterFactory.java
index 04bb5f8456..47608b85b6 100644
--- a/test/org/apache/jasper/compiler/TestELInterpreterFactory.java
+++ b/test/org/apache/jasper/compiler/TestELInterpreterFactory.java
@@ -39,9 +39,8 @@ public class TestELInterpreterFactory extends TomcatBaseTest {
public static class SimpleELInterpreter implements ELInterpreter {
@Override
- public String interpreterCall(JspCompilationContext context,
- boolean isTagFile, String expression, Class<?> expectedType,
- String fnmapvar) {
+ public String interpreterCall(JspCompilationContext context, boolean
isTagFile, String expression,
+ Class<?> expectedType, String fnmapvar) {
return expression;
}
}
@@ -62,8 +61,7 @@ public class TestELInterpreterFactory extends TomcatBaseTest {
context.removeAttribute(ELInterpreter.class.getName());
- context.setAttribute(ELInterpreter.class.getName(),
- SimpleELInterpreter.class.getName());
+ context.setAttribute(ELInterpreter.class.getName(),
SimpleELInterpreter.class.getName());
interpreter = ELInterpreterFactory.getELInterpreter(context);
Assert.assertNotNull(interpreter);
assertThat(interpreter, instanceOf(SimpleELInterpreter.class));
diff --git a/test/org/apache/jasper/compiler/TestELParser.java
b/test/org/apache/jasper/compiler/TestELParser.java
index 6b47533b64..f68507c47e 100644
--- a/test/org/apache/jasper/compiler/TestELParser.java
+++ b/test/org/apache/jasper/compiler/TestELParser.java
@@ -30,21 +30,18 @@ import org.apache.jasper.compiler.ELNode.Nodes;
import org.apache.jasper.compiler.ELParser.TextBuilder;
/**
- * You will need to keep your wits about you when working with this class. Keep
- * in mind the following:
+ * You will need to keep your wits about you when working with this class.
Keep in mind the following:
* <ul>
* <li>If in doubt, read the EL and JSP specifications. Twice.</li>
- * <li>The escaping rules are complex and subtle. The explanation below (as
well
- * as the tests and the implementation) may have missed an edge case
despite
- * trying hard not to.
- * <li>The strings passed to {@link #doTestParser(String,String)} are Java
- * escaped in the source code and will be unescaped before being used.</li>
- * <li>LiteralExpressions always occur outside of "${...}" and "#{...}".
Literal
- * expressions escape '$' and '#' with '\\'</li>
- * <li>LiteralStrings always occur inside "${...}" or "#{...}". Literal strings
- * escape '\'', '\"' and '\\' with '\\'. Escaping '\"' is optional if the
- * literal string is delimited by '\''. Escaping '\'' is optional if the
- * literal string is delimited by '\"'.</li>
+ * <li>The escaping rules are complex and subtle. The explanation below (as
well as the tests and the implementation)
+ * may have missed an edge case despite trying hard not to.
+ * <li>The strings passed to {@link #doTestParser(String,String)} are Java
escaped in the source code and will be
+ * unescaped before being used.</li>
+ * <li>LiteralExpressions always occur outside of "${...}" and "#{...}".
Literal expressions escape '$' and '#' with
+ * '\\'</li>
+ * <li>LiteralStrings always occur inside "${...}" or "#{...}". Literal
strings escape '\'', '\"' and '\\' with '\\'.
+ * Escaping '\"' is optional if the literal string is delimited by '\''.
Escaping '\'' is optional if the literal string
+ * is delimited by '\"'.</li>
* </ul>
*/
public class TestELParser {
@@ -285,7 +282,8 @@ public class TestELParser {
doTestParser(input, expected, input);
}
- private void doTestParser(String input, String expectedResult, String
expectedBuilderOutput) throws JasperException {
+ private void doTestParser(String input, String expectedResult, String
expectedBuilderOutput)
+ throws JasperException {
ELException elException = null;
String elResult = null;
diff --git a/test/org/apache/jasper/compiler/TestEncodingDetector.java
b/test/org/apache/jasper/compiler/TestEncodingDetector.java
index 4cc5016b14..6d4f07eef5 100644
--- a/test/org/apache/jasper/compiler/TestEncodingDetector.java
+++ b/test/org/apache/jasper/compiler/TestEncodingDetector.java
@@ -37,28 +37,28 @@ public class TestEncodingDetector extends TomcatBaseTest {
public static Collection<Object[]> inputs() {
/// Note: These files are saved using the encoding indicated by the BOM
List<Object[]> result = new ArrayList<>();
- result.add(new Object[] { "bom-none-prolog-none.jsp",
Integer.valueOf(200), Boolean.TRUE });
- result.add(new Object[] { "bom-none-prolog-none.jspx",
Integer.valueOf(200), Boolean.TRUE });
- result.add(new Object[] { "bom-none-prolog-utf16be.jspx",
Integer.valueOf(200), Boolean.TRUE });
- result.add(new Object[] { "bom-none-prolog-utf16le.jspx",
Integer.valueOf(200), Boolean.TRUE });
- result.add(new Object[] { "bom-none-prolog-utf8.jspx",
Integer.valueOf(200), Boolean.TRUE });
- result.add(new Object[] { "bom-utf8-prolog-none.jsp",
Integer.valueOf(200), Boolean.TRUE });
- result.add(new Object[] { "bom-utf8-prolog-none.jspx",
Integer.valueOf(200), Boolean.TRUE });
- result.add(new Object[] { "bom-utf8-prolog-utf16be.jspx",
Integer.valueOf(500), null });
- result.add(new Object[] { "bom-utf8-prolog-utf16le.jspx",
Integer.valueOf(500), null });
- result.add(new Object[] { "bom-utf8-prolog-utf8.jspx",
Integer.valueOf(200), Boolean.TRUE });
- result.add(new Object[] { "bom-utf16be-prolog-none.jsp",
Integer.valueOf(200), Boolean.TRUE });
- result.add(new Object[] { "bom-utf16be-prolog-none.jspx",
Integer.valueOf(200), Boolean.TRUE });
+ result.add(new Object[] { "bom-none-prolog-none.jsp",
Integer.valueOf(200), Boolean.TRUE });
+ result.add(new Object[] { "bom-none-prolog-none.jspx",
Integer.valueOf(200), Boolean.TRUE });
+ result.add(new Object[] { "bom-none-prolog-utf16be.jspx",
Integer.valueOf(200), Boolean.TRUE });
+ result.add(new Object[] { "bom-none-prolog-utf16le.jspx",
Integer.valueOf(200), Boolean.TRUE });
+ result.add(new Object[] { "bom-none-prolog-utf8.jspx",
Integer.valueOf(200), Boolean.TRUE });
+ result.add(new Object[] { "bom-utf8-prolog-none.jsp",
Integer.valueOf(200), Boolean.TRUE });
+ result.add(new Object[] { "bom-utf8-prolog-none.jspx",
Integer.valueOf(200), Boolean.TRUE });
+ result.add(new Object[] { "bom-utf8-prolog-utf16be.jspx",
Integer.valueOf(500), null });
+ result.add(new Object[] { "bom-utf8-prolog-utf16le.jspx",
Integer.valueOf(500), null });
+ result.add(new Object[] { "bom-utf8-prolog-utf8.jspx",
Integer.valueOf(200), Boolean.TRUE });
+ result.add(new Object[] { "bom-utf16be-prolog-none.jsp",
Integer.valueOf(200), Boolean.TRUE });
+ result.add(new Object[] { "bom-utf16be-prolog-none.jspx",
Integer.valueOf(200), Boolean.TRUE });
result.add(new Object[] { "bom-utf16be-prolog-utf16be.jspx",
Integer.valueOf(200), Boolean.TRUE });
result.add(new Object[] { "bom-utf16be-prolog-utf16le.jspx",
Integer.valueOf(500), null });
- result.add(new Object[] { "bom-utf16be-prolog-utf8.jspx",
Integer.valueOf(500), null });
- result.add(new Object[] { "bom-utf16le-prolog-none.jsp",
Integer.valueOf(200), Boolean.TRUE });
- result.add(new Object[] { "bom-utf16le-prolog-none.jspx",
Integer.valueOf(200), Boolean.TRUE });
+ result.add(new Object[] { "bom-utf16be-prolog-utf8.jspx",
Integer.valueOf(500), null });
+ result.add(new Object[] { "bom-utf16le-prolog-none.jsp",
Integer.valueOf(200), Boolean.TRUE });
+ result.add(new Object[] { "bom-utf16le-prolog-none.jspx",
Integer.valueOf(200), Boolean.TRUE });
result.add(new Object[] { "bom-utf16le-prolog-utf16be.jspx",
Integer.valueOf(500), null });
result.add(new Object[] { "bom-utf16le-prolog-utf16le.jspx",
Integer.valueOf(200), Boolean.TRUE });
- result.add(new Object[] { "bom-utf16le-prolog-utf8.jspx",
Integer.valueOf(500), null });
- result.add(new Object[] { "bug60769a.jspx", Integer.valueOf(500),
null });
- result.add(new Object[] { "bug60769b.jspx", Integer.valueOf(200),
Boolean.TRUE });
+ result.add(new Object[] { "bom-utf16le-prolog-utf8.jspx",
Integer.valueOf(500), null });
+ result.add(new Object[] { "bug60769a.jspx", Integer.valueOf(500), null
});
+ result.add(new Object[] { "bug60769b.jspx", Integer.valueOf(200),
Boolean.TRUE });
return result;
}
@@ -77,8 +77,7 @@ public class TestEncodingDetector extends TomcatBaseTest {
getTomcatInstanceTestWebapp(false, true);
ByteChunk responseBody = new ByteChunk();
- int rc = getUrl("http://localhost:"; + getPort() +
"/test/jsp/encoding/" + jspName,
- responseBody, null);
+ int rc = getUrl("http://localhost:"; + getPort() +
"/test/jsp/encoding/" + jspName, responseBody, null);
Assert.assertEquals(expectedResponseCode, rc);
diff --git a/test/org/apache/jasper/compiler/TestGenerator.java
b/test/org/apache/jasper/compiler/TestGenerator.java
index 192a4fca17..8cfe73f54c 100644
--- a/test/org/apache/jasper/compiler/TestGenerator.java
+++ b/test/org/apache/jasper/compiler/TestGenerator.java
@@ -56,8 +56,7 @@ public class TestGenerator extends TomcatBaseTest {
public void testBug45015a() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- ByteChunk res = getUrl("http://localhost:"; + getPort() +
- "/test/bug45nnn/bug45015a.jsp");
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/bug45nnn/bug45015a.jsp");
String result = res.toString();
// Beware of the differences between escaping in JSP attributes and
@@ -78,8 +77,7 @@ public class TestGenerator extends TomcatBaseTest {
public void testBug45015b() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- int rc = getUrl("http://localhost:"; + getPort() +
- "/test/bug45nnn/bug45015b.jsp", new ByteChunk(), null);
+ int rc = getUrl("http://localhost:"; + getPort() +
"/test/bug45nnn/bug45015b.jsp", new ByteChunk(), null);
Assert.assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc);
}
@@ -88,8 +86,7 @@ public class TestGenerator extends TomcatBaseTest {
public void testBug45015c() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- int rc = getUrl("http://localhost:"; + getPort() +
- "/test/bug45nnn/bug45015c.jsp", new ByteChunk(), null);
+ int rc = getUrl("http://localhost:"; + getPort() +
"/test/bug45nnn/bug45015c.jsp", new ByteChunk(), null);
Assert.assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc);
}
@@ -98,8 +95,7 @@ public class TestGenerator extends TomcatBaseTest {
public void testBug48701Fail() throws Exception {
getTomcatInstanceTestWebapp(true, true);
- int rc = getUrl("http://localhost:"; + getPort() +
- "/test/bug48nnn/bug48701-fail.jsp", new ByteChunk(), null);
+ int rc = getUrl("http://localhost:"; + getPort() +
"/test/bug48nnn/bug48701-fail.jsp", new ByteChunk(), null);
Assert.assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc);
}
@@ -127,8 +123,7 @@ public class TestGenerator extends TomcatBaseTest {
private void testBug48701(String jsp) throws Exception {
getTomcatInstanceTestWebapp(false, true);
- ByteChunk res = getUrl("http://localhost:"; + getPort() +
- "/test/" + jsp);
+ ByteChunk res = getUrl("http://localhost:"; + getPort() + "/test/" +
jsp);
String result = res.toString();
assertEcho(result, "00-PASS");
@@ -163,9 +158,7 @@ public class TestGenerator extends TomcatBaseTest {
@Override
public VariableInfo[] getVariableInfo(TagData data) {
return new VariableInfo[] {
- new VariableInfo("now", Bean.class.getCanonicalName(),
- true, VariableInfo.AT_END)
- };
+ new VariableInfo("now", Bean.class.getCanonicalName(),
true, VariableInfo.AT_END) };
}
}
@@ -185,12 +178,9 @@ public class TestGenerator extends TomcatBaseTest {
@Test
public void testBug49799() throws Exception {
- String[] expected = { "<p style=\"color:red\">00-Red</p>",
- "<p>01-Not Red</p>",
- "<p style=\"color:red\">02-Red</p>",
- "<p>03-Not Red</p>",
- "<p style=\"color:red\">04-Red</p>",
- "<p>05-Not Red</p>"};
+ String[] expected =
+ { "<p style=\"color:red\">00-Red</p>", "<p>01-Not Red</p>",
"<p style=\"color:red\">02-Red</p>",
+ "<p>03-Not Red</p>", "<p
style=\"color:red\">04-Red</p>", "<p>05-Not Red</p>" };
getTomcatInstanceTestWebapp(false, true);
@@ -219,14 +209,11 @@ public class TestGenerator extends TomcatBaseTest {
getTomcatInstanceTestWebapp(false, true);
ByteChunk bc = new ByteChunk();
- int rc = getUrl("http://localhost:"; + getPort() +
- "/test/bug5nnnn/bug56529.jsp", bc, null);
+ int rc = getUrl("http://localhost:"; + getPort() +
"/test/bug5nnnn/bug56529.jsp", bc, null);
Assert.assertEquals(HttpServletResponse.SC_OK, rc);
String response = bc.toStringInternal();
- Assert.assertTrue(response,
- response.contains("[1:attribute1: '', attribute2: '']"));
- Assert.assertTrue(response,
- response.contains("[2:attribute1: '', attribute2: '']"));
+ Assert.assertTrue(response, response.contains("[1:attribute1: '',
attribute2: '']"));
+ Assert.assertTrue(response, response.contains("[2:attribute1: '',
attribute2: '']"));
}
public static class Bug56529 extends TagSupport {
@@ -256,9 +243,7 @@ public class TestGenerator extends TomcatBaseTest {
@Override
public int doEndTag() throws JspException {
try {
- pageContext.getOut().print(
- "attribute1: '" + attribute1 + "', " + "attribute2: '"
- + attribute2 + "'");
+ pageContext.getOut().print("attribute1: '" + attribute1 + "',
" + "attribute2: '" + attribute2 + "'");
} catch (IOException e) {
throw new JspException(e);
}
@@ -273,8 +258,7 @@ public class TestGenerator extends TomcatBaseTest {
ByteChunk res = new ByteChunk();
try {
- getUrl("http://localhost:"; + getPort()
- + "/test/bug5nnnn/bug56581.jsp", res, null);
+ getUrl("http://localhost:"; + getPort() +
"/test/bug5nnnn/bug56581.jsp", res, null);
Assert.fail("An IOException was expected.");
} catch (IOException expected) {
// ErrorReportValve in Tomcat 8.0.9+ flushes and aborts the
@@ -607,12 +591,10 @@ public class TestGenerator extends TomcatBaseTest {
@Override
public VariableInfo[] getVariableInfo(TagData data) {
- return new VariableInfo[] {
- new VariableInfo("variable01", "java.lang.String", true,
VariableInfo.NESTED),
- new
VariableInfo(data.getAttribute("attribute02").toString(),
- "java.lang.String", true, VariableInfo.NESTED),
- new VariableInfo("variable03", "java.lang.String", false,
VariableInfo.NESTED)
- };
+ return new VariableInfo[] { new VariableInfo("variable01",
"java.lang.String", true, VariableInfo.NESTED),
+ new
VariableInfo(data.getAttribute("attribute02").toString(), "java.lang.String",
true,
+ VariableInfo.NESTED),
+ new VariableInfo("variable03", "java.lang.String", false,
VariableInfo.NESTED) };
}
}
@@ -622,8 +604,7 @@ public class TestGenerator extends TomcatBaseTest {
private static final long serialVersionUID = 1L;
@Override
- public void setDynamicAttribute(String uri, String localName, Object
value)
- throws JspException {
+ public void setDynamicAttribute(String uri, String localName, Object
value) throws JspException {
// NO-OP
}
}
@@ -951,7 +932,8 @@ public class TestGenerator extends TomcatBaseTest {
// This should break all subsequent requests
ByteChunk body = new ByteChunk();
- int rc = getUrl("http://localhost:"; + getPort() +
"/test/jsp/generator/break-string-interpreter.jsp", body, null);
+ int rc = getUrl("http://localhost:"; + getPort() +
"/test/jsp/generator/break-string-interpreter.jsp", body,
+ null);
Assert.assertEquals(body.toString(), HttpServletResponse.SC_OK, rc);
body.recycle();
diff --git a/test/org/apache/jasper/compiler/TestJspConfig.java
b/test/org/apache/jasper/compiler/TestJspConfig.java
index 64f6d0c092..4f9cf26cd9 100644
--- a/test/org/apache/jasper/compiler/TestJspConfig.java
+++ b/test/org/apache/jasper/compiler/TestJspConfig.java
@@ -39,8 +39,7 @@ public class TestJspConfig extends TomcatBaseTest {
tomcat.start();
- ByteChunk res = getUrl("http://localhost:"; + getPort() +
- "/test/el-as-literal.jsp");
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/el-as-literal.jsp");
String result = res.toString();
@@ -52,15 +51,13 @@ public class TestJspConfig extends TomcatBaseTest {
public void testServlet23NoEL() throws Exception {
Tomcat tomcat = getTomcatInstance();
- File appDir =
- new File("test/webapp-2.3");
+ File appDir = new File("test/webapp-2.3");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
tomcat.start();
- ByteChunk res = getUrl("http://localhost:"; + getPort() +
- "/test/el-as-literal.jsp");
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/el-as-literal.jsp");
String result = res.toString();
@@ -78,8 +75,7 @@ public class TestJspConfig extends TomcatBaseTest {
tomcat.start();
- ByteChunk res = getUrl("http://localhost:"; + getPort() +
- "/test/el-as-literal.jsp");
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/el-as-literal.jsp");
String result = res.toString();
@@ -97,8 +93,7 @@ public class TestJspConfig extends TomcatBaseTest {
tomcat.start();
- ByteChunk res = getUrl("http://localhost:"; + getPort() +
- "/test/el-as-literal.jsp");
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/el-as-literal.jsp");
String result = res.toString();
@@ -115,8 +110,7 @@ public class TestJspConfig extends TomcatBaseTest {
tomcat.start();
- ByteChunk res = getUrl("http://localhost:"; + getPort() +
- "/test/el-as-literal.jsp");
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/el-as-literal.jsp");
String result = res.toString();
@@ -133,8 +127,7 @@ public class TestJspConfig extends TomcatBaseTest {
tomcat.start();
- ByteChunk res = getUrl("http://localhost:"; + getPort() +
- "/test/el-as-literal.jsp");
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/el-as-literal.jsp");
String result = res.toString();
@@ -151,8 +144,7 @@ public class TestJspConfig extends TomcatBaseTest {
tomcat.start();
- ByteChunk res = getUrl("http://localhost:"; + getPort() +
- "/test/el-as-literal.jsp");
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/el-as-literal.jsp");
String result = res.toString();
@@ -169,8 +161,7 @@ public class TestJspConfig extends TomcatBaseTest {
tomcat.start();
- ByteChunk res = getUrl("http://localhost:"; + getPort() +
- "/test/el-as-literal.jsp");
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/el-as-literal.jsp");
String result = res.toString();
@@ -187,8 +178,7 @@ public class TestJspConfig extends TomcatBaseTest {
tomcat.start();
- ByteChunk res = getUrl("http://localhost:"; + getPort() +
- "/test/el-as-literal.jsp");
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/el-as-literal.jsp");
String result = res.toString();
@@ -227,7 +217,8 @@ public class TestJspConfig extends TomcatBaseTest {
tomcat.start();
ByteChunk res = new ByteChunk();
- int rc = getUrl("http://localhost:"; + getPort() +
"/test/jsp/errorOnELNotFound/page-directive-true.jsp", res, null);
+ int rc = getUrl("http://localhost:"; + getPort() +
"/test/jsp/errorOnELNotFound/page-directive-true.jsp", res,
+ null);
Assert.assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc);
@@ -248,7 +239,8 @@ public class TestJspConfig extends TomcatBaseTest {
tomcat.start();
ByteChunk res = new ByteChunk();
- int rc = getUrl("http://localhost:"; + getPort() +
"/test/jsp/errorOnELNotFound/page-directive-false.jsp", res, null);
+ int rc = getUrl("http://localhost:"; + getPort() +
"/test/jsp/errorOnELNotFound/page-directive-false.jsp", res,
+ null);
Assert.assertEquals(HttpServletResponse.SC_OK, rc);
diff --git a/test/org/apache/jasper/compiler/TestJspDocumentParser.java
b/test/org/apache/jasper/compiler/TestJspDocumentParser.java
index 015afaabe5..8eac2bf2c3 100644
--- a/test/org/apache/jasper/compiler/TestJspDocumentParser.java
+++ b/test/org/apache/jasper/compiler/TestJspDocumentParser.java
@@ -39,8 +39,7 @@ public class TestJspDocumentParser extends TomcatBaseTest {
public void testBug47977() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- int rc = getUrl("http://localhost:"; + getPort() +
- "/test/bug47977.jspx", new ByteChunk(), null);
+ int rc = getUrl("http://localhost:"; + getPort() +
"/test/bug47977.jspx", new ByteChunk(), null);
Assert.assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc);
}
@@ -65,13 +64,11 @@ public class TestJspDocumentParser extends TomcatBaseTest {
getTomcatInstanceTestWebapp(false, true);
ByteChunk bc = new ByteChunk();
- int rc = getUrl("http://localhost:"; + getPort() +
- "/test/bug5nnnn/bug54801a.jspx", bc, null);
+ int rc = getUrl("http://localhost:"; + getPort() +
"/test/bug5nnnn/bug54801a.jspx", bc, null);
Assert.assertEquals(HttpServletResponse.SC_OK, rc);
bc.recycle();
- rc = getUrl("http://localhost:"; + getPort() +
- "/test/bug5nnnn/bug54801b.jspx", bc, null);
+ rc = getUrl("http://localhost:"; + getPort() +
"/test/bug5nnnn/bug54801b.jspx", bc, null);
Assert.assertEquals(HttpServletResponse.SC_OK, rc);
}
@@ -80,13 +77,11 @@ public class TestJspDocumentParser extends TomcatBaseTest {
getTomcatInstanceTestWebapp(false, true);
ByteChunk bc = new ByteChunk();
- int rc = getUrl("http://localhost:"; + getPort() +
- "/test/bug5nnnn/bug54821a.jspx", bc, null);
+ int rc = getUrl("http://localhost:"; + getPort() +
"/test/bug5nnnn/bug54821a.jspx", bc, null);
Assert.assertEquals(HttpServletResponse.SC_OK, rc);
bc.recycle();
- rc = getUrl("http://localhost:"; + getPort() +
- "/test/bug5nnnn/bug54821b.jspx", bc, null);
+ rc = getUrl("http://localhost:"; + getPort() +
"/test/bug5nnnn/bug54821b.jspx", bc, null);
Assert.assertEquals(HttpServletResponse.SC_OK, rc);
}
@@ -206,7 +201,7 @@ public class TestJspDocumentParser extends TomcatBaseTest {
doTestDocument(false, "5.4");
}
- private void doTestDocument(boolean valid, String version) throws
Exception{
+ private void doTestDocument(boolean valid, String version) throws
Exception {
getTomcatInstanceTestWebapp(false, true);
StringBuilder url = new StringBuilder("http://localhost:";);
diff --git a/test/org/apache/jasper/compiler/TestJspReader.java
b/test/org/apache/jasper/compiler/TestJspReader.java
index f82fbc9904..9e12a65be0 100644
--- a/test/org/apache/jasper/compiler/TestJspReader.java
+++ b/test/org/apache/jasper/compiler/TestJspReader.java
@@ -28,8 +28,7 @@ public class TestJspReader extends TomcatBaseTest {
public void testBug53986() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- ByteChunk res = getUrl("http://localhost:"; + getPort() +
- "/test/bug5nnnn/bug53986.jsp");
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/bug5nnnn/bug53986.jsp");
Assert.assertTrue(res.toString().contains("OK"));
}
}
diff --git a/test/org/apache/jasper/compiler/TestJspUtil.java
b/test/org/apache/jasper/compiler/TestJspUtil.java
index f7755d0324..9516f0339e 100644
--- a/test/org/apache/jasper/compiler/TestJspUtil.java
+++ b/test/org/apache/jasper/compiler/TestJspUtil.java
@@ -41,7 +41,7 @@ public class TestJspUtil extends TomcatBaseTest {
if (line.startsWith("<p>")) {
line = line.substring(3, line.length() - 4);
String[] parts = line.split(":");
- Assert.assertEquals(parts[0], parts[1], parts[2]);
+ Assert.assertEquals(parts[0], parts[1], parts[2]);
}
}
Assert.assertEquals(bc.toString(), HttpServletResponse.SC_OK, rc);
diff --git a/test/org/apache/jasper/compiler/TestJspUtilMakeJavaPackage.java
b/test/org/apache/jasper/compiler/TestJspUtilMakeJavaPackage.java
index c02837fb85..dba45a67ca 100644
--- a/test/org/apache/jasper/compiler/TestJspUtilMakeJavaPackage.java
+++ b/test/org/apache/jasper/compiler/TestJspUtilMakeJavaPackage.java
@@ -33,19 +33,19 @@ public class TestJspUtilMakeJavaPackage {
public static Collection<Object[]> parameters() {
List<Object[]> parameterSets = new ArrayList<>();
- parameterSets.add(new Object[] { "/foo", "foo"});
- parameterSets.add(new Object[] { "//foo", "foo"});
- parameterSets.add(new Object[] { "//foo//", "foo"});
- parameterSets.add(new Object[] { "/foo//", "foo"});
- parameterSets.add(new Object[] { "/foo/", "foo"});
- parameterSets.add(new Object[] { "foo/", "foo"});
-
- parameterSets.add(new Object[] { "/foo/bar", "foo.bar"});
- parameterSets.add(new Object[] { "//foo/bar", "foo.bar"});
- parameterSets.add(new Object[] { "//foo//bar", "foo.bar"});
- parameterSets.add(new Object[] { "/foo//bar", "foo.bar"});
- parameterSets.add(new Object[] { "/foo/bar", "foo.bar"});
- parameterSets.add(new Object[] { "foo/bar", "foo.bar"});
+ parameterSets.add(new Object[] { "/foo", "foo" });
+ parameterSets.add(new Object[] { "//foo", "foo" });
+ parameterSets.add(new Object[] { "//foo//", "foo" });
+ parameterSets.add(new Object[] { "/foo//", "foo" });
+ parameterSets.add(new Object[] { "/foo/", "foo" });
+ parameterSets.add(new Object[] { "foo/", "foo" });
+
+ parameterSets.add(new Object[] { "/foo/bar", "foo.bar" });
+ parameterSets.add(new Object[] { "//foo/bar", "foo.bar" });
+ parameterSets.add(new Object[] { "//foo//bar", "foo.bar" });
+ parameterSets.add(new Object[] { "/foo//bar", "foo.bar" });
+ parameterSets.add(new Object[] { "/foo/bar", "foo.bar" });
+ parameterSets.add(new Object[] { "foo/bar", "foo.bar" });
return parameterSets;
}
diff --git a/test/org/apache/jasper/compiler/TestNode.java
b/test/org/apache/jasper/compiler/TestNode.java
index c1ee3087a4..c959b0977e 100644
--- a/test/org/apache/jasper/compiler/TestNode.java
+++ b/test/org/apache/jasper/compiler/TestNode.java
@@ -28,7 +28,7 @@ public class TestNode {
/*
* https://bz.apache.org/bugzilla/show_bug.cgi?id=57099
*/
- @Test(expected=IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void testPageDirectiveImport01() {
doTestPageDirectiveImport("java.io.*;\r\n\timport java.net.*");
}
@@ -53,7 +53,7 @@ public class TestNode {
doTestPageDirectiveImport("java.util.List,java.util.ArrayList,java.util.Set");
}
- @Test(expected=IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void testPageDirectiveImport06() {
doTestPageDirectiveImport("java.util.List;import java.util.ArrayList;
import java.util.Set");
}
diff --git a/test/org/apache/jasper/compiler/TestNodeIntegration.java
b/test/org/apache/jasper/compiler/TestNodeIntegration.java
index 148b1630fa..9a1bb05288 100644
--- a/test/org/apache/jasper/compiler/TestNodeIntegration.java
+++ b/test/org/apache/jasper/compiler/TestNodeIntegration.java
@@ -28,12 +28,10 @@ public class TestNodeIntegration extends TomcatBaseTest {
public void testJspAttributeIsLiteral() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- ByteChunk res = getUrl("http://localhost:"; + getPort() +
- "/test/bug5nnnn/bug55642a.jsp");
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/bug5nnnn/bug55642a.jsp");
String result = res.toString();
- Assert.assertTrue(
- result.indexOf("/test/bug5nnnn/bug55642b.jsp?foo=bar&a=1&b=2")
> 0);
+
Assert.assertTrue(result.indexOf("/test/bug5nnnn/bug55642b.jsp?foo=bar&a=1&b=2")
> 0);
}
}
diff --git a/test/org/apache/jasper/compiler/TestParser.java
b/test/org/apache/jasper/compiler/TestParser.java
index 356ebabb44..e2f2079b08 100644
--- a/test/org/apache/jasper/compiler/TestParser.java
+++ b/test/org/apache/jasper/compiler/TestParser.java
@@ -23,9 +23,8 @@ import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.util.buf.ByteChunk;
/**
- * Tests that depend on strict whitespace parsing are duplicated in
- * {@link TestParserNoStrictWhitespace} with the strict whitespace parsing
- * disabled.
+ * Tests that depend on strict whitespace parsing are duplicated in {@link
TestParserNoStrictWhitespace} with the strict
+ * whitespace parsing disabled.
*/
public class TestParser extends TomcatBaseTest {
@@ -33,8 +32,7 @@ public class TestParser extends TomcatBaseTest {
public void testBug48627() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- ByteChunk res = getUrl("http://localhost:"; + getPort() +
- "/test/bug48nnn/bug48627.jsp");
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/bug48nnn/bug48627.jsp");
String result = res.toString();
// Beware of the differences between escaping in JSP attributes and
@@ -47,8 +45,7 @@ public class TestParser extends TomcatBaseTest {
public void testBug48668a() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- ByteChunk res = getUrl("http://localhost:"; + getPort() +
- "/test/bug48nnn/bug48668a.jsp");
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/bug48nnn/bug48668a.jsp");
String result = res.toString();
assertEcho(result, "00-Hello world</p>#{foo.bar}");
assertEcho(result, "01-Hello world</p>${foo.bar}");
@@ -86,8 +83,7 @@ public class TestParser extends TomcatBaseTest {
public void testBug48668b() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- ByteChunk res = getUrl("http://localhost:"; + getPort() +
- "/test/bug48nnn/bug48668b.jsp");
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/bug48nnn/bug48668b.jsp");
String result = res.toString();
assertEcho(result, "00-Hello world</p>#{foo.bar}");
assertEcho(result, "01-Hello world</p>#{foo2");
@@ -97,8 +93,8 @@ public class TestParser extends TomcatBaseTest {
public void testBug49297NoSpaceStrict() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- int sc = getUrl("http://localhost:"; + getPort() +
- "/test/bug49nnn/bug49297NoSpaceStrict.jsp", new ByteChunk(),
null);
+ int sc = getUrl("http://localhost:"; + getPort() +
"/test/bug49nnn/bug49297NoSpaceStrict.jsp", new ByteChunk(),
+ null);
Assert.assertEquals(500, sc);
}
@@ -107,8 +103,8 @@ public class TestParser extends TomcatBaseTest {
public void testBug49297DuplicateAttr() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- int sc = getUrl("http://localhost:"; + getPort() +
- "/test/bug49nnn/bug49297DuplicateAttr.jsp", new ByteChunk(),
null);
+ int sc = getUrl("http://localhost:"; + getPort() +
"/test/bug49nnn/bug49297DuplicateAttr.jsp", new ByteChunk(),
+ null);
Assert.assertEquals(500, sc);
}
@@ -118,8 +114,7 @@ public class TestParser extends TomcatBaseTest {
getTomcatInstanceTestWebapp(false, true);
ByteChunk res = new ByteChunk();
- int sc = getUrl("http://localhost:"; + getPort() +
- "/test/bug49nnn/bug49297MultipleImport1.jsp", res, null);
+ int sc = getUrl("http://localhost:"; + getPort() +
"/test/bug49nnn/bug49297MultipleImport1.jsp", res, null);
Assert.assertEquals(200, sc);
assertEcho(res.toString(), "OK");
@@ -130,8 +125,7 @@ public class TestParser extends TomcatBaseTest {
getTomcatInstanceTestWebapp(false, true);
ByteChunk res = new ByteChunk();
- int sc = getUrl("http://localhost:"; + getPort() +
- "/test/bug49nnn/bug49297MultipleImport2.jsp", res, null);
+ int sc = getUrl("http://localhost:"; + getPort() +
"/test/bug49nnn/bug49297MultipleImport2.jsp", res, null);
Assert.assertEquals(200, sc);
assertEcho(res.toString(), "OK");
@@ -142,8 +136,8 @@ public class TestParser extends TomcatBaseTest {
getTomcatInstanceTestWebapp(false, true);
ByteChunk res = new ByteChunk();
- int sc = getUrl("http://localhost:"; + getPort() +
- "/test/bug49nnn/bug49297MultiplePageEncoding1.jsp", res, null);
+ int sc = getUrl("http://localhost:"; + getPort() +
"/test/bug49nnn/bug49297MultiplePageEncoding1.jsp", res,
+ null);
Assert.assertEquals(500, sc);
}
@@ -153,8 +147,8 @@ public class TestParser extends TomcatBaseTest {
getTomcatInstanceTestWebapp(false, true);
ByteChunk res = new ByteChunk();
- int sc = getUrl("http://localhost:"; + getPort() +
- "/test/bug49nnn/bug49297MultiplePageEncoding2.jsp", res, null);
+ int sc = getUrl("http://localhost:"; + getPort() +
"/test/bug49nnn/bug49297MultiplePageEncoding2.jsp", res,
+ null);
Assert.assertEquals(500, sc);
}
@@ -164,8 +158,8 @@ public class TestParser extends TomcatBaseTest {
getTomcatInstanceTestWebapp(false, true);
ByteChunk res = new ByteChunk();
- int sc = getUrl("http://localhost:"; + getPort() +
- "/test/bug49nnn/bug49297MultiplePageEncoding3.jsp", res, null);
+ int sc = getUrl("http://localhost:"; + getPort() +
"/test/bug49nnn/bug49297MultiplePageEncoding3.jsp", res,
+ null);
Assert.assertEquals(500, sc);
}
@@ -175,8 +169,8 @@ public class TestParser extends TomcatBaseTest {
getTomcatInstanceTestWebapp(false, true);
ByteChunk res = new ByteChunk();
- int sc = getUrl("http://localhost:"; + getPort() +
- "/test/bug49nnn/bug49297MultiplePageEncoding4.jsp", res, null);
+ int sc = getUrl("http://localhost:"; + getPort() +
"/test/bug49nnn/bug49297MultiplePageEncoding4.jsp", res,
+ null);
Assert.assertEquals(500, sc);
}
@@ -186,8 +180,7 @@ public class TestParser extends TomcatBaseTest {
getTomcatInstanceTestWebapp(false, true);
ByteChunk res = new ByteChunk();
- int sc = getUrl("http://localhost:"; + getPort() +
- "/test/bug49nnn/bug49297Tag.jsp", res, null);
+ int sc = getUrl("http://localhost:"; + getPort() +
"/test/bug49nnn/bug49297Tag.jsp", res, null);
Assert.assertEquals(200, sc);
assertEcho(res.toString(), "OK");
@@ -197,8 +190,7 @@ public class TestParser extends TomcatBaseTest {
public void testBug52335() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- ByteChunk res = getUrl("http://localhost:"; + getPort() +
- "/test/bug5nnnn/bug52335.jsp");
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/bug5nnnn/bug52335.jsp");
String result = res.toString();
// Beware of the differences between escaping in JSP attributes and
@@ -212,53 +204,38 @@ public class TestParser extends TomcatBaseTest {
public void testBug55198() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- ByteChunk res = getUrl("http://localhost:"; + getPort() +
- "/test/bug5nnnn/bug55198.jsp");
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/bug5nnnn/bug55198.jsp");
String result = res.toString();
Assert.assertTrue(result,
- result.contains(""1foo1<&>"")
- || result.contains(""1foo1<&>""));
+ result.contains(""1foo1<&>"") ||
result.contains(""1foo1<&>""));
Assert.assertTrue(result,
- result.contains(""2bar2<&>"")
- || result.contains(""2bar2<&>""));
- Assert.assertTrue(result,
- result.contains(""3a&b3"")
- || result.contains(""3a&b3""));
- Assert.assertTrue(result,
- result.contains(""4&4"")
- || result.contains(""4&4""));
- Assert.assertTrue(result,
- result.contains(""5'5"")
- || result.contains(""5'5""));
+ result.contains(""2bar2<&>"") ||
result.contains(""2bar2<&>""));
+ Assert.assertTrue(result, result.contains(""3a&b3"") ||
result.contains(""3a&b3""));
+ Assert.assertTrue(result, result.contains(""4&4"") ||
result.contains(""4&4""));
+ Assert.assertTrue(result, result.contains(""5'5"") ||
result.contains(""5'5""));
}
@Test
public void testBug56265() throws Exception {
getTomcatInstanceTestWebapp(true, true);
- ByteChunk res = getUrl("http://localhost:"; + getPort() +
- "/test/bug5nnnn/bug56265.jsp");
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/bug5nnnn/bug56265.jsp");
String result = res.toString();
- Assert.assertTrue(result,
- result.contains("[1: [data-test]: [window.alert('Hello World
<&>!')]]"));
- Assert.assertTrue(result,
- result.contains("[2: [data-test]: [window.alert('Hello World
<&>!')]]"));
- Assert.assertTrue(result,
- result.contains("[3: [data-test]: [window.alert('Hello 'World
<&>'!')]]"));
- Assert.assertTrue(result,
- result.contains("[4: [data-test]: [window.alert('Hello 'World
<&>'!')]]"));
+ Assert.assertTrue(result, result.contains("[1: [data-test]:
[window.alert('Hello World <&>!')]]"));
+ Assert.assertTrue(result, result.contains("[2: [data-test]:
[window.alert('Hello World <&>!')]]"));
+ Assert.assertTrue(result, result.contains("[3: [data-test]:
[window.alert('Hello 'World <&>'!')]]"));
+ Assert.assertTrue(result, result.contains("[4: [data-test]:
[window.alert('Hello 'World <&>'!')]]"));
}
@Test
public void testBug56334And56561() throws Exception {
getTomcatInstanceTestWebapp(true, true);
- ByteChunk res = getUrl("http://localhost:"; + getPort() +
- "/test/bug5nnnn/bug56334and56561.jspx");
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/bug5nnnn/bug56334and56561.jspx");
String result = res.toString();
diff --git a/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java
b/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java
index 3101dcc97c..56c6663ea9 100644
--- a/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java
+++ b/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java
@@ -23,9 +23,8 @@ import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.util.buf.ByteChunk;
/**
- * Tests duplicate those in {@link TestParser} where the strict whitespace
- * parsing is enabled by default. Strict whitespace parsing is disabled for
- * these tests in web.xml.
+ * Tests duplicate those in {@link TestParser} where the strict whitespace
parsing is enabled by default. Strict
+ * whitespace parsing is disabled for these tests in web.xml.
*/
public class TestParserNoStrictWhitespace extends TomcatBaseTest {
diff --git a/test/org/apache/jasper/compiler/TestScriptingVariabler.java
b/test/org/apache/jasper/compiler/TestScriptingVariabler.java
index dc5f0b502a..ca502e571e 100644
--- a/test/org/apache/jasper/compiler/TestScriptingVariabler.java
+++ b/test/org/apache/jasper/compiler/TestScriptingVariabler.java
@@ -59,10 +59,7 @@ public class TestScriptingVariabler extends TomcatBaseTest {
*/
@Override
public VariableInfo[] getVariableInfo(TagData data) {
- return new VariableInfo[] {
- new VariableInfo("Test", "java.lang.String", true,
- VariableInfo.AT_END)
- };
+ return new VariableInfo[] { new VariableInfo("Test",
"java.lang.String", true, VariableInfo.AT_END) };
}
}
diff --git a/test/org/apache/jasper/compiler/TestSmapStratum.java
b/test/org/apache/jasper/compiler/TestSmapStratum.java
index b3e3eeaa38..ee3fe75669 100644
--- a/test/org/apache/jasper/compiler/TestSmapStratum.java
+++ b/test/org/apache/jasper/compiler/TestSmapStratum.java
@@ -34,6 +34,7 @@ public class TestSmapStratum {
s.addLineData(20, "/foo/foo/bar.jsp", 1, 30, 1);
s.setOutputFileName("foo.java");
+ //@formatter:off
Assert.assertEquals(
"SMAP\n" +
"foo.java\n" +
@@ -51,5 +52,6 @@ public class TestSmapStratum {
"20#1:30\n" +
"*E\n",
s.getSmapString());
+ //@formatter:on
}
}
diff --git a/test/org/apache/jasper/compiler/TestTagLibraryInfoImpl.java
b/test/org/apache/jasper/compiler/TestTagLibraryInfoImpl.java
index 65c0ca596c..9012262696 100644
--- a/test/org/apache/jasper/compiler/TestTagLibraryInfoImpl.java
+++ b/test/org/apache/jasper/compiler/TestTagLibraryInfoImpl.java
@@ -35,8 +35,7 @@ public class TestTagLibraryInfoImpl extends TomcatBaseTest {
ByteChunk res = new ByteChunk();
- int rc = getUrl("http://localhost:"; + getPort() +
- "/test/jsp/test.jsp", res, null);
+ int rc = getUrl("http://localhost:"; + getPort() +
"/test/jsp/test.jsp", res, null);
Assert.assertEquals(HttpServletResponse.SC_OK, rc);
}
@@ -50,8 +49,7 @@ public class TestTagLibraryInfoImpl extends TomcatBaseTest {
ByteChunk res = new ByteChunk();
- int rc = getUrl("http://localhost:"; + getPort() +
- "/test/bug6nnnn/bug64373.jsp", res, null);
+ int rc = getUrl("http://localhost:"; + getPort() +
"/test/bug6nnnn/bug64373.jsp", res, null);
Assert.assertEquals(HttpServletResponse.SC_OK, rc);
}
diff --git a/test/org/apache/jasper/compiler/TestTagPluginManager.java
b/test/org/apache/jasper/compiler/TestTagPluginManager.java
index 4b2f607873..f7eb60ffcc 100644
--- a/test/org/apache/jasper/compiler/TestTagPluginManager.java
+++ b/test/org/apache/jasper/compiler/TestTagPluginManager.java
@@ -32,24 +32,21 @@ import org.apache.catalina.startup.TomcatBaseTest;
*/
public class TestTagPluginManager extends TomcatBaseTest {
- private static TagInfo tagInfo = new TagInfo("ATag",
- "org.apache.jasper.compiler.ATagSupport", "", "", null, null,
null);
+ private static TagInfo tagInfo =
+ new TagInfo("ATag", "org.apache.jasper.compiler.ATagSupport", "",
"", null, null, null);
@Test
public void testBug54240() throws Exception {
Tomcat tomcat = getTomcatInstanceTestWebapp(false, true);
-
ServletContext context = ((Context)
tomcat.getHost().findChildren()[0]).getServletContext();
TagPluginManager manager = new TagPluginManager(context);
Node.Nodes nodes = new Node.Nodes();
- Node.CustomTag c = new Node.CustomTag("test:ATag", "test", "ATag",
- "http://tomcat.apache.org/jasper";, null, null, null, null,
null,
- new TagFileInfo("ATag", "http://tomcat.apache.org/jasper";,
- tagInfo));
+ Node.CustomTag c = new Node.CustomTag("test:ATag", "test", "ATag",
"http://tomcat.apache.org/jasper";, null,
+ null, null, null, null, new TagFileInfo("ATag",
"http://tomcat.apache.org/jasper";, tagInfo));
c.setTagHandlerClass(TesterTag.class);
nodes.add(c);
manager.apply(nodes, null, null);
@@ -57,13 +54,13 @@ public class TestTagPluginManager extends TomcatBaseTest {
Node n = nodes.getNode(0);
Assert.assertNotNull(n);
- Node.CustomTag t = (Node.CustomTag)n;
+ Node.CustomTag t = (Node.CustomTag) n;
Assert.assertNotNull(t.getAtSTag());
Node.Nodes sTag = c.getAtSTag();
Node scriptlet = sTag.getNode(0);
Assert.assertNotNull(scriptlet);
- Node.Scriptlet s = (Node.Scriptlet)scriptlet;
+ Node.Scriptlet s = (Node.Scriptlet) scriptlet;
Assert.assertEquals("//Just a comment", s.getText());
}
}
diff --git a/test/org/apache/jasper/compiler/TestValidator.java
b/test/org/apache/jasper/compiler/TestValidator.java
index e2b36e8b1f..aec4efc425 100644
--- a/test/org/apache/jasper/compiler/TestValidator.java
+++ b/test/org/apache/jasper/compiler/TestValidator.java
@@ -36,8 +36,7 @@ public class TestValidator extends TomcatBaseTest {
public void testBug47331() throws Exception {
getTomcatInstanceTestWebapp(false, true);
- int rc = getUrl("http://localhost:"; + getPort() +
- "/test/bug47331.jsp", new ByteChunk(), null);
+ int rc = getUrl("http://localhost:"; + getPort() +
"/test/bug47331.jsp", new ByteChunk(), null);
Assert.assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc);
}
@@ -46,15 +45,13 @@ public class TestValidator extends TomcatBaseTest {
public void testTldVersions22() throws Exception {
Tomcat tomcat = getTomcatInstance();
- File appDir =
- new File("test/webapp-2.2");
+ File appDir = new File("test/webapp-2.2");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
tomcat.start();
- ByteChunk res = getUrl("http://localhost:"; + getPort() +
- "/test/tld-versions.jsp");
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/tld-versions.jsp");
String result = res.toString();
@@ -71,15 +68,13 @@ public class TestValidator extends TomcatBaseTest {
public void testTldVersions23() throws Exception {
Tomcat tomcat = getTomcatInstance();
- File appDir =
- new File("test/webapp-2.3");
+ File appDir = new File("test/webapp-2.3");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
tomcat.start();
- ByteChunk res = getUrl("http://localhost:"; + getPort() +
- "/test/tld-versions.jsp");
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/tld-versions.jsp");
String result = res.toString();
@@ -96,15 +91,13 @@ public class TestValidator extends TomcatBaseTest {
public void testTldVersions24() throws Exception {
Tomcat tomcat = getTomcatInstance();
- File appDir =
- new File("test/webapp-2.4");
+ File appDir = new File("test/webapp-2.4");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
tomcat.start();
- ByteChunk res = getUrl("http://localhost:"; + getPort() +
- "/test/tld-versions.jsp");
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/tld-versions.jsp");
String result = res.toString();
@@ -121,15 +114,13 @@ public class TestValidator extends TomcatBaseTest {
public void testTldVersions25() throws Exception {
Tomcat tomcat = getTomcatInstance();
- File appDir =
- new File("test/webapp-2.5");
+ File appDir = new File("test/webapp-2.5");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
tomcat.start();
- ByteChunk res = getUrl("http://localhost:"; + getPort() +
- "/test/tld-versions.jsp");
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/tld-versions.jsp");
String result = res.toString();
@@ -146,15 +137,13 @@ public class TestValidator extends TomcatBaseTest {
public void testTldVersions30() throws Exception {
Tomcat tomcat = getTomcatInstance();
- File appDir =
- new File("test/webapp-3.0");
+ File appDir = new File("test/webapp-3.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
tomcat.start();
- ByteChunk res = getUrl("http://localhost:"; + getPort() +
- "/test/tld-versions.jsp");
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/tld-versions.jsp");
String result = res.toString();
@@ -171,15 +160,13 @@ public class TestValidator extends TomcatBaseTest {
public void testTldVersions31() throws Exception {
Tomcat tomcat = getTomcatInstance();
- File appDir =
- new File("test/webapp-3.1");
+ File appDir = new File("test/webapp-3.1");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
tomcat.start();
- ByteChunk res = getUrl("http://localhost:"; + getPort() +
- "/test/tld-versions.jsp");
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/tld-versions.jsp");
String result = res.toString();
@@ -196,15 +183,13 @@ public class TestValidator extends TomcatBaseTest {
public void testTldVersions40() throws Exception {
Tomcat tomcat = getTomcatInstance();
- File appDir =
- new File("test/webapp-4.0");
+ File appDir = new File("test/webapp-4.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
tomcat.start();
- ByteChunk res = getUrl("http://localhost:"; + getPort() +
- "/test/tld-versions.jsp");
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/tld-versions.jsp");
String result = res.toString();
@@ -221,15 +206,13 @@ public class TestValidator extends TomcatBaseTest {
public void testTldVersions50() throws Exception {
Tomcat tomcat = getTomcatInstance();
- File appDir =
- new File("test/webapp-5.0");
+ File appDir = new File("test/webapp-5.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
tomcat.start();
- ByteChunk res = getUrl("http://localhost:"; + getPort() +
- "/test/tld-versions.jsp");
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/tld-versions.jsp");
String result = res.toString();
@@ -247,15 +230,13 @@ public class TestValidator extends TomcatBaseTest {
public void testTldVersions60() throws Exception {
Tomcat tomcat = getTomcatInstance();
- File appDir =
- new File("test/webapp-6.0");
+ File appDir = new File("test/webapp-6.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
tomcat.start();
- ByteChunk res = getUrl("http://localhost:"; + getPort() +
- "/test/tld-versions.jsp");
+ ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/tld-versions.jsp");
String result = res.toString();
diff --git a/test/org/apache/jasper/compiler/TesterValidator.java
b/test/org/apache/jasper/compiler/TesterValidator.java
index f2d47f825d..b6ed4cc557 100644
--- a/test/org/apache/jasper/compiler/TesterValidator.java
+++ b/test/org/apache/jasper/compiler/TesterValidator.java
@@ -26,9 +26,7 @@ import org.apache.tomcat.util.security.Escape;
*/
public class TesterValidator {
- private static String[] bug53867TestData = new String[] {
- "Hello World!",
- "<meta http-equiv=\"Content-Language\">",
+ private static String[] bug53867TestData = new String[] { "Hello World!",
"<meta http-equiv=\"Content-Language\">",
"This connection has limited network connectivity.",
"Please use this web page & to access file server resources." };
@@ -43,8 +41,7 @@ public class TesterValidator {
int count = 100000;
for (String testDatum : bug53867TestData) {
- Assert.assertEquals(doTestBug53867OldVersion(testDatum),
- Escape.xml(testDatum));
+ Assert.assertEquals(doTestBug53867OldVersion(testDatum),
Escape.xml(testDatum));
}
for (int i = 0; i < 100; i++) {
@@ -64,8 +61,7 @@ public class TesterValidator {
doTestBug53867OldVersion(bug53867TestDatum);
}
}
- System.out.println(
- "Old escape:" + (System.currentTimeMillis() - start));
+ System.out.println("Old escape:" + (System.currentTimeMillis() -
start));
start = System.currentTimeMillis();
for (int i = 0; i < count; i++) {
@@ -73,13 +69,12 @@ public class TesterValidator {
Escape.xml(bug53867TestDatum);
}
}
- System.out.println(
- "New escape:" + (System.currentTimeMillis() - start));
+ System.out.println("New escape:" + (System.currentTimeMillis() -
start));
}
private static String doTestBug53867OldVersion(String s) {
if (s == null) {
- return null;
+ return null;
}
StringBuilder sb = new StringBuilder();
for (int i = 0; i < s.length(); i++) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
