RefspecFixture: use the isolated repository

carlosmn · nulltoken · commit d72764c02098 · 2014-03-29T12:17:03.000+01:00
diff --git a/LibGit2Sharp.Tests/RefSpecFixture.cs b/LibGit2Sharp.Tests/RefSpecFixture.cs
@@ -12,7 +12,7 @@ public class RefSpecFixture : BaseFixture
         public void CanCountRefSpecs()
         {
             var path = CloneStandardTestRepo();
-            using (var repo = new Repository(path))
+            using (var repo = InitIsolatedRepository(path))
             {
                 var remote = repo.Network.Remotes["origin"];
                 Assert.Equal(1, remote.RefSpecs.Count());
@@ -23,7 +23,7 @@ public void CanCountRefSpecs()
         public void CanIterateOverRefSpecs()
         {
             var path = CloneStandardTestRepo();
-            using (var repo = new Repository(path))
+            using (var repo = InitIsolatedRepository(path))
             {
                 var remote = repo.Network.Remotes["origin"];
                 int count = 0;
@@ -40,7 +40,7 @@ public void CanIterateOverRefSpecs()
         public void FetchAndPushRefSpecsComposeRefSpecs()
         {
             var path = CloneStandardTestRepo();
-            using (var repo = new Repository(path))
+            using (var repo = InitIsolatedRepository(path))
             {
                 var remote = repo.Network.Remotes["origin"];
 
@@ -54,7 +54,7 @@ public void FetchAndPushRefSpecsComposeRefSpecs()
         public void CanReadRefSpecDetails()
         {
             var path = CloneStandardTestRepo();
-            using (var repo = new Repository(path))
+            using (var repo = InitIsolatedRepository(path))
             {
                 var remote = repo.Network.Remotes["origin"];
 
@@ -74,7 +74,7 @@ public void CanReadRefSpecDetails()
         public void CanReplaceRefSpecs(string[] newFetchRefSpecs, string[] newPushRefSpecs)
         {
             var path = CloneStandardTestRepo();
-            using (var repo = new Repository(path))
+            using (var repo = InitIsolatedRepository(path))
             {
                 var remote = repo.Network.Remotes["origin"];
                 var oldRefSpecs = remote.RefSpecs.ToList();
@@ -104,13 +104,13 @@ public void RemoteUpdaterSavesRefSpecsPermanently()
             var fetchRefSpecs = new string[] { "refs/their/heads/*:refs/my/heads/*", "+refs/their/tag:refs/my/tag" };
 
             var path = CloneStandardTestRepo();
-            using (var repo = new Repository(path))
+            using (var repo = InitIsolatedRepository(path))
             {
                 var remote = repo.Network.Remotes["origin"];
                 repo.Network.Remotes.Update(remote, r => r.FetchRefSpecs = fetchRefSpecs);
             }
 
-            using (var repo = new Repository(path))
+            using (var repo = InitIsolatedRepository(path))
             {
                 var remote = repo.Network.Remotes["origin"];
                 var actualRefSpecs = remote.RefSpecs
@@ -127,7 +127,7 @@ public void CanAddAndRemoveRefSpecs()
             string newRefSpec = "+refs/heads/test:refs/heads/other-test";
 
             var path = CloneStandardTestRepo();
-            using (var repo = new Repository(path))
+            using (var repo = InitIsolatedRepository(path))
             {
                 var remote = repo.Network.Remotes["origin"];
 
@@ -151,7 +151,7 @@ public void CanAddAndRemoveRefSpecs()
         public void CanClearRefSpecs()
         {
             var path = CloneStandardTestRepo();
-            using (var repo = new Repository(path))
+            using (var repo = InitIsolatedRepository(path))
             {
                 var remote = repo.Network.Remotes["origin"];
 
@@ -179,7 +179,7 @@ public void CanClearRefSpecs()
         public void SettingInvalidRefSpecsThrows(string refSpec)
         {
             var path = CloneStandardTestRepo();
-            using (var repo = new Repository(path))
+            using (var repo = InitIsolatedRepository(path))
             {
                 var remote = repo.Network.Remotes["origin"];
                 var oldRefSpecs = remote.RefSpecs.Select(r => r.Specification).ToList();
diff --git a/LibGit2Sharp.Tests/TestHelpers/BaseFixture.cs b/LibGit2Sharp.Tests/TestHelpers/BaseFixture.cs
@@ -154,9 +154,10 @@ protected string InitNewRepository(bool isBare = false)
             return Repository.Init(scd.DirectoryPath, isBare);
         }
 
-        protected Repository InitIsolatedRepository(bool isBare = false)
+        protected Repository InitIsolatedRepository(string path = null, bool isBare = false)
         {
-            return new Repository(InitNewRepository(), options: BuildFakeConfigs(BuildSelfCleaningDirectory()));
+            path = path ?? InitNewRepository();
+            return new Repository(path, options: BuildFakeConfigs(BuildSelfCleaningDirectory()));
         }
 
         public void Register(string directoryPath)

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public class RefSpecFixture : BaseFixture`
`12`	`12`	`public void CanCountRefSpecs()`
`13`	`13`	`{`
`14`	`14`	`var path = CloneStandardTestRepo();`
`15`		`- using (var repo = new Repository(path))`
	`15`	`+ using (var repo = InitIsolatedRepository(path))`
`16`	`16`	`{`
`17`	`17`	`var remote = repo.Network.Remotes["origin"];`
`18`	`18`	`Assert.Equal(1, remote.RefSpecs.Count());`
`@@ -23,7 +23,7 @@ public void CanCountRefSpecs()`
`23`	`23`	`public void CanIterateOverRefSpecs()`
`24`	`24`	`{`
`25`	`25`	`var path = CloneStandardTestRepo();`
`26`		`- using (var repo = new Repository(path))`
	`26`	`+ using (var repo = InitIsolatedRepository(path))`
`27`	`27`	`{`
`28`	`28`	`var remote = repo.Network.Remotes["origin"];`
`29`	`29`	`int count = 0;`
`@@ -40,7 +40,7 @@ public void CanIterateOverRefSpecs()`
`40`	`40`	`public void FetchAndPushRefSpecsComposeRefSpecs()`
`41`	`41`	`{`
`42`	`42`	`var path = CloneStandardTestRepo();`
`43`		`- using (var repo = new Repository(path))`
	`43`	`+ using (var repo = InitIsolatedRepository(path))`
`44`	`44`	`{`
`45`	`45`	`var remote = repo.Network.Remotes["origin"];`
`46`	`46`
`@@ -54,7 +54,7 @@ public void FetchAndPushRefSpecsComposeRefSpecs()`
`54`	`54`	`public void CanReadRefSpecDetails()`
`55`	`55`	`{`
`56`	`56`	`var path = CloneStandardTestRepo();`
`57`		`- using (var repo = new Repository(path))`
	`57`	`+ using (var repo = InitIsolatedRepository(path))`
`58`	`58`	`{`
`59`	`59`	`var remote = repo.Network.Remotes["origin"];`
`60`	`60`
`@@ -74,7 +74,7 @@ public void CanReadRefSpecDetails()`
`74`	`74`	`public void CanReplaceRefSpecs(string[] newFetchRefSpecs, string[] newPushRefSpecs)`
`75`	`75`	`{`
`76`	`76`	`var path = CloneStandardTestRepo();`
`77`		`- using (var repo = new Repository(path))`
	`77`	`+ using (var repo = InitIsolatedRepository(path))`
`78`	`78`	`{`
`79`	`79`	`var remote = repo.Network.Remotes["origin"];`
`80`	`80`	`var oldRefSpecs = remote.RefSpecs.ToList();`
`@@ -104,13 +104,13 @@ public void RemoteUpdaterSavesRefSpecsPermanently()`
`104`	`104`	`var fetchRefSpecs = new string[] { "refs/their/heads/:refs/my/heads/", "+refs/their/tag:refs/my/tag" };`
`105`	`105`
`106`	`106`	`var path = CloneStandardTestRepo();`
`107`		`- using (var repo = new Repository(path))`
	`107`	`+ using (var repo = InitIsolatedRepository(path))`
`108`	`108`	`{`
`109`	`109`	`var remote = repo.Network.Remotes["origin"];`
`110`	`110`	`repo.Network.Remotes.Update(remote, r => r.FetchRefSpecs = fetchRefSpecs);`
`111`	`111`	`}`
`112`	`112`
`113`		`- using (var repo = new Repository(path))`
	`113`	`+ using (var repo = InitIsolatedRepository(path))`
`114`	`114`	`{`
`115`	`115`	`var remote = repo.Network.Remotes["origin"];`
`116`	`116`	`var actualRefSpecs = remote.RefSpecs`
`@@ -127,7 +127,7 @@ public void CanAddAndRemoveRefSpecs()`
`127`	`127`	`string newRefSpec = "+refs/heads/test:refs/heads/other-test";`
`128`	`128`
`129`	`129`	`var path = CloneStandardTestRepo();`
`130`		`- using (var repo = new Repository(path))`
	`130`	`+ using (var repo = InitIsolatedRepository(path))`
`131`	`131`	`{`
`132`	`132`	`var remote = repo.Network.Remotes["origin"];`
`133`	`133`
`@@ -151,7 +151,7 @@ public void CanAddAndRemoveRefSpecs()`
`151`	`151`	`public void CanClearRefSpecs()`
`152`	`152`	`{`
`153`	`153`	`var path = CloneStandardTestRepo();`
`154`		`- using (var repo = new Repository(path))`
	`154`	`+ using (var repo = InitIsolatedRepository(path))`
`155`	`155`	`{`
`156`	`156`	`var remote = repo.Network.Remotes["origin"];`
`157`	`157`
`@@ -179,7 +179,7 @@ public void CanClearRefSpecs()`
`179`	`179`	`public void SettingInvalidRefSpecsThrows(string refSpec)`
`180`	`180`	`{`
`181`	`181`	`var path = CloneStandardTestRepo();`
`182`		`- using (var repo = new Repository(path))`
	`182`	`+ using (var repo = InitIsolatedRepository(path))`
`183`	`183`	`{`
`184`	`184`	`var remote = repo.Network.Remotes["origin"];`
`185`	`185`	`var oldRefSpecs = remote.RefSpecs.Select(r => r.Specification).ToList();`
Original file line number	Diff line number	Diff line change
`@@ -154,9 +154,10 @@ protected string InitNewRepository(bool isBare = false)`
`154`	`154`	`return Repository.Init(scd.DirectoryPath, isBare);`
`155`	`155`	`}`
`156`	`156`
`157`		`- protected Repository InitIsolatedRepository(bool isBare = false)`
	`157`	`+ protected Repository InitIsolatedRepository(string path = null, bool isBare = false)`
`158`	`158`	`{`
`159`		`- return new Repository(InitNewRepository(), options: BuildFakeConfigs(BuildSelfCleaningDirectory()));`
	`159`	`+ path = path ?? InitNewRepository();`
	`160`	`+ return new Repository(path, options: BuildFakeConfigs(BuildSelfCleaningDirectory()));`
`160`	`161`	`}`
`161`	`162`
`162`	`163`	`public void Register(string directoryPath)`