bodewig 2003/01/15 08:06:42
Modified: src/testcases/org/apache/tools/ant/taskdefs/optional Tag:
ANT_15_BRANCH JspcTest.java
Log:
Merge Costin's patch from HEAD to adapt to JasperC's latest naming scheme
Revision Changes Path
No revision
No revision
1.2.2.1 +12 -9
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/optional/JspcTest.java
Index: JspcTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/optional/JspcTest.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- JspcTest.java 23 Mar 2002 20:48:29 -0000 1.2
+++ JspcTest.java 15 Jan 2003 16:06:40 -0000 1.2.2.1
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2002-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -113,7 +113,7 @@
* A unit test for JUnit
*/
public void testSimple() throws Exception {
- executeJspCompile("testSimple", "simple.java");
+ executeJspCompile("testSimple", "simple_jsp.java");
}
@@ -121,7 +121,7 @@
* A unit test for JUnit
*/
public void testUriroot() throws Exception {
- executeJspCompile("testUriroot", "uriroot.java");
+ executeJspCompile("testUriroot", "uriroot_jsp.java");
}
@@ -129,7 +129,7 @@
* A unit test for JUnit
*/
public void testXml() throws Exception {
- executeJspCompile("testXml", "xml.java");
+ executeJspCompile("testXml", "xml_jsp.java");
}
@@ -137,7 +137,7 @@
* 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 void testInvalidClassname() throws Exception {
executeJspCompile("testInvalidClassname",
- "_00031nvalid_0002dclassname.java");
+ "_1nvalid_0002dclassname_jsp.java");
}
@@ -154,9 +154,12 @@
* 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");
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
