From d7fb1bca2312f01cd5d8986568d818a6819ca820 Mon Sep 17 00:00:00 2001 From: Hasso Date: Mon, 6 Apr 2026 10:09:36 -0500 Subject: [PATCH 1/3] Revert "LT-21804: try ignoring new utility tests to avoid test failure" This reverts commit 6d235fab8c0e559fe4e8c076310bfebe6fa81aa3. --- .../DisambiguateInFLExDBTests/AndFileLoaderTest.cs | 2 +- .../DisambiguateInFLExDBTests/DisambiguateSegmentTest.cs | 4 ++-- .../DisambiguateInFLExDBTests/DisambiguateTest.cs | 6 ++---- .../DisambiguateInFLExDBTests/DisambiguateText2Test.cs | 2 +- .../DisambiguateInFLExDBTests/DisambiguateTextTest.cs | 2 +- .../DisambiguateInFLExDBTests/FLExDBExtractorTests.cs | 8 ++++---- .../DisambiguateInFLExDBTests/GuidConverterTest.cs | 2 +- .../DisambiguateInFLExDBTests/PcPatrInvokerTests.cs | 4 ++-- .../ToneParsInvokerOptionsTest.cs | 2 +- .../DisambiguateInFLExDBTests/ToneParsInvokerTests.cs | 4 ++-- .../PrepFLExDBDll/PrepFLExDBTests/PreparerTests.cs | 4 ++-- 11 files changed, 19 insertions(+), 21 deletions(-) diff --git a/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/AndFileLoaderTest.cs b/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/AndFileLoaderTest.cs index 0bdbe7a7bb..339590db13 100644 --- a/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/AndFileLoaderTest.cs +++ b/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/AndFileLoaderTest.cs @@ -20,7 +20,7 @@ class AndFileLoaderTest : DisambiguateTests { string AndFile { get; set; } - [Test, Ignore("Ignoring this test for timing purposes")] + [Test] public void LoadAndFileGuidsTest() { AndFile = Path.Combine(TestDataDir, "Text4LoadTest.and"); diff --git a/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/DisambiguateSegmentTest.cs b/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/DisambiguateSegmentTest.cs index 2e45db2ac4..48485f1513 100644 --- a/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/DisambiguateSegmentTest.cs +++ b/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/DisambiguateSegmentTest.cs @@ -51,7 +51,7 @@ public override void FixtureTeardown() /// /// Test disambiguating segment in a text /// - [Test, Ignore("Ignoring this test for timing purposes")] + [Test] public void DisambiguateSegmentTest() { //MyCache = Loader.CreateCache(); @@ -131,7 +131,7 @@ public void DisambiguateSegmentTest() /// /// Test disambiguating segment in a text /// - [Test, Ignore("Ignoring this test for timing purposes")] + [Test] public void EnsureMorphBundleHasSenseTest() { //MyCache = Loader.CreateCache(); diff --git a/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/DisambiguateTest.cs b/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/DisambiguateTest.cs index f25330804d..12956f5bb5 100644 --- a/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/DisambiguateTest.cs +++ b/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/DisambiguateTest.cs @@ -41,10 +41,8 @@ public override void FixtureSetup() if (String.IsNullOrEmpty(SavedTestFile)) SavedTestFile = kTestFileB4; - using (var temp = new IO.TempFile(Path.Combine(Path.GetTempPath(), TestFile), false)) - { - TempTestFile = temp.Path; - } + var temp = new IO.TempFile(Path.Combine(Path.GetTempPath(), TestFile), false); + TempTestFile = temp.Path; File.Copy(Path.Combine(TestDataDir, SavedTestFile), TempTestFile, true); ProjId = new ProjectId(TempTestFile); FwRegistryHelper.Initialize(); diff --git a/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/DisambiguateText2Test.cs b/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/DisambiguateText2Test.cs index 1fcfd3bd6a..f7c11f6d2d 100644 --- a/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/DisambiguateText2Test.cs +++ b/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/DisambiguateText2Test.cs @@ -46,7 +46,7 @@ public override void FixtureTeardown() /// /// Test disambiguating segment in a text /// - [Test, Ignore("Ignoring this test for timing purposes")] + [Test] public void DisambiguateText2Test() { //MyCache = Loader.CreateCache(); diff --git a/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/DisambiguateTextTest.cs b/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/DisambiguateTextTest.cs index 95611ac97a..fa57b3879e 100644 --- a/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/DisambiguateTextTest.cs +++ b/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/DisambiguateTextTest.cs @@ -59,7 +59,7 @@ public override void FixtureTeardown() /// /// Test disambiguating segment in a text /// - [Test, Ignore("Ignoring this test for timing purposes")] + [Test] public void DisambiguateTextTest() { //MyCache = Loader.CreateCache(); diff --git a/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/FLExDBExtractorTests.cs b/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/FLExDBExtractorTests.cs index 98e2b58035..01862ccb4c 100644 --- a/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/FLExDBExtractorTests.cs +++ b/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/FLExDBExtractorTests.cs @@ -52,7 +52,7 @@ public override void FixtureTeardown() /// /// Test extracting of lexicon. /// - [Test, Ignore("Ignoring this test for timing purposes")] + [Test] public void ExtractLexiconTest() { //MyCache = Loader.CreateCache(); @@ -66,7 +66,7 @@ public void ExtractLexiconTest() Assert.AreEqual(Lexicon, lexicon); } - [Test, Ignore("Ignoring this test for timing purposes")] + [Test] public void IsAttachedCliticTest() { //MyCache = Loader.CreateCache(); @@ -103,7 +103,7 @@ public void IsAttachedCliticTest() Assert.IsTrue(extractor.IsAttachedClitic(MoMorphTypeTags.kguidMorphProclitic, 2)); } - [Test, Ignore("Ignoring this test for timing purposes")] + [Test] public void GetOrComputeWordCategoryTest() { //MyCache = Loader.CreateCache(); @@ -160,7 +160,7 @@ public void GetOrComputeWordCategoryTest() /// /// Test extracting of text segments in ANA format. /// - [Test, Ignore("Ignoring this test for timing purposes")] + [Test] public void ExtractTextSegmentAsANATest() { //MyCache = Loader.CreateCache(); diff --git a/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/GuidConverterTest.cs b/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/GuidConverterTest.cs index e8b07ae544..b1e506dac7 100644 --- a/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/GuidConverterTest.cs +++ b/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/GuidConverterTest.cs @@ -15,7 +15,7 @@ namespace SIL.DisambiguateInFLExDBTest [TestFixture] class GuidConverterTest { - [Test, Ignore("Ignoring this test for timing purposes")] + [Test] public void ConvertGuidsTest() { string result = diff --git a/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/PcPatrInvokerTests.cs b/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/PcPatrInvokerTests.cs index 7a29e416d1..92d6508f2d 100644 --- a/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/PcPatrInvokerTests.cs +++ b/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/PcPatrInvokerTests.cs @@ -27,7 +27,7 @@ class PcPatrInvokerTests : DisambiguateTests /// /// Test extracting of lexicon. /// - [Test, Ignore("Ignoring this test for timing purposes")] + [Test] public void PcPatrInvokerTest() { // Check for the existence of the PcPatr executable @@ -128,7 +128,7 @@ string expectedValue /// /// Test extracting of lexicon. /// - [Test, Ignore("Ignoring this test for timing purposes")] + [Test] public void PcPatrInvokerFailureTest() { string grammarFile = "GrammarFail.grm"; diff --git a/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/ToneParsInvokerOptionsTest.cs b/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/ToneParsInvokerOptionsTest.cs index dfd04481cf..6e70db18e0 100644 --- a/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/ToneParsInvokerOptionsTest.cs +++ b/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/ToneParsInvokerOptionsTest.cs @@ -35,7 +35,7 @@ public void FixtureTeardown() /// /// Test setting of trace and verify options. /// - [Test, Ignore("Ignoring this test for timing purposes")] + [Test] public void TraceOptionsTest() { Assert.AreEqual("", ToneParsInvokerOptions.Instance.GetOptionsString()); diff --git a/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/ToneParsInvokerTests.cs b/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/ToneParsInvokerTests.cs index 62b336cf7a..67074e6d1a 100644 --- a/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/ToneParsInvokerTests.cs +++ b/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/ToneParsInvokerTests.cs @@ -66,7 +66,7 @@ public override void FixtureTeardown() /// /// Test conversion of log file using hvos to using glosses. /// - [Test, Ignore("Ignoring this test for timing purposes")] + [Test] public void ToneParsHvoToGlossInLogTest() { var logFileWithHvos = Path.Combine(TestDataDir, "ToneParsInvokerWithHvos.log"); @@ -83,7 +83,7 @@ public void ToneParsHvoToGlossInLogTest() /// /// Test invoking of XAmple followed by TonePars. /// - [Test, Ignore("Ignoring this test for timing purposes")] + [Test] public void ToneParsInvokerTest() { // Check for the existence of the TonePars executable diff --git a/Src/Utilities/pcpatrflex/PrepFLExDBDll/PrepFLExDBTests/PreparerTests.cs b/Src/Utilities/pcpatrflex/PrepFLExDBDll/PrepFLExDBTests/PreparerTests.cs index 9be1e2b99f..17ee218e77 100644 --- a/Src/Utilities/pcpatrflex/PrepFLExDBDll/PrepFLExDBTests/PreparerTests.cs +++ b/Src/Utilities/pcpatrflex/PrepFLExDBDll/PrepFLExDBTests/PreparerTests.cs @@ -62,7 +62,7 @@ public override void FixtureTeardown() /// /// Test we get the expected results for the preparer service. /// - [Test, Ignore("Ignoring this test for timing purposes")] + [Test] public void PCPATRPreparerTest() { FixtureSetup(); @@ -128,7 +128,7 @@ private void CheckMatch(ICmPossibilityList last, string sToMatch) /// /// Test we get the expected results for the preparer service. /// - [Test, Ignore("Ignoring this test for timing purposes")] + [Test] public void ToneParsPreparerTest() { FixtureSetup(); From 16d4667742d656e64d4dc7e91f2752d67f90e11a Mon Sep 17 00:00:00 2001 From: Hasso Date: Mon, 6 Apr 2026 10:12:28 -0500 Subject: [PATCH 2/3] Mark ToneParsInvokerTest as DesktopRequired --- .../DisambiguateInFLExDBTests/ToneParsInvokerTests.cs | 1 + Test.runsettings | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/ToneParsInvokerTests.cs b/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/ToneParsInvokerTests.cs index 67074e6d1a..898a185dee 100644 --- a/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/ToneParsInvokerTests.cs +++ b/Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/ToneParsInvokerTests.cs @@ -84,6 +84,7 @@ public void ToneParsHvoToGlossInLogTest() /// Test invoking of XAmple followed by TonePars. /// [Test] + [Category("DesktopRequired")] public void ToneParsInvokerTest() { // Check for the existence of the TonePars executable diff --git a/Test.runsettings b/Test.runsettings index b3de02a2b4..67453c8423 100644 --- a/Test.runsettings +++ b/Test.runsettings @@ -22,7 +22,7 @@ x64 net48 - + 900000