public void MergeConflictFiles_AncestorDidNotExist() { using (GroupOfConflictFiles group = new GroupOfConflictFiles("", "<notes><annotation guid='bobGuid'/></notes>", "<notes><annotation guid='sallyGuid'/></notes>")) { MergeOrder order = new MergeOrder(group.BobFile.Path, group.AncestorFile.Path, group.SallyFile.Path, new NullMergeSituation()); new ChorusNotesFileHandler().Do3WayMerge(order); XmlDocument doc = new XmlDocument(); doc.Load(group.BobFile.Path); Assert.AreEqual(2, doc.SelectNodes("notes/annotation").Count); } }
public void MergeConflictFiles_CheckIsMutableIsUsedToSkipMergingMessages() { //NB: we can't actualy unit test for this, since it is just a performance improvement, but //this test let me watch in the debugger to make sure it skipped trying to merge the message using ( GroupOfConflictFiles group = new GroupOfConflictFiles("<notes version='0'><annotation guid='111'><message guid='123'>I am thirsty</message></annotation></notes>", "<notes version='0'><annotation guid='111'><message guid='123'>I am thirsty</message></annotation></notes>", "<notes version='0'><annotation guid='111'><message guid='123'>I am thirsty</message><message guid='222'>Me too.</message></annotation></notes>") ) { MergeOrder order = new MergeOrder( group.BobFile.Path, group.AncestorFile.Path, group.SallyFile.Path, new NullMergeSituation()); new ChorusNotesFileHandler().Do3WayMerge(order); XmlDocument doc = new XmlDocument(); doc.Load(group.BobFile.Path); Assert.AreEqual(1, doc.SelectNodes("notes/annotation").Count); Assert.AreEqual(2, doc.SelectNodes("notes/annotation/message").Count); } }