Browse Source

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
master
Costin Manolache 22 years ago
parent
commit
7ae8cce4da
1 changed files with 11 additions and 8 deletions
  1. +11
    -8
      src/testcases/org/apache/tools/ant/taskdefs/optional/JspcTest.java

+ 11
- 8
src/testcases/org/apache/tools/ant/taskdefs/optional/JspcTest.java View File

@@ -113,7 +113,7 @@ public class JspcTest extends BuildFileTest {
* A unit test for JUnit * A unit test for JUnit
*/ */
public void testSimple() throws Exception { 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 * A unit test for JUnit
*/ */
public void testUriroot() throws Exception { 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 * A unit test for JUnit
*/ */
public void testXml() throws Exception { 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 * try a keyword in a file
*/ */
public void testKeyword() throws Exception { 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 { public void testInvalidClassname() throws Exception {
executeJspCompile("testInvalidClassname", executeJspCompile("testInvalidClassname",
"_00031nvalid_0002dclassname.java");
"_1nvalid_0002dclassname_jsp.java");
} }


@@ -154,9 +154,12 @@ public class JspcTest extends BuildFileTest {
* A unit test for JUnit * A unit test for JUnit
*/ */
public void testNoTld() throws Exception { 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");
} }






Loading…
Cancel
Save