From 2d5e68c5327bfd85ffa887e241634fa4a862de2a Mon Sep 17 00:00:00 2001 From: markt Date: Tue, 9 Mar 2010 21:56:36 +0000 Subject: [PATCH] Move the 48nnn bugs git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@921150 13f79535-47bb-0310-9956-ffa450edef68 --- test/org/apache/el/TestELInJsp.java | 2 +- test/org/apache/jasper/compiler/TestGenerator.java | 10 +++++----- test/org/apache/jasper/compiler/TestJspDocumentParser.java | 2 +- test/org/apache/jasper/compiler/TestParser.java | 6 +++--- test/org/apache/jasper/compiler/TestScriptingVariabler.java | 4 ++-- test/webapp-3.0/{ => bug48nnn}/bug48112.jsp | 0 test/webapp-3.0/{ => bug48nnn}/bug48616.jsp | 0 test/webapp-3.0/{ => bug48nnn}/bug48616b.jsp | 0 test/webapp-3.0/{ => bug48nnn}/bug48627.jsp | 0 test/webapp-3.0/{ => bug48nnn}/bug48668a.jsp | 0 test/webapp-3.0/{ => bug48nnn}/bug48668b.jsp | 0 test/webapp-3.0/{ => bug48nnn}/bug48701-TVI-NFA.jsp | 0 test/webapp-3.0/{ => bug48nnn}/bug48701-TVI-NG.jsp | 0 test/webapp-3.0/{ => bug48nnn}/bug48701-UseBean.jsp | 0 test/webapp-3.0/{ => bug48nnn}/bug48701-VI.jsp | 0 test/webapp-3.0/{ => bug48nnn}/bug48701-fail.jsp | 0 test/webapp-3.0/{ => bug48nnn}/bug48827.jspx | 0 17 files changed, 12 insertions(+), 12 deletions(-) rename test/webapp-3.0/{ => bug48nnn}/bug48112.jsp (100%) rename test/webapp-3.0/{ => bug48nnn}/bug48616.jsp (100%) rename test/webapp-3.0/{ => bug48nnn}/bug48616b.jsp (100%) rename test/webapp-3.0/{ => bug48nnn}/bug48627.jsp (100%) rename test/webapp-3.0/{ => bug48nnn}/bug48668a.jsp (100%) rename test/webapp-3.0/{ => bug48nnn}/bug48668b.jsp (100%) rename test/webapp-3.0/{ => bug48nnn}/bug48701-TVI-NFA.jsp (100%) rename test/webapp-3.0/{ => bug48nnn}/bug48701-TVI-NG.jsp (100%) rename test/webapp-3.0/{ => bug48nnn}/bug48701-UseBean.jsp (100%) rename test/webapp-3.0/{ => bug48nnn}/bug48701-VI.jsp (100%) rename test/webapp-3.0/{ => bug48nnn}/bug48701-fail.jsp (100%) rename test/webapp-3.0/{ => bug48nnn}/bug48827.jspx (100%) diff --git a/test/org/apache/el/TestELInJsp.java b/test/org/apache/el/TestELInJsp.java index 8e25d0072..27d8034f5 100644 --- a/test/org/apache/el/TestELInJsp.java +++ b/test/org/apache/el/TestELInJsp.java @@ -304,7 +304,7 @@ public class TestELInJsp extends TomcatBaseTest { tomcat.start(); ByteChunk res = getUrl("http://localhost:" + getPort() + - "/test/bug48112.jsp"); + "/test/bug48nnn/bug48112.jsp"); String result = res.toString(); assertEcho(result, "{OK}"); } diff --git a/test/org/apache/jasper/compiler/TestGenerator.java b/test/org/apache/jasper/compiler/TestGenerator.java index ac0d630de..7f090e841 100644 --- a/test/org/apache/jasper/compiler/TestGenerator.java +++ b/test/org/apache/jasper/compiler/TestGenerator.java @@ -100,7 +100,7 @@ public class TestGenerator extends TomcatBaseTest { Exception e = null; try { - getUrl("http://localhost:" + getPort() + "/test/bug48701-fail.jsp"); + getUrl("http://localhost:" + getPort() + "/test/bug48nnn/bug48701-fail.jsp"); } catch (IOException ioe) { e = ioe; } @@ -110,19 +110,19 @@ public class TestGenerator extends TomcatBaseTest { } public void testBug48701UseBean() throws Exception { - testBug48701("bug48701-UseBean.jsp"); + testBug48701("bug48nnn/bug48701-UseBean.jsp"); } public void testBug48701VariableInfo() throws Exception { - testBug48701("bug48701-VI.jsp"); + testBug48701("bug48nnn/bug48701-VI.jsp"); } public void testBug48701TagVariableInfoNameGiven() throws Exception { - testBug48701("bug48701-TVI-NG.jsp"); + testBug48701("bug48nnn/bug48701-TVI-NG.jsp"); } public void testBug48701TagVariableInfoNameFromAttribute() throws Exception { - testBug48701("bug48701-TVI-NFA.jsp"); + testBug48701("bug48nnn/bug48701-TVI-NFA.jsp"); } private void testBug48701(String jsp) throws Exception { diff --git a/test/org/apache/jasper/compiler/TestJspDocumentParser.java b/test/org/apache/jasper/compiler/TestJspDocumentParser.java index c1c493d6f..08b636c7d 100644 --- a/test/org/apache/jasper/compiler/TestJspDocumentParser.java +++ b/test/org/apache/jasper/compiler/TestJspDocumentParser.java @@ -58,7 +58,7 @@ public class TestJspDocumentParser extends TomcatBaseTest { Exception e = null; try { - getUrl("http://localhost:" + getPort() + "/test/bug48827.jspx"); + getUrl("http://localhost:" + getPort() + "/test/bug48nnn/bug48827.jspx"); } catch (IOException ioe) { e = ioe; } diff --git a/test/org/apache/jasper/compiler/TestParser.java b/test/org/apache/jasper/compiler/TestParser.java index 6c3eebdaa..4675fe2a7 100644 --- a/test/org/apache/jasper/compiler/TestParser.java +++ b/test/org/apache/jasper/compiler/TestParser.java @@ -36,7 +36,7 @@ public class TestParser extends TomcatBaseTest { tomcat.start(); ByteChunk res = getUrl("http://localhost:" + getPort() + - "/test/bug48627.jsp"); + "/test/bug48nnn/bug48627.jsp"); String result = res.toString(); // Beware of the differences between escaping in JSP attributes and @@ -56,7 +56,7 @@ public class TestParser extends TomcatBaseTest { tomcat.start(); ByteChunk res = getUrl("http://localhost:" + getPort() + - "/test/bug48668a.jsp"); + "/test/bug48nnn/bug48668a.jsp"); String result = res.toString(); assertEcho(result, "00-Hello world

#{foo.bar}"); assertEcho(result, "01-Hello world

${foo.bar}"); @@ -101,7 +101,7 @@ public class TestParser extends TomcatBaseTest { tomcat.start(); ByteChunk res = getUrl("http://localhost:" + getPort() + - "/test/bug48668b.jsp"); + "/test/bug48nnn/bug48668b.jsp"); String result = res.toString(); assertEcho(result, "00-Hello world

#{foo.bar}"); assertEcho(result, "01-Hello world

#{foo2"); diff --git a/test/org/apache/jasper/compiler/TestScriptingVariabler.java b/test/org/apache/jasper/compiler/TestScriptingVariabler.java index 8b372c3e4..c031d8d64 100644 --- a/test/org/apache/jasper/compiler/TestScriptingVariabler.java +++ b/test/org/apache/jasper/compiler/TestScriptingVariabler.java @@ -84,7 +84,7 @@ public class TestScriptingVariabler extends TomcatBaseTest { Exception e = null; try { - getUrl("http://localhost:" + getPort() + "/test/bug48616.jsp"); + getUrl("http://localhost:" + getPort() + "/test/bug48nnn/bug48616.jsp"); } catch (IOException ioe) { e = ioe; } @@ -105,7 +105,7 @@ public class TestScriptingVariabler extends TomcatBaseTest { Exception e = null; try { - getUrl("http://localhost:" + getPort() + "/test/bug48616b.jsp"); + getUrl("http://localhost:" + getPort() + "/test/bug48nnn/bug48616b.jsp"); } catch (IOException ioe) { e = ioe; } diff --git a/test/webapp-3.0/bug48112.jsp b/test/webapp-3.0/bug48nnn/bug48112.jsp similarity index 100% rename from test/webapp-3.0/bug48112.jsp rename to test/webapp-3.0/bug48nnn/bug48112.jsp diff --git a/test/webapp-3.0/bug48616.jsp b/test/webapp-3.0/bug48nnn/bug48616.jsp similarity index 100% rename from test/webapp-3.0/bug48616.jsp rename to test/webapp-3.0/bug48nnn/bug48616.jsp diff --git a/test/webapp-3.0/bug48616b.jsp b/test/webapp-3.0/bug48nnn/bug48616b.jsp similarity index 100% rename from test/webapp-3.0/bug48616b.jsp rename to test/webapp-3.0/bug48nnn/bug48616b.jsp diff --git a/test/webapp-3.0/bug48627.jsp b/test/webapp-3.0/bug48nnn/bug48627.jsp similarity index 100% rename from test/webapp-3.0/bug48627.jsp rename to test/webapp-3.0/bug48nnn/bug48627.jsp diff --git a/test/webapp-3.0/bug48668a.jsp b/test/webapp-3.0/bug48nnn/bug48668a.jsp similarity index 100% rename from test/webapp-3.0/bug48668a.jsp rename to test/webapp-3.0/bug48nnn/bug48668a.jsp diff --git a/test/webapp-3.0/bug48668b.jsp b/test/webapp-3.0/bug48nnn/bug48668b.jsp similarity index 100% rename from test/webapp-3.0/bug48668b.jsp rename to test/webapp-3.0/bug48nnn/bug48668b.jsp diff --git a/test/webapp-3.0/bug48701-TVI-NFA.jsp b/test/webapp-3.0/bug48nnn/bug48701-TVI-NFA.jsp similarity index 100% rename from test/webapp-3.0/bug48701-TVI-NFA.jsp rename to test/webapp-3.0/bug48nnn/bug48701-TVI-NFA.jsp diff --git a/test/webapp-3.0/bug48701-TVI-NG.jsp b/test/webapp-3.0/bug48nnn/bug48701-TVI-NG.jsp similarity index 100% rename from test/webapp-3.0/bug48701-TVI-NG.jsp rename to test/webapp-3.0/bug48nnn/bug48701-TVI-NG.jsp diff --git a/test/webapp-3.0/bug48701-UseBean.jsp b/test/webapp-3.0/bug48nnn/bug48701-UseBean.jsp similarity index 100% rename from test/webapp-3.0/bug48701-UseBean.jsp rename to test/webapp-3.0/bug48nnn/bug48701-UseBean.jsp diff --git a/test/webapp-3.0/bug48701-VI.jsp b/test/webapp-3.0/bug48nnn/bug48701-VI.jsp similarity index 100% rename from test/webapp-3.0/bug48701-VI.jsp rename to test/webapp-3.0/bug48nnn/bug48701-VI.jsp diff --git a/test/webapp-3.0/bug48701-fail.jsp b/test/webapp-3.0/bug48nnn/bug48701-fail.jsp similarity index 100% rename from test/webapp-3.0/bug48701-fail.jsp rename to test/webapp-3.0/bug48nnn/bug48701-fail.jsp diff --git a/test/webapp-3.0/bug48827.jspx b/test/webapp-3.0/bug48nnn/bug48827.jspx similarity index 100% rename from test/webapp-3.0/bug48827.jspx rename to test/webapp-3.0/bug48nnn/bug48827.jspx -- 2.11.0