public void Sync_RepeatedMergeFailure_WeAreLeftOnOurOwnWorkingDefault()
{
using (var bob = new RepositoryWithFilesSetup("bob", "test.txt", "hello"))
using (var sally = RepositoryWithFilesSetup.CreateByCloning("sally", bob))
using (new FailureSimulator("TextMerger-test.txt"))
{
bob.WriteNewContentsToTestFile("bobWasHere");
bob.AddAndCheckIn();
sally.WriteNewContentsToTestFile("sallyWasHere");
var result = sally.CheckinAndPullAndMerge(bob);
Assert.That(result.Succeeded, Is.False);
//make sure we ended up on Sally's revision, even though Bob's are newer
var currentRevision = sally.Repository.GetRevisionWorkingSetIsBasedOn();
Assert.AreEqual("sally", sally.Repository.GetRevision(currentRevision.Number.Hash).UserId);
//Now do it again
bob.WriteNewContentsToTestFile("bobWasHere2");
bob.AddAndCheckIn();
Assert.AreEqual("bob", sally.Repository.GetTip().UserId, "if bob's not the tip, we're not testing the right situation");
result = sally.CheckinAndPullAndMerge(bob);
Assert.That(result.Succeeded, Is.False);
result = sally.CheckinAndPullAndMerge(bob);
Assert.AreEqual("sally", sally.Repository.GetRevisionWorkingSetIsBasedOn().UserId);
//sally.ShowInTortoise();
}
File.Delete(Path.Combine(Path.GetTempPath(), "TextMerger-test.txt"));
}
[Category("UnknownMonoIssue")] // It insists on failing on mono, for some reason.
public void EnsureRightPersonMadeChanges()
{
const string commonAncestor =
@"<?xml version='1.0' encoding='utf-8'?>
<Lexicon>
<header>
<LexDb guid='2d23f428-83a9-44ba-90f1-9e3264b5b982' >
<DateCreated val='2012-12-10 6:29:17.117' />
<DateModified val='2012-12-10 6:29:17.117' />
<IsHeadwordCitationForm val='True' />
<IsBodyInSeparateSubentry val='True' />
</LexDb>
</header>
<LexEntry guid='ffdc58c9-5cc3-469f-9118-9f18c0138d02'>
<DateCreated val='2012-12-10 6:29:17.117' />
<DateModified val='2012-12-10 6:29:17.117' />
<HomographNumber val='1' />
<DoNotUseForParsing val='True' />
<ExcludeAsHeadword val='True' />
<Senses>
<ownseq class='LexSense' guid='97129e67-e0a5-47c4-a875-05c2b2e1b7df'>
<Custom
name='Paradigm'>
<AStr
ws='qaa-x-ezpi'>
<Run
ws='qaa-x-ezpi'>saklo, yzaklo, rzaklo, wzaklo, nzaklo, -</Run>
</AStr>
</Custom>
</ownseq>
</Senses>
</LexEntry>
</Lexicon>";
const string sue =
@"<?xml version='1.0' encoding='utf-8'?>
<Lexicon>
<header>
<LexDb guid='2d23f428-83a9-44ba-90f1-9e3264b5b982' >
<DateCreated val='2012-12-10 6:29:17.117' />
<DateModified val='2012-12-10 6:29:17.117' />
<IsHeadwordCitationForm val='True' />
<IsBodyInSeparateSubentry val='True' />
</LexDb>
</header>
<LexEntry guid='ffdc58c9-5cc3-469f-9118-9f18c0138d02'>
<DateCreated val='2012-12-10 6:29:17.117' />
<DateModified val='2012-12-10 6:29:17.117' />
<HomographNumber val='1' />
<DoNotUseForParsing val='True' />
<ExcludeAsHeadword val='True' />
<Senses>
<ownseq class='LexSense' guid='97129e67-e0a5-47c4-a875-05c2b2e1b7df'>
<Custom
name='Paradigm'>
<AStr
ws='qaa-x-ezpi'>
<Run
ws='qaa-x-ezpi'>saglo, yzaglo, rzaglo, wzaglo, nzaglo, -</Run>
</AStr>
</Custom>
</ownseq>
</Senses>
</LexEntry>
</Lexicon>";
const string randy =
@"<?xml version='1.0' encoding='utf-8'?>
<Lexicon>
<header>
<LexDb guid='2d23f428-83a9-44ba-90f1-9e3264b5b982' >
</LexDb>
</header>
<LexEntry guid='ffdc58c9-5cc3-469f-9118-9f18c0138d02'>
<Senses>
<ownseq class='LexSense' guid='97129e67-e0a5-47c4-a875-05c2b2e1b7df'>
<Custom
name='Paradigm'>
<AStr
ws='zpi'>
<Run
ws='zpi'>saklo, yzaklo, rzaklo, wzaklo, nzaklo, -</Run>
</AStr>
</Custom>
</ownseq>
</Senses>
</LexEntry>
</Lexicon>";
const string customPropData =
@"<?xml version='1.0' encoding='utf-8'?>
<AdditionalFields>
<CustomField
class='LexEntry'
destclass='7'
key='LexEntryTone'
listRoot='53241fd4-72ae-4082-af55-6b659657083c'
name='Tone'
type='ReferenceCollection' />
<CustomField
class='LexSense'
key='LexSenseParadigm'
name='Paradigm'
type='MultiString'
wsSelector='-2' />
<CustomField
class='WfiWordform'
key='WfiWordformCertified'
name='Certified'
type='Boolean' />
</AdditionalFields>";
var mdc = MetadataCache.TestOnlyNewCache;
using (var sueRepo = new RepositoryWithFilesSetup("Sue", string.Format("{0}_01.{1}", SharedConstants.Lexicon, SharedConstants.Lexdb), commonAncestor))
{
var sueProjPath = sueRepo.ProjectFolder.Path;
// Add model version number file.
var modelVersionPathname = Path.Combine(sueProjPath, SharedConstants.ModelVersionFilename);
File.WriteAllText(modelVersionPathname, AnnotationImages.kModelVersion);
sueRepo.Repository.TestOnlyAddSansCommit(modelVersionPathname);
// Add custom property data file.
var customPropsPathname = Path.Combine(sueProjPath, SharedConstants.CustomPropertiesFilename);
File.WriteAllText(customPropsPathname, customPropData);
sueRepo.Repository.TestOnlyAddSansCommit(customPropsPathname);
sueRepo.AddAndCheckIn();
using (var randyRepo = RepositoryWithFilesSetup.CreateByCloning("Randy", sueRepo))
{
// By doing the clone first, we get the common starting state in both repos.
sueRepo.WriteNewContentsToTestFile(sue);
sueRepo.AddAndCheckIn();
var mergeConflictsNotesFile = ChorusNotesMergeEventListener.GetChorusNotesFilePath(randyRepo.UserFile.Path);
Assert.IsFalse(File.Exists(mergeConflictsNotesFile), "ChorusNotes file should NOT have been in working set.");
randyRepo.WriteNewContentsToTestFile(randy);
randyRepo.CheckinAndPullAndMerge(sueRepo);
Assert.IsTrue(File.Exists(mergeConflictsNotesFile), "ChorusNotes file should have been in working set.");
var notesContents = File.ReadAllText(mergeConflictsNotesFile);
Assert.IsNotNullOrEmpty(notesContents);
Assert.IsTrue(notesContents.Contains("Removed Vs Edited Element Conflict"));
Assert.IsTrue(notesContents.Contains("Randy deleted this element"));
Assert.IsTrue(notesContents.Contains("Sue edited it"));
Assert.IsTrue(notesContents.Contains("The merger kept the change made by Sue."));
Assert.IsTrue(notesContents.Contains("whoWon=\"Sue\""));
Assert.IsTrue(notesContents.Contains("alphaUserId=\"Randy\""));
Assert.IsTrue(notesContents.Contains("betaUserId=\"Sue\""));
// Make sure merged file has both alts.
var doc = XDocument.Load(randyRepo.UserFile.Path);
var customParadigmElement = doc.Root.Element("LexEntry").Element("Senses").Element("ownseq").Element("Custom");
var aStrElements = customParadigmElement.Elements("AStr").ToList();
Assert.AreEqual(2, aStrElements.Count);
var aStrZpi = aStrElements.FirstOrDefault(el => el.Attribute("ws").Value == "zpi");
Assert.IsNotNull(aStrZpi);
Assert.IsTrue(aStrZpi.Element("Run").Value == "saklo, yzaklo, rzaklo, wzaklo, nzaklo, -");
var aStrEzpi = aStrElements.FirstOrDefault(el => el.Attribute("ws").Value == "qaa-x-ezpi");
Assert.IsNotNull(aStrEzpi);
Assert.IsTrue(aStrEzpi.Element("Run").Value == "saglo, yzaglo, rzaglo, wzaglo, nzaglo, -");
}
}
}
[Category("UnknownMonoIssue")] // Do3WayMerge is never called on Mono, for some reason.
public void EnsureDictionaryConfigsUseDictionaryStrategy()
{
const string commonAncestor = @"<?xml version='1.0' encoding='utf-8'?>
<DictionaryConfiguration name='Root-based (complex forms as subentries)' allPublications='true' version='1' lastModified='2014-10-07'>
<ConfigurationItem name='Main Entry' style='Dictionary-Normal' isEnabled='true' field='LexEntry' cssClassNameOverride='entry'>
<ParagraphOptions paragraphStyle='Dictionary-Normal' continuationParagraphStyle='Dictionary-Continuation' />
<ConfigurationItem name='Headword' between=' ' after=' ' style='Dictionary-Headword' isEnabled='true' field='MLHeadWord' cssClassNameOverride='mainheadword'>
<WritingSystemOptions writingSystemType='vernacular' displayWSAbreviation='false'>
<Option id='vernacular' isEnabled='true'/>
</WritingSystemOptions>
</ConfigurationItem>
<ConfigurationItem name='Variant Forms' before='(' between='; ' after=') ' isEnabled='true' field='VariantFormEntryBackRefs'>
<ListTypeOptions list='variant'>
<Option isEnabled='true' id='b0000000-c40e-433e-80b5-31da08771344'/>
<Option isEnabled='false' id='0c4663b3-4d9a-47af-b9a1-c8565d8112ed'/>
</ListTypeOptions>
</ConfigurationItem>
</ConfigurationItem>
</DictionaryConfiguration>";
const string sue = @"<?xml version='1.0' encoding='utf-8'?>
<DictionaryConfiguration name='Root-based (complex forms as subentries)' allPublications='true' version='1' lastModified='2014-10-07'>
<ConfigurationItem name='Main Entry' style='Dictionary-Normal' isEnabled='true' field='LexEntry' cssClassNameOverride='entry'>
<ParagraphOptions paragraphStyle='Dictionary-Normal' continuationParagraphStyle='Dictionary-Continuation' />
<ConfigurationItem name='Headword' between=' ' after=' ' style='Dictionary-Headword' isEnabled='true' field='MLHeadWord' cssClassNameOverride='mainheadword'>
<WritingSystemOptions writingSystemType='vernacular' displayWSAbreviation='false'>
<Option id='vernacular' isEnabled='false'/>
<Option id='fr' isEnabled='true' />
</WritingSystemOptions>
</ConfigurationItem>
<ConfigurationItem name='Variant Forms' before='(' between='; ' after=') ' isEnabled='true' field='VariantFormEntryBackRefs'>
<ListTypeOptions list='variant'>
<Option isEnabled='true' id='b0000000-c40e-433e-80b5-31da08771344'/>
<Option isEnabled='false' id='0c4663b3-4d9a-47af-b9a1-c8565d8112ed'/>
</ListTypeOptions>
</ConfigurationItem>
</ConfigurationItem>
</DictionaryConfiguration>";
const string randy = @"<?xml version='1.0' encoding='utf-8'?>
<DictionaryConfiguration name='Root-based (complex forms as subentries)' allPublications='true' version='1' lastModified='2014-10-07'>
<ConfigurationItem name='Main Entry' style='Dictionary-Normal' isEnabled='true' field='LexEntry' cssClassNameOverride='entry'>
<ParagraphOptions paragraphStyle='Dictionary-Normal' continuationParagraphStyle='Dictionary-Continuation' />
<ConfigurationItem name='Headword' between=' ' after=' ' style='Dictionary-Headword' isEnabled='true' field='MLHeadWord' cssClassNameOverride='mainheadword'>
<WritingSystemOptions writingSystemType='vernacular' displayWSAbreviation='false'>
<Option id='vernacular' isEnabled='true'/>
</WritingSystemOptions>
</ConfigurationItem>
<ConfigurationItem name='Variant Forms' before='(' between='; ' after=') ' isEnabled='true' field='VariantFormEntryBackRefs'>
<ListTypeOptions list='variant'>
<Option isEnabled='false' id='b0000000-c40e-433e-80b5-31da08771344'/>
<Option isEnabled='true' id='0c4663b3-4d9a-47af-b9a1-c8565d8112ed'/>
</ListTypeOptions>
</ConfigurationItem>
</ConfigurationItem>
</DictionaryConfiguration>";
using (var tempFolder = new TemporaryFolder("Temp"))
{
// Copy the Dictionary Configuration Schema to where the Dictionary Configuration Handler Strategy looks
var appsDir = Path.GetDirectoryName(Utilities.StripFilePrefix(Assembly.GetExecutingAssembly().CodeBase));
var xsdPath = Path.Combine(appsDir, "TestData", "Language Explorer", "Configuration", SharedConstants.DictConfigSchemaFilename);
var xsdPathInProj = Path.Combine(tempFolder.Path, SharedConstants.DictConfigSchemaFilename);
File.Copy(xsdPath, xsdPathInProj, true);
using (var sueRepo = new RepositoryWithFilesSetup("Sue", string.Format("root.{0}", SharedConstants.fwdictconfig), commonAncestor))
using (var randyRepo = RepositoryWithFilesSetup.CreateByCloning("Randy", sueRepo))
{
// By doing the clone before making Sue's changes, we get the common starting state in both repos.
sueRepo.WriteNewContentsToTestFile(sue);
sueRepo.AddAndCheckIn();
var mergeConflictsNotesFile = ChorusNotesMergeEventListener.GetChorusNotesFilePath(randyRepo.UserFile.Path);
Assert.IsFalse(File.Exists(mergeConflictsNotesFile), "ChorusNotes file should NOT have been in working set.");
randyRepo.WriteNewContentsToTestFile(randy);
randyRepo.CheckinAndPullAndMerge(sueRepo);
Assert.IsTrue(File.Exists(mergeConflictsNotesFile), "ChorusNotes file should have been in working set.");
var notesContents = File.ReadAllText(mergeConflictsNotesFile);
Assert.IsNotNullOrEmpty(notesContents);
Assert.That(notesContents, Is.StringContaining("Randy and Sue edited the same part of this data."));
Assert.That(notesContents, Is.StringContaining("The merger kept the change made by Randy."));
Assert.That(notesContents, Is.StringContaining("alphaUserId=\"Randy\""));
Assert.That(notesContents, Is.StringContaining("betaUserId=\"Sue\""));
// Make sure merged file has Randy's changes
var doc = XDocument.Load(randyRepo.UserFile.Path);
var options = doc.Root.Element("ConfigurationItem").Elements("ConfigurationItem").Last(/*Variant Forms*/)
.Element("ListTypeOptions").Elements("Option").ToList();
Assert.AreEqual(2, options.Count, "There should be two Variant Forms options");
Assert.AreEqual("b0000000-c40e-433e-80b5-31da08771344", options[0].Attribute("id").Value, "Options are out of order");
Assert.AreEqual("0c4663b3-4d9a-47af-b9a1-c8565d8112ed", options[1].Attribute("id").Value, "Options are out of order");
Assert.AreEqual("false", options[0].Attribute("isEnabled").Value, "First option should be disabled");
Assert.AreEqual("true", options[1].Attribute("isEnabled").Value, "Second option should be enabled");
// Make sure merged file does *not* have Sue's changes
options = doc.Root.Element("ConfigurationItem").Element("ConfigurationItem" /*Headword*/)
.Element("WritingSystemOptions").Elements("Option").ToList();
Assert.AreEqual(1, options.Count, "There should be only one WS Option");
Assert.AreEqual("vernacular", options[0].Attribute("id").Value, "should be default vernacular");
Assert.AreEqual("true", options[0].Attribute("isEnabled").Value, "should be enabled");
}
}
}
[Category("UnknownMonoIssue")] // It insists on failing on mono, for some reason.
public void EnsureRightPersonMadeChanges()
{
const string commonAncestor =
@"<?xml version='1.0' encoding='utf-8'?>
<Lexicon>
<header>
<LexDb guid='2d23f428-83a9-44ba-90f1-9e3264b5b982' >
<DateCreated val='2012-12-10 6:29:17.117' />
<DateModified val='2012-12-10 6:29:17.117' />
<IsHeadwordCitationForm val='True' />
<IsBodyInSeparateSubentry val='True' />
</LexDb>
</header>
<LexEntry guid='ffdc58c9-5cc3-469f-9118-9f18c0138d02'>
<DateCreated val='2012-12-10 6:29:17.117' />
<DateModified val='2012-12-10 6:29:17.117' />
<HomographNumber val='1' />
<DoNotUseForParsing val='True' />
<ExcludeAsHeadword val='True' />
<Senses>
<ownseq class='LexSense' guid='97129e67-e0a5-47c4-a875-05c2b2e1b7df'>
<Custom
name='Paradigm'>
<AStr
ws='qaa-x-ezpi'>
<Run
ws='qaa-x-ezpi'>saklo, yzaklo, rzaklo, wzaklo, nzaklo, -</Run>
</AStr>
</Custom>
</ownseq>
</Senses>
</LexEntry>
</Lexicon>";
const string sue =
@"<?xml version='1.0' encoding='utf-8'?>
<Lexicon>
<header>
<LexDb guid='2d23f428-83a9-44ba-90f1-9e3264b5b982' >
<DateCreated val='2012-12-10 6:29:17.117' />
<DateModified val='2012-12-10 6:29:17.117' />
<IsHeadwordCitationForm val='True' />
<IsBodyInSeparateSubentry val='True' />
</LexDb>
</header>
<LexEntry guid='ffdc58c9-5cc3-469f-9118-9f18c0138d02'>
<DateCreated val='2012-12-10 6:29:17.117' />
<DateModified val='2012-12-10 6:29:17.117' />
<HomographNumber val='1' />
<DoNotUseForParsing val='True' />
<ExcludeAsHeadword val='True' />
<Senses>
<ownseq class='LexSense' guid='97129e67-e0a5-47c4-a875-05c2b2e1b7df'>
<Custom
name='Paradigm'>
<AStr
ws='qaa-x-ezpi'>
<Run
ws='qaa-x-ezpi'>saglo, yzaglo, rzaglo, wzaglo, nzaglo, -</Run>
</AStr>
</Custom>
</ownseq>
</Senses>
</LexEntry>
</Lexicon>";
const string randy =
@"<?xml version='1.0' encoding='utf-8'?>
<Lexicon>
<header>
<LexDb guid='2d23f428-83a9-44ba-90f1-9e3264b5b982' >
</LexDb>
</header>
<LexEntry guid='ffdc58c9-5cc3-469f-9118-9f18c0138d02'>
<Senses>
<ownseq class='LexSense' guid='97129e67-e0a5-47c4-a875-05c2b2e1b7df'>
<Custom
name='Paradigm'>
<AStr
ws='zpi'>
<Run
ws='zpi'>saklo, yzaklo, rzaklo, wzaklo, nzaklo, -</Run>
</AStr>
</Custom>
</ownseq>
</Senses>
</LexEntry>
</Lexicon>";
var mdc = MetadataCache.TestOnlyNewCache;
using (var sueRepo = new RepositoryWithFilesSetup("Sue", string.Format("{0}_01.{1}", SharedConstants.Lexicon, SharedConstants.Lexdb), commonAncestor))
{
var sueProjPath = sueRepo.ProjectFolder.Path;
// Add model version number file.
var modelVersionPathname = Path.Combine(sueProjPath, SharedConstants.ModelVersionFilename);
File.WriteAllText(modelVersionPathname, AnnotationImages.kModelVersion);
sueRepo.Repository.TestOnlyAddSansCommit(modelVersionPathname);
// Add custom property data file.
var customPropsPathname = Path.Combine(sueProjPath, SharedConstants.CustomPropertiesFilename);
File.WriteAllText(customPropsPathname, CustomPropData);
sueRepo.Repository.TestOnlyAddSansCommit(customPropsPathname);
sueRepo.AddAndCheckIn();
using (var randyRepo = RepositoryWithFilesSetup.CreateByCloning("Randy", sueRepo))
{
// By doing the clone first, we get the common starting state in both repos.
sueRepo.WriteNewContentsToTestFile(sue);
sueRepo.AddAndCheckIn();
var mergeConflictsNotesFile = ChorusNotesMergeEventListener.GetChorusNotesFilePath(randyRepo.UserFile.Path);
Assert.IsFalse(File.Exists(mergeConflictsNotesFile), "ChorusNotes file should NOT have been in working set.");
randyRepo.WriteNewContentsToTestFile(randy);
randyRepo.CheckinAndPullAndMerge(sueRepo);
Assert.IsTrue(File.Exists(mergeConflictsNotesFile), "ChorusNotes file should have been in working set.");
var notesContents = File.ReadAllText(mergeConflictsNotesFile);
Assert.IsNotNullOrEmpty(notesContents);
Assert.That(notesContents, Is.StringContaining("Removed Vs Edited Element Conflict"));
Assert.That(notesContents, Is.StringContaining("Randy deleted this element"));
Assert.That(notesContents, Is.StringContaining("Sue edited it"));
Assert.That(notesContents, Is.StringContaining("The merger kept the change made by Sue."));
Assert.That(notesContents, Is.StringContaining("whoWon=\"Sue\""));
Assert.That(notesContents, Is.StringContaining("alphaUserId=\"Randy\""));
Assert.That(notesContents, Is.StringContaining("betaUserId=\"Sue\""));
// Make sure merged file has both alts.
var doc = XDocument.Load(randyRepo.UserFile.Path);
var customParadigmElement = doc.Root.Element("LexEntry").Element("Senses").Element("ownseq").Element("Custom");
var aStrElements = customParadigmElement.Elements("AStr").ToList();
Assert.AreEqual(2, aStrElements.Count);
var aStrZpi = aStrElements.FirstOrDefault(el => el.Attribute("ws").Value == "zpi");
Assert.IsNotNull(aStrZpi);
Assert.IsTrue(aStrZpi.Element("Run").Value == "saklo, yzaklo, rzaklo, wzaklo, nzaklo, -");
var aStrEzpi = aStrElements.FirstOrDefault(el => el.Attribute("ws").Value == "qaa-x-ezpi");
Assert.IsNotNull(aStrEzpi);
Assert.IsTrue(aStrEzpi.Element("Run").Value == "saglo, yzaglo, rzaglo, wzaglo, nzaglo, -");
}
}
}
public void Sync_RepeatedMergeFailure_WeAreLeftOnOurOwnWorkingDefault()
{
using (var bob = new RepositoryWithFilesSetup("bob", "test.txt", "hello"))
using (var sally = RepositoryWithFilesSetup.CreateByCloning("sally",bob))
using (new FailureSimulator("TextMerger-test.txt"))
{
bob.WriteNewContentsToTestFile("bobWasHere");
bob.AddAndCheckIn();
sally.WriteNewContentsToTestFile("sallyWasHere");
var result = sally.CheckinAndPullAndMerge(bob);
Assert.IsFalse(result.Succeeded);
//make sure we ended up on Sally's revision, even though Bob's are newer
var currentRevision = sally.Repository.GetRevisionWorkingSetIsBasedOn();
Assert.AreEqual("sally", sally.Repository.GetRevision(currentRevision.Number.Hash).UserId);
//Now do it again
bob.WriteNewContentsToTestFile("bobWasHere2");
bob.AddAndCheckIn();
Assert.AreEqual("bob", sally.Repository.GetTip().UserId,"if bob's not the tip, we're not testing the right situation");
result = sally.CheckinAndPullAndMerge(bob);
Assert.IsFalse(result.Succeeded);
result = sally.CheckinAndPullAndMerge(bob);
Assert.AreEqual("sally",sally.Repository.GetRevisionWorkingSetIsBasedOn().UserId);
//sally.ShowInTortoise();
}
File.Delete(Path.Combine(Path.GetTempPath(), "TextMerger-test.txt"));
}