Skip to content

Commit 5dab358

Browse files
yorahyorah
committed
Cleanup DiffTreeToTreeFixture to use var and consts when appropriate
1 parent 4720e82 commit 5dab358

File tree

1 file changed

+29
-29
lines changed

1 file changed

+29
-29
lines changed

‎LibGit2Sharp.Tests/DiffTreeToTreeFixture.cs‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -290,12 +290,12 @@ public void DetectsTheExactRenamingOfFilesByDefault()
290290

291291
Commit @new = repo.Commit("Updated", Constants.Signature, Constants.Signature);
292292

293-
TreeChanges changes = repo.Diff.Compare<TreeChanges>(old.Tree, @new.Tree);
293+
var changes = repo.Diff.Compare<TreeChanges>(old.Tree, @new.Tree);
294294

295295
Assert.Equal(1, changes.Count());
296296
Assert.Equal(1, changes.Renamed.Count());
297-
Assert.Equal("original.txt", changes.Renamed.Single().OldPath);
298-
Assert.Equal("renamed.txt", changes.Renamed.Single().Path);
297+
Assert.Equal(originalPath, changes.Renamed.Single().OldPath);
298+
Assert.Equal(renamedPath, changes.Renamed.Single().Path);
299299
}
300300
}
301301

@@ -337,7 +337,7 @@ public void RenameThresholdsAreObeyed()
337337
};
338338

339339
compareOptions.Similarity.RenameThreshold = 30;
340-
TreeChanges changes = repo.Diff.Compare<TreeChanges>(old.Tree, @new.Tree, compareOptions: compareOptions);
340+
var changes = repo.Diff.Compare<TreeChanges>(old.Tree, @new.Tree, compareOptions: compareOptions);
341341
Assert.True(changes.All(x => x.Status == ChangeKind.Renamed));
342342

343343
compareOptions.Similarity.RenameThreshold = 90;
@@ -366,16 +366,16 @@ public void ExactModeDetectsExactRenames()
366366

367367
Commit @new = repo.Commit("Updated", Constants.Signature, Constants.Signature);
368368

369-
TreeChanges changes = repo.Diff.Compare<TreeChanges>(old.Tree, @new.Tree,
369+
var changes = repo.Diff.Compare<TreeChanges>(old.Tree, @new.Tree,
370370
compareOptions: new CompareOptions
371371
{
372372
Similarity = SimilarityOptions.Exact,
373373
});
374374

375375
Assert.Equal(1, changes.Count());
376376
Assert.Equal(1, changes.Renamed.Count());
377-
Assert.Equal("original.txt", changes.Renamed.Single().OldPath);
378-
Assert.Equal("renamed.txt", changes.Renamed.Single().Path);
377+
Assert.Equal(originalPath, changes.Renamed.Single().OldPath);
378+
Assert.Equal(renamedPath, changes.Renamed.Single().Path);
379379
}
380380
}
381381

@@ -400,7 +400,7 @@ public void ExactModeDetectsExactCopies()
400400

401401
Commit @new = repo.Commit("Updated", Constants.Signature, Constants.Signature);
402402

403-
TreeChanges changes = repo.Diff.Compare<TreeChanges>(old.Tree, @new.Tree,
403+
var changes = repo.Diff.Compare<TreeChanges>(old.Tree, @new.Tree,
404404
compareOptions: new CompareOptions
405405
{
406406
Similarity = SimilarityOptions.Exact,
@@ -433,7 +433,7 @@ public void ExactModeDoesntDetectRenamesWithEdits()
433433

434434
Commit @new = repo.Commit("Updated", Constants.Signature, Constants.Signature);
435435

436-
TreeChanges changes = repo.Diff.Compare<TreeChanges>(old.Tree, @new.Tree,
436+
var changes = repo.Diff.Compare<TreeChanges>(old.Tree, @new.Tree,
437437
compareOptions: new CompareOptions
438438
{
439439
Similarity = SimilarityOptions.Exact,
@@ -469,7 +469,7 @@ public void CanIncludeUnmodifiedEntriesWhenDetectingTheExactRenamingOfFilesWhenE
469469

470470
Commit @new = repo.Commit("Updated", Constants.Signature, Constants.Signature);
471471

472-
TreeChanges changes = repo.Diff.Compare<TreeChanges>(old.Tree, @new.Tree,
472+
var changes = repo.Diff.Compare<TreeChanges>(old.Tree, @new.Tree,
473473
compareOptions:
474474
new CompareOptions
475475
{
@@ -480,8 +480,8 @@ public void CanIncludeUnmodifiedEntriesWhenDetectingTheExactRenamingOfFilesWhenE
480480
Assert.Equal(2, changes.Count());
481481
Assert.Equal(1, changes.Unmodified.Count());
482482
Assert.Equal(1, changes.Copied.Count());
483-
Assert.Equal("original.txt", changes.Copied.Single().OldPath);
484-
Assert.Equal("copied.txt", changes.Copied.Single().Path);
483+
Assert.Equal(originalPath, changes.Copied.Single().OldPath);
484+
Assert.Equal(copiedPath, changes.Copied.Single().Path);
485485
}
486486
}
487487

@@ -505,7 +505,7 @@ public void CanNotDetectTheExactRenamingFilesWhenNotEnabled()
505505

506506
Commit @new = repo.Commit("Updated", Constants.Signature, Constants.Signature);
507507

508-
TreeChanges changes = repo.Diff.Compare<TreeChanges>(old.Tree, @new.Tree,
508+
var changes = repo.Diff.Compare<TreeChanges>(old.Tree, @new.Tree,
509509
compareOptions:
510510
new CompareOptions
511511
{
@@ -540,7 +540,7 @@ public void CanDetectTheExactCopyingOfNonModifiedFilesWhenEnabled()
540540

541541
Commit @new = repo.Commit("Updated", Constants.Signature, Constants.Signature);
542542

543-
TreeChanges changes = repo.Diff.Compare<TreeChanges>(old.Tree, @new.Tree,
543+
var changes = repo.Diff.Compare<TreeChanges>(old.Tree, @new.Tree,
544544
compareOptions:
545545
new CompareOptions
546546
{
@@ -549,8 +549,8 @@ public void CanDetectTheExactCopyingOfNonModifiedFilesWhenEnabled()
549549

550550
Assert.Equal(1, changes.Count());
551551
Assert.Equal(1, changes.Copied.Count());
552-
Assert.Equal("original.txt", changes.Copied.Single().OldPath);
553-
Assert.Equal("copied.txt", changes.Copied.Single().Path);
552+
Assert.Equal(originalPath, changes.Copied.Single().OldPath);
553+
Assert.Equal(copiedPath, changes.Copied.Single().Path);
554554
}
555555
}
556556

@@ -577,7 +577,7 @@ public void CanNotDetectTheExactCopyingOfNonModifiedFilesWhenNotEnabled()
577577

578578
Commit @new = repo.Commit("Updated", Constants.Signature, Constants.Signature);
579579

580-
TreeChanges changes = repo.Diff.Compare<TreeChanges>(old.Tree, @new.Tree);
580+
var changes = repo.Diff.Compare<TreeChanges>(old.Tree, @new.Tree);
581581

582582
Assert.Equal(1, changes.Count());
583583
Assert.Equal(0, changes.Copied.Count());
@@ -610,7 +610,7 @@ public void CanDetectTheExactCopyingOfModifiedFilesWhenEnabled()
610610

611611
Commit @new = repo.Commit("Updated", Constants.Signature, Constants.Signature);
612612

613-
TreeChanges changes = repo.Diff.Compare<TreeChanges>(old.Tree, @new.Tree,
613+
var changes = repo.Diff.Compare<TreeChanges>(old.Tree, @new.Tree,
614614
compareOptions:
615615
new CompareOptions
616616
{
@@ -619,8 +619,8 @@ public void CanDetectTheExactCopyingOfModifiedFilesWhenEnabled()
619619

620620
Assert.Equal(2, changes.Count());
621621
Assert.Equal(1, changes.Copied.Count());
622-
Assert.Equal("original.txt", changes.Copied.Single().OldPath);
623-
Assert.Equal("copied.txt", changes.Copied.Single().Path);
622+
Assert.Equal(originalPath, changes.Copied.Single().OldPath);
623+
Assert.Equal(copiedPath, changes.Copied.Single().Path);
624624
}
625625
}
626626

@@ -650,7 +650,7 @@ public void CanNotDetectTheExactCopyingOfModifiedFilesWhenNotEnabled()
650650

651651
Commit @new = repo.Commit("Updated", Constants.Signature, Constants.Signature);
652652

653-
TreeChanges changes = repo.Diff.Compare<TreeChanges>(old.Tree, @new.Tree);
653+
var changes = repo.Diff.Compare<TreeChanges>(old.Tree, @new.Tree);
654654

655655
Assert.Equal(2, changes.Count());
656656
Assert.Equal(0, changes.Copied.Count());
@@ -674,7 +674,7 @@ public void CanIncludeUnmodifiedEntriesWhenEnabled()
674674
repo.Index.Stage("b.txt");
675675
Commit @new = repo.Commit("Updated", Constants.Signature, Constants.Signature);
676676

677-
TreeChanges changes = repo.Diff.Compare<TreeChanges>(old.Tree, @new.Tree,
677+
var changes = repo.Diff.Compare<TreeChanges>(old.Tree, @new.Tree,
678678
compareOptions: new CompareOptions {IncludeUnmodified = true});
679679

680680
Assert.Equal(2, changes.Count());
@@ -722,7 +722,7 @@ public void CanDetectTheExactRenamingExactCopyingOfNonModifiedAndModifiedFilesWh
722722

723723
Commit @new = repo.Commit("Updated", Constants.Signature, Constants.Signature);
724724

725-
TreeChanges changes = repo.Diff.Compare<TreeChanges>(old.Tree, @new.Tree,
725+
var changes = repo.Diff.Compare<TreeChanges>(old.Tree, @new.Tree,
726726
compareOptions:
727727
new CompareOptions
728728
{
@@ -732,13 +732,13 @@ public void CanDetectTheExactRenamingExactCopyingOfNonModifiedAndModifiedFilesWh
732732
Assert.Equal(4, changes.Count());
733733
Assert.Equal(1, changes.Modified.Count());
734734
Assert.Equal(1, changes.Renamed.Count());
735-
Assert.Equal("original.txt", changes.Renamed.Single().OldPath);
736-
Assert.Equal("renamed.txt", changes.Renamed.Single().Path);
735+
Assert.Equal(originalPath, changes.Renamed.Single().OldPath);
736+
Assert.Equal(renamedPath, changes.Renamed.Single().Path);
737737
Assert.Equal(2, changes.Copied.Count());
738-
Assert.Equal("original2.txt", changes.Copied.ElementAt(0).OldPath);
739-
Assert.Equal("copied.txt", changes.Copied.ElementAt(0).Path);
740-
Assert.Equal("original3.txt", changes.Copied.ElementAt(1).OldPath);
741-
Assert.Equal("copied2.txt", changes.Copied.ElementAt(1).Path);
738+
Assert.Equal(originalPath2, changes.Copied.ElementAt(0).OldPath);
739+
Assert.Equal(copiedPath1, changes.Copied.ElementAt(0).Path);
740+
Assert.Equal(originalPath3, changes.Copied.ElementAt(1).OldPath);
741+
Assert.Equal(copiedPath2, changes.Copied.ElementAt(1).Path);
742742
}
743743
}
744744
/*

0 commit comments

Comments
 (0)