bodewig 2003/04/09 07:02:23
Modified: src/etc/testcases/taskdefs checksum.xml
src/testcases/org/apache/tools/ant/taskdefs
ChecksumTest.java
Log:
Demonstrate bug 18670
Revision Changes Path
1.2 +5 -0 ant/src/etc/testcases/taskdefs/checksum.xml
Index: checksum.xml
===================================================================
RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/checksum.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- checksum.xml 19 Nov 2001 15:18:46 -0000 1.1
+++ checksum.xml 9 Apr 2003 14:02:23 -0000 1.2
@@ -36,4 +36,9 @@
<checksum file="../asf-logo.gif" fileext=".md5" />
</condition>
</target>
+
+ <target name="verifyFromProperty">
+ <checksum property="checksum" file="checksum.xml"/>
+ <checksum property="checksum" file="checksum.xml"
verifyproperty="verify"/>
+ </target>
</project>
1.4 +7 -2
ant/src/testcases/org/apache/tools/ant/taskdefs/ChecksumTest.java
Index: ChecksumTest.java
===================================================================
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/ChecksumTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ChecksumTest.java 7 Mar 2003 11:23:11 -0000 1.3
+++ ChecksumTest.java 9 Apr 2003 14:02:23 -0000 1.4
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001,2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -100,6 +100,11 @@
public void testVerifyAsCondition() {
testVerify("verifyAsCondition");
assertNull(project.getProperty("no.logo.md5"));
+ }
+
+ public void testVerifyFromProperty() {
+ assertNull(getProject().getProperty("verify"));
+ expectPropertySet("verifyFromProperty", "verify", "true");
}
private void testVerify(String target) {
