conor 00/11/21 05:36:23
Modified: src/testcases/org/apache/tools/ant/taskdefs EchoTest.java
MkdirTest.java TaskdefsTest.java
Log:
Fix up test cases due to recent changes
Revision Changes Path
1.3 +4 -4
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/EchoTest.java
Index: EchoTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/EchoTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EchoTest.java 2000/09/21 07:19:50 1.2
+++ EchoTest.java 2000/11/21 13:36:11 1.3
@@ -69,21 +69,21 @@
// Output an empty String
public void test1() {
- expectOutput("test1", "\n");
+ expectLog("test1", "");
}
// Output 'OUTPUT OF ECHO'
public void test2() {
- expectOutput("test2", "OUTPUT OF ECHO\n");
+ expectLog("test2", "OUTPUT OF ECHO");
}
public void test3() {
- expectOutput("test3", "\n"+
+ expectLog("test3", "\n"+
" This \n"+
" is\n"+
" a \n"+
" multiline\n"+
" message\n"+
- " \n");
+ " ");
}
}
1.2 +1 -3
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/MkdirTest.java
Index: MkdirTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/MkdirTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MkdirTest.java 2000/09/20 13:38:50 1.1
+++ MkdirTest.java 2000/11/21 13:36:12 1.2
@@ -72,9 +72,7 @@
}
public void test2() {
- executeTarget("test2");
- String log = getLog();
- assert(log.indexOf("Warning: Specified directory is a file: ") > -1);
+ expectBuildException("test2", "directory already exists as a file");
}
public void test3() {
1.2 +1 -0
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/TaskdefsTest.java
Index: TaskdefsTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/TaskdefsTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TaskdefsTest.java 2000/09/20 13:38:50 1.1
+++ TaskdefsTest.java 2000/11/21 13:36:13 1.2
@@ -213,6 +213,7 @@
*/
public void messageLogged(BuildEvent event) {
if (event.getPriority() == Project.MSG_INFO ||
+ event.getPriority() == Project.MSG_WARN ||
event.getPriority() == Project.MSG_ERR)
{
logBuffer.append(event.getMessage());
