Merge pull request #544 from github/fixes/543-test-temp-files

Removed TempFileBaseClass.

Author: shana

src/UnitTests/GitHub.App/Models/RepositoryModelTests.cs

@@ -54,31 +54,37 @@ public void DifferentContentEqualsFalse(long id1, string name1, string url1, lon
     }
 
     [Collection("PackageServiceProvider global data tests")]
-    public class PathConstructorTests : TempFileBaseClass
+    public class PathConstructorTests : TestBaseClass
     {
         [Fact]
         public void NoRemoteUrl()
         {
-            var provider = Substitutes.ServiceProvider;
-            var gitservice = provider.GetGitService();
-            var repo = Substitute.For<IRepository>();
-            var path = Directory.CreateSubdirectory("repo-name");
-            gitservice.GetUri(path.FullName).Returns((UriString)null);
-            var model = new SimpleRepositoryModel(path.FullName);
-            Assert.Equal("repo-name", model.Name);
+            using (var temp = new TempDirectory())
+            {
+                var provider = Substitutes.ServiceProvider;
+                var gitservice = provider.GetGitService();
+                var repo = Substitute.For<IRepository>();
+                var path = temp.Directory.CreateSubdirectory("repo-name");
+                gitservice.GetUri(path.FullName).Returns((UriString)null);
+                var model = new SimpleRepositoryModel(path.FullName);
+                Assert.Equal("repo-name", model.Name);
+            }
         }
 
         [Fact]
         public void WithRemoteUrl()
         {
-            var provider = Substitutes.ServiceProvider;
-            var gitservice = provider.GetGitService();
-            var repo = Substitute.For<IRepository>();
-            var path = Directory.CreateSubdirectory("repo-name");
-            gitservice.GetUri(path.FullName).Returns(new UriString("https://github.com/user/repo-name"));
-            var model = new SimpleRepositoryModel(path.FullName);
-            Assert.Equal("repo-name", model.Name);
-            Assert.Equal("user", model.Owner);
+            using (var temp = new TempDirectory())
+            {
+                var provider = Substitutes.ServiceProvider;
+                var gitservice = provider.GetGitService();
+                var repo = Substitute.For<IRepository>();
+                var path = temp.Directory.CreateSubdirectory("repo-name");
+                gitservice.GetUri(path.FullName).Returns(new UriString("https://github.com/user/repo-name"));
+                var model = new SimpleRepositoryModel(path.FullName);
+                Assert.Equal("repo-name", model.Name);
+                Assert.Equal("user", model.Owner);
+            }
         }
     }
 

src/UnitTests/GitHub.Exports/SimpleRepositoryModelTests.cs

@@ -6,10 +6,18 @@
 using UnitTests;
 using Xunit;
 using GitHub.Primitives;
+using Xunit.Abstractions;
 
 [Collection("PackageServiceProvider global data tests")]
-public class SimpleRepositoryModelTests : TempFileBaseClass
+public class SimpleRepositoryModelTests : TestBaseClass
 {
+    ITestOutputHelper output;
+
+    public SimpleRepositoryModelTests(ITestOutputHelper output)
+    {
+        this.output = output;
+    }
+
     static void SetupRepository(string sha)
     {
         var provider = Substitutes.ServiceProvider;
@@ -48,17 +56,20 @@ static void SetupRepository(string sha)
     [InlineData(21, false, "[email protected]/foo/bar", "123123", @"src\dir\ThisIsFile1.cs", -1, -1, "https://github.com/foo/bar/blob/123123/src/dir/ThisIsFile1.cs")]
     public void GenerateUrl(int testid, bool createRootedPath, string baseUrl, string sha, string path, int startLine, int endLine, string expected)
     {
-        SetupRepository(sha);
+        using (var temp = new TempDirectory())
+        {
+            SetupRepository(sha);
 
-        var basePath = Directory.CreateSubdirectory("generate-url-test1-" + testid);
-        if (createRootedPath && path != null)
-            path = System.IO.Path.Combine(basePath.FullName, path);
-        ISimpleRepositoryModel model = null;
-        if (!String.IsNullOrEmpty(baseUrl))
-            model = new SimpleRepositoryModel("bar", new UriString(baseUrl), basePath.FullName);
-        else
-            model = new SimpleRepositoryModel(basePath.FullName);
-        var result = model.GenerateUrl(path, startLine, endLine);
-        Assert.Equal(expected, result?.ToString());
+            var basePath = temp.Directory.CreateSubdirectory("generate-url-test1-" + testid);
+            if (createRootedPath && path != null)
+                path = System.IO.Path.Combine(basePath.FullName, path);
+            ISimpleRepositoryModel model = null;
+            if (!String.IsNullOrEmpty(baseUrl))
+                model = new SimpleRepositoryModel("bar", new UriString(baseUrl), basePath.FullName);
+            else
+                model = new SimpleRepositoryModel(basePath.FullName);
+            var result = model.GenerateUrl(path, startLine, endLine);
+            Assert.Equal(expected, result?.ToString());
+        }
     }
 }

src/UnitTests/Helpers/TestBaseClass.cs

@@ -3,6 +3,7 @@
 using Octokit;
 using System;
 using System.IO;
+using Xunit.Abstractions;
 
 /// <summary>
 /// This base class will get its methods called by the most-derived
@@ -62,25 +63,23 @@ protected static PullRequest CreatePullRequest(User user, int id, ItemState stat
             commentCount, reviewCommentCount, 0, 0, 0, 0,
             null, false);
     }
-}
-
-public class TempFileBaseClass : TestBaseClass
-{
-    public DirectoryInfo Directory { get; set; }
 
-    public override void OnEntry()
+    protected class TempDirectory : IDisposable
     {
-        var f = Path.GetTempFileName();
-        var name = Path.GetFileNameWithoutExtension(f);
-        File.Delete(f);
-        Directory = new DirectoryInfo(Path.Combine(Path.GetTempPath(), name));
-        Directory.Create();
-        base.OnEntry();
-    }
+        public TempDirectory()
+        {
+            var f = Path.GetTempFileName();
+            var name = Path.GetFileNameWithoutExtension(f);
+            File.Delete(f);
+            Directory = new DirectoryInfo(Path.Combine(Path.GetTempPath(), name));
+            Directory.Create();
+        }
 
-    public override void OnExit()
-    {
-        Directory.Delete(true);
-        base.OnExit();
+        public DirectoryInfo Directory { get; }
+
+        public void Dispose()
+        {
+            Directory.Delete(true);
+        }
     }
-}
+}