Fix broken tests on OS X

ben · ben · commit 1679067e3534 · 2013-11-11T08:54:39.000-08:00
diff --git a/LibGit2Sharp.Tests/BranchFixture.cs b/LibGit2Sharp.Tests/BranchFixture.cs
@@ -30,7 +30,13 @@ public void CanCreateBranch(string name)
                 Assert.Equal("refs/heads/" + name, newBranch.CanonicalName);
                 Assert.NotNull(newBranch.Tip);
                 Assert.Equal(committish, newBranch.Tip.Sha);
-                Assert.NotNull(repo.Branches.SingleOrDefault(p => p.Name == name));
+
+                // Note the call to String.Normalize(). This is because, on Mac OS X, the filesystem
+                // decomposes the  UTF-8 characters on write, which results in a different set of bytes
+                // when they're read back:
+                // - from InlineData: C5-00-6E-00-67-00-73-00-74-00-72-00-F6-00-6D-00
+                // - from filesystem: 41-00-0A-03-6E-00-67-00-73-00-74-00-72-00-6F-00-08-03-6D-00
+                Assert.NotNull(repo.Branches.SingleOrDefault(p => p.Name.Normalize() == name));
 
                 AssertRefLogEntry(repo, newBranch.CanonicalName,
                                   newBranch.Tip.Id,
diff --git a/LibGit2Sharp.Tests/ConflictFixture.cs b/LibGit2Sharp.Tests/ConflictFixture.cs
@@ -13,7 +13,7 @@ public static IEnumerable<object[]> ConflictData
         {
             get
             {
-                return new[]
+                return new List<object[]>
                 {
                     new[] { "ancestor-and-ours.txt", "5dee68477001f447f50fa7ee7e6a818370b5c2fb", "dad0664ae617d36e464ec08ed969ff496432b075", null },
                     new[] { "ancestor-and-theirs.txt", "3aafd4d0bac33cc3c78c4c070f3966fb6e6f641a", null, "7b26cd5ac0ee68483ae4d5e1e00b064547ea8c9b" },
diff --git a/LibGit2Sharp.Tests/ShadowCopyFixture.cs b/LibGit2Sharp.Tests/ShadowCopyFixture.cs
@@ -51,6 +51,11 @@ public void CanProbeForNativeBinariesFromAShadowCopiedAssembly()
 
             // ...but are currently loaded from different locations...
             string cachedAssemblyLocation = wrapper.AssemblyLocation;
+            if (cachedAssemblyLocation.StartsWith("/private"))
+            {
+                // On OS X, sometimes you get /private/var/… instead of /var/…, but they map to the same place.
+                cachedAssemblyLocation = cachedAssemblyLocation.Substring("/private".Length);
+            }
             Assert.NotEqual(sourceAssembly.Location, cachedAssemblyLocation);
 
             // ...that the assembly in the other domain is stored in the shadow copy cache...

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public static IEnumerable<object[]> ConflictData`
`13`	`13`	`{`
`14`	`14`	`get`
`15`	`15`	`{`
`16`		`- return new[]`
	`16`	`+ return new List<object[]>`
`17`	`17`	`{`
`18`	`18`	`new[] { "ancestor-and-ours.txt", "5dee68477001f447f50fa7ee7e6a818370b5c2fb", "dad0664ae617d36e464ec08ed969ff496432b075", null },`
`19`	`19`	`new[] { "ancestor-and-theirs.txt", "3aafd4d0bac33cc3c78c4c070f3966fb6e6f641a", null, "7b26cd5ac0ee68483ae4d5e1e00b064547ea8c9b" },`