Replace AssertExtensions.ShouldNotEqual method by Assert.NotEqual

yorah · nulltoken · commit a020a3622dfc · 2012-05-25T17:24:54.000+02:00
diff --git a/LibGit2Sharp.Tests/CommitFixture.cs b/LibGit2Sharp.Tests/CommitFixture.cs
@@ -636,7 +636,7 @@ private void AssertCommitHasBeenAmended(Repository repo, Commit amendedCommit, C
             Commit headCommit = repo.Head.Tip;
             Assert.Equal(amendedCommit, headCommit);
 
-            amendedCommit.Sha.ShouldNotEqual(originalCommit.Sha);
+            Assert.NotEqual(originalCommit.Sha, amendedCommit.Sha);
             Assert.Equal(originalCommit.Parents, amendedCommit.Parents);
         }
 
diff --git a/LibGit2Sharp.Tests/IndexFixture.cs b/LibGit2Sharp.Tests/IndexFixture.cs
@@ -125,7 +125,7 @@ public void CanStageTheUpdationOfAStagedFile()
                 IndexEntry newBlob = repo.Index[filename];
 
                 Assert.Equal(count, repo.Index.Count);
-                blob.Id.ShouldNotEqual(newBlob.Id);
+                Assert.NotEqual(newBlob.Id, blob.Id);
                 Assert.Equal(FileStatus.Added, repo.Index.RetrieveStatus(filename));
             }
         }
@@ -185,7 +185,7 @@ public void StagingANewVersionOfAFileThenUnstagingItRevertsTheBlobToTheVersionOf
                 repo.Index.Stage(filename);
 
                 Assert.Equal(count, repo.Index.Count);
-                repo.Index[posixifiedFileName].Id.ShouldNotEqual((blobId));
+                Assert.NotEqual((blobId), repo.Index[posixifiedFileName].Id);
 
                 repo.Index.Unstage(posixifiedFileName);
                 Assert.Equal(count, repo.Index.Count);
diff --git a/LibGit2Sharp.Tests/ObjectIdFixture.cs b/LibGit2Sharp.Tests/ObjectIdFixture.cs
@@ -68,7 +68,7 @@ public void DifferentObjectIdsDoesNotHaveSameHashCode()
             var a = new ObjectId(validSha1);
             var b = new ObjectId(validSha2);
 
-            a.GetHashCode().ShouldNotEqual(b.GetHashCode());
+            Assert.NotEqual(b.GetHashCode(), a.GetHashCode());
         }
 
         [Fact]
diff --git a/LibGit2Sharp.Tests/ReferenceFixture.cs b/LibGit2Sharp.Tests/ReferenceFixture.cs
@@ -309,7 +309,7 @@ public void CanUpdateTargetOnReference()
             {
                 string sha = repo.Refs["refs/heads/test"].ResolveToDirectReference().Target.Sha;
                 Reference master = repo.Refs[masterRef];
-                master.ResolveToDirectReference().Target.Sha.ShouldNotEqual(sha);
+                Assert.NotEqual(sha, master.ResolveToDirectReference().Target.Sha);
 
                 Reference updated = repo.Refs.UpdateTarget(masterRef, sha);
 
diff --git a/LibGit2Sharp.Tests/RemoteFixture.cs b/LibGit2Sharp.Tests/RemoteFixture.cs
@@ -62,7 +62,7 @@ public void CanCheckEqualityOfRemote()
                 Assert.NotNull(loadedRemote);
                 Assert.Equal(createdRemote, loadedRemote);
 
-                loadedRemote.ShouldNotEqual(oneOrigin);
+                Assert.NotEqual(oneOrigin, loadedRemote);
             }
         }
     }
diff --git a/LibGit2Sharp.Tests/RepositoryFixture.cs b/LibGit2Sharp.Tests/RepositoryFixture.cs
@@ -66,7 +66,7 @@ private static void CheckGitConfigFile(string dir)
             Assert.True(File.Exists(configFilePath));
 
             string contents = File.ReadAllText(configFilePath);
-            contents.IndexOf("repositoryformatversion = 0", StringComparison.Ordinal).ShouldNotEqual(-1);
+            Assert.NotEqual(-1, contents.IndexOf("repositoryformatversion = 0", StringComparison.Ordinal));
         }
 
         private static void AssertIsHidden(string repoPath)
diff --git a/LibGit2Sharp.Tests/TagFixture.cs b/LibGit2Sharp.Tests/TagFixture.cs
@@ -352,7 +352,7 @@ public void CanCreateAnAnnotatedTagPointingToATagAnnotation()
                 Assert.NotNull(tag);
                 Assert.True(tag.IsAnnotated);
                 Assert.Equal(annotation.Id, tag.Annotation.Target.Id);
-                tag.Annotation.ShouldNotEqual(annotation);
+                Assert.NotEqual(annotation, tag.Annotation);
 
                 Assert.Equal(tag, repo.Tags[tag.Name]);
             }
diff --git a/LibGit2Sharp.Tests/TestHelpers/AssertExtensions.cs b/LibGit2Sharp.Tests/TestHelpers/AssertExtensions.cs
@@ -13,10 +13,5 @@ public static void ShouldBeAboutEqualTo(this DateTimeOffset expected, DateTimeOf
             Assert.Equal(expected.Minute, current.Minute);
             Assert.Equal(expected.Second, current.Second);
         }
-
-        public static void ShouldNotEqual(this object compareFrom, object compareTo)
-        {
-            Assert.NotEqual(compareTo, compareFrom);
-        }
     }
 }
diff --git a/LibGit2Sharp.Tests/TreeFixture.cs b/LibGit2Sharp.Tests/TreeFixture.cs
@@ -165,7 +165,7 @@ public void CanRetrieveTreeEntryPath()
                 Assert.NotNull(subTree);
                 TreeEntry anInstance = subTree["branch_file.txt"];
 
-                anInstance.Path.ShouldNotEqual("branch_file.txt");
+                Assert.NotEqual("branch_file.txt", anInstance.Path);
                 Assert.Equal(completePath, anInstance.Path);
                 Assert.Equal(completePath, subTree.First().Path);
 
diff --git a/LibGit2Sharp.Tests/TupleFixture.cs b/LibGit2Sharp.Tests/TupleFixture.cs
@@ -31,7 +31,7 @@ public void GetHashCodeIsDifferent()
         {
             var sut2 = new Tuple<int, string>(integer + 1, stringy);
 
-            sut.GetHashCode().ShouldNotEqual(sut2.GetHashCode());
+            Assert.NotEqual(sut2.GetHashCode(), sut.GetHashCode());
         }
 
         [Fact]

Original file line number	Diff line number	Diff line change
`@@ -636,7 +636,7 @@ private void AssertCommitHasBeenAmended(Repository repo, Commit amendedCommit, C`
`636`	`636`	`Commit headCommit = repo.Head.Tip;`
`637`	`637`	`Assert.Equal(amendedCommit, headCommit);`
`638`	`638`
`639`		`- amendedCommit.Sha.ShouldNotEqual(originalCommit.Sha);`
	`639`	`+ Assert.NotEqual(originalCommit.Sha, amendedCommit.Sha);`
`640`	`640`	`Assert.Equal(originalCommit.Parents, amendedCommit.Parents);`
`641`	`641`	`}`
`642`	`642`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ public void CanStageTheUpdationOfAStagedFile()`
`125`	`125`	`IndexEntry newBlob = repo.Index[filename];`
`126`	`126`
`127`	`127`	`Assert.Equal(count, repo.Index.Count);`
`128`		`- blob.Id.ShouldNotEqual(newBlob.Id);`
	`128`	`+ Assert.NotEqual(newBlob.Id, blob.Id);`
`129`	`129`	`Assert.Equal(FileStatus.Added, repo.Index.RetrieveStatus(filename));`
`130`	`130`	`}`
`131`	`131`	`}`
`@@ -185,7 +185,7 @@ public void StagingANewVersionOfAFileThenUnstagingItRevertsTheBlobToTheVersionOf`
`185`	`185`	`repo.Index.Stage(filename);`
`186`	`186`
`187`	`187`	`Assert.Equal(count, repo.Index.Count);`
`188`		`- repo.Index[posixifiedFileName].Id.ShouldNotEqual((blobId));`
	`188`	`+ Assert.NotEqual((blobId), repo.Index[posixifiedFileName].Id);`
`189`	`189`
`190`	`190`	`repo.Index.Unstage(posixifiedFileName);`
`191`	`191`	`Assert.Equal(count, repo.Index.Count);`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public void DifferentObjectIdsDoesNotHaveSameHashCode()`
`68`	`68`	`var a = new ObjectId(validSha1);`
`69`	`69`	`var b = new ObjectId(validSha2);`
`70`	`70`
`71`		`- a.GetHashCode().ShouldNotEqual(b.GetHashCode());`
	`71`	`+ Assert.NotEqual(b.GetHashCode(), a.GetHashCode());`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,7 @@ public void CanUpdateTargetOnReference()`
`309`	`309`	`{`
`310`	`310`	`string sha = repo.Refs["refs/heads/test"].ResolveToDirectReference().Target.Sha;`
`311`	`311`	`Reference master = repo.Refs[masterRef];`
`312`		`- master.ResolveToDirectReference().Target.Sha.ShouldNotEqual(sha);`
	`312`	`+ Assert.NotEqual(sha, master.ResolveToDirectReference().Target.Sha);`
`313`	`313`
`314`	`314`	`Reference updated = repo.Refs.UpdateTarget(masterRef, sha);`
`315`	`315`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public void CanCheckEqualityOfRemote()`
`62`	`62`	`Assert.NotNull(loadedRemote);`
`63`	`63`	`Assert.Equal(createdRemote, loadedRemote);`
`64`	`64`
`65`		`- loadedRemote.ShouldNotEqual(oneOrigin);`
	`65`	`+ Assert.NotEqual(oneOrigin, loadedRemote);`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ private static void CheckGitConfigFile(string dir)`
`66`	`66`	`Assert.True(File.Exists(configFilePath));`
`67`	`67`
`68`	`68`	`string contents = File.ReadAllText(configFilePath);`
`69`		`- contents.IndexOf("repositoryformatversion = 0", StringComparison.Ordinal).ShouldNotEqual(-1);`
	`69`	`+ Assert.NotEqual(-1, contents.IndexOf("repositoryformatversion = 0", StringComparison.Ordinal));`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`private static void AssertIsHidden(string repoPath)`
Original file line number	Diff line number	Diff line change
`@@ -352,7 +352,7 @@ public void CanCreateAnAnnotatedTagPointingToATagAnnotation()`
`352`	`352`	`Assert.NotNull(tag);`
`353`	`353`	`Assert.True(tag.IsAnnotated);`
`354`	`354`	`Assert.Equal(annotation.Id, tag.Annotation.Target.Id);`
`355`		`- tag.Annotation.ShouldNotEqual(annotation);`
	`355`	`+ Assert.NotEqual(annotation, tag.Annotation);`
`356`	`356`
`357`	`357`	`Assert.Equal(tag, repo.Tags[tag.Name]);`
`358`	`358`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,10 +13,5 @@ public static void ShouldBeAboutEqualTo(this DateTimeOffset expected, DateTimeOf`
`13`	`13`	`Assert.Equal(expected.Minute, current.Minute);`
`14`	`14`	`Assert.Equal(expected.Second, current.Second);`
`15`	`15`	`}`
`16`		`-`
`17`		`- public static void ShouldNotEqual(this object compareFrom, object compareTo)`
`18`		`- {`
`19`		`- Assert.NotEqual(compareTo, compareFrom);`
`20`		`- }`
`21`	`16`	`}`
`22`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public void GetHashCodeIsDifferent()`
`31`	`31`	`{`
`32`	`32`	`var sut2 = new Tuple<int, string>(integer + 1, stringy);`
`33`	`33`
`34`		`- sut.GetHashCode().ShouldNotEqual(sut2.GetHashCode());`
	`34`	`+ Assert.NotEqual(sut2.GetHashCode(), sut.GetHashCode());`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`[Fact]`