Port to Xunit

.gitignore

@@ -207,4 +207,5 @@ UpgradeLog*.htm
 .dotnet/
 
 # Tools
-tools/
+tools/
+src/.vs/

src/api/Reactive.Streams/Reactive.Streams.csproj

@@ -6,11 +6,10 @@
     <Copyright>CC0 1.0 Universal</Copyright>
     <VersionPrefix>1.0.3</VersionPrefix>
     <Authors>Reactive Streams</Authors>
-    <TargetFrameworks>netstandard1.0;net45</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
     <PackageTags>reactive;stream</PackageTags>
     <PackageProjectUrl>https://github.com/reactive-streams/reactive-streams-dotnet</PackageProjectUrl>
     <PackageLicenseUrl>http://creativecommons.org/publicdomain/zero/1.0/</PackageLicenseUrl>
-    <NetStandardImplicitPackageVersion>1.6.0</NetStandardImplicitPackageVersion>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 

src/examples/Reactive.Streams.Example.Unicast.Tests/AsyncSubscriberTest.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Threading;
-using NUnit.Framework;
+using Xunit;
+using Xunit.Abstractions;
 using Reactive.Streams.TCK;
 using Reactive.Streams.TCK.Support;
 
@@ -22,7 +23,7 @@ private sealed class Suscriber : AsyncSubscriber<int?>
             protected override bool WhenNext(int? element) => true;
         }
 
-        [Test]
+        [SkippableFact]
         public void TestAccumulation()
         {
             var i = new AtomicCounterLong(0);

src/examples/Reactive.Streams.Example.Unicast.Tests/IterablePublisherTest.cs

@@ -1,7 +1,8 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using NUnit.Framework;
+using Xunit;
+using Xunit.Abstractions;
 using Reactive.Streams.TCK;
 
 namespace Reactive.Streams.Example.Unicast.Tests

src/examples/Reactive.Streams.Example.Unicast.Tests/Reactive.Streams.Example.Unicast.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>Reactive.Streams.Example.Unicast.Tests</AssemblyName>
-    <TargetFrameworks>net45</TargetFrameworks>
+    <TargetFrameworks>net461</TargetFrameworks>
     <RuntimeIdentifier>win7-x64</RuntimeIdentifier>
   </PropertyGroup>
 
@@ -12,9 +12,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="NUnit" Version="3.7.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.utility" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

src/examples/Reactive.Streams.Example.Unicast.Tests/SyncSubscriberTest.cs

@@ -1,5 +1,6 @@
 using System;
-using NUnit.Framework;
+using Xunit;
+using Xunit.Abstractions;
 using Reactive.Streams.TCK;
 
 namespace Reactive.Streams.Example.Unicast.Tests

src/examples/Reactive.Streams.Example.Unicast.Tests/SyncSubscriberWhiteboxTest.cs

@@ -1,5 +1,6 @@
 using System;
-using NUnit.Framework;
+using Xunit;
+using Xunit.Abstractions;
 using Reactive.Streams.TCK;
 
 namespace Reactive.Streams.Example.Unicast.Tests

src/examples/Reactive.Streams.Example.Unicast.Tests/UnboundedIntegerIncrementPublisherTest.cs

@@ -1,7 +1,8 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using NUnit.Framework;
+using Xunit;
+using Xunit.Abstractions;
 using Reactive.Streams.TCK;
 
 namespace Reactive.Streams.Example.Unicast.Tests

src/examples/Reactive.Streams.Example.Unicast/Reactive.Streams.Example.Unicast.csproj

@@ -2,18 +2,14 @@
 
   <PropertyGroup>
     <AssemblyName>Reactive.Streams.Example.Unicast</AssemblyName>
-    <TargetFrameworks>netstandard1.4;net45</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\api\Reactive.Streams\Reactive.Streams.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.4' ">
-    <PackageReference Include="System.Diagnostics.TraceSource" Version="4.3.0" />
-  </ItemGroup>
-
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
   </PropertyGroup>

src/tck/README.md

@@ -44,7 +44,7 @@ Here is an example test method signature:
 
 ```C#
 // Verifies rule: https://github.com/reactive-streams/reactive-streams-jvm#1.1
-[Test]
+[SkippableFact]
 public void Required_spec101_subscriptionRequestMustResultInTheCorrectNumberOfProducedElements()
 {
     // ...
@@ -54,7 +54,7 @@ public void Required_spec101_subscriptionRequestMustResultInTheCorrectNumberOfPr
 #### Test types explained:
 
 ```C#
-[Test]
+[SkippableFact]
 public void Required_spec101_subscriptionRequestMustResultInTheCorrectNumberOfProducedElements()
 ```
 
@@ -63,15 +63,15 @@ The `Required_` means that this test case is a hard requirement, it covers a *MU
 
 
 ```C#
-[Test]
+[SkippableFact]
 public void Optional_spec104_mustSignalOnErrorWhenFails()
 ```
 
 <a name="type-optional"></a>
 The `Optional_` means that this test case is an optional requirement, it covers a *MAY* or *SHOULD* Rule of the Specification.
 
 ```C#
-[Test]
+[SkippableFact]
 public void Stochastic_spec103_mustSignalOnMethodsSequentially()
 ```
 
@@ -80,7 +80,7 @@ The `Stochastic_` means that the Rule is impossible or infeasible to determinist
 usually this means that this test case can yield false positives ("be green") even if for some case, the given implementation may violate the tested behaviour.
 
 ```C#
-[Test]
+[SkippableFact]
 public void Untested_spec106_mustConsiderSubscriptionCancelledAfterOnErrorOrOnCompleteHasBeenCalled()
 ```
 

src/tck/Reactive.Streams.TCK.Tests/EmptyLazyPublisherTest.cs

@@ -1,10 +1,10 @@
 using System.Linq;
-using NUnit.Framework;
+using Xunit;
+using Xunit.Abstractions;
 using Reactive.Streams.Example.Unicast;
 
 namespace Reactive.Streams.TCK.Tests
 {
-    [TestFixture]
     public class EmptyLazyPublisherTest : PublisherVerification<int>
     {
         public EmptyLazyPublisherTest() : base(new TestEnvironment())

src/tck/Reactive.Streams.TCK.Tests/IdentityProcessorVerificationDelegationTest.cs

@@ -3,7 +3,8 @@
 using System.Linq;
 using System.Reflection;
 using System.Text;
-using NUnit.Framework;
+using Xunit;
+using Xunit.Abstractions;
 
 namespace Reactive.Streams.TCK.Tests
 {
@@ -16,7 +17,7 @@ namespace Reactive.Streams.TCK.Tests
     /// </summary>
     public class IdentityProcessorVerificationDelegationTest
     {
-        [Test]
+        [SkippableFact]
         public void ShouldIncludeAllTestsFromPublisherVerification()
         {
             var processeroTests = GetTestNames(typeof(IdentityProcessorVerification<>)).ToList();
@@ -25,7 +26,7 @@ public void ShouldIncludeAllTestsFromPublisherVerification()
                 typeof(PublisherVerification<>), publisherTests);
         }
 
-        [Test]
+        [SkippableFact]
         public void ShouldIncludeAllTestsFromSubscriberVerification()
         {
             var processeroTests = GetTestNames(typeof(IdentityProcessorVerification<>)).ToList();
@@ -42,7 +43,7 @@ private static void AssertSuiteDelegatedAllTests(Type delegatingFrom, IList<stri
                 var message = new StringBuilder();
                 message.AppendLine($"Test '{targetTest}' in '{targetClass}' has not been properly delegated to in aggregate '{delegatingFrom}'!");
                 message.AppendLine($"You must delegate to this test from {delegatingFrom}, like this:");
-                message.AppendLine("[Test]");
+                message.AppendLine("[SkippableFact]");
                 message.AppendLine($"public void {targetTest} () => delegate{targetClass.Name}.{targetTest}();");
 
                 Assert.True(TestsInclude(allTests, targetTest), message.ToString());
@@ -54,7 +55,9 @@ private static bool TestsInclude(IList<string> processorTests, string targetTest
 
         private static IEnumerable<string> GetTestNames(Type type)
             => type.GetMethods()
-                .Where(m => m.GetCustomAttribute<TestAttribute>() != null)
+                .Where(m => 
+                    m.GetCustomAttribute<FactAttribute>() != null || 
+                    m.GetCustomAttribute<SkippableFactAttribute>() != null)
                 .Select(m => m.Name);
     }
 }

src/tck/Reactive.Streams.TCK.Tests/IdentityProcessorVerificationTest.cs

@@ -1,5 +1,6 @@
 using System;
-using NUnit.Framework;
+using Xunit;
+using Xunit.Abstractions;
 using Reactive.Streams.TCK.Tests.Support;
 
 namespace Reactive.Streams.TCK.Tests
@@ -11,7 +12,7 @@ public class IdentityProcessorVerificationTest : TCKVerificationSupport
         private static readonly long DefaultNoSignalsTimeoutMilliseconds =
             TestEnvironment.EnvironmentDefaultNoSignalsTimeoutMilliseconds();
 
-        [Test]
+        [SkippableFact]
         public void Required_spec104_mustCallOnErrorOnAllItsSubscribersIfItEncountersANonRecoverableError_shouldBeIgnored()
         {
             RequireTestSkip(() =>
@@ -98,7 +99,7 @@ public Spec104WaitingVerification(TestEnvironment environment, long publisherRef
             public override IPublisher<int> CreateFailedPublisher() => null;
         }
 
-        [Test]
+        [SkippableFact]
         public void Required_spec104_mustCallOnErrorOnAllItsSubscribersIfItEncountersANonRecoverableError_shouldFailWhileWaitingForOnError()
         {
             RequireTestFailure(() =>