From 7ae8cce4da36f0ea25aab108cc5b69b1432907b9 Mon Sep 17 00:00:00 2001
From: Costin Manolache <costin@apache.org>
Date: Mon, 30 Dec 2002 06:11:14 +0000
Subject: [PATCH] Update with the current name generation schema.

There is no standard for how jsp generates names - and jasper
changes from time to time :-)

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273728 13f79535-47bb-0310-9956-ffa450edef68
---
 .../tools/ant/taskdefs/optional/JspcTest.java | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/JspcTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/JspcTest.java
index 9e550b303..f5bcca520 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/optional/JspcTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/JspcTest.java
@@ -113,7 +113,7 @@ public class JspcTest extends BuildFileTest {
      * A unit test for JUnit
      */
     public void testSimple() throws Exception {
-        executeJspCompile("testSimple", "simple.java");
+        executeJspCompile("testSimple", "simple_jsp.java");
     }
 
 
@@ -121,7 +121,7 @@ public class JspcTest extends BuildFileTest {
      * A unit test for JUnit
      */
     public void testUriroot() throws Exception {
-        executeJspCompile("testUriroot", "uriroot.java");
+        executeJspCompile("testUriroot", "uriroot_jsp.java");
     }
 
 
@@ -129,7 +129,7 @@ public class JspcTest extends BuildFileTest {
      * A unit test for JUnit
      */
     public void testXml() throws Exception {
-        executeJspCompile("testXml", "xml.java");
+        executeJspCompile("testXml", "xml_jsp.java");
     }
 
 
@@ -137,7 +137,7 @@ public class JspcTest extends BuildFileTest {
      * try a keyword in a file
      */
     public void testKeyword() throws Exception {
-        executeJspCompile("testKeyword", "default_00025.java");
+        executeJspCompile("testKeyword", "default_jsp.java");
     }
 
 
@@ -146,7 +146,7 @@ public class JspcTest extends BuildFileTest {
      */
     public void testInvalidClassname() throws Exception {
         executeJspCompile("testInvalidClassname", 
-                "_00031nvalid_0002dclassname.java");
+                "_1nvalid_0002dclassname_jsp.java");
     }
 
     
@@ -154,9 +154,12 @@ public class JspcTest extends BuildFileTest {
      * A unit test for JUnit
      */
     public void testNoTld() throws Exception {
-        expectBuildExceptionContaining("testNoTld",
-                "Jasper found an error in a file",
-                "Java returned: 9");
+//         expectBuildExceptionContaining("testNoTld",
+//                 "Jasper found an error in a file",
+//                 "Java returned: 9");
+         expectBuildExceptionContaining("testNoTld",
+                 "not found",
+                 "Java returned: 9");
     }