Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LT-22017: Fix between content for multirun strings & unit test #245

Merged
merged 2 commits into from
Jan 7, 2025
Merged

LT-22017: Fix between content for multirun strings & unit test #245

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8f92ca
Add unit test showing the failure in LT-22017
jasonleenaylor Jan 6, 2025
1896c0a
LT-22017: Suppress between content inside a multirun string
aror92 Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 75 additions & 0 deletions Src/xWorks/xWorksTests/LcmWordGeneratorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,6 +567,68 @@ public void GeneratePropertyData()
// The property after text 'AF4' was written.
Assert.True(outXml.Contains("AF4"));
}
[Test]
public void EmbeddedStylesHaveNoExtraSpace()
{
var translationNode = new ConfigurableDictionaryNode
{
FieldDescription = "Translation",
DictionaryNodeOptions = ConfiguredXHTMLGeneratorTests.GetWsOptionsForLanguages(new[] { "en", "fr" }),
Between = "AREYOUCRAZY"
};
var translationsNode = new ConfigurableDictionaryNode
{
FieldDescription = "TranslationsOC",
CSSClassNameOverride = "translationcontents",
Children = new List<ConfigurableDictionaryNode> { translationNode }
};
var exampleNode = new ConfigurableDictionaryNode
{
FieldDescription = "Example",
DictionaryNodeOptions = ConfiguredXHTMLGeneratorTests.GetWsOptionsForLanguages(new[] { "fr" })
};
var examplesNode = new ConfigurableDictionaryNode
{
FieldDescription = "ExamplesOS",
CSSClassNameOverride = "examplescontents",
Children = new List<ConfigurableDictionaryNode> { exampleNode, translationsNode },
Style = DictionaryNormal
};
var sensesNode = new ConfigurableDictionaryNode
{
FieldDescription = "SensesOS",
CSSClassNameOverride = "senses",
DictionaryNodeOptions = ConfiguredXHTMLGeneratorTests.GetSenseNodeOptions(),
Children = new List<ConfigurableDictionaryNode> { examplesNode },
Style = DictionaryNormal
};
var mainEntryNode = new ConfigurableDictionaryNode
{
FieldDescription = "LexEntry",
Children = new List<ConfigurableDictionaryNode> { sensesNode },
Style = DictionaryNormal
};
CssGeneratorTests.PopulateFieldsForTesting(mainEntryNode);

const string example = "Jones and Schneider";
const string translation = "Overwritten with actual SUT data";
var testEntry = ConfiguredXHTMLGeneratorTests.CreateInterestingLexEntry(Cache);
var wsEn = Cache.WritingSystemFactory.GetWsFromStr("en");
var wsFr = Cache.WritingSystemFactory.GetWsFromStr("fr");
ConfiguredXHTMLGeneratorTests.AddExampleToSense(testEntry.SensesOS[0], example, Cache, wsFr, wsEn, translation);
var enTrans = MakeMuliStyleTss(new [] { "don't", "go", "between" });
var frTrans = MakeMuliStyleTss(new[] { "aller", "entre", "eux" });
testEntry.SensesOS[0].ExamplesOS[0].TranslationsOC.First().Translation.set_String(wsEn, enTrans);
testEntry.SensesOS[0].ExamplesOS[0].TranslationsOC.First().Translation.set_String(wsFr, frTrans);

//SUT
var result = ConfiguredLcmGenerator.GenerateContentForEntry(testEntry, mainEntryNode, null, DefaultSettings, 0) as DocFragment;
var outXml = result.mainDocPart.RootElement.OuterXml;
// Verify that AREYOUCRAZY appears only once in the output.
var betweenCount = Regex.Matches(outXml, "AREYOUCRAZY").Count;

Assert.That(betweenCount, Is.EqualTo(1)); // The between should not separate runs in a single translation
}

[Test]
public void ReferenceParagraphDisplayNames()
Expand Down Expand Up @@ -853,5 +915,18 @@ public void GetFirstHeadwordStyle()

Assert.True(firstHeadwordStyle == "Headword[lang='en']");
}
private ITsString MakeMuliStyleTss(IEnumerable<string> content)
{
var wsEn = Cache.WritingSystemFactory.GetWsFromStr("en");
var tsFact = TsStringUtils.TsStrFactory;
var builder = tsFact.GetIncBldr();
var lastStyle = "Dictionary-Gloss-Char";
foreach (var runContent in content)
{
builder.AppendTsString(TsStringUtils.MakeString(runContent, wsEn, lastStyle));
lastStyle = lastStyle.Equals("Dictionary-Gloss-Char") ? "Dictionary-Normal-Char" : "Dictionary-Gloss-Char";
}
return builder.GetString();
}
}
}
Loading