Author: markt
Date: Fri Nov 12 15:11:25 2010
New Revision: 1034416
URL: http://svn.apache.org/viewvc?rev=1034416&view=rev
Log:
Re-organise tests for bugs 49nnn
Added:
tomcat/trunk/test/webapp-3.0/bug49nnn/bug49196.jsp
- copied unchanged from r1033904,
tomcat/trunk/test/webapp-3.0/bug49196.jsp
tomcat/trunk/test/webapp-3.0/bug49nnn/bug49297DuplicateAttr.jsp
- copied unchanged from r1033904,
tomcat/trunk/test/webapp-3.0/bug49297DuplicateAttr.jsp
tomcat/trunk/test/webapp-3.0/bug49nnn/bug49297NoSpace.jsp
- copied unchanged from r1033904,
tomcat/trunk/test/webapp-3.0/bug49297NoSpace.jsp
tomcat/trunk/test/webapp-3.0/bug49nnn/bug49555.jsp
- copied unchanged from r1033904,
tomcat/trunk/test/webapp-3.0/bug49555.jsp
tomcat/trunk/test/webapp-3.0/bug49nnn/bug49726a.jsp
- copied unchanged from r1033904,
tomcat/trunk/test/webapp-3.0/bug49726a.jsp
tomcat/trunk/test/webapp-3.0/bug49nnn/bug49726b.jsp
- copied unchanged from r1033904,
tomcat/trunk/test/webapp-3.0/bug49726b.jsp
tomcat/trunk/test/webapp-3.0/bug49nnn/bug49799.jsp
- copied unchanged from r1033904,
tomcat/trunk/test/webapp-3.0/bug49799.jsp
Removed:
tomcat/trunk/test/webapp-3.0/bug49196.jsp
tomcat/trunk/test/webapp-3.0/bug49297DuplicateAttr.jsp
tomcat/trunk/test/webapp-3.0/bug49297NoSpace.jsp
tomcat/trunk/test/webapp-3.0/bug49555.jsp
tomcat/trunk/test/webapp-3.0/bug49726a.jsp
tomcat/trunk/test/webapp-3.0/bug49726b.jsp
tomcat/trunk/test/webapp-3.0/bug49799.jsp
Modified:
tomcat/trunk/test/javax/servlet/jsp/TestPageContext.java
tomcat/trunk/test/org/apache/el/TestELInJsp.java
tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java
tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java
tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java
tomcat/trunk/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java
tomcat/trunk/test/webapp-3.0/WEB-INF/web.xml
Modified: tomcat/trunk/test/javax/servlet/jsp/TestPageContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/javax/servlet/jsp/TestPageContext.java?rev=1034416&r1=1034415&r2=1034416&view=diff
==============================================================================
--- tomcat/trunk/test/javax/servlet/jsp/TestPageContext.java (original)
+++ tomcat/trunk/test/javax/servlet/jsp/TestPageContext.java Fri Nov 12
15:11:25 2010
@@ -35,7 +35,7 @@ public class TestPageContext extends Tom
tomcat.start();
ByteChunk res = getUrl("http://localhost:"; + getPort() +
- "/test/bug49196.jsp");
+ "/test/bug49nnn/bug49196.jsp");
String result = res.toString();
assertTrue(result.contains("OK"));
Modified: tomcat/trunk/test/org/apache/el/TestELInJsp.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestELInJsp.java?rev=1034416&r1=1034415&r2=1034416&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/el/TestELInJsp.java (original)
+++ tomcat/trunk/test/org/apache/el/TestELInJsp.java Fri Nov 12 15:11:25 2010
@@ -319,7 +319,7 @@ public class TestELInJsp extends TomcatB
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);
Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java?rev=1034416&r1=1034415&r2=1034416&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java Fri Nov 12
15:11:25 2010
@@ -38,8 +38,8 @@ public class TestCompiler extends Tomcat
ByteChunk res = new ByteChunk();
Map<String,List<String>> headers = new HashMap<String,List<String>>();
- 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 Tomcat
ByteChunk res = new ByteChunk();
Map<String,List<String>> headers = new HashMap<String,List<String>>();
- 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();
Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java?rev=1034416&r1=1034415&r2=1034416&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java Fri Nov 12
15:11:25 2010
@@ -218,8 +218,8 @@ public class TestGenerator extends Tomca
ByteChunk res = new ByteChunk();
Map<String,List<String>> headers = new HashMap<String,List<String>>();
- 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();
Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java?rev=1034416&r1=1034415&r2=1034416&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java Fri Nov 12
15:11:25 2010
@@ -122,7 +122,7 @@ public class TestParser extends TomcatBa
tomcat.start();
int sc = getUrl("http://localhost:"; + getPort() +
- "/test/bug49297NoSpace.jsp", new ByteChunk(),
+ "/test/bug49nnn/bug49297NoSpace.jsp", new ByteChunk(),
new HashMap<String,List<String>>());
assertEquals(500, sc);
@@ -138,7 +138,7 @@ public class TestParser extends TomcatBa
tomcat.start();
int sc = getUrl("http://localhost:"; + getPort() +
- "/test/bug49297DuplicateAttr.jsp", new ByteChunk(),
+ "/test/bug49nnn/bug49297DuplicateAttr.jsp", new ByteChunk(),
new HashMap<String,List<String>>());
assertEquals(500, sc);
Modified:
tomcat/trunk/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java?rev=1034416&r1=1034415&r2=1034416&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java
(original)
+++
tomcat/trunk/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java
Fri Nov 12 15:11:25 2010
@@ -132,7 +132,7 @@ public class TestParserNoStrictWhitespac
ByteChunk res = new ByteChunk();
int sc = getUrl("http://localhost:"; + getPort() +
- "/test/bug49297NoSpace.jsp", res,
+ "/test/bug49nnn/bug49297NoSpace.jsp", res,
new HashMap<String,List<String>>());
@@ -150,7 +150,7 @@ public class TestParserNoStrictWhitespac
tomcat.start();
int sc = getUrl("http://localhost:"; + getPort() +
- "/test/bug49297DuplicateAttr.jsp", new ByteChunk(),
+ "/test/bug49nnn/bug49297DuplicateAttr.jsp", new ByteChunk(),
new HashMap<String,List<String>>());
assertEquals(500, sc);
Modified: tomcat/trunk/test/webapp-3.0/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/WEB-INF/web.xml?rev=1034416&r1=1034415&r2=1034416&view=diff
==============================================================================
--- tomcat/trunk/test/webapp-3.0/WEB-INF/web.xml (original)
+++ tomcat/trunk/test/webapp-3.0/WEB-INF/web.xml Fri Nov 12 15:11:25 2010
@@ -99,8 +99,8 @@
<jsp-config>
<jsp-property-group>
<default-content-type>text/plain</default-content-type>
- <url-pattern>/bug49726a.jsp</url-pattern>
- <url-pattern>/bug49726b.jsp</url-pattern>
+ <url-pattern>/bug49nnn/bug49726a.jsp</url-pattern>
+ <url-pattern>/bug49nnn/bug49726b.jsp</url-pattern>
</jsp-property-group>
</jsp-config>
</web-app>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
