* Don't throw if test clean up fails

pranavkm · pranavkm · commit 229edc3a326a · 2015-10-02T06:54:22.000-07:00
* Minor FunctionalTests refactoring
diff --git a/test/Microsoft.Framework.FileSystemGlobbing.Tests/FunctionalTests.cs b/test/Microsoft.Framework.FileSystemGlobbing.Tests/FunctionalTests.cs
@@ -12,7 +12,7 @@ namespace Microsoft.Framework.FileSystemGlobbing.Tests
 {
     public class FunctionalTests : IDisposable
     {
-        private DisposableFileSystem _context;
+        private readonly DisposableFileSystem _context;
 
         public FunctionalTests()
         {
@@ -21,10 +21,7 @@ public FunctionalTests()
 
         public void Dispose()
         {
-            if (_context != null)
-            {
-                _context.Dispose();
-            }
+            _context.Dispose();
         }
 
         [Theory]
@@ -78,11 +75,11 @@ public void IncludeCaseInsensitive(string root, string includePattern, string[]
                                                                                     "sub/preprocess-source2.cs",
                                                                                     "sub/sub/preprocess-source3.cs",
                                                                                     "sub/sub/preprocess-source3.txt" })]
-        [InlineData("src/project/compiler/preprocess/", "preprocess-source1.cs", new string[] { 
+        [InlineData("src/project/compiler/preprocess/", "preprocess-source1.cs", new string[] {
                                                                                     "sub/preprocess-source2.cs",
                                                                                     "sub/sub/preprocess-source3.cs",
                                                                                     "sub/sub/preprocess-source3.txt" })]
-        [InlineData("src/project/compiler/preprocess/", "preprocesS-source1.cs", new string[] { 
+        [InlineData("src/project/compiler/preprocess/", "preprocesS-source1.cs", new string[] {
                                                                                     "preprocess-source1.cs",
                                                                                     "sub/preprocess-source2.cs",
                                                                                     "sub/sub/preprocess-source3.cs",
@@ -118,11 +115,11 @@ public void ExcludeCaseSensitive(string root, string excludePattern, string[] ex
                                                                                     "sub/preprocess-source2.cs",
                                                                                     "sub/sub/preprocess-source3.cs",
                                                                                     "sub/sub/preprocess-source3.txt" })]
-        [InlineData("src/project/compiler/preprocess/", "preprocess-source1.cs", new string[] { 
+        [InlineData("src/project/compiler/preprocess/", "preprocess-source1.cs", new string[] {
                                                                                     "sub/preprocess-source2.cs",
                                                                                     "sub/sub/preprocess-source3.cs",
                                                                                     "sub/sub/preprocess-source3.txt" })]
-        [InlineData("src/project/compiler/preprocess/", "preprocesS-source1.cs", new string[] { 
+        [InlineData("src/project/compiler/preprocess/", "preprocesS-source1.cs", new string[] {
                                                                                     "sub/preprocess-source2.cs",
                                                                                     "sub/sub/preprocess-source3.cs",
                                                                                     "sub/sub/preprocess-source3.txt" })]
@@ -405,9 +402,12 @@ private void ExecuteAndVerify(Matcher matcher, string directoryPath, params stri
             var results = matcher.Execute(new DirectoryInfoWrapper(new DirectoryInfo(directoryPath)));
 
             var actual = results.Files.Select(match => Path.GetFullPath(Path.Combine(_context.RootPath, directoryPath, match.Path)));
-            var expect = expectFiles.Select(relativePath => Path.GetFullPath(Path.Combine(_context.RootPath, relativePath)));
+            var expected = expectFiles.Select(relativePath => Path.GetFullPath(Path.Combine(_context.RootPath, relativePath)));
 
-            AssertHelpers.SortAndEqual(expect, actual, StringComparer.OrdinalIgnoreCase);
+            Assert.Equal(
+                expected.OrderBy(e => e),
+                actual.OrderBy(e => e),
+                StringComparer.OrdinalIgnoreCase);
         }
     }
 }
diff --git a/test/Microsoft.Framework.FileSystemGlobbing.Tests/TestUtility/AssertHelpers.cs b/test/Microsoft.Framework.FileSystemGlobbing.Tests/TestUtility/AssertHelpers.cs
diff --git a/test/Microsoft.Framework.FileSystemGlobbing.Tests/TestUtility/DisposableFileSystem.cs b/test/Microsoft.Framework.FileSystemGlobbing.Tests/TestUtility/DisposableFileSystem.cs
@@ -9,14 +9,9 @@ namespace Microsoft.Framework.FileSystemGlobbing.Tests.TestUtility
 {
     public class DisposableFileSystem : IDisposable
     {
-        private readonly bool _automaticCleanup;
-
-        public DisposableFileSystem(bool automaticCleanup = true)
+        public DisposableFileSystem()
         {
-            _automaticCleanup = automaticCleanup;
-
-            RootPath = Path.GetTempFileName();
-            File.Delete(RootPath);
+            RootPath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
             Directory.CreateDirectory(RootPath);
             DirectoryInfo = new DirectoryInfoWrapper(new DirectoryInfo(RootPath));
         }
@@ -46,18 +41,22 @@ public DisposableFileSystem CreateFiles(params string[] fileRelativePaths)
 
                 File.WriteAllText(
                     fullPath,
-                    string.Format("Automatically generated for testing on {0:yyyy}/{0:MM}/{0:dd} {0:hh}:{0:mm}:{0:ss}", DateTime.Now));
+                    string.Format("Automatically generated for testing on {0:yyyy}/{0:MM}/{0:dd} {0:hh}:{0:mm}:{0:ss}", DateTime.UtcNow));
             }
 
             return this;
         }
 
         public void Dispose()
         {
-            if (_automaticCleanup)
+            try
             {
                 Directory.Delete(RootPath, true);
             }
+            catch
+            {
+                // Don't throw if this fails.
+            }
         }
     }
 }
diff --git a/test/Microsoft.Framework.FileSystemGlobbing.Tests/project.json b/test/Microsoft.Framework.FileSystemGlobbing.Tests/project.json
@@ -5,14 +5,9 @@
         "Microsoft.Framework.FileSystemGlobbing": "1.0.0-*",
         "Microsoft.AspNet.Testing": "1.0.0-*"
     },
-
     "frameworks": {
         "dnx451": { },
-        "dnxcore50": {
-            "dependencies": {
-                "System.Runtime": "4.0.21-beta-*"
-            }
-        }
+        "dnxcore50": { }
     },
     "commands": {
         "test": "xunit.runner.aspnet"

Original file line number	Diff line number	Diff line change
`@@ -9,14 +9,9 @@ namespace Microsoft.Framework.FileSystemGlobbing.Tests.TestUtility`
`9`	`9`	`{`
`10`	`10`	`public class DisposableFileSystem : IDisposable`
`11`	`11`	`{`
`12`		`- private readonly bool _automaticCleanup;`
`13`		`-`
`14`		`- public DisposableFileSystem(bool automaticCleanup = true)`
	`12`	`+ public DisposableFileSystem()`
`15`	`13`	`{`
`16`		`- _automaticCleanup = automaticCleanup;`
`17`		`-`
`18`		`- RootPath = Path.GetTempFileName();`
`19`		`- File.Delete(RootPath);`
	`14`	`+ RootPath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());`
`20`	`15`	`Directory.CreateDirectory(RootPath);`
`21`	`16`	`DirectoryInfo = new DirectoryInfoWrapper(new DirectoryInfo(RootPath));`
`22`	`17`	`}`
`@@ -46,18 +41,22 @@ public DisposableFileSystem CreateFiles(params string[] fileRelativePaths)`
`46`	`41`
`47`	`42`	`File.WriteAllText(`
`48`	`43`	`fullPath,`
`49`		`- string.Format("Automatically generated for testing on {0:yyyy}/{0:MM}/{0:dd} {0:hh}:{0:mm}:{0:ss}", DateTime.Now));`
	`44`	`+ string.Format("Automatically generated for testing on {0:yyyy}/{0:MM}/{0:dd} {0:hh}:{0:mm}:{0:ss}", DateTime.UtcNow));`
`50`	`45`	`}`
`51`	`46`
`52`	`47`	`return this;`
`53`	`48`	`}`
`54`	`49`
`55`	`50`	`public void Dispose()`
`56`	`51`	`{`
`57`		`- if (_automaticCleanup)`
	`52`	`+ try`
`58`	`53`	`{`
`59`	`54`	`Directory.Delete(RootPath, true);`
`60`	`55`	`}`
	`56`	`+ catch`
	`57`	`+ {`
	`58`	`+ // Don't throw if this fails.`
	`59`	`+ }`
`61`	`60`	`}`
`62`	`61`	`}`
`63`	`62`	`}`