From 5320013dd3b0a95413dd5df2b308acd7c1022ec4 Mon Sep 17 00:00:00 2001
From: Matthew Jason Benson <mbenson@apache.org>
Date: Wed, 8 Dec 2004 18:00:53 +0000
Subject: [PATCH] Address Windows CVS client line ending conversion
 incompatibility issue.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@277153 13f79535-47bb-0310-9956-ffa450edef68
---
 src/etc/testcases/taskdefs/checksum.xml       | 28 ++++++++++++++++---
 .../tools/ant/taskdefs/ChecksumTest.java      |  8 ------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/etc/testcases/taskdefs/checksum.xml b/src/etc/testcases/taskdefs/checksum.xml
index 8213ccf49..6a92f5a77 100644
--- a/src/etc/testcases/taskdefs/checksum.xml
+++ b/src/etc/testcases/taskdefs/checksum.xml
@@ -1,6 +1,26 @@
 <?xml version="1.0"?>
 <project default="cleanup" basedir=".">
 
+  <macrodef name="compare">
+    <attribute name="expected" />
+    <attribute name="output" />
+    <sequential>
+      <loadfile property="expected" srcfile="@{expected}">
+        <filterchain><striplinebreaks /></filterchain>
+      </loadfile>
+      <loadfile property="output" srcfile="@{output}">
+        <filterchain><striplinebreaks /></filterchain>
+      </loadfile>
+      <fail message="${output} not = ${expected}">
+        <condition>
+          <not>
+            <equals arg1="${output}" arg2="${expected}" />
+          </not>
+        </condition>
+      </fail>
+    </sequential>
+  </macrodef>
+
   <target name="cleanup">
     <delete file="../asf-logo.gif.MD5" />
     <delete file="../asf-logo.gif.md5" />
@@ -20,22 +40,22 @@
 
   <target name="createMd5">
     <checksum file="../asf-logo.gif" fileext=".MD5" />
-    <fixcrlf eol="lf" srcdir=".." includes="asf-logo.gif.MD5" />
+    <compare expected="expected/asf-logo.gif.md5" output="../asf-logo.gif.MD5" />
   </target>
 
   <target name="createMD5SUMformat">
     <checksum file="../asf-logo.gif" format="MD5SUM" fileext=".MD5SUM" />
-    <fixcrlf eol="lf" srcdir=".." includes="asf-logo.gif.MD5SUM" />
+    <compare expected="expected/asf-logo.gif.md5sum" output="../asf-logo.gif.MD5SUM" />
   </target>
 
   <target name="createSVFformat">
     <checksum file="../asf-logo.gif" format="SVF" fileext=".SVF" />
-    <fixcrlf eol="lf" srcdir=".." includes="asf-logo.gif.SVF" />
+    <compare expected="expected/asf-logo.gif.svf" output="../asf-logo.gif.SVF" />
   </target>
 
   <target name="createPattern">
     <checksum file="../asf-logo.gif" pattern="foo{0}bar" fileext=".PATTERN" />
-    <fixcrlf eol="lf" srcdir=".." includes="asf-logo.gif.PATTERN" />
+    <compare expected="expected/asf-logo.gif.pattern" output="../asf-logo.gif.PATTERN" />
   </target>
 
   <target name="setProperty">
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/ChecksumTest.java b/src/testcases/org/apache/tools/ant/taskdefs/ChecksumTest.java
index 88a090df5..5069aa4d7 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/ChecksumTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/ChecksumTest.java
@@ -43,29 +43,21 @@ public class ChecksumTest extends BuildFileTest {
     public void testCreateMd5() throws IOException {
         FileUtils fileUtils = FileUtils.newFileUtils();
         executeTarget("createMd5");
-        assertTrue(fileUtils.contentEquals(project.resolveFile("expected/asf-logo.gif.md5"),
-                                           project.resolveFile("../asf-logo.gif.MD5")));
     }
 
     public void testCreateMD5SUMformat() throws IOException {
         FileUtils fileUtils = FileUtils.newFileUtils();
         executeTarget("createMD5SUMformat");
-        assertTrue(fileUtils.contentEquals(project.resolveFile("expected/asf-logo.gif.md5sum"),
-                                           project.resolveFile("../asf-logo.gif.MD5SUM")));
     }
     
     public void testCreateSVFformat() throws IOException {
         FileUtils fileUtils = FileUtils.newFileUtils();
         executeTarget("createSVFformat");
-        assertTrue(fileUtils.contentEquals(project.resolveFile("expected/asf-logo.gif.svf"),
-                                           project.resolveFile("../asf-logo.gif.SVF")));
     }
     
     public void testCreatePattern() throws IOException {
         FileUtils fileUtils = FileUtils.newFileUtils();
         executeTarget("createPattern");
-        assertTrue(fileUtils.contentEquals(project.resolveFile("expected/asf-logo.gif.pattern"),
-                                           project.resolveFile("../asf-logo.gif.PATTERN")));
     }
 
     public void testSetProperty() {