public void Cannot_merge_Mark_as_a_conflict()
{
string userText = Helper.GetResource(resourcePrefix + "ThreeOtherLines2.txt");
string prevGenText = Helper.GetResource(resourcePrefix + "ThreeLines.txt");
string newGenText = Helper.GetResource(resourcePrefix + "ThreeOtherLines.txt");
SlyceMergeResult mergeObject = SlyceMerge.Perform3wayDiff(userText, prevGenText, newGenText, out merged);
Assert.AreEqual(TypeOfDiff.Conflict, mergeObject.DiffType, "Cannot merge. Mark as conflicted.");
}
public void The_merged_equals_3CrLfs_input()
{
string userText = Environment.NewLine + Environment.NewLine + Environment.NewLine;
string prevGenText = userText;
string newGenText = userText;
SlyceMergeResult mergeObject = SlyceMerge.Perform3wayDiff(userText, prevGenText, newGenText, out merged);
Assert.AreEqual(TypeOfDiff.ExactCopy, mergeObject.DiffType, "Mark as Exact Copy.");
Assert.AreEqual(userText, merged, "The merged text should equal the 3 empty lines.");
}
public void First_line_changed_Go_with_the_User_version()
{
string userText = Helper.GetResource(resourcePrefix + "ThreeLines_FirstLineDeleted.txt");
string prevGenText = Helper.GetResource(resourcePrefix + "ThreeLines.txt");
string newGenText = Helper.GetResource(resourcePrefix + "ThreeLines_FirstLineChanged.txt");
string fileExpected = userText;
SlyceMergeResult mergeObject = SlyceMerge.Perform3wayDiff(userText, prevGenText, newGenText, out merged);
Assert.AreEqual(TypeOfDiff.Conflict, mergeObject.DiffType, "Cannot merge. Mark as conflicted.");
}
public void Last_line_changed_Cannot_merge_Mark_as_a_conflict()
{
string userText = Helper.GetResource(resourcePrefix + "ThreeLines_LastLineChanged.txt");
string prevGenText = Helper.GetResource(resourcePrefix + "ThreeLines.txt");
string newGenText = Helper.GetResource(resourcePrefix + "TwoLines.txt");
string fileExpected = userText;
SlyceMergeResult mergeObject = SlyceMerge.Perform3wayDiff(userText, prevGenText, newGenText, out merged);
Assert.AreEqual(TypeOfDiff.Conflict, mergeObject.DiffType, "Cannot merge. Mark as conflicted.");
}
public void Even_when_all_files_are_empty()
{
string userText = string.Empty;
string prevGenText = userText;
string newGenText = userText;
SlyceMergeResult mergeObject = SlyceMerge.Perform3wayDiff(userText, prevGenText, newGenText, out merged);
Assert.AreEqual(String.Empty, merged, "The merged text should be empty.");
Assert.AreEqual(TypeOfDiff.ExactCopy, mergeObject.DiffType, "Mark as Exact Copy.");
}
public void The_merged_file_equals_the_NewGen_TEMPLATECHANGE()
{
string userText = Helper.GetResource(resourcePrefix + "ThreeLines.txt");
string prevGenText = userText;
string newGenText = Helper.GetResource(resourcePrefix + "ThreeOtherLines.txt");
SlyceMergeResult mergeObject = SlyceMerge.Perform3wayDiff(userText, prevGenText, newGenText, out merged);
Assert.AreEqual(TypeOfDiff.TemplateChangeOnly, mergeObject.DiffType, "Mark as Exact Copy.");
Assert.AreEqual(newGenText, merged, "Merged file should equal NewGen.");
}
public void The_merged_file_equals_2way_merge_of_User_and_NewGen_CONFLICT()
{
string userText = Helper.GetResource(resourcePrefix + "FourLines.txt");
string prevGenText = string.Empty;
string newGenText = Helper.GetResource(resourcePrefix + "FourLines_2Different.txt");
string fileExpected = Helper.GetResource(resourcePrefix + "FourLines_Expected.txt");
SlyceMergeResult mergeObject = SlyceMerge.Perform3wayDiff(userText, prevGenText, newGenText, out merged);
Assert.AreEqual(TypeOfDiff.Conflict, mergeObject.DiffType, "Mark as Exact Copy.");
Assert.AreEqual(fileExpected, merged, "Merged file should equal merge of User and NewGen.");
}
public void The_merged_file_equals_User_and_NewGen()
{
string userText = Helper.GetResource(resourcePrefix + "TwoLinesWithEmptyLines.txt");
string prevGenText = string.Empty;
string newGenText = userText;
string fileExpected = userText;
SlyceMergeResult mergeObject = SlyceMerge.Perform3wayDiff(userText, prevGenText, newGenText, out merged);
Assert.AreEqual(TypeOfDiff.ExactCopy, mergeObject.DiffType, "Mark as Exact Copy.");
Assert.AreEqual(fileExpected, merged, "Merged file should equal User and NewGen.");
}
public void The_merged_equals_the_simple_input_with_linebreaks()
{
string userText = Helper.GetResource(resourcePrefix + "TwoLinesWithEmptyLines.txt");
string prevGenText = userText;
string newGenText = userText;
string fileExpected = userText;
SlyceMergeResult mergeObject = SlyceMerge.Perform3wayDiff(userText, prevGenText, newGenText, out merged);
Assert.AreEqual(TypeOfDiff.ExactCopy, mergeObject.DiffType, "Mark as Exact Copy.");
Assert.AreEqual(fileExpected, merged, "The merged text should equal the input.");
}
public void To_NewGen_line1_Include_it()
{
string prevGenText = Helper.GetResource(resourcePrefix + "ThreeLines.txt");
string userText = Helper.GetResource(resourcePrefix + "ThreeLines.txt");
string newGenText = Helper.GetResource(resourcePrefix + "ThreeLines_LastLineChanged.txt");
string fileExpected = newGenText;
SlyceMergeResult mergeObject = SlyceMerge.Perform3wayDiff(userText, prevGenText, newGenText, out merged);
Assert.AreEqual(TypeOfDiff.TemplateChangeOnly, mergeObject.DiffType, "NewGen change only.");
Assert.AreEqual(fileExpected, merged, "NewGen change incorporated.");
}
public void Same_first_line_added_to_User_and_NewGen_Include_it()
{
string prevGenText = Helper.GetResource(resourcePrefix + "ThreeLines_FirstLineDeleted.txt");
string userText = Helper.GetResource(resourcePrefix + "ThreeLines.txt");
string newGenText = Helper.GetResource(resourcePrefix + "ThreeLines.txt");
string fileExpected = userText;
SlyceMergeResult mergeObject = SlyceMerge.Perform3wayDiff(userText, prevGenText, newGenText, out merged);
Assert.AreEqual(TypeOfDiff.ExactCopy, mergeObject.DiffType, "Same changes to both files.");
Assert.AreEqual(fileExpected, merged, "User change incorporated.");
}
public void Last_line_inserted_in_User_Include_it()
{
string prevGenText = Helper.GetResource(resourcePrefix + "TwoLines.txt");
string userText = Helper.GetResource(resourcePrefix + "ThreeLines.txt");
string newGenText = Helper.GetResource(resourcePrefix + "TwoLines.txt");
string fileExpected = userText;
SlyceMergeResult mergeObject = SlyceMerge.Perform3wayDiff(userText, prevGenText, newGenText, out merged);
Assert.AreEqual(TypeOfDiff.UserChangeOnly, mergeObject.DiffType, "User change only.");
Assert.AreEqual(fileExpected, merged, "User change incorporated.");
}
public void From_User_remove_from_merge()
{
string userText = Helper.GetResource(resourcePrefix + "ThreeLines_FirstLineDeleted.txt");
string prevGenText = Helper.GetResource(resourcePrefix + "ThreeLines.txt");
string newGenText = Helper.GetResource(resourcePrefix + "ThreeLines.txt");
string fileExpected = userText;
SlyceMergeResult mergeObject = SlyceMerge.Perform3wayDiff(userText, prevGenText, newGenText, out merged);
Assert.AreEqual(TypeOfDiff.UserChangeOnly, mergeObject.DiffType, "User change only.");
Assert.AreEqual(fileExpected, merged, "User supercedes unchanged NewGen.");
}
public void User_changes_merge_with_unchanged_NewGen()
{
string userText = Helper.GetResource(resourcePrefix + "ThreeOtherLines.txt");
string prevGenText = Helper.GetResource(resourcePrefix + "ThreeLines.txt");
string newGenText = Helper.GetResource(resourcePrefix + "ThreeLines.txt");
string fileExpected = userText;
SlyceMergeResult mergeObject = SlyceMerge.Perform3wayDiff(userText, prevGenText, newGenText, out merged);
Assert.AreEqual(TypeOfDiff.UserChangeOnly, mergeObject.DiffType, "User change only.");
Assert.AreEqual(fileExpected, merged, "NewGen supercedes unchanged user.");
}
