Fix tests

Author: shana

src/tests/IntegrationTests/SetupFixture.cs

@@ -1,4 +1,4 @@
-using System.IO;
+using System;
 using GitHub.Unity;
 using NUnit.Framework;
 
@@ -12,11 +12,7 @@ public void Setup()
         {
             //Logging.TracingEnabled = true;
 
-            var tempFileName = Path.GetTempFileName();
-            var fileLog = tempFileName.Substring(0, tempFileName.Length - 4) + "_integrationtest.log";
-
-            Logging.LogAdapter = new MultipleLogAdapter(new ConsoleLogAdapter(), new FileLogAdapter(fileLog));
-            Logging.Debug("Logging to \"{0}\"", fileLog);
+            Logging.LogAdapter = new MultipleLogAdapter(new FileLogAdapter($"{DateTime.UtcNow.ToString("yyyyMMddHHmmss")}-integration-tests.log"));
         }
     }
 }

src/tests/TaskSystemIntegrationTests/Tests.cs

@@ -30,7 +30,7 @@ public BaseTest()
         public void OneTimeSetup()
         {
             GitHub.Unity.Guard.InUnitTestRunner = true;
-            Logging.LogAdapter = new ConsoleLogAdapter();
+            Logging.LogAdapter = new MultipleLogAdapter(new FileLogAdapter($"{DateTime.UtcNow.ToString("yyyyMMddHHmmss")}-tasksystem-tests.log"));
             //Logging.TracingEnabled = true;
             TaskManager = new TaskManager();
             var syncContext = new ThreadSynchronizationContext(Token);

src/tests/TaskSystemIntegrationTests/packages.config

@@ -3,6 +3,7 @@
   <package id="AsyncBridge.Net35" version="0.2.0" targetFramework="net35" />
   <package id="NSubstitute" version="1.10.0.0" targetFramework="net35" />
   <package id="NUnit" version="2.6.4" targetFramework="net35" />
+  <package id="NUnit.Runners" version="2.6.4" targetFramework="net35" />
   <package id="NUnitTestAdapter" version="2.1.1" targetFramework="net35" />
   <package id="Rackspace.Threading" version="2.0.0-alpha001" targetFramework="net35" />
   <package id="TaskParallelLibrary" version="1.0.2856.0" targetFramework="net452" />

src/tests/UnitTests/IO/GitEnvironmentTestsBase.cs

@@ -13,6 +13,8 @@ protected object BuildFindRootFileSystem()
         {
             var filesystem = Substitute.For<IFileSystem>();
 
+            filesystem.DirectorySeparatorChar.Returns('\\');
+
             filesystem
                 .GetDirectoryName(Args.String)
                 .Returns(info => Path.GetDirectoryName((string) info[0]));
@@ -51,6 +53,20 @@ protected object BuildFindRootFileSystem()
                     {
                         case @"c:\Source\.git":
                             return true;
+                        case @"c:\Source":
+                            return true;
+                        default:
+                            return false;
+                    }
+                });
+
+            filesystem.FileExists(Args.String)
+                .Returns(info =>
+                {
+                    switch ((string) info[0])
+                    {
+                        case @"c:\Source\file.txt":
+                            return true;
 
                         default:
                             return false;

src/tests/UnitTests/IO/LinuxBasedGitEnvironmentTests.cs

@@ -55,29 +55,5 @@ public void ValidateGitPath(bool inFileSystem, bool found)
             //var linuxBasedGitInstallationStrategy = new LinuxEnvironment(environment);
             //linuxBasedGitInstallationStrategy.ValidateGitInstall("asdf".ToNPath()).Should().Be(found);
         }
-
-        [TestCase(@"c:\Source\file.txt", @"c:\Source", TestName = "should be found", Ignored = true)]
-        [TestCase(@"c:\Documents\file.txt", null, TestName = "file outside root should not be found")]
-        [TestCase(@"c:\file.txt", null, TestName = "file outside root inside sibling should not be found")]
-        public void FindRoot(string input, string expected)
-        {
-            var fs = (IFileSystem)BuildFindRootFileSystem();
-            NPath.FileSystem = fs;
-
-            var environment = Substitute.For<IEnvironment>();
-            environment.FileSystem.Returns(fs);
-
-            var windowsGitEnvironment = new ProcessEnvironment(environment);
-            var result = windowsGitEnvironment.FindRoot(input.ToNPath());
-
-            if (expected == null)
-            {
-                result.Should().BeNull();
-            }
-            else
-            {
-                result.Should().Be(expected);
-            }
-        }
     }
 }

src/tests/UnitTests/IO/WindowsGitEnvironmentTests.cs

@@ -86,26 +86,20 @@ public void ValidateGitPath(bool inFileSystem, bool found)
             //linuxBasedGitInstallationStrategy.ValidateGitInstall("asdf").Should().Be(found);
         }
 
-        [TestCase(@"c:\Source\file.txt", @"c:\Source", TestName = "should be found", Ignored = true)]
+        [TestCase(@"c:\Source\file.txt", @"c:\Source", TestName = "should be found")]
         [TestCase(@"c:\Documents\file.txt", null, TestName = "file outside root should not be found")]
         [TestCase(@"c:\file.txt", null, TestName = "file outside root inside sibling should not be found")]
         public void FindRoot(string input, string expected)
         {
             var filesystem = (IFileSystem) BuildFindRootFileSystem();
-
             var environment = Substitute.For<IEnvironment>();
+            environment.FileSystem.Returns(filesystem);
+            NPath.FileSystem = filesystem;
 
             var windowsGitEnvironment = new ProcessEnvironment(environment);
             var result = windowsGitEnvironment.FindRoot(input.ToNPath());
 
-            if (expected == null)
-            {
-                result.Should().BeNull();
-            }
-            else
-            {
-                result.Should().Be(expected);
-            }
+            Assert.AreEqual(result?.ToString(), expected);
         }
     }
 }

src/tests/UnitTests/SetUpFixture.cs

@@ -1,4 +1,4 @@
-using System.IO;
+using System;
 using GitHub.Unity;
 using NUnit.Framework;
 
@@ -12,11 +12,7 @@ public void SetUp()
         {
             //Logging.TracingEnabled = true;
 
-            var tempFileName = Path.GetTempFileName();
-            var fileLog = tempFileName.Substring(0, tempFileName.Length - 4) + "_integrationtest.log";
-
-            Logging.LogAdapter = new MultipleLogAdapter(new ConsoleLogAdapter(), new FileLogAdapter(fileLog));
-            Logging.Trace("Logging to \"{0}\"", fileLog);
+            Logging.LogAdapter = new MultipleLogAdapter(new FileLogAdapter($"{DateTime.UtcNow.ToString("yyyyMMddHHmmss")}-unit-tests.log"));
         }
     }
 }