Merge pull request #230 from mwhelan/netcore

Netcore

Author: JakeGinnivan

src/TestStack.BDDfy.Tests/Reporters/Diagnostics/DiagnosticsReportBuilderTests.cs

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

src/TestStack.BDDfy.Tests/Reporters/Diagnostics/DiagnosticsReporterTests.cs

@@ -1,5 +1,4 @@
-#if NSubstitute
-using System;
+using System;
 using System.Collections.Generic;
 using NSubstitute;
 using TestStack.BDDfy.Reporters;
@@ -46,5 +45,4 @@ private DiagnosticsReporter CreateSut()
             return new DiagnosticsReporter(_builder, _writer);
         }
     }
-}
-#endif
+}

src/TestStack.BDDfy.Tests/Reporters/Html/HtmlReporterTests.cs

@@ -1,5 +1,4 @@
-#if NSubstitute
-using System;
+using System;
 using System.Collections.Generic;
 using NSubstitute;
 using Shouldly;
@@ -99,5 +98,4 @@ public void ShouldNotLoadCustomJavascriptIfNoneExist()
             _sut.FileReader.DidNotReceive().Read(customJavascript);
         }
     }
-}
-#endif
+}

src/TestStack.BDDfy.Tests/Reporters/Html/TestableHtmlReporter.cs

@@ -1,4 +1,3 @@
-#if NSubstitute
 using NSubstitute;
 using TestStack.BDDfy.Reporters;
 using TestStack.BDDfy.Reporters.Html;
@@ -30,5 +29,4 @@ public static TestableHtmlReporter Create()
                 Substitute.For<IReportWriter>(), Substitute.For<IFileReader>());
         }
     }
-}
-#endif
+}

src/TestStack.BDDfy.Tests/Reporters/MarkDown/MarkDownReporterTests.cs

@@ -1,5 +1,4 @@
-#if NSubstitute
-using System;
+using System;
 using System.Collections.Generic;
 using NSubstitute;
 using TestStack.BDDfy.Reporters;
@@ -46,5 +45,4 @@ private MarkDownReporter CreateSut()
             return new MarkDownReporter(_builder, _writer);
         }
     }
-}
-#endif
+}

src/TestStack.BDDfy.Tests/Scanner/FluentScanner/DoesNotConflictWithnSubstitute.cs

@@ -1,5 +1,4 @@
-#if NSubstitute
-using NSubstitute;
+using NSubstitute;
 using Xunit;
 
 namespace TestStack.BDDfy.Tests.Scanner.FluentScanner
@@ -34,5 +33,4 @@ private void GivenSomeStuff()
             _subsitute = Substitute.For<ITestContext>();
         }
     }
-}
-#endif
+}

src/TestStack.BDDfy.Tests/project.json

@@ -1,13 +1,15 @@
 {
-    "dependencies": {
-        "Shouldly": "2.8.0",
-        "TestStack.BDDfy": {
-            "target": "project"
-        },
-        "Microsoft.NETCore.Platforms": "1.0.1",
-        "xunit.core": "2.2.0-beta2-build3300",
-        "dotnet-test-xunit": "2.2.0-preview2-build1029"
+  "dependencies": {
+    "Shouldly": "2.8.0",
+    "TestStack.BDDfy": {
+      "target": "project"
     },
+    "Microsoft.NETCore.Platforms": "1.0.1",
+    "NSubstitute": "2.0.0-alpha003",
+    "System.Diagnostics.TraceSource": "4.0.0",
+    "xunit.core": "2.2.0-beta2-build3300",
+    "dotnet-test-xunit": "2.2.0-preview2-build1029"
+  },
     "frameworks": {
         "netcoreapp1.0": {
             "dependencies": {
@@ -23,14 +25,12 @@
             ]
         },
         "net46": {
-            "dependencies": {
-                "NSubstitute": "1.10.0"
-            },
+          "dependencies": {
+          },
             "buildOptions": {
                 "define": [
                     "Approvals",
-                    "Culture",
-                    "NSubstitute"
+                    "Culture"
                 ]
             }
         }

src/TestStack.BDDfy/Reporters/Diagnostics/DiagnosticsReport.cs

@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace TestStack.BDDfy.Reporters.Diagnostics
+{
+    public class DiagnosticsReport
+    {
+        public IList<StoryDiagnostic> Stories { get; set; }
+    }
+}

src/TestStack.BDDfy/Reporters/Diagnostics/DiagnosticsReportBuilder.cs

@@ -18,7 +18,7 @@ public DiagnosticsReportBuilder(ISerializer serializer)
         public string CreateReport(FileReportModel model)
         {
             var graph = GetDiagnosticData(model);
-            var rootObject = new { Stories = graph };
+            var rootObject = new DiagnosticsReport { Stories = graph };
             return _serializer.Serialize(rootObject);
         }
 

src/TestStack.BDDfy/Reporters/Serializers/JsonSerializer.cs

@@ -1,35 +1,22 @@
+using System.IO;
+using System.Runtime.Serialization.Json;
+using System.Text;
+
 namespace TestStack.BDDfy.Reporters.Serializers
 {
-#if NET40
-    using System.Web.Script.Serialization;
-
     public class JsonSerializer : ISerializer
     {
         public string Serialize(object obj)
         {
-            var serializer = new JavaScriptSerializer();
-            string json = serializer.Serialize(obj);
+            var serializer = new DataContractJsonSerializer(obj.GetType());
+            string json;
+            using (var stream = new MemoryStream())
+            {
+                serializer.WriteObject(stream, obj);
+                json = Encoding.UTF8.GetString(stream.ToArray());
+            }
 
             return new JsonFormatter(json).Format();
         }
     }
-
-#else
-    using Newtonsoft.Json;
-
-    public class JsonSerializer : ISerializer
-    {
-        public string Serialize(object obj)
-        {
-            return JsonConvert.SerializeObject(obj, Formatting.Indented,
-                new JsonSerializerSettings
-                {
-                    NullValueHandling = NullValueHandling.Ignore,
-                    ReferenceLoopHandling = ReferenceLoopHandling.Ignore
-                });
-        }
-    }
-
-#endif
-
 }