diff options
author | nulltoken <emeric.fermas@gmail.com> | 2013-06-26 18:17:41 +0400 |
---|---|---|
committer | nulltoken <emeric.fermas@gmail.com> | 2013-06-28 22:17:46 +0400 |
commit | 219b0c5764ac247e3bbcf04c2966208c813c36c9 (patch) | |
tree | 4e058f2e3da3cf819089de624a27f286858f7f02 /LibGit2Sharp.Tests/CheckoutFixture.cs | |
parent | d05b0daa16aaa287ce9068219add9030847024df (diff) |
Rename CheckoutOptions into CheckoutModifiers
Diffstat (limited to 'LibGit2Sharp.Tests/CheckoutFixture.cs')
-rw-r--r-- | LibGit2Sharp.Tests/CheckoutFixture.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/LibGit2Sharp.Tests/CheckoutFixture.cs b/LibGit2Sharp.Tests/CheckoutFixture.cs index e48321ea..8876af16 100644 --- a/LibGit2Sharp.Tests/CheckoutFixture.cs +++ b/LibGit2Sharp.Tests/CheckoutFixture.cs @@ -266,7 +266,7 @@ namespace LibGit2Sharp.Tests Assert.Throws<MergeConflictException>(() => repo.Checkout(master.CanonicalName)); // Checkout with force option should succeed. - repo.Checkout(master.CanonicalName, CheckoutOptions.Force, null, null); + repo.Checkout(master.CanonicalName, CheckoutModifiers.Force, null, null); // Assert that master branch is checked out. Assert.True(repo.Branches["master"].IsCurrentRepositoryHead); @@ -339,7 +339,7 @@ namespace LibGit2Sharp.Tests // Verify that we get called for the notify conflict cb string conflictPath = string.Empty; CheckoutNotificationOptions checkoutNotifications = new CheckoutNotificationOptions((path, flags) => { conflictPath = path; return false; }, CheckoutNotifyFlags.Conflict); - Assert.Throws<UserCancelledException>(() => repo.Checkout("master", CheckoutOptions.None, null, checkoutNotifications)); + Assert.Throws<UserCancelledException>(() => repo.Checkout("master", CheckoutModifiers.None, null, checkoutNotifications)); Assert.Equal(relativePath, conflictPath); } } @@ -398,7 +398,7 @@ namespace LibGit2Sharp.Tests bool wasCalled = false; Branch branch = repo.Branches[otherBranchName]; - branch.Checkout(CheckoutOptions.None, (path, completed, total) => wasCalled = true, null); + branch.Checkout(CheckoutModifiers.None, (path, completed, total) => wasCalled = true, null); Assert.True(wasCalled); } @@ -414,7 +414,7 @@ namespace LibGit2Sharp.Tests PopulateBasicRepository(repo); bool wasCalled = false; - repo.Checkout(otherBranchName, CheckoutOptions.None, (path, completed, total) => wasCalled = true, null); + repo.Checkout(otherBranchName, CheckoutModifiers.None, (path, completed, total) => wasCalled = true, null); Assert.True(wasCalled); } @@ -490,7 +490,7 @@ namespace LibGit2Sharp.Tests (path, notificationType) => { wasCalled = true; actualNotificationPath = path; actualNotifyFlags = notificationType; return true; }, notifyFlags); - Assert.Throws<MergeConflictException>(() => repo.Checkout("master", CheckoutOptions.None, null, checkoutNotifications)); + Assert.Throws<MergeConflictException>(() => repo.Checkout("master", CheckoutModifiers.None, null, checkoutNotifications)); Assert.True(wasCalled); Assert.Equal(expectedNotificationPath, actualNotificationPath); @@ -538,7 +538,7 @@ namespace LibGit2Sharp.Tests Assert.Equal(1, repo.Index.RetrieveStatus().Untracked.Count()); Assert.Equal(FileStatus.Untracked, repo.Index.RetrieveStatus(fullPathFileB)); - repo.Checkout(otherBranchName, CheckoutOptions.Force, null, null); + repo.Checkout(otherBranchName, CheckoutModifiers.Force, null, null); // Verify untracked entry still exists. Assert.Equal(1, repo.Index.RetrieveStatus().Untracked.Count()); @@ -641,7 +641,7 @@ namespace LibGit2Sharp.Tests Assert.Equal(FileStatus.Ignored, repo.Index.RetrieveStatus(ignoredFilePath)); - repo.Checkout(otherBranchName, CheckoutOptions.Force, null, null); + repo.Checkout(otherBranchName, CheckoutModifiers.Force, null, null); // Verify that the ignored file still exists. Assert.Equal(FileStatus.Ignored, repo.Index.RetrieveStatus(ignoredFilePath)); @@ -723,7 +723,7 @@ namespace LibGit2Sharp.Tests // The blob actually exists in the object database with the correct Sha Assert.Equal(expectedSha, repo.Lookup<Blob>(expectedSha).Sha); - repo.Checkout("refs/heads/logo", CheckoutOptions.Force, null, null); + repo.Checkout("refs/heads/logo", CheckoutModifiers.Force, null, null); // The Index has been updated as well with the blob Assert.Equal(expectedSha, repo.Index["square-logo.png"].Id.Sha); |