diff --git a/src/etc/testcases/taskdefs/checksum.xml b/src/etc/testcases/taskdefs/checksum.xml
index 6a92f5a77..7b4565476 100644
--- a/src/etc/testcases/taskdefs/checksum.xml
+++ b/src/etc/testcases/taskdefs/checksum.xml
@@ -21,6 +21,47 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -60,47 +101,76 @@
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -109,6 +179,13 @@
+
+
+
+
+
+
+
@@ -117,13 +194,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/ChecksumTest.java b/src/testcases/org/apache/tools/ant/taskdefs/ChecksumTest.java
index 94c06706e..cbe900d30 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/ChecksumTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/ChecksumTest.java
@@ -56,58 +56,34 @@ public class ChecksumTest extends BuildFileTest {
public void testSetProperty() {
executeTarget("setProperty");
- assertEquals("0541d3df42520911f268abc730f3afe0",
- project.getProperty("logo.MD5"));
- assertTrue(!project.resolveFile("../asf-logo.gif.MD5").exists());
}
public void testVerifyTotal() {
executeTarget("verifyTotal");
- assertEquals("ef8f1477fcc9bf93832c1a74f629c626",
- project.getProperty("total"));
}
public void testVerifyChecksumdir() {
executeTarget("verifyChecksumdir");
- assertEquals("ef8f1477fcc9bf93832c1a74f629c626",
- project.getProperty("total"));
- File shouldExist = project.resolveFile("checksum/checksums/foo/zap/Eenie.MD5");
- File shouldNotExist = project.resolveFile("checksum/foo/zap/Eenie.MD5");
- assertTrue( "Checksums should be written to " + shouldExist.getAbsolutePath(), shouldExist.exists());
- assertTrue( "Checksums should not be written to " + shouldNotExist.getAbsolutePath(), !shouldNotExist.exists());
}
public void testVerifyAsTask() {
- testVerify("verifyAsTask");
- assertNotNull(project.getProperty("no.logo.MD5"));
- assertEquals("false", project.getProperty("no.logo.MD5"));
+ executeTarget("verifyAsTask");
}
public void testVerifyMD5SUMAsTask() {
- testVerify("verifyMD5SUMAsTask");
- assertNotNull(project.getProperty("no.logo.MD5"));
- assertEquals("false", project.getProperty("no.logo.MD5"));
+ executeTarget("verifyMD5SUMAsTask");
}
public void testVerifyAsCondition() {
- testVerify("verifyAsCondition");
- assertNull(project.getProperty("no.logo.MD5"));
+ executeTarget("verifyAsCondition");
}
public void testVerifyFromProperty() {
- assertNull(getProject().getProperty("verify"));
- expectPropertySet("verifyFromProperty", "verify", "true");
+ executeTarget("verifyFromProperty");
}
public void testVerifyChecksumdirNoTotal() {
executeTarget("verifyChecksumdirNoTotal");
}
- private void testVerify(String target) {
- assertNull(project.getProperty("logo.MD5"));
- assertNull(project.getProperty("no.logo.MD5"));
- executeTarget(target);
- assertNotNull(project.getProperty("logo.MD5"));
- assertEquals("true", project.getProperty("logo.MD5"));
- }
}