Merge pull request #12 from couven92/assert

Skip tests even if SkipException is coming from within Assert.Throws
AArnott · Oct 3, 2018 · c7f20ea · c7f20ea
2 parents 8eaf385 + aae5999
commit c7f20ea
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 11 deletions.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,10 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
     <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)..\obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
     <OutputPath>$(MSBuildThisFileDirectory)..\bin\$(MSBuildProjectName)\$(Configuration)\</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="1.6.25" PrivateAssets="all" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="2.2.13" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup>
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" />

diff --git a/src/Xunit.SkippableFact.Tests/SampleTests.cs b/src/Xunit.SkippableFact.Tests/SampleTests.cs
@@ -63,5 +63,15 @@ public void SkipTheoryMaybe(bool skip)
         {
             Skip.If(skip, "I was told to.");
         }
+
+        [SkippableFact]
+        public void SkipInsideAssertThrows()
+        {
+            Assert.Throws<Exception>(new Action(() =>
+            {
+                Skip.If(true, "Skip inside Assert.Throws");
+                throw new Exception();
+            }));
+        }
     }
 }
diff --git a/src/Xunit.SkippableFact.Tests/Xunit.SkippableFact.Tests.csproj b/src/Xunit.SkippableFact.Tests/Xunit.SkippableFact.Tests.csproj
@@ -12,9 +12,12 @@
     <ProjectReference Include="..\Xunit.SkippableFact\Xunit.SkippableFact.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Validation" Version="2.4.15" />
-    <PackageReference Include="xunit" Version="2.2.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
+    <PackageReference Include="Validation" Version="2.4.18" />
+    <PackageReference Include="xunit" Version="2.4.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/Xunit.SkippableFact/Sdk/SkippableTestMessageBus.cs b/src/Xunit.SkippableFact/Sdk/SkippableTestMessageBus.cs
@@ -58,14 +58,36 @@ public bool QueueMessage(IMessageSinkMessage message)
             if (failed != null)
             {
                 var outerException = failed.ExceptionTypes.FirstOrDefault();
-                if (outerException != null && Array.IndexOf(this.SkippingExceptionNames, outerException) >= 0)
+                bool skipTest = false;
+                string skipReason = null;
+                switch (outerException)
+                {
+                    case string _ when this.ShouldSkipException(outerException):
+                        skipTest = true;
+                        skipReason = failed.Messages.FirstOrDefault();
+                        break;
+                    case "Xunit.Sdk.ThrowsException" when failed.ExceptionTypes.Length > 1:
+                        outerException = failed.ExceptionTypes[1];
+                        if (this.ShouldSkipException(outerException))
+                        {
+                            skipTest = true;
+                            skipReason = (failed.Messages?.Length ?? 0) > 1 ? failed.Messages[1] : null;
+                        }
+
+                        break;
+                }
+
+                if (skipTest)
                 {
                     this.SkippedCount++;
-                    return this.inner.QueueMessage(new TestSkipped(failed.Test, failed.Messages[0]));
+                    return this.inner.QueueMessage(new TestSkipped(failed.Test, skipReason));
                 }
             }
 
             return this.inner.QueueMessage(message);
         }
+
+        private bool ShouldSkipException(string exceptionType) =>
+            Array.IndexOf(this.SkippingExceptionNames, exceptionType) >= 0;
     }
 }
diff --git a/src/Xunit.SkippableFact/Xunit.SkippableFact.csproj b/src/Xunit.SkippableFact/Xunit.SkippableFact.csproj
@@ -16,10 +16,10 @@
     <PackageTags>xunit testing skipping</PackageTags>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Validation" Version="2.4.15" PrivateAssets="compile;contentfiles;analyzers;build" />
+    <PackageReference Include="Validation" Version="2.4.18" PrivateAssets="compile;contentfiles;analyzers;build" />
     <PackageReference Include="xunit.extensibility.execution" Version="2.1.0" Condition=" '$(TargetFramework)' == 'net45' " />
-    <PackageReference Include="xunit.extensibility.execution" Version="2.2.0" Condition=" '$(TargetFramework)' != 'net45' " />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.0.0" PrivateAssets="all" />
+    <PackageReference Include="xunit.extensibility.execution" Version="2.4.0" Condition=" '$(TargetFramework)' != 'net45' " />
+    <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" />
     <PackageReference Update="NETStandard.Library" PrivateAssets="all" />
   </ItemGroup>
   <Target Name="SetNuSpecProperties" BeforeTargets="GenerateNuspec" DependsOnTargets="GetBuildVersion">