Merge pull request #1 from JakeGinnivan/netcore

First pass at making coreclr compatible

Author: mwhelan

.gitignore

@@ -20,3 +20,4 @@ _NCrunch_TestStack.BDDfy/
 TestStack.BDDfy.sln.ide/
 src/packages/
 src/.vs/
+project.lock.json

src/NuGet.config

@@ -2,9 +2,8 @@
 
 <configuration>
   <packageSources>
-    <!-- add key="CoreCLR Xunit" value="https://www.myget.org/F/coreclr-xunit/api/v3/index.json" / -->
-    <!-- add key="AspNet CI Feed" value="https://www.myget.org/F/aspnetcirelease/api/v3/index.json" /> -->
     <add key="myget.org xunit" value="https://www.myget.org/F/xunit/api/v3/index.json" />
+    <add key="myget.org dotnet" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
     <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
 </configuration>

src/TestStack.BDDfy.Tests/Concurrency/ParallelRunnerScenario.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Linq;
+using System.Linq;
 using System.Threading.Tasks;
 using TestStack.BDDfy.Tests.Stories;
 using Xunit;
@@ -11,16 +10,9 @@ public class ParallelRunnerScenario
         [Fact]
         public async Task CanHandleMultipleThreadsExecutingBddfyConcurrently()
         {
-            try
-            {
-                await Task.WhenAll(
-                    Enumerable.Range(0, 100)
-                        .Select(_ => Task.Run(() => new DummyScenario().BDDfy<ParallelRunnerScenario>())));
-            }
-            catch (Exception e)
-            {
-                Assert.False(true, "Threw exception " + e);
-            }
+            await Task.WhenAll(
+                Enumerable.Range(0, 100)
+                    .Select(_ => Task.Run(() => new DummyScenario().BDDfy<ParallelRunnerScenario>())));
         }
     }
 }

src/TestStack.BDDfy.Tests/FodyWeavers.xml

@@ -1,13 +1,15 @@
 using System;
+using System.Linq.Expressions;
 using System.Reflection;
 
 namespace TestStack.BDDfy.Tests
 {
     public class Helpers
     {
-        public static MethodInfo GetMethodInfo(Action methodOn)
+        public static MethodInfo GetMethodInfo(Expression<Action> methodOn)
         {
-            return methodOn.Method;
+            var methodCallExp = (MethodCallExpression)methodOn.Body;
+            return methodCallExp.Method;
         }
     }
 }

src/TestStack.BDDfy.Tests/Helpers.cs

@@ -2,7 +2,6 @@
 using Shouldly;
 using TestStack.BDDfy.Configuration;
 using Xunit;
-using Xunit.Extensions;
 
 namespace TestStack.BDDfy.Tests
 {
@@ -78,8 +77,8 @@ public void ReportsIllegalExampleStepNames(string stepName, string expectedStepT
                 NetToString.Convert(stepName).ShouldBe(expectedStepTitle, Case.Sensitive);
             });
 
-            Assert.NotNull(exception);
-            Assert.IsType<ArgumentException>(exception);
+            exception.ShouldNotBeNull();
+            exception.ShouldBeOfType<ArgumentException>();
         }
     }
 }

src/TestStack.BDDfy.Tests/ModuleInitializer.cs

@@ -1,39 +1,22 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
+using Xunit;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-using ApprovalTests.Reporters;
-
-[assembly: AssemblyTitle("BDDfy.Tests")]
-[assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("BDDfy.Tests")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2011")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("TestStack.BDDfy.Tests")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("f9519669-4620-4abd-977a-c3cb2b54126a")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: Guid("1ceb33e8-3aac-4d02-a15b-5b75b5f662ad")]
 
-[assembly: UseReporter(typeof(DiffReporter))]
+// BDDfy tests overwrite static configuration for test, cannot use parallel testing
+[assembly: CollectionBehavior(DisableTestParallelization = true)]

src/TestStack.BDDfy.Tests/NetToStringTests.cs

@@ -1,4 +1,5 @@
-using NSubstitute;
+#if NSubstitute
+using NSubstitute;
 using TestStack.BDDfy.Reporters;
 using TestStack.BDDfy.Reporters.Diagnostics;
 using TestStack.BDDfy.Reporters.Serializers;
@@ -21,4 +22,5 @@ public void ShouldSerializeDiagnosticDataToSpecifiedFormat()
             serializer.Received().Serialize(Arg.Any<object>());
         }
     }
-}
+}
+#endif

src/TestStack.BDDfy.Tests/Properties/AssemblyInfo.cs

@@ -1,4 +1,5 @@
-using System;
+#if NSubstitute
+using System;
 using System.Collections.Generic;
 using NSubstitute;
 using TestStack.BDDfy.Reporters;
@@ -46,3 +47,4 @@ private DiagnosticsReporter CreateSut()
         }
     }
 }
+#endif