cmlenz 2003/06/09 05:35:57
Modified: integration/ant/src/test-input/org/apache/cactus/integration/ant
test-runservertests.xml
integration/ant/src/test/org/apache/cactus/integration/ant
TestRunServerTestsTask.java
Log:
Remove dependancy on the creation of a file just to check whether a target has been
run.
Instead, use the new assertTargetExecuted() in AntTestCase
Revision Changes Path
1.3 +0 -3
jakarta-cactus/integration/ant/src/test-input/org/apache/cactus/integration/ant/test-runservertests.xml
Index: test-runservertests.xml
===================================================================
RCS file:
/home/cvs/jakarta-cactus/integration/ant/src/test-input/org/apache/cactus/integration/ant/test-runservertests.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- test-runservertests.xml 12 May 2003 22:48:21 -0000 1.2
+++ test-runservertests.xml 9 Jun 2003 12:35:57 -0000 1.3
@@ -46,15 +46,12 @@
<!-- Utility Targets -->
<target name="startDummy">
- <touch file="${work.dir}/startDummy.tmp"/>
</target>
<target name="stopDummy">
- <touch file="${work.dir}/stopDummy.tmp"/>
</target>
<target name="testDummy">
- <touch file="${work.dir}/testDummy.tmp"/>
</target>
</project>
1.4 +2 -3
jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/TestRunServerTestsTask.java
Index: TestRunServerTestsTask.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/integration/ant/src/test/org/apache/cactus/integration/ant/TestRunServerTestsTask.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestRunServerTestsTask.java 26 May 2003 13:27:18 -0000 1.3
+++ TestRunServerTestsTask.java 9 Jun 2003 12:35:57 -0000 1.4
@@ -132,8 +132,7 @@
assertEquals("Failed to start the container after more than [0] "
+ "ms.", expected.getMessage());
}
- assertTrue("The [starttarget] was not run",
- getProject().resolveFile("work/startDummy.tmp").isFile());
+ assertTargetExecuted("startDummy");
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
