Merge pull request #39 from AArnott/fixes

Remove dead `#if` regions
AArnott · Oct 1, 2024 · d10db23 · d10db23
2 parents 0a2cdce + 90c26e5
commit d10db23
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 24 deletions.
diff --git a/src/Xunit.SkippableFact/Sdk/SkippableFactDiscoverer.cs b/src/Xunit.SkippableFact/Sdk/SkippableFactDiscoverer.cs
@@ -50,10 +50,6 @@ public virtual IEnumerable<IXunitTestCase> Discover(ITestFrameworkDiscoveryOptio
     {
         Requires.NotNull(factAttribute, nameof(factAttribute));
         string[] skippingExceptionNames = GetSkippableExceptionNames(factAttribute);
-#if NET45
-        yield return new SkippableFactTestCase(skippingExceptionNames, this.diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), testMethod);
-#else
         yield return new SkippableFactTestCase(skippingExceptionNames, this.diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), discoveryOptions.MethodDisplayOptionsOrDefault(), testMethod);
-#endif
     }
 }
diff --git a/src/Xunit.SkippableFact/Sdk/SkippableFactTestCase.cs b/src/Xunit.SkippableFact/Sdk/SkippableFactTestCase.cs
@@ -36,17 +36,12 @@ public SkippableFactTestCase()
     /// <param name="testMethod">The test method.</param>
     /// <param name="testMethodArguments">The test method arguments.</param>
     public SkippableFactTestCase(string[] skippingExceptionNames, IMessageSink diagnosticMessageSink, TestMethodDisplay defaultMethodDisplay, ITestMethod testMethod, object[]? testMethodArguments = null)
-#if NET45
-            : base(diagnosticMessageSink, defaultMethodDisplay, testMethod, testMethodArguments)
-#else
             : base(diagnosticMessageSink, defaultMethodDisplay, TestMethodDisplayOptions.None, testMethod, testMethodArguments)
-#endif
     {
         Requires.NotNull(skippingExceptionNames, nameof(skippingExceptionNames));
         this.SkippingExceptionNames = skippingExceptionNames;
     }
 
-#if !NET45
     /// <summary>
     /// Initializes a new instance of the <see cref="SkippableFactTestCase"/> class.
     /// </summary>
@@ -62,7 +57,6 @@ public SkippableFactTestCase(string[] skippingExceptionNames, IMessageSink diagn
         Requires.NotNull(skippingExceptionNames, nameof(skippingExceptionNames));
         this.SkippingExceptionNames = skippingExceptionNames;
     }
-#endif
 
     /// <summary>
     /// Gets an array of full names to exception types that should be interpreted as a skip result.

diff --git a/src/Xunit.SkippableFact/Sdk/SkippableTheoryDiscoverer.cs b/src/Xunit.SkippableFact/Sdk/SkippableTheoryDiscoverer.cs
@@ -48,19 +48,11 @@ public virtual IEnumerable<IXunitTestCase> Discover(ITestFrameworkDiscoveryOptio
         {
             if (testCase is XunitTheoryTestCase)
             {
-#if NET45
-                yield return new SkippableTheoryTestCase(skippingExceptionNames, this.diagnosticMessageSink, defaultMethodDisplay, testCase.TestMethod);
-#else
                 yield return new SkippableTheoryTestCase(skippingExceptionNames, this.diagnosticMessageSink, defaultMethodDisplay, discoveryOptions.MethodDisplayOptionsOrDefault(), testCase.TestMethod);
-#endif
             }
             else
             {
-#if NET45
-                yield return new SkippableFactTestCase(skippingExceptionNames, this.diagnosticMessageSink, defaultMethodDisplay, testCase.TestMethod, testCase.TestMethodArguments);
-#else
                 yield return new SkippableFactTestCase(skippingExceptionNames, this.diagnosticMessageSink, defaultMethodDisplay, discoveryOptions.MethodDisplayOptionsOrDefault(), testCase.TestMethod, testCase.TestMethodArguments);
-#endif
             }
         }
     }

diff --git a/src/Xunit.SkippableFact/Sdk/SkippableTheoryTestCase.cs b/src/Xunit.SkippableFact/Sdk/SkippableTheoryTestCase.cs
@@ -35,17 +35,12 @@ public SkippableTheoryTestCase()
     /// <param name="defaultMethodDisplay">The preferred test name derivation.</param>
     /// <param name="testMethod">The test method.</param>
     public SkippableTheoryTestCase(string[] skippingExceptionNames, IMessageSink diagnosticMessageSink, TestMethodDisplay defaultMethodDisplay, ITestMethod testMethod)
-#if NET45
-            : base(diagnosticMessageSink, defaultMethodDisplay, testMethod)
-#else
             : base(diagnosticMessageSink, defaultMethodDisplay, TestMethodDisplayOptions.None, testMethod)
-#endif
     {
         Requires.NotNull(skippingExceptionNames, nameof(skippingExceptionNames));
         this.SkippingExceptionNames = skippingExceptionNames;
     }
 
-#if !NET45
     /// <summary>
     /// Initializes a new instance of the <see cref="SkippableTheoryTestCase"/> class.
     /// </summary>
@@ -60,7 +55,6 @@ public SkippableTheoryTestCase(string[] skippingExceptionNames, IMessageSink dia
         Requires.NotNull(skippingExceptionNames, nameof(skippingExceptionNames));
         this.SkippingExceptionNames = skippingExceptionNames;
     }
-#endif
 
     /// <summary>
     /// Gets an array of the full names of the exception types which should be interpreted as a skipped test.