From 566ea426c391b0114e12ab6cbd5fc822d792ccc0 Mon Sep 17 00:00:00 2001
From: Antoine Levy-Lambert <antoine@apache.org>
Date: Wed, 3 Dec 2003 21:58:08 +0000
Subject: [PATCH] 1) make JarTest pass on Windows, these testcases were failing
 :    testRecreateWithUpdateNewerFile   
 testRecreateZipfilesetWithUpdateNewerFile,    the problem is the granularity
 of time stamps on the FAT    see
 http://msdn.microsoft.com/library/default.asp?url=/library/en-us/sysinfo/base/filetime_str.asp
    for more information

2) prevent XalanLiaisonTest and XslpLiaisonTest from running in batch
   when Xerces1 is not available,

3) fix one of the 3 failing testcases (testSimple) from JDependTest
   it was failing due to an overdose of \r in the output coming from
   BuildFileTest


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@275733 13f79535-47bb-0310-9956-ffa450edef68
---
 build.xml                                                | 7 +++++++
 src/testcases/org/apache/tools/ant/BuildFileTest.java    | 6 +-----
 src/testcases/org/apache/tools/ant/taskdefs/JarTest.java | 7 ++++++-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/build.xml b/build.xml
index b9ccf8479..bfe5fe849 100644
--- a/build.xml
+++ b/build.xml
@@ -556,6 +556,9 @@
     <available property="beanshell.present"
                classname="bsh.StringUtil"
                classpathref="classpath"/>
+    <available property="xerces1.present"
+               classname="org.apache.xerces.framework.XMLParser"
+               classpathref="classpath"/>
     <available property="jsch.present"
                classname="com.jcraft.jsch.Session"
                classpathref="classpath"/>
@@ -1498,6 +1501,10 @@
           <!-- needs BSF to work -->
           <exclude name="${optional.package}/XalanLiaisonTest.java"
                    unless="bsf.present"/>
+          <exclude name="${optional.package}/XalanLiaisonTest.java"
+                   unless="xerces1.present"/>
+          <exclude name="${optional.package}/XslpLiaisonTest.java"
+                   unless="xerces1.present"/>
 
           <!-- needs resolver.jar to work -->
           <exclude name="${optional.package}/XmlValidateCatalogTest.java"
diff --git a/src/testcases/org/apache/tools/ant/BuildFileTest.java b/src/testcases/org/apache/tools/ant/BuildFileTest.java
index 48e41b185..3026baa2e 100644
--- a/src/testcases/org/apache/tools/ant/BuildFileTest.java
+++ b/src/testcases/org/apache/tools/ant/BuildFileTest.java
@@ -215,11 +215,7 @@ public abstract class BuildFileTest extends TestCase {
             if (!cr) {
                 cleanedBuffer.append(ch);
             } else {
-                if (ch == '\n') {
-                    cleanedBuffer.append(ch);
-                } else {
-                    cleanedBuffer.append('\r').append(ch);
-                }
+                cleanedBuffer.append(ch);
             }
         }
         return cleanedBuffer.toString();
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java b/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java
index 2c69a1e61..f101ac521 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java
@@ -66,6 +66,7 @@ import java.util.Enumeration;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 import org.apache.tools.ant.BuildFileTest;
+import org.apache.tools.ant.taskdefs.condition.Os;
 
 /**
  * @author Erik Meade <emeade@geekfarm.org>
@@ -160,8 +161,12 @@ public class JarTest extends BuildFileTest {
 
     private void testRecreate(String firstTarget, String secondTarget) {
         executeTarget(firstTarget);
+        int sleeptime = 2500;
+        if (Os.isFamily("windows")) {
+            sleeptime += 2500;
+        }
         try {
-            Thread.currentThread().sleep(2500);
+            Thread.currentThread().sleep(sleeptime);
         } catch (InterruptedException e) {
         } // end of try-catch
         File jarFile = new File(getProjectDir(), tempJar);