From cd517c28816d6aeb32efbd15e8442d5145b1ca30 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Thu, 11 Sep 2008 13:59:41 +0000
Subject: [PATCH] fix tests broken by changed exception message of svn revision
 685593

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@694254 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/org/apache/tools/ant/DirectoryScanner.java       | 8 +++++---
 src/main/org/apache/tools/ant/taskdefs/Copy.java          | 3 ++-
 src/main/org/apache/tools/ant/types/AbstractFileSet.java  | 3 ++-
 .../junit/org/apache/tools/ant/taskdefs/CopyTest.java     | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/main/org/apache/tools/ant/DirectoryScanner.java b/src/main/org/apache/tools/ant/DirectoryScanner.java
index dd89e49e3..42179e24a 100644
--- a/src/main/org/apache/tools/ant/DirectoryScanner.java
+++ b/src/main/org/apache/tools/ant/DirectoryScanner.java
@@ -171,6 +171,7 @@ public class DirectoryScanner
     };
 
     public static final int MAX_LEVELS_OF_SYMLINKS = 1;
+    public static final String DOES_NOT_EXIST_POSTFIX = " does not exist.";
 
     /** Helper. */
     private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
@@ -834,8 +835,9 @@ public class DirectoryScanner
                 } else {
                     if (!basedir.exists()) {
                         if (errorOnMissingDir) {
-                            illegal = new IllegalStateException(
-                                "basedir " + basedir + " does not exist.");
+                            illegal = new IllegalStateException("basedir "
+                                                                + basedir
+                                                                + DOES_NOT_EXIST_POSTFIX);
                         } else {
                             // Nothing to do - basedir does not exist
                             return;
@@ -1100,7 +1102,7 @@ public class DirectoryScanner
         String[] newfiles = list(dir);
         if (newfiles == null) {
             if (!dir.exists()) {
-                throw new BuildException(dir + " doesn't exist.");
+                throw new BuildException(dir + DOES_NOT_EXIST_POSTFIX);
             } else if (!dir.isDirectory()) {
                 throw new BuildException(dir + " is not a directory.");
             } else {
diff --git a/src/main/org/apache/tools/ant/taskdefs/Copy.java b/src/main/org/apache/tools/ant/taskdefs/Copy.java
index 21dda7181..49a457771 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Copy.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Copy.java
@@ -434,7 +434,8 @@ public class Copy extends Task {
                         ds = fs.getDirectoryScanner(getProject());
                     } catch (BuildException e) {
                         if (failonerror
-                            || !getMessage(e).endsWith(" not found.")) {
+                            || !getMessage(e).endsWith(DirectoryScanner
+                                                       .DOES_NOT_EXIST_POSTFIX)) {
                             throw e;
                         } else {
                             log("Warning: " + getMessage(e), Project.MSG_ERR);
diff --git a/src/main/org/apache/tools/ant/types/AbstractFileSet.java b/src/main/org/apache/tools/ant/types/AbstractFileSet.java
index e1a743d68..c1d04c0d9 100644
--- a/src/main/org/apache/tools/ant/types/AbstractFileSet.java
+++ b/src/main/org/apache/tools/ant/types/AbstractFileSet.java
@@ -446,7 +446,8 @@ public abstract class AbstractFileSet extends DataType
                 }
                 if (!dir.exists() && errorOnMissingDir) {
                     throw new BuildException(dir.getAbsolutePath()
-                                             + " does not exist.");
+                                             + DirectoryScanner
+                                             .DOES_NOT_EXIST_POSTFIX);
                 }
                 if (!dir.isDirectory() && dir.exists()) {
                     throw new BuildException(dir.getAbsolutePath()
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/CopyTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/CopyTest.java
index f205b2692..514443dba 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/CopyTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/CopyTest.java
@@ -153,7 +153,7 @@ public class CopyTest extends BuildFileTest {
 
     public void testMissingDirBail() {
         expectBuildException("testMissingDirBail", "not-there doesn't exist");
-        assertTrue(getBuildException().getMessage().endsWith(" not found."));
+        assertTrue(getBuildException().getMessage().endsWith(" does not exist."));
     }
     
     public void testFileResourcePlain() {