From df679c4e71f6bef20aad49b05acaea1c03c3d109 Mon Sep 17 00:00:00 2001 From: Bert Date: Thu, 7 Nov 2024 15:44:58 +0100 Subject: [PATCH 1/3] enable tests "Hang due to System.Console.ReadKey()" --- .../Coverage/CoverageTests.DoesNotReturn.cs | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/test/coverlet.core.tests/Coverage/CoverageTests.DoesNotReturn.cs b/test/coverlet.core.tests/Coverage/CoverageTests.DoesNotReturn.cs index d4b371e4d..d0a391ca5 100644 --- a/test/coverlet.core.tests/Coverage/CoverageTests.DoesNotReturn.cs +++ b/test/coverlet.core.tests/Coverage/CoverageTests.DoesNotReturn.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; using Coverlet.Core.Samples.Tests; using Coverlet.Tests.Utils; +using Coverlet.Tests.Xunit.Extensions; using Xunit; namespace Coverlet.Core.Tests @@ -45,7 +46,9 @@ public void NoBranches_DoesNotReturnAttribute_InstrumentsCorrect() } } - [Fact(Skip = "Hang due to System.Console.ReadKey()")] + [Fact] + [SkipOnOS(OS.MacOS, "Hang due to System.Console.ReadKey()")] + [SkipOnOS(OS.Linux, "Hang due to System.Console.ReadKey()")] public void If_DoesNotReturnAttribute_InstrumentsCorrect() { string path = Path.GetTempFileName(); @@ -77,7 +80,9 @@ public void If_DoesNotReturnAttribute_InstrumentsCorrect() } } - [Fact(Skip = "Hang due to System.Console.ReadKey()")] + [Fact] + [SkipOnOS(OS.MacOS, "Hang due to System.Console.ReadKey()")] + [SkipOnOS(OS.Linux, "Hang due to System.Console.ReadKey()")] public void Switch_DoesNotReturnAttribute_InstrumentsCorrect() { string path = Path.GetTempFileName(); @@ -109,7 +114,9 @@ public void Switch_DoesNotReturnAttribute_InstrumentsCorrect() } } - [Fact(Skip = "Hang due to System.Console.ReadKey()")] + [Fact] + [SkipOnOS(OS.MacOS, "Hang due to System.Console.ReadKey()")] + [SkipOnOS(OS.Linux, "Hang due to System.Console.ReadKey()")] public void Subtle_DoesNotReturnAttribute_InstrumentsCorrect() { string path = Path.GetTempFileName(); @@ -141,7 +148,9 @@ public void Subtle_DoesNotReturnAttribute_InstrumentsCorrect() } } - [Fact(Skip = "Hang due to System.Console.ReadKey()")] + [Fact] + [SkipOnOS(OS.MacOS, "Hang due to System.Console.ReadKey()")] + [SkipOnOS(OS.Linux, "Hang due to System.Console.ReadKey()")] public void UnreachableBranch_DoesNotReturnAttribute_InstrumentsCorrect() { string path = Path.GetTempFileName(); From df0b1cbcc707c34d0286818413a95bd1b105b1fa Mon Sep 17 00:00:00 2001 From: Bert Date: Fri, 8 Nov 2024 09:42:49 +0100 Subject: [PATCH 2/3] modify AssertInstrumentLines --- .../Coverage/CoverageTests.DoesNotReturn.cs | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/test/coverlet.core.tests/Coverage/CoverageTests.DoesNotReturn.cs b/test/coverlet.core.tests/Coverage/CoverageTests.DoesNotReturn.cs index d0a391ca5..cb419493f 100644 --- a/test/coverlet.core.tests/Coverage/CoverageTests.DoesNotReturn.cs +++ b/test/coverlet.core.tests/Coverage/CoverageTests.DoesNotReturn.cs @@ -46,9 +46,10 @@ public void NoBranches_DoesNotReturnAttribute_InstrumentsCorrect() } } - [Fact] + [SkipOnOS(OS.MacOS, "Hang due to System.Console.ReadKey()")] [SkipOnOS(OS.Linux, "Hang due to System.Console.ReadKey()")] + [Fact] public void If_DoesNotReturnAttribute_InstrumentsCorrect() { string path = Path.GetTempFileName(); @@ -71,8 +72,8 @@ public void If_DoesNotReturnAttribute_InstrumentsCorrect() CoverageResult result = TestInstrumentationHelper.GetCoverageResult(path); result.Document("Instrumentation.DoesNotReturn.cs") - .AssertInstrumentLines(BuildConfiguration.Debug, 7, 8, 19, 20, 22, 23, 24, 25, 29, 30) - .AssertNonInstrumentedLines(BuildConfiguration.Debug, 26, 27); + .AssertInstrumentLines(BuildConfiguration.Debug, 7, 8, 19, 20, 22, 23, 24, 25, 29, 30, 26, 27); + //.AssertNonInstrumentedLines(BuildConfiguration.Debug, 26, 27); } finally { @@ -105,8 +106,8 @@ public void Switch_DoesNotReturnAttribute_InstrumentsCorrect() CoverageResult result = TestInstrumentationHelper.GetCoverageResult(path); result.Document("Instrumentation.DoesNotReturn.cs") - .AssertInstrumentLines(BuildConfiguration.Debug, 7, 8, 33, 34, 36, 39, 40, 44, 45, 49, 50, 52, 53, 55, 56, 58, 59, 61, 62, 64, 65, 68, 69) - .AssertNonInstrumentedLines(BuildConfiguration.Debug, 41, 42); + .AssertInstrumentLines(BuildConfiguration.Debug, 7, 8, 33, 34, 36, 39, 40, 44, 45, 49, 50, 52, 53, 55, 56, 58, 59, 61, 62, 64, 65, 68, 69, 41, 42); + //.AssertNonInstrumentedLines(BuildConfiguration.Debug, 41, 42); } finally { @@ -139,8 +140,8 @@ public void Subtle_DoesNotReturnAttribute_InstrumentsCorrect() CoverageResult result = TestInstrumentationHelper.GetCoverageResult(path); result.Document("Instrumentation.DoesNotReturn.cs") - .AssertInstrumentLines(BuildConfiguration.Debug, 7, 8, 72, 73, 75, 78, 82, 83, 86, 87, 91, 92, 95, 101, 102, 103) - .AssertNonInstrumentedLines(BuildConfiguration.Debug, 79, 80, 88, 96, 98, 99); + .AssertInstrumentLines(BuildConfiguration.Debug, 7, 8, 72, 73, 75, 78, 82, 83, 86, 87, 91, 92, 95, 101, 102, 103, 79, 80, 88, 96, 98, 99); + //.AssertNonInstrumentedLines(BuildConfiguration.Debug, 79, 80, 88, 96, 98, 99); } finally { @@ -173,8 +174,8 @@ public void UnreachableBranch_DoesNotReturnAttribute_InstrumentsCorrect() CoverageResult result = TestInstrumentationHelper.GetCoverageResult(path); result.Document("Instrumentation.DoesNotReturn.cs") - .AssertInstrumentLines(BuildConfiguration.Debug, 7, 8, 106, 107, 108) - .AssertNonInstrumentedLines(BuildConfiguration.Debug, 110, 111, 112, 113, 114); + .AssertInstrumentLines(BuildConfiguration.Debug, 7, 8, 106, 107, 108, 110, 111, 112, 113, 114); + //.AssertNonInstrumentedLines(BuildConfiguration.Debug, 110, 111, 112, 113, 114); } finally { From fb540839db64d681756d799823586a731b76cb4b Mon Sep 17 00:00:00 2001 From: Bert Date: Fri, 8 Nov 2024 09:58:07 +0100 Subject: [PATCH 3/3] remove attributes and comments --- .../Coverage/CoverageTests.DoesNotReturn.cs | 18 ++---------------- .../Samples/Instrumentation.DoesNotReturn.cs | 6 +++--- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/test/coverlet.core.tests/Coverage/CoverageTests.DoesNotReturn.cs b/test/coverlet.core.tests/Coverage/CoverageTests.DoesNotReturn.cs index cb419493f..a0c391d75 100644 --- a/test/coverlet.core.tests/Coverage/CoverageTests.DoesNotReturn.cs +++ b/test/coverlet.core.tests/Coverage/CoverageTests.DoesNotReturn.cs @@ -6,7 +6,6 @@ using System.Threading.Tasks; using Coverlet.Core.Samples.Tests; using Coverlet.Tests.Utils; -using Coverlet.Tests.Xunit.Extensions; using Xunit; namespace Coverlet.Core.Tests @@ -46,9 +45,6 @@ public void NoBranches_DoesNotReturnAttribute_InstrumentsCorrect() } } - - [SkipOnOS(OS.MacOS, "Hang due to System.Console.ReadKey()")] - [SkipOnOS(OS.Linux, "Hang due to System.Console.ReadKey()")] [Fact] public void If_DoesNotReturnAttribute_InstrumentsCorrect() { @@ -73,7 +69,6 @@ public void If_DoesNotReturnAttribute_InstrumentsCorrect() result.Document("Instrumentation.DoesNotReturn.cs") .AssertInstrumentLines(BuildConfiguration.Debug, 7, 8, 19, 20, 22, 23, 24, 25, 29, 30, 26, 27); - //.AssertNonInstrumentedLines(BuildConfiguration.Debug, 26, 27); } finally { @@ -82,8 +77,6 @@ public void If_DoesNotReturnAttribute_InstrumentsCorrect() } [Fact] - [SkipOnOS(OS.MacOS, "Hang due to System.Console.ReadKey()")] - [SkipOnOS(OS.Linux, "Hang due to System.Console.ReadKey()")] public void Switch_DoesNotReturnAttribute_InstrumentsCorrect() { string path = Path.GetTempFileName(); @@ -107,7 +100,6 @@ public void Switch_DoesNotReturnAttribute_InstrumentsCorrect() result.Document("Instrumentation.DoesNotReturn.cs") .AssertInstrumentLines(BuildConfiguration.Debug, 7, 8, 33, 34, 36, 39, 40, 44, 45, 49, 50, 52, 53, 55, 56, 58, 59, 61, 62, 64, 65, 68, 69, 41, 42); - //.AssertNonInstrumentedLines(BuildConfiguration.Debug, 41, 42); } finally { @@ -116,8 +108,6 @@ public void Switch_DoesNotReturnAttribute_InstrumentsCorrect() } [Fact] - [SkipOnOS(OS.MacOS, "Hang due to System.Console.ReadKey()")] - [SkipOnOS(OS.Linux, "Hang due to System.Console.ReadKey()")] public void Subtle_DoesNotReturnAttribute_InstrumentsCorrect() { string path = Path.GetTempFileName(); @@ -141,7 +131,6 @@ public void Subtle_DoesNotReturnAttribute_InstrumentsCorrect() result.Document("Instrumentation.DoesNotReturn.cs") .AssertInstrumentLines(BuildConfiguration.Debug, 7, 8, 72, 73, 75, 78, 82, 83, 86, 87, 91, 92, 95, 101, 102, 103, 79, 80, 88, 96, 98, 99); - //.AssertNonInstrumentedLines(BuildConfiguration.Debug, 79, 80, 88, 96, 98, 99); } finally { @@ -150,8 +139,6 @@ public void Subtle_DoesNotReturnAttribute_InstrumentsCorrect() } [Fact] - [SkipOnOS(OS.MacOS, "Hang due to System.Console.ReadKey()")] - [SkipOnOS(OS.Linux, "Hang due to System.Console.ReadKey()")] public void UnreachableBranch_DoesNotReturnAttribute_InstrumentsCorrect() { string path = Path.GetTempFileName(); @@ -175,7 +162,6 @@ public void UnreachableBranch_DoesNotReturnAttribute_InstrumentsCorrect() result.Document("Instrumentation.DoesNotReturn.cs") .AssertInstrumentLines(BuildConfiguration.Debug, 7, 8, 106, 107, 108, 110, 111, 112, 113, 114); - //.AssertNonInstrumentedLines(BuildConfiguration.Debug, 110, 111, 112, 113, 114); } finally { @@ -280,7 +266,7 @@ public void WithLeave_DoesNotReturnAttribute_InstrumentsCorrect() } [Fact] - public void FiltersAndFinallies_DoesNotReturnAttribute_InstrumentsCorrect() + public void FiltersAndFinally_DoesNotReturnAttribute_InstrumentsCorrect() { string path = Path.GetTempFileName(); try @@ -289,7 +275,7 @@ public void FiltersAndFinallies_DoesNotReturnAttribute_InstrumentsCorrect() { CoveragePrepareResult coveragePrepareResult = await TestInstrumentationHelper.Run(instance => { - try { instance.FiltersAndFinallies(); } + try { instance.FiltersAndFinally(); } catch (Exception) { } return Task.CompletedTask; diff --git a/test/coverlet.core.tests/Samples/Instrumentation.DoesNotReturn.cs b/test/coverlet.core.tests/Samples/Instrumentation.DoesNotReturn.cs index 2fd37bff7..5c4159214 100644 --- a/test/coverlet.core.tests/Samples/Instrumentation.DoesNotReturn.cs +++ b/test/coverlet.core.tests/Samples/Instrumentation.DoesNotReturn.cs @@ -85,7 +85,7 @@ public void Subtle() case 'C': System.Console.WriteLine("In-Constant-3"); Throws(); - goto alwayUnreachable; // unreachable + goto alwaysUnreachable; // unreachable case 'D': System.Console.WriteLine("In-Constant-4"); @@ -95,7 +95,7 @@ public void Subtle() Throws(); System.Console.WriteLine("Out-Constant-1"); // unreachable - alwayUnreachable: // unreachable + alwaysUnreachable: // unreachable System.Console.WriteLine("Out-Constant-2"); // unreachable subtlyReachable: @@ -167,7 +167,7 @@ public void WithLeave() System.Console.WriteLine("Constant-2"); } - public void FiltersAndFinallies() + public void FiltersAndFinally() { try {