Skip to content

Commit becda06

Browse files
committed
Avoid problem altogether
1 parent 59b19e5 commit becda06

File tree

1 file changed

+20
-14
lines changed

1 file changed

+20
-14
lines changed

LibGit2Sharp.Tests/IndexFixture.cs

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -158,29 +158,35 @@ public void CanMoveAnExistingFileOverANonExistingFile(string sourcePath, FileSta
158158
}
159159

160160
[Theory]
161-
[InlineData("README", FileStatus.Unaltered, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt" })]
162-
[InlineData("new_tracked_file.txt", FileStatus.NewInIndex, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt" })]
163-
[InlineData("modified_staged_file.txt", FileStatus.ModifiedInIndex, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt" })]
164-
[InlineData("modified_unstaged_file.txt", FileStatus.ModifiedInWorkdir, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt" })]
165-
public void MovingOverAnExistingFileThrows(string sourcePath, FileStatus sourceStatus, object[] destPaths)
161+
[InlineData("README", FileStatus.Unaltered)]
162+
[InlineData("new_tracked_file.txt", FileStatus.NewInIndex)]
163+
[InlineData("modified_staged_file.txt", FileStatus.ModifiedInIndex)]
164+
[InlineData("modified_unstaged_file.txt", FileStatus.ModifiedInWorkdir)]
165+
public void MovingOverAnExistingFileThrows(string sourcePath, FileStatus sourceStatus)
166166
{
167-
InvalidMoveUseCases(sourcePath, sourceStatus, (string[])destPaths);
167+
var destPaths = new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt" };
168+
169+
InvalidMoveUseCases(sourcePath, sourceStatus, destPaths);
168170
}
169171

170172
[Theory]
171-
[InlineData("new_untracked_file.txt", FileStatus.NewInWorkdir, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt", "deleted_unstaged_file.txt", "deleted_staged_file.txt", "i_dont_exist.txt" })]
172-
public void MovingAFileWichIsNotUnderSourceControlThrows(string sourcePath, FileStatus sourceStatus, object[] destPaths)
173+
[InlineData("new_untracked_file.txt", FileStatus.NewInWorkdir)]
174+
public void MovingAFileWichIsNotUnderSourceControlThrows(string sourcePath, FileStatus sourceStatus)
173175
{
174-
InvalidMoveUseCases(sourcePath, sourceStatus, (string[])destPaths);
176+
var destPaths = new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt", "deleted_unstaged_file.txt", "deleted_staged_file.txt", "i_dont_exist.txt" };
177+
178+
InvalidMoveUseCases(sourcePath, sourceStatus, destPaths);
175179
}
176180

177181
[Theory]
178-
[InlineData("deleted_unstaged_file.txt", FileStatus.DeletedFromWorkdir, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt", "deleted_unstaged_file.txt", "deleted_staged_file.txt", "i_dont_exist.txt" })]
179-
[InlineData("deleted_staged_file.txt", FileStatus.DeletedFromIndex, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt", "deleted_unstaged_file.txt", "deleted_staged_file.txt", "i_dont_exist.txt" })]
180-
[InlineData("i_dont_exist.txt", FileStatus.Nonexistent, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt", "deleted_unstaged_file.txt", "deleted_staged_file.txt", "i_dont_exist.txt" })]
181-
public void MovingAFileNotInTheWorkingDirectoryThrows(string sourcePath, FileStatus sourceStatus, object[] destPaths)
182+
[InlineData("deleted_unstaged_file.txt", FileStatus.DeletedFromWorkdir)]
183+
[InlineData("deleted_staged_file.txt", FileStatus.DeletedFromIndex)]
184+
[InlineData("i_dont_exist.txt", FileStatus.Nonexistent)]
185+
public void MovingAFileNotInTheWorkingDirectoryThrows(string sourcePath, FileStatus sourceStatus)
182186
{
183-
InvalidMoveUseCases(sourcePath, sourceStatus, (string[])destPaths);
187+
var destPaths = new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt", "deleted_unstaged_file.txt", "deleted_staged_file.txt", "i_dont_exist.txt" };
188+
189+
InvalidMoveUseCases(sourcePath, sourceStatus, destPaths);
184190
}
185191

186192
private void InvalidMoveUseCases(string sourcePath, FileStatus sourceStatus, IEnumerable<string> destPaths)

0 commit comments

Comments
 (0)