[nant-commits] [PATCH 15/23] Fixed DirectoryScanner.IsEverythingIncluded so it is only updated when checking files, not directories. Fixed new MoveTask test to take recent DirectoryScanner.IsEverythingIncluded fix into account. Added additional MoveTask test and added DirectoryScanner test.

[<nan...@na...>]

From: Ryan Boggs <rm...@gm...>

---
 src/NAnt.Core/DirectoryScanner.cs       |    8 ++--
 tests/NAnt.Core/DirectoryScannerTest.cs |   24 +++++++++++++++
 tests/NAnt.Core/Tasks/MoveTest.cs       |   49 ++++++++++++++++++++++--------
 3 files changed, 64 insertions(+), 17 deletions(-)

diff --git a/src/NAnt.Core/DirectoryScanner.cs b/src/NAnt.Core/DirectoryScanner.cs
index 27a32e4..abd0fc3 100644
--- a/src/NAnt.Core/DirectoryScanner.cs
+++ b/src/NAnt.Core/DirectoryScanner.cs
@@ -765,12 +765,12 @@ namespace NAnt.Core {
                 }
             }
 
- #if DEBUG_REGEXES
+#if DEBUG_REGEXES
              Console.WriteLine("Result: {0}", included);
- #endif
-            // If the current file/directory was not included and the isEverythingIncluded
+#endif
+            // If the current file was not included and the isEverythingIncluded
             // indicator is true; set the isEverythingIncluded indicator to false.
-            if (!included && _isEverythingIncluded)
+            if (!included && _isEverythingIncluded && File.Exists(path))
             {
                 _isEverythingIncluded = false;
             }
diff --git a/tests/NAnt.Core/DirectoryScannerTest.cs b/tests/NAnt.Core/DirectoryScannerTest.cs
index 58f8e2d..32af499 100644
--- a/tests/NAnt.Core/DirectoryScannerTest.cs
+++ b/tests/NAnt.Core/DirectoryScannerTest.cs
@@ -769,6 +769,30 @@ namespace Tests.NAnt.Core {
             Assert.AreEqual(1, _scanner.FileNames.Count, "#4");
         }
 
+        /// <summary>
+        /// Tests the "IsEverythingIncluded" indicator to make sure it is working
+        /// correctly.
+        /// </summary>
+        [Test]
+        public void IsEverythingIncludedTest()
+        {
+            TempFile.Create(Path.Combine(_folder3, "EverythingIncluded.txt"));
+            TempFile.Create(Path.Combine(_folder3, "EverythingIncluded.tlb"));
+            TempFile.Create(Path.Combine(_folder3, "EverythingIncluded.now"));
+
+            _scanner.Includes.Add(Path.Combine(_folder2, "**/*"));
+            _scanner.Scan();
+
+            Assert.IsTrue(_scanner.IsEverythingIncluded,
+                "Everything was not included");
+
+            _scanner.Includes.Clear();
+            _scanner.Includes.Add(Path.Combine(_folder3, "*.txt"));
+            _scanner.Scan();
+
+            Assert.IsFalse(_scanner.IsEverythingIncluded, "Everything was included");
+        }
+
         #endregion Public Instance Methods
 
         #region Protected Instance Methods
diff --git a/tests/NAnt.Core/Tasks/MoveTest.cs b/tests/NAnt.Core/Tasks/MoveTest.cs
index bc2b8d4..be9b82e 100644
--- a/tests/NAnt.Core/Tasks/MoveTest.cs
+++ b/tests/NAnt.Core/Tasks/MoveTest.cs
@@ -81,7 +81,7 @@ namespace Tests.NAnt.Core.Tasks {
             <project>
                 <move todir='{0}'>
                     <fileset basedir='{1}'>
-                        <include name='**/*'/>
+                        <include name='{2}'/>
                     </fileset>
                 </move>
             </project>
@@ -115,17 +115,17 @@ namespace Tests.NAnt.Core.Tasks {
             _tempDirSourceThree = CreateTempDir("dirE");
             _tempDirSourceFour = CreateTempDir(Path.Combine(_tempDirSourceThree, "CVS"));
             _tempFileSourceOne = CreateTempFile(Path.Combine(_tempDirSourceOne, "file.one"));
-            _tempFileSourceTwo = CreateTempFile(Path.Combine(_tempDirSourceTwo, "file.two"));
-            _tempFileSourceThree = CreateTempFile(Path.Combine(_tempDirSourceThree, "file.three"));
-            _tempFileSourceFour = CreateTempFile(Path.Combine(_tempDirSourceFour, "file.four"));
+            _tempFileSourceTwo = CreateTempFile(Path.Combine(_tempDirSourceTwo, "file2.two"));
+            _tempFileSourceThree = CreateTempFile(Path.Combine(_tempDirSourceThree, "file3.three"));
+            _tempFileSourceFour = CreateTempFile(Path.Combine(_tempDirSourceFour, "file4.four"));
             _tempDirTargetOne = Path.Combine(TempDirName, "dirB");
             _tempDirTargetTwo = Path.Combine(_tempDirTargetOne, "subDir");
             _tempDirTargetThree = Path.Combine(_tempDirTargetOne, "dirX");
             _tempDirTargetFour = Path.Combine(_tempDirTargetThree, "CVS");
             _tempFileTargetOne = Path.Combine(_tempDirTargetOne, "file.one");
-            _tempFileTargetTwo = Path.Combine(_tempDirTargetTwo, "file.two");
-            _tempFileTargetThree = Path.Combine(_tempDirTargetThree, "file.three");
-            _tempFileTargetFour = Path.Combine(_tempDirTargetFour, "file.four");
+            _tempFileTargetTwo = Path.Combine(_tempDirTargetTwo, "file2.two");
+            _tempFileTargetThree = Path.Combine(_tempDirTargetThree, "file3.three");
+            _tempFileTargetFour = Path.Combine(_tempDirTargetFour, "file4.four");
         }
 
         /// <summary>
@@ -165,7 +165,7 @@ namespace Tests.NAnt.Core.Tasks {
         public void FilesetIncludeDirectoryMoveTest()
         {
             RunBuild(string.Format(_xmlProjectTemplate3, _tempDirTargetOne,
-                _tempDirSourceOne));
+                _tempDirSourceOne, "**/*"));
 
             Assert.IsTrue(Directory.Exists(_tempDirTargetOne),
                 string.Format("'{0}' directory does not exist", _tempDirTargetOne));
@@ -177,13 +177,13 @@ namespace Tests.NAnt.Core.Tasks {
             Assert.IsTrue(File.Exists(_tempFileTargetTwo),
                 string.Format("'{0}' file does not exist", _tempFileTargetTwo));
 
-            Assert.IsTrue(Directory.Exists(_tempDirSourceOne),
-                string.Format("'{0}' directory does not exist", _tempDirSourceOne));
+            Assert.IsFalse(Directory.Exists(_tempDirSourceOne),
+                string.Format("'{0}' directory still exists", _tempDirSourceOne));
             Assert.IsFalse(File.Exists(_tempFileSourceOne),
                 string.Format("'{0}' file still exists", _tempFileSourceOne));
 
-            Assert.IsTrue(Directory.Exists(_tempDirSourceTwo),
-                string.Format("'{0}' directory does not exist", _tempDirSourceTwo));
+            Assert.IsFalse(Directory.Exists(_tempDirSourceTwo),
+                string.Format("'{0}' directory still exists", _tempDirSourceTwo));
             Assert.IsFalse(File.Exists(_tempFileSourceTwo),
                 string.Format("'{0}' file still exists", _tempFileSourceTwo));
         }
@@ -202,6 +202,28 @@ namespace Tests.NAnt.Core.Tasks {
                 string.Format("'{0}' file does not exist", _tempFileTargetOne));
         }
 
+        [Test]
+        public void SelectFileMoveTest()
+        {
+            RunBuild(string.Format(_xmlProjectTemplate3, _tempDirTargetOne,
+                _tempDirSourceOne, "**/file.*"));
+
+            Assert.IsTrue(Directory.Exists(_tempDirSourceOne),
+                string.Format("'{0}' source directory does not exist", _tempDirSourceOne));
+            Assert.IsTrue(Directory.Exists(_tempDirTargetOne),
+                string.Format("'{0}' target directory does not exist", _tempDirTargetOne));
+
+            Assert.IsFalse(File.Exists(_tempFileSourceOne),
+                string.Format("'{0}' source file still exists", _tempFileSourceOne));
+            Assert.IsTrue(File.Exists(_tempFileTargetOne),
+                string.Format("'{0}' target file does not exist", _tempFileTargetOne));
+
+            Assert.IsTrue(File.Exists(_tempFileSourceTwo),
+                string.Format("'{0}' source file does not exists", _tempFileSourceTwo));
+            Assert.IsFalse(File.Exists(_tempFileTargetTwo),
+                string.Format("'{0}' target file does exist", _tempFileTargetTwo));
+        }
+
         /// <summary>
         /// Simple file to dir move test.
         /// </summary>
@@ -254,7 +276,8 @@ namespace Tests.NAnt.Core.Tasks {
         [Test]
         public void FilesetExcludeDirectoryMoveTest()
         {
-            RunBuild(String.Format(_xmlProjectTemplate3, _tempDirTargetThree, _tempDirSourceThree));
+            RunBuild(String.Format(_xmlProjectTemplate3, _tempDirTargetThree,
+                _tempDirSourceThree, "**/*"));
 
             Assert.IsTrue(Directory.Exists(_tempDirTargetThree),
                 string.Format("'{0}' target directory does not exist", _tempDirTargetThree));
-- 
1.7.7