public void Change_Line_Of_Text_To_Left() { TwoWayDiff diffAlgorithm = new TwoWayDiff(); DiffResult result = diffAlgorithm.PerformDiff("Common Text\nLeft Text\nCommon Text2", "Common Text\nRight Text\nCommon Text2"); result.InsertLine(1, 0, "Left Text"); Assert.That(result.Merged.Lines[1], Is.EqualTo("Left Text")); Assert.That(result.MergedSuccessfully, Is.True); }
public void Remove_Line_Of_Text_Weve_Just_Added() { TwoWayDiff diffAlgorithm = new TwoWayDiff(); DiffResult result = diffAlgorithm.PerformDiff("Common Text\nLeft Text\nCommon Text2", "Common Text\nRight Text\nCommon Text2"); Assert.That(result.MergedSuccessfully, Is.False); result.SelectVersionOfConflict(1, ObjectVersion.Left); Assert.That(result.MergedSuccessfully, Is.True); result.InsertLine(1, 0, "New Text"); Assert.That(result.Merged.Lines.Count, Is.EqualTo(5)); Assert.That(result.Merged.Lines[1], Is.EqualTo("New Text")); Assert.That(result.MergedSuccessfully, Is.False); // Change the line back result.RemoveLine(1, 0); Assert.That(result.Merged.Lines[1], Is.EqualTo("Left Text")); Assert.That(result.MergedSuccessfully, Is.True); }