Skip to content

Commit c23944e

Browse files
jasonleenaylorjasonleenaylor
committed
Fix missing disposes in tests
1 parent 82df3e5 commit c23944e

File tree

1 file changed

+28
-26
lines changed

1 file changed

+28
-26
lines changed

‎tests/SIL.LCModel.Tests/Application/ApplicationServices/XmlImportDataTests.cs‎

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public void ImportData1()
8282
TimeSpan span = new TimeSpan(dtLexOrig.Ticks - m_now.Ticks);
8383
Assert.LessOrEqual(span.TotalMinutes, 1.0); // should be only a second or two...
8484
XmlImportData xid = new XmlImportData(m_cache, true);
85-
using (var rdr = new StringReader(
85+
using(var rdr = new StringReader(
8686
"<FwDatabase>" +
8787
"<LangProject>" +
8888
"<LexDb>" +
@@ -273,7 +273,7 @@ public void ImportData1()
273273
public void ImportData2()
274274
{
275275
XmlImportData xid = new XmlImportData(m_cache, true);
276-
using (var rdr = new StringReader(
276+
using(var rdr = new StringReader(
277277
"<FwDatabase>" +
278278
"<LangProject>" +
279279
"<LexDb>" +
@@ -482,7 +482,7 @@ public void ImportData2()
482482
public void ImportData3()
483483
{
484484
XmlImportData xid = new XmlImportData(m_cache, true);
485-
using (var rdr = new StringReader(
485+
using(var rdr = new StringReader(
486486
"<FwDatabase>" + Environment.NewLine +
487487
"<LangProject>" + Environment.NewLine +
488488
"<LexDb>" + Environment.NewLine +
@@ -1289,7 +1289,7 @@ public void ImportData4()
12891289
Assert.LessOrEqual(span.TotalMinutes, 1.0);
12901290
// should be only a second or two
12911291
XmlImportData xid = new XmlImportData(m_cache, true);
1292-
using (var rdr = new StringReader(
1292+
using(var rdr = new StringReader(
12931293
"<LexDb>" + Environment.NewLine +
12941294
"<Entries>" + Environment.NewLine +
12951295
"<LexEntry>" + Environment.NewLine +
@@ -1385,7 +1385,7 @@ public void MergeCreatedDateWorks()
13851385
{
13861386
var xid = new XmlImportData(m_cache, false);
13871387
var createdDate = "2011-09-14 12:00:00.000";
1388-
using (var reader = new StringReader("<LexDb xmlns:msxsl=\"urn:schemas-microsoft-com:xslt\" xmlns:user=\"urn:my-scripts\">" +
1388+
using(var reader = new StringReader("<LexDb xmlns:msxsl=\"urn:schemas-microsoft-com:xslt\" xmlns:user=\"urn:my-scripts\">" +
13891389
"<Entries><LexEntry><LexemeForm><MoStemAllomorph><MorphType><Link ws=\"en\" name=\"stem\" /></MorphType>" +
13901390
"<Form><AUni ws=\"cub\">ãcʉriojomecacʉ</AUni></Form></MoStemAllomorph></LexemeForm><DateCreated>" +
13911391
$"<Time val=\"{createdDate}\" /></DateCreated><DialectLabels><Link ws=\"en\" abbr=\"C\" name=\"C\" />" +
@@ -1401,9 +1401,9 @@ public void MergeCreatedDateWorks()
14011401
"<Link ws=\"en\" name=\"stem\" /></MorphType><Form><AUni ws=\"cub\">ãcʉriojomecacʉ</AUni></Form></MoStemAllomorph>" +
14021402
"</LexemeForm><EntryRefs><LexEntryRef><VariantEntryTypes><Link ws=\"es\" name=\"Variante\" /></VariantEntryTypes>" +
14031403
"<ComponentLexemes><Link target=\"IID0E3\" /></ComponentLexemes></LexEntryRef></EntryRefs></LexEntry></Entries></LexDb>"))
1404+
using(var writer = new StringWriter(new StringBuilder()))
14041405
{
1405-
StringBuilder sbLog = new StringBuilder();
1406-
xid.ImportData(reader, new StringWriter(sbLog), null);
1406+
xid.ImportData(reader, writer, null);
14071407
var entries = m_cache.LangProject.LexDbOA.Entries.ToArray();
14081408
Assert.That(entries.Length, Is.EqualTo(2), "The lexicon should have 2 entries.");
14091409
Assert.That(entries[0].DateCreated, Is.EqualTo(entries[1].DateCreated));
@@ -1424,7 +1424,7 @@ public void ImportSequenceRelation()
14241424
Assert.LessOrEqual(span.TotalMinutes, 1.0);
14251425
// should be only a second or two
14261426
XmlImportData xid = new XmlImportData(m_cache, true);
1427-
using (var rdr = new StringReader(@"<LexDb xmlns:msxsl='urn:schemas-microsoft-com:xslt' xmlns:user='urn:my-scripts'>
1427+
using(var rdr = new StringReader(@"<LexDb xmlns:msxsl='urn:schemas-microsoft-com:xslt' xmlns:user='urn:my-scripts'>
14281428
<Entries>
14291429
<LexEntry>
14301430
<LexemeForm>
@@ -1521,6 +1521,7 @@ public void ImportSequenceRelation()
15211521
</LexEntry>
15221522
</Entries>
15231523
</LexDb>"))
1524+
using(var writer = new StringWriter(new StringBuilder()))
15241525
{
15251526
Assert.AreEqual(0, m_cache.LangProject.LexDbOA.Entries.Count(), "The lexicon starts out empty.");
15261527
Assert.AreEqual(0, m_cache.LangProject.AnthroListOA.PossibilitiesOS.Count);
@@ -1536,8 +1537,7 @@ public void ImportSequenceRelation()
15361537
calendar.Name.SetAnalysisDefaultWritingSystem("calendar");
15371538
calendar.MappingType = (int)LexRefTypeTags.MappingTypes.kmtSenseSequence;
15381539
});
1539-
StringBuilder sbLog = new StringBuilder();
1540-
xid.ImportData(rdr, new StringWriter(sbLog), null);
1540+
xid.ImportData(rdr, writer, null);
15411541
// The entries are Mon, Tue, Wed.
15421542
// The input specifies (three times!) that there is a Calendar relation Mon, Tue, Wed.
15431543
Assert.AreEqual(3, m_cache.LangProject.LexDbOA.Entries.Count());
@@ -1719,10 +1719,10 @@ public void ImportTreeRelation()
17191719
partWhole.Name.SetAnalysisDefaultWritingSystem("part");
17201720
partWhole.MappingType = (int)LexRefTypeTags.MappingTypes.kmtSenseTree;
17211721
});
1722-
StringBuilder sbLog = new StringBuilder();
1723-
using (var rdr = new StringReader(input))
1722+
using(var rdr = new StringReader(input))
1723+
using(var writer = new StringWriter(new StringBuilder()))
17241724
{
1725-
xid.ImportData(rdr, new StringWriter(sbLog), null);
1725+
xid.ImportData(rdr, writer, null);
17261726
}
17271727
// The entries are house, wall, wall, ceiling.
17281728
// The input specifies that there is a part-whole relation house, wall(2.2), ceiling.
@@ -2012,9 +2012,10 @@ public void ImportWithoutCreatingMissingLinkEntries()
20122012
});
20132013
var xid = new XmlImportData(m_cache, false); // false -> fCreateMissingLinks flag (this is the new default)
20142014
var sbLog = new StringBuilder();
2015-
using (var rdr = new StringReader(input))
2015+
using(var rdr = new StringReader(input))
2016+
using(var writer = new StringWriter(sbLog))
20162017
{
2017-
xid.ImportData(rdr, new StringWriter(sbLog), null);
2018+
xid.ImportData(rdr, writer, null);
20182019
}
20192020
// The main entries are test, aok, bok, cok and dok. The xslt has already created entries a and d.
20202021
// Because the fCreateMissingLinks flag is false, the import should NOT create entries b and c,
@@ -2076,9 +2077,10 @@ public void ImportWithoutCreatingMissingLinkEntries_ComponentLexemes()
20762077
});
20772078
var xid = new XmlImportData(m_cache, false); // false -> fCreateMissingLinks flag (this is the new default)
20782079
var sbLog = new StringBuilder();
2079-
using (var rdr = new StringReader(input))
2080+
using(var rdr = new StringReader(input))
2081+
using(var writer = new StringWriter(sbLog))
20802082
{
2081-
xid.ImportData(rdr, new StringWriter(sbLog), null);
2083+
xid.ImportData(rdr, writer, null);
20822084
}
20832085
// The main entries is 'a'. The xslt has already created it.
20842086
// Because the fCreateMissingLinks flag is false, the import should NOT create entry ab,
@@ -2108,7 +2110,7 @@ public void SubentryOrderRetained()
21082110
TimeSpan span = new TimeSpan(dtLexOrig.Ticks - m_now.Ticks);
21092111
Assert.LessOrEqual(span.TotalMinutes, 1.0); // should be only a second or two...
21102112
XmlImportData xid = new XmlImportData(m_cache, true);
2111-
using (var rdr = new StringReader(
2113+
using(var rdr = new StringReader(
21122114
"<LexDb xmlns:msxsl='urn:schemas-microsoft-com:xslt' xmlns:user='urn:my-scripts'>" +
21132115
" <Entries>" +
21142116
" <LexEntry id='IID0EK'>" +
@@ -2232,13 +2234,13 @@ public void SubentryOrderRetained()
22322234
" </LexEntry>" +
22332235
" </Entries>" +
22342236
"</LexDb>"))
2237+
using(var writer = new StringWriter(new StringBuilder()))
22352238
{
2236-
var sbLog = new StringBuilder();
22372239
Assert.AreEqual(0, m_cache.LangProject.LexDbOA.Entries.Count(), "The lexicon starts out empty.");
22382240
Assert.AreEqual(0, m_cache.LangProject.AnthroListOA.PossibilitiesOS.Count);
22392241
Assert.AreEqual(0, m_cache.LangProject.SemanticDomainListOA.PossibilitiesOS.Count);
22402242
Assert.AreEqual(0, m_cache.LangProject.PartsOfSpeechOA.PossibilitiesOS.Count);
2241-
xid.ImportData(rdr, new StringWriter(sbLog), null);
2243+
xid.ImportData(rdr, writer, null);
22422244
Assert.AreEqual(3, m_cache.LangProject.LexDbOA.Entries.Count(), "The import data had one entry.");
22432245
var entry = m_cache.LangProject.LexDbOA.Entries.ToArray()[0];
22442246
Assert.IsTrue(VirtualOrderingServices.HasVirtualOrdering(entry, "Subentries"));
@@ -2261,7 +2263,7 @@ public void NoSubentryVirtualOrderingOnSingleComplexForm()
22612263
TimeSpan span = new TimeSpan(dtLexOrig.Ticks - m_now.Ticks);
22622264
Assert.LessOrEqual(span.TotalMinutes, 1.0); // should be only a second or two...
22632265
XmlImportData xid = new XmlImportData(m_cache, true);
2264-
using (var rdr = new StringReader(
2266+
using(var rdr = new StringReader(
22652267
"<LexDb xmlns:msxsl='urn:schemas-microsoft-com:xslt' xmlns:user='urn:my-scripts'>" +
22662268
" <Entries>" +
22672269
" <LexEntry id='IID0EK'>" +
@@ -2340,13 +2342,13 @@ public void NoSubentryVirtualOrderingOnSingleComplexForm()
23402342
" </LexEntry>" +
23412343
" </Entries>" +
23422344
"</LexDb>"))
2345+
using(var writer = new StringWriter(new StringBuilder()))
23432346
{
2344-
var sbLog = new StringBuilder();
23452347
Assert.AreEqual(0, m_cache.LangProject.LexDbOA.Entries.Count(), "The lexicon starts out empty.");
23462348
Assert.AreEqual(0, m_cache.LangProject.AnthroListOA.PossibilitiesOS.Count);
23472349
Assert.AreEqual(0, m_cache.LangProject.SemanticDomainListOA.PossibilitiesOS.Count);
23482350
Assert.AreEqual(0, m_cache.LangProject.PartsOfSpeechOA.PossibilitiesOS.Count);
2349-
xid.ImportData(rdr, new StringWriter(sbLog), null);
2351+
xid.ImportData(rdr, writer, null);
23502352
Assert.AreEqual(2, m_cache.LangProject.LexDbOA.Entries.Count(), "The import data should have 2 entries.");
23512353
var entry = m_cache.LangProject.LexDbOA.Entries.ToArray()[0];
23522354
Assert.IsFalse(VirtualOrderingServices.HasVirtualOrdering(entry, "Subentries"), "No virtual ordering should have been created.");
@@ -2365,7 +2367,7 @@ public void NoSubentryVirtualOrderingOnSingleComplexForm()
23652367
public void ImportData_CmFolders_EnsureOnlyOneEachForMediaAndPictures()
23662368
{
23672369
var xid = new XmlImportData(m_cache, true);
2368-
using (var rdr = new StringReader(
2370+
using(var rdr = new StringReader(
23692371
"<LexDb>" + Environment.NewLine +
23702372
"<Entries>" + Environment.NewLine +
23712373
"<LexEntry>" + Environment.NewLine +
@@ -2450,16 +2452,16 @@ public void ImportData_CmFolders_EnsureOnlyOneEachForMediaAndPictures()
24502452
"</LexEntry>" + Environment.NewLine +
24512453
"</Entries>" + Environment.NewLine +
24522454
"</LexDb>" + Environment.NewLine))
2455+
using(var writer = new StringWriter(new StringBuilder()))
24532456
{
24542457
Assert.AreEqual(0, m_cache.LangProject.LexDbOA.Entries.Count(), "The lexicon starts out empty.");
24552458
Assert.AreEqual(0, m_cache.LangProject.PicturesOC.Count);
24562459
Assert.AreEqual(0, m_cache.LangProject.MediaOC.Count);
24572460
var folderRepo = m_cache.ServiceLocator.GetInstance<ICmFolderRepository>();
24582461
Assert.AreEqual(0, folderRepo.Count);
2459-
var sbLog = new StringBuilder();
24602462

24612463
// SUT
2462-
xid.ImportData(rdr, new StringWriter(sbLog), null);
2464+
xid.ImportData(rdr, writer, null);
24632465
Assert.AreEqual(2, m_cache.LangProject.LexDbOA.Entries.Count());
24642466
Assert.AreEqual(2, folderRepo.Count, "Should have created 2 CmFolders");
24652467
Assert.AreEqual(1, m_cache.LangProject.MediaOC.Count);

0 commit comments

Comments
 (0)