public void Main_UnhandledMergeFailure_Returns1() { using (var group = new GroupOfConflictingLiftFiles()) using (new FailureSimulator("LiftMerger.FindEntryById")) { Assert.AreEqual(1, DoMerge(group)); } }
public void Main_NoConflictFileB4_ConflictsEncountered_HaveConflictFileAfter() { using (var group = new GroupOfConflictingLiftFiles()) { Assert.AreEqual(0, DoMerge(group)); Assert.IsTrue(File.Exists(group.BobTextConflictsPath)); var text = File.ReadAllText(group.BobTextConflictsPath); Assert.AreNotEqual(string.Empty, text); } }
private int DoMerge(GroupOfConflictingLiftFiles group) { MergeSituation.PushRevisionsToEnvironmentVariables("bob", "-123", "sally", "-456"); MergeOrder.PushToEnvironmentVariables(group.Folder.Path); return Program.Main(new[] {group.BobFile.Path, group.AncestorFile.Path, group.SallyFile.Path}); }