From a0931dcdad824f5e73a3545dcbaeddd5732d6776 Mon Sep 17 00:00:00 2001 From: markt Date: Fri, 12 Nov 2010 15:11:25 +0000 Subject: [PATCH] Re-organise tests for bugs 49nnn git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1034416 13f79535-47bb-0310-9956-ffa450edef68 --- test/javax/servlet/jsp/TestPageContext.java | 2 +- test/org/apache/el/TestELInJsp.java | 2 +- test/org/apache/jasper/compiler/TestCompiler.java | 8 ++++---- test/org/apache/jasper/compiler/TestGenerator.java | 4 ++-- test/org/apache/jasper/compiler/TestParser.java | 4 ++-- test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java | 4 ++-- test/webapp-3.0/WEB-INF/web.xml | 4 ++-- test/webapp-3.0/{ => bug49nnn}/bug49196.jsp | 0 test/webapp-3.0/{ => bug49nnn}/bug49297DuplicateAttr.jsp | 0 test/webapp-3.0/{ => bug49nnn}/bug49297NoSpace.jsp | 0 test/webapp-3.0/{ => bug49nnn}/bug49555.jsp | 0 test/webapp-3.0/{ => bug49nnn}/bug49726a.jsp | 0 test/webapp-3.0/{ => bug49nnn}/bug49726b.jsp | 0 test/webapp-3.0/{ => bug49nnn}/bug49799.jsp | 0 14 files changed, 14 insertions(+), 14 deletions(-) rename test/webapp-3.0/{ => bug49nnn}/bug49196.jsp (100%) rename test/webapp-3.0/{ => bug49nnn}/bug49297DuplicateAttr.jsp (100%) rename test/webapp-3.0/{ => bug49nnn}/bug49297NoSpace.jsp (100%) rename test/webapp-3.0/{ => bug49nnn}/bug49555.jsp (100%) rename test/webapp-3.0/{ => bug49nnn}/bug49726a.jsp (100%) rename test/webapp-3.0/{ => bug49nnn}/bug49726b.jsp (100%) rename test/webapp-3.0/{ => bug49nnn}/bug49799.jsp (100%) diff --git a/test/javax/servlet/jsp/TestPageContext.java b/test/javax/servlet/jsp/TestPageContext.java index 961234c96..17b31aa84 100644 --- a/test/javax/servlet/jsp/TestPageContext.java +++ b/test/javax/servlet/jsp/TestPageContext.java @@ -35,7 +35,7 @@ public class TestPageContext extends TomcatBaseTest { tomcat.start(); ByteChunk res = getUrl("http://localhost:" + getPort() + - "/test/bug49196.jsp"); + "/test/bug49nnn/bug49196.jsp"); String result = res.toString(); assertTrue(result.contains("OK")); diff --git a/test/org/apache/el/TestELInJsp.java b/test/org/apache/el/TestELInJsp.java index 558b53dba..51bc8edb5 100644 --- a/test/org/apache/el/TestELInJsp.java +++ b/test/org/apache/el/TestELInJsp.java @@ -319,7 +319,7 @@ public class TestELInJsp extends TomcatBaseTest { tomcat.start(); ByteChunk res = getUrl("http://localhost:" + getPort() + - "/test/bug49555.jsp"); + "/test/bug49nnn/bug49555.jsp"); String result = res.toString(); assertEcho(result, "00-" + TesterFunctions.Inner$Class.RETVAL); diff --git a/test/org/apache/jasper/compiler/TestCompiler.java b/test/org/apache/jasper/compiler/TestCompiler.java index e9d01f64b..c3324c26e 100644 --- a/test/org/apache/jasper/compiler/TestCompiler.java +++ b/test/org/apache/jasper/compiler/TestCompiler.java @@ -38,8 +38,8 @@ public class TestCompiler extends TomcatBaseTest { ByteChunk res = new ByteChunk(); Map> headers = new HashMap>(); - getUrl("http://localhost:" + getPort() + "/test/bug49726a.jsp", res, - headers); + getUrl("http://localhost:" + getPort() + "/test/bug49nnn/bug49726a.jsp", + res, headers); // Check request completed String result = res.toString(); @@ -59,8 +59,8 @@ public class TestCompiler extends TomcatBaseTest { ByteChunk res = new ByteChunk(); Map> headers = new HashMap>(); - getUrl("http://localhost:" + getPort() + "/test/bug49726b.jsp", res, - headers); + getUrl("http://localhost:" + getPort() + "/test/bug49nnn/bug49726b.jsp", + res, headers); // Check request completed String result = res.toString(); diff --git a/test/org/apache/jasper/compiler/TestGenerator.java b/test/org/apache/jasper/compiler/TestGenerator.java index ccd5414f5..8478e7ec2 100644 --- a/test/org/apache/jasper/compiler/TestGenerator.java +++ b/test/org/apache/jasper/compiler/TestGenerator.java @@ -218,8 +218,8 @@ public class TestGenerator extends TomcatBaseTest { ByteChunk res = new ByteChunk(); Map> headers = new HashMap>(); - getUrl("http://localhost:" + getPort() + "/test/bug49799.jsp", res, - headers); + getUrl("http://localhost:" + getPort() + "/test/bug49nnn/bug49799.jsp", + res, headers); // Check request completed String result = res.toString(); diff --git a/test/org/apache/jasper/compiler/TestParser.java b/test/org/apache/jasper/compiler/TestParser.java index 145c2609f..5fcd170c9 100644 --- a/test/org/apache/jasper/compiler/TestParser.java +++ b/test/org/apache/jasper/compiler/TestParser.java @@ -122,7 +122,7 @@ public class TestParser extends TomcatBaseTest { tomcat.start(); int sc = getUrl("http://localhost:" + getPort() + - "/test/bug49297NoSpace.jsp", new ByteChunk(), + "/test/bug49nnn/bug49297NoSpace.jsp", new ByteChunk(), new HashMap>()); assertEquals(500, sc); @@ -138,7 +138,7 @@ public class TestParser extends TomcatBaseTest { tomcat.start(); int sc = getUrl("http://localhost:" + getPort() + - "/test/bug49297DuplicateAttr.jsp", new ByteChunk(), + "/test/bug49nnn/bug49297DuplicateAttr.jsp", new ByteChunk(), new HashMap>()); assertEquals(500, sc); diff --git a/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java b/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java index b1bba1f7b..f46d7762e 100644 --- a/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java +++ b/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java @@ -132,7 +132,7 @@ public class TestParserNoStrictWhitespace extends TomcatBaseTest { ByteChunk res = new ByteChunk(); int sc = getUrl("http://localhost:" + getPort() + - "/test/bug49297NoSpace.jsp", res, + "/test/bug49nnn/bug49297NoSpace.jsp", res, new HashMap>()); @@ -150,7 +150,7 @@ public class TestParserNoStrictWhitespace extends TomcatBaseTest { tomcat.start(); int sc = getUrl("http://localhost:" + getPort() + - "/test/bug49297DuplicateAttr.jsp", new ByteChunk(), + "/test/bug49nnn/bug49297DuplicateAttr.jsp", new ByteChunk(), new HashMap>()); assertEquals(500, sc); diff --git a/test/webapp-3.0/WEB-INF/web.xml b/test/webapp-3.0/WEB-INF/web.xml index 71ae7d9af..634d39086 100644 --- a/test/webapp-3.0/WEB-INF/web.xml +++ b/test/webapp-3.0/WEB-INF/web.xml @@ -99,8 +99,8 @@ text/plain - /bug49726a.jsp - /bug49726b.jsp + /bug49nnn/bug49726a.jsp + /bug49nnn/bug49726b.jsp \ No newline at end of file diff --git a/test/webapp-3.0/bug49196.jsp b/test/webapp-3.0/bug49nnn/bug49196.jsp similarity index 100% rename from test/webapp-3.0/bug49196.jsp rename to test/webapp-3.0/bug49nnn/bug49196.jsp diff --git a/test/webapp-3.0/bug49297DuplicateAttr.jsp b/test/webapp-3.0/bug49nnn/bug49297DuplicateAttr.jsp similarity index 100% rename from test/webapp-3.0/bug49297DuplicateAttr.jsp rename to test/webapp-3.0/bug49nnn/bug49297DuplicateAttr.jsp diff --git a/test/webapp-3.0/bug49297NoSpace.jsp b/test/webapp-3.0/bug49nnn/bug49297NoSpace.jsp similarity index 100% rename from test/webapp-3.0/bug49297NoSpace.jsp rename to test/webapp-3.0/bug49nnn/bug49297NoSpace.jsp diff --git a/test/webapp-3.0/bug49555.jsp b/test/webapp-3.0/bug49nnn/bug49555.jsp similarity index 100% rename from test/webapp-3.0/bug49555.jsp rename to test/webapp-3.0/bug49nnn/bug49555.jsp diff --git a/test/webapp-3.0/bug49726a.jsp b/test/webapp-3.0/bug49nnn/bug49726a.jsp similarity index 100% rename from test/webapp-3.0/bug49726a.jsp rename to test/webapp-3.0/bug49nnn/bug49726a.jsp diff --git a/test/webapp-3.0/bug49726b.jsp b/test/webapp-3.0/bug49nnn/bug49726b.jsp similarity index 100% rename from test/webapp-3.0/bug49726b.jsp rename to test/webapp-3.0/bug49nnn/bug49726b.jsp diff --git a/test/webapp-3.0/bug49799.jsp b/test/webapp-3.0/bug49nnn/bug49799.jsp similarity index 100% rename from test/webapp-3.0/bug49799.jsp rename to test/webapp-3.0/bug49nnn/bug49799.jsp -- 2.11.0