public void Files_Are_Exact_Copy() { TwoWayVisualDiff diffUtility = GetDiffUtility("line 1", "line 1"); VisualDiffOutput output = diffUtility.ProcessMergeOutput(); Assert.That(output, Is.Not.Null); Assert.That(output.LineCount, Is.EqualTo(1)); Assert.That(output.LeftLines[0].Text, Is.EqualTo("line 1")); Assert.That(output.RightLines[0].Text, Is.EqualTo("line 1")); }
public void Files_Are_Removed_NewGen() { TextFileInformation tfi = new TextFileInformation(); tfi.PrevGenFile = tfi.UserFile = tfi.NewGenFile = new TextFile("line 1"); tfi.IntelliMerge = IntelliMergeType.PlainText; tfi.RelativeFilePath = "text.txt"; TwoWayVisualDiff diffUtility = new TwoWayVisualDiff(tfi); tfi.NewGenFile = TextFile.Blank; diffUtility.ProcessMergeOutput(); }
public void Template_Added_At_Start() { TwoWayVisualDiff diffUtility = GetDiffUtility("line 0\nline 1", "line 1"); VisualDiffOutput output = diffUtility.ProcessMergeOutput(); Assert.That(output.LineCount, Is.EqualTo(2)); CheckLines(output.LeftLines, new[] { true, false }); CheckLines(output.RightLines, new[] { false, false }); CheckLines(output.LeftLines, new[] { "", "line 1" }); CheckLines(output.RightLines, new[] { "line 0", "line 1" }); CheckLines(output.LeftLines, new[] { ChangeType.None, ChangeType.None }); CheckLines(output.RightLines, new[] { ChangeType.Template, ChangeType.None }); }
public void User_Added_At_End() { TwoWayVisualDiff diffUtility = GetDiffUtility("line 1", "line 1\nline 2"); VisualDiffOutput output = diffUtility.ProcessMergeOutput(); Assert.That(output.LineCount, Is.EqualTo(2)); CheckLines(output.LeftLines, new[] { false, true }); CheckLines(output.RightLines, new[] { false, false }); CheckLines(output.LeftLines, new[] { "line 1", "" }); CheckLines(output.RightLines, new[] { "line 1", "line 2" }); CheckLines(output.LeftLines, new[] { ChangeType.None, ChangeType.None }); CheckLines(output.RightLines, new[] { ChangeType.None, ChangeType.User }); }
public void Change_In_Middle() { TwoWayVisualDiff diffUtility = GetDiffUtility("line 1\nline 22\nline 3", "line 1\nline 2\nline 3"); VisualDiffOutput output = diffUtility.ProcessMergeOutput(); Assert.That(output.LineCount, Is.EqualTo(4)); CheckLines(output.LeftLines, new[] { false, false, false, false }); CheckLines(output.RightLines, new[] { false, true, true, false }); CheckLines(output.LeftLines, new[] { "line 1", "line 2", "line 22", "line 3" }); CheckLines(output.RightLines, new[] { "line 1", "", "", "line 3" }); CheckLines(output.LeftLines, new[] { ChangeType.None, ChangeType.User, ChangeType.Template, ChangeType.None }); CheckLines(output.RightLines, new[] { ChangeType.None, ChangeType.None, ChangeType.None, ChangeType.None }); }
public void Files_Are_Exact_Copy_PrevGen_Missing() { TextFileInformation tfi = new TextFileInformation(); tfi.PrevGenFile = TextFile.Blank; tfi.UserFile = tfi.NewGenFile = new TextFile("line 1"); tfi.IntelliMerge = IntelliMergeType.PlainText; tfi.RelativeFilePath = "text.txt"; TwoWayVisualDiff diffUtility = new TwoWayVisualDiff(tfi); VisualDiffOutput output = diffUtility.ProcessMergeOutput(); Assert.That(output, Is.Not.Null); Assert.That(output.LineCount, Is.EqualTo(1)); Assert.That(output.LeftLines[0].Text, Is.EqualTo("line 1")); Assert.That(output.RightLines[0].Text, Is.EqualTo("line 1")); }
public override VisualDiffOutput GetDiffOutput() { TwoWayVisualDiff diffUtility = new TwoWayVisualDiff(fileInformation); return(diffUtility.ProcessMergeOutput()); }