From: markt Date: Fri, 12 Nov 2010 15:11:25 +0000 (+0000) Subject: Re-organise tests for bugs 49nnn X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=a0931dcdad824f5e73a3545dcbaeddd5732d6776;p=tomcat7.0 Re-organise tests for bugs 49nnn git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1034416 13f79535-47bb-0310-9956-ffa450edef68 --- 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/bug49196.jsp deleted file mode 100644 index 9797a94a3..000000000 --- a/test/webapp-3.0/bug49196.jsp +++ /dev/null @@ -1,26 +0,0 @@ -<%-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---%> -<% -// As nonsensical as this is, it shouldn't throw an NPE -pageContext.getErrorData(); -%> - - Bug 49196 test case - -

OK

- - \ No newline at end of file diff --git a/test/webapp-3.0/bug49297DuplicateAttr.jsp b/test/webapp-3.0/bug49297DuplicateAttr.jsp deleted file mode 100644 index 9790c80e6..000000000 --- a/test/webapp-3.0/bug49297DuplicateAttr.jsp +++ /dev/null @@ -1,23 +0,0 @@ -<%-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---%> -<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %> - - Bug 49297 duplicate attribute test case - - - - \ No newline at end of file diff --git a/test/webapp-3.0/bug49297NoSpace.jsp b/test/webapp-3.0/bug49297NoSpace.jsp deleted file mode 100644 index 5a857c3fb..000000000 --- a/test/webapp-3.0/bug49297NoSpace.jsp +++ /dev/null @@ -1,23 +0,0 @@ -<%-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---%> -<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %> - - Bug 49297 whitespace test case - - - - \ No newline at end of file diff --git a/test/webapp-3.0/bug49555.jsp b/test/webapp-3.0/bug49555.jsp deleted file mode 100644 index de65fe972..000000000 --- a/test/webapp-3.0/bug49555.jsp +++ /dev/null @@ -1,18 +0,0 @@ -<%-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---%> -<%@ taglib uri="http://tomcat.apache.org/bugs" prefix="bugs" %> -

00-${bugs:bug49555()}

diff --git a/test/webapp-3.0/bug49726a.jsp b/test/webapp-3.0/bug49726a.jsp deleted file mode 100644 index a9e177b4a..000000000 --- a/test/webapp-3.0/bug49726a.jsp +++ /dev/null @@ -1,24 +0,0 @@ -<%-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---%> -<%@ page contentType="text/html"%> - - Bug 49726 test case - -

OK

- - - diff --git a/test/webapp-3.0/bug49726b.jsp b/test/webapp-3.0/bug49726b.jsp deleted file mode 100644 index eaf7737fe..000000000 --- a/test/webapp-3.0/bug49726b.jsp +++ /dev/null @@ -1,23 +0,0 @@ -<%-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---%> - - Bug 49726 test case - -

OK

- - - diff --git a/test/webapp-3.0/bug49799.jsp b/test/webapp-3.0/bug49799.jsp deleted file mode 100644 index 8fd39dbe9..000000000 --- a/test/webapp-3.0/bug49799.jsp +++ /dev/null @@ -1,40 +0,0 @@ -<%-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---%> - - color:red - 00-Red - - - color:red - 01-Not Red - - - color:red - 02-Red - - - color:red - 03-Not Red - - - color:red - 04-Red - - - color:red - 05-Not Red - \ No newline at end of file diff --git a/test/webapp-3.0/bug49nnn/bug49196.jsp b/test/webapp-3.0/bug49nnn/bug49196.jsp new file mode 100644 index 000000000..9797a94a3 --- /dev/null +++ b/test/webapp-3.0/bug49nnn/bug49196.jsp @@ -0,0 +1,26 @@ +<%-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--%> +<% +// As nonsensical as this is, it shouldn't throw an NPE +pageContext.getErrorData(); +%> + + Bug 49196 test case + +

OK

+ + \ No newline at end of file diff --git a/test/webapp-3.0/bug49nnn/bug49297DuplicateAttr.jsp b/test/webapp-3.0/bug49nnn/bug49297DuplicateAttr.jsp new file mode 100644 index 000000000..9790c80e6 --- /dev/null +++ b/test/webapp-3.0/bug49nnn/bug49297DuplicateAttr.jsp @@ -0,0 +1,23 @@ +<%-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--%> +<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %> + + Bug 49297 duplicate attribute test case + + + + \ No newline at end of file diff --git a/test/webapp-3.0/bug49nnn/bug49297NoSpace.jsp b/test/webapp-3.0/bug49nnn/bug49297NoSpace.jsp new file mode 100644 index 000000000..5a857c3fb --- /dev/null +++ b/test/webapp-3.0/bug49nnn/bug49297NoSpace.jsp @@ -0,0 +1,23 @@ +<%-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--%> +<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %> + + Bug 49297 whitespace test case + + + + \ No newline at end of file diff --git a/test/webapp-3.0/bug49nnn/bug49555.jsp b/test/webapp-3.0/bug49nnn/bug49555.jsp new file mode 100644 index 000000000..de65fe972 --- /dev/null +++ b/test/webapp-3.0/bug49nnn/bug49555.jsp @@ -0,0 +1,18 @@ +<%-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--%> +<%@ taglib uri="http://tomcat.apache.org/bugs" prefix="bugs" %> +

00-${bugs:bug49555()}

diff --git a/test/webapp-3.0/bug49nnn/bug49726a.jsp b/test/webapp-3.0/bug49nnn/bug49726a.jsp new file mode 100644 index 000000000..a9e177b4a --- /dev/null +++ b/test/webapp-3.0/bug49nnn/bug49726a.jsp @@ -0,0 +1,24 @@ +<%-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--%> +<%@ page contentType="text/html"%> + + Bug 49726 test case + +

OK

+ + + diff --git a/test/webapp-3.0/bug49nnn/bug49726b.jsp b/test/webapp-3.0/bug49nnn/bug49726b.jsp new file mode 100644 index 000000000..eaf7737fe --- /dev/null +++ b/test/webapp-3.0/bug49nnn/bug49726b.jsp @@ -0,0 +1,23 @@ +<%-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--%> + + Bug 49726 test case + +

OK

+ + + diff --git a/test/webapp-3.0/bug49nnn/bug49799.jsp b/test/webapp-3.0/bug49nnn/bug49799.jsp new file mode 100644 index 000000000..8fd39dbe9 --- /dev/null +++ b/test/webapp-3.0/bug49nnn/bug49799.jsp @@ -0,0 +1,40 @@ +<%-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--%> + + color:red + 00-Red + + + color:red + 01-Not Red + + + color:red + 02-Red + + + color:red + 03-Not Red + + + color:red + 04-Red + + + color:red + 05-Not Red + \ No newline at end of file