Added System.Ling.Expressions and System.Runtime.Extensions

mwhelan · mwhelan · commit a016947ab8d9 · 2016-06-12T14:23:52.000+01:00
diff --git a/src/TestStack.BDDfy/Reporters/Html/ClassicReportBuilder.cs b/src/TestStack.BDDfy/Reporters/Html/ClassicReportBuilder.cs
@@ -1,8 +1,8 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net;
 using System.Text;
-using System.Web;
 using TestStack.BDDfy.Configuration;
 
 namespace TestStack.BDDfy.Reporters.Html
@@ -187,15 +187,15 @@ private void AddScenarioWithExamples(ReportModel.Scenario[] scenarioGroup)
             var firstScenario = scenarioGroup.First();
             var scenarioResult = (Result)scenarioGroup.Max(s => (int)s.Result);
 
-            AddLine(string.Format("<div class='{0} canToggle scenarioTitle' data-toggle-target='{1}'>{2}{3}</div>", scenarioResult, firstScenario.Id, HttpUtility.HtmlEncode(firstScenario.Title), FormatTags(firstScenario.Tags)));
+            AddLine(string.Format("<div class='{0} canToggle scenarioTitle' data-toggle-target='{1}'>{2}{3}</div>", scenarioResult, firstScenario.Id, WebUtility.HtmlEncode(firstScenario.Title), FormatTags(firstScenario.Tags)));
 
             using (OpenTag(string.Format("<ul class='steps' id='{0}'>", firstScenario.Id), HtmlTag.ul))
             {
                 foreach (var step in firstScenario.Steps.Where(s => s.ShouldReport))
                 {
                     using (OpenTag(string.Format("<li class='step {0}'>", step.ExecutionOrder), HtmlTag.li))
                     {
-                        var titleLines = HttpUtility.HtmlEncode(step.Title)
+                        var titleLines = WebUtility.HtmlEncode(step.Title)
                             .Split(new[] { Environment.NewLine }, StringSplitOptions.None);
                         var title = titleLines[0];
 
@@ -247,7 +247,7 @@ private void AddExampleRow(ReportModel.Scenario scenario, Result scenarioResult)
             {
                 AddLine(string.Format("<td><Span class='{0}' style='margin-right:4px;' /></td>", scenario.Result));
                 foreach (var exampleValue in scenario.Example.Values)
-                    AddLine(string.Format("<td>{0}</td>", HttpUtility.HtmlEncode(exampleValue.GetValueAsString())));
+                    AddLine(string.Format("<td>{0}</td>", WebUtility.HtmlEncode(exampleValue.GetValueAsString())));
 
                 if (scenarioResult != Result.Failed)
                     return;
@@ -260,7 +260,7 @@ private void AddExampleRow(ReportModel.Scenario scenario, Result scenarioResult)
                         return;
 
                     var exceptionId = Configurator.IdGenerator.GetStepId();
-                    var encodedExceptionMessage = HttpUtility.HtmlEncode(failingStep.Exception.Message);
+                    var encodedExceptionMessage = WebUtility.HtmlEncode(failingStep.Exception.Message);
                     AddLine(string.Format("<span class='canToggle' data-toggle-target='{0}'>{1}</span>", exceptionId, encodedExceptionMessage));
                     using (OpenTag(string.Format("<div class='step' id='{0}'>", exceptionId), HtmlTag.div))
                     {
diff --git a/src/TestStack.BDDfy/Reporters/Html/MetroReportBuilder.cs b/src/TestStack.BDDfy/Reporters/Html/MetroReportBuilder.cs
@@ -1,8 +1,8 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net;
 using System.Text;
-using System.Web;
 using TestStack.BDDfy.Configuration;
 
 namespace TestStack.BDDfy.Reporters.Html
@@ -202,15 +202,15 @@ private void AddScenarioWithExamples(ReportModel.Scenario[] scenarioGroup)
             var firstScenario = scenarioGroup.First();
             var scenarioResult = (Result)scenarioGroup.Max(s => (int)s.Result);
 
-            AddLine(string.Format("<div class='{0} canToggle scenarioTitle' data-toggle-target='{1}'>{2}{3}</div>", scenarioResult, firstScenario.Id, HttpUtility.HtmlEncode(firstScenario.Title), FormatTags(firstScenario.Tags)));
+            AddLine(string.Format("<div class='{0} canToggle scenarioTitle' data-toggle-target='{1}'>{2}{3}</div>", scenarioResult, firstScenario.Id, WebUtility.HtmlEncode(firstScenario.Title), FormatTags(firstScenario.Tags)));
 
             using (OpenTag(string.Format("<ul class='steps' id='{0}'>", firstScenario.Id), HtmlTag.ul))
             {
                 foreach (var step in firstScenario.Steps.Where(s => s.ShouldReport))
                 {
                     using (OpenTag(string.Format("<li class='step {0}'>", step.ExecutionOrder), HtmlTag.li))
                     {
-                        var titleLines = HttpUtility.HtmlEncode(step.Title)
+                        var titleLines = WebUtility.HtmlEncode(step.Title)
                             .Split(new[] { Environment.NewLine }, StringSplitOptions.None);
                         var title = titleLines[0];
 
@@ -262,7 +262,7 @@ private void AddExampleRow(ReportModel.Scenario scenario, Result scenarioResult)
             {
                 AddLine(string.Format("<td><Span class='{0}' style='margin-right:4px;' /></td>", scenario.Result));
                 foreach (var exampleValue in scenario.Example.Values)
-                    AddLine(string.Format("<td>{0}</td>", HttpUtility.HtmlEncode(exampleValue.GetValueAsString())));
+                    AddLine(string.Format("<td>{0}</td>", WebUtility.HtmlEncode(exampleValue.GetValueAsString())));
 
                 if (scenarioResult != Result.Failed)
                     return;
@@ -275,7 +275,7 @@ private void AddExampleRow(ReportModel.Scenario scenario, Result scenarioResult)
                         return;
 
                     var exceptionId = Configurator.IdGenerator.GetStepId();
-                    var encodedExceptionMessage = HttpUtility.HtmlEncode(failingStep.Exception.Message);
+                    var encodedExceptionMessage = WebUtility.HtmlEncode(failingStep.Exception.Message);
                     AddLine(string.Format("<span class='canToggle' data-toggle-target='{0}'>{1}</span>", exceptionId, encodedExceptionMessage));
                     using (OpenTag(string.Format("<div class='step FailedException' id='{0}'>", exceptionId), HtmlTag.div))
                     {
@@ -287,7 +287,7 @@ private void AddExampleRow(ReportModel.Scenario scenario, Result scenarioResult)
 
         private void AddScenario(ReportModel.Scenario scenario)
         {
-            AddLine(string.Format("<div class='{0} canToggle scenarioTitle' data-toggle-target='{1}'>{2}{3}</div>", scenario.Result, scenario.Id, HttpUtility.HtmlEncode(scenario.Title), FormatTags(scenario.Tags)));
+            AddLine(string.Format("<div class='{0} canToggle scenarioTitle' data-toggle-target='{1}'>{2}{3}</div>", scenario.Result, scenario.Id, WebUtility.HtmlEncode(scenario.Title), FormatTags(scenario.Tags)));
 
             using (OpenTag(string.Format("<ul class='steps' id='{0}'>", scenario.Id), HtmlTag.ul))
             {
diff --git a/src/TestStack.BDDfy/Reporters/MarkDown/MarkDownReportBuilder.cs b/src/TestStack.BDDfy/Reporters/MarkDown/MarkDownReportBuilder.cs
@@ -1,8 +1,8 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net;
 using System.Text;
-using System.Web;
 
 namespace TestStack.BDDfy.Reporters.MarkDown
 {
@@ -41,7 +41,7 @@ public string CreateReport(FileReportModel model)
                         if (exampleScenario.Steps.Any())
                         {
                             foreach (var step in exampleScenario.Steps.Where(s => s.ShouldReport))
-                                report.AppendLine("  " + HttpUtility.HtmlEncode(step.Title) + "  ");
+                                report.AppendLine("  " + WebUtility.HtmlEncode(step.Title) + "  ");
                         }
 
                         report.AppendLine(); // separator
@@ -55,7 +55,7 @@ public string CreateReport(FileReportModel model)
                             report.AppendLine(string.Format("### {0}", scenario.Title));
 
                             foreach (var step in scenario.Steps.Where(s => s.ShouldReport))
-                                report.AppendLine("  " + HttpUtility.HtmlEncode(step.Title) + "  ");
+                                report.AppendLine("  " + WebUtility.HtmlEncode(step.Title) + "  ");
 
                             report.AppendLine(); // separator
                         }
@@ -121,7 +121,7 @@ private void WriteExamples(StringBuilder report, ReportModel.Scenario exampleSce
                 var failingStep = scenario.Steps.FirstOrDefault(s => s.Result == Result.Failed);
                 var error = failingStep == null
                     ? null
-                    : string.Format("Step: {0} failed with exception: {1}", HttpUtility.HtmlEncode(failingStep.Title), CreateExceptionMessage(failingStep));
+                    : string.Format("Step: {0} failed with exception: {1}", WebUtility.HtmlEncode(failingStep.Title), CreateExceptionMessage(failingStep));
 
                 addRow(scenario.Example.Values.Select(e => e.GetValueAsString()), scenario.Result.ToString(), error);
             }
diff --git a/src/TestStack.BDDfy/project.json b/src/TestStack.BDDfy/project.json
@@ -1,4 +1,4 @@
-﻿{
+{
     "version": "1.0.0-*",
     "packOptions": {
     },
@@ -20,7 +20,9 @@
         "netstandard1.5": {
           "imports": "dnxcore50",
           "dependencies": {
-            "NETStandard.Library": "1.5.0-rc2-24027"
+            "NETStandard.Library": "1.5.0-rc2-24027",
+            "System.Linq.Expressions": "4.0.11-rc2-24027",
+            "System.Runtime.Extensions":  "4.1.0-rc2-24027"
           }
         }
     }
diff --git a/src/TestStack.BDDfy/project.lock.json b/src/TestStack.BDDfy/project.lock.json

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Linq;`
	`4`	`+using System.Net;`
`4`	`5`	`using System.Text;`
`5`		`-using System.Web;`
`6`	`6`
`7`	`7`	`namespace TestStack.BDDfy.Reporters.MarkDown`
`8`	`8`	`{`
`@@ -41,7 +41,7 @@ public string CreateReport(FileReportModel model)`
`41`	`41`	`if (exampleScenario.Steps.Any())`
`42`	`42`	`{`
`43`	`43`	`foreach (var step in exampleScenario.Steps.Where(s => s.ShouldReport))`
`44`		`- report.AppendLine(" " + HttpUtility.HtmlEncode(step.Title) + " ");`
	`44`	`+ report.AppendLine(" " + WebUtility.HtmlEncode(step.Title) + " ");`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`report.AppendLine(); // separator`
`@@ -55,7 +55,7 @@ public string CreateReport(FileReportModel model)`
`55`	`55`	`report.AppendLine(string.Format("### {0}", scenario.Title));`
`56`	`56`
`57`	`57`	`foreach (var step in scenario.Steps.Where(s => s.ShouldReport))`
`58`		`- report.AppendLine(" " + HttpUtility.HtmlEncode(step.Title) + " ");`
	`58`	`+ report.AppendLine(" " + WebUtility.HtmlEncode(step.Title) + " ");`
`59`	`59`
`60`	`60`	`report.AppendLine(); // separator`
`61`	`61`	`}`
`@@ -121,7 +121,7 @@ private void WriteExamples(StringBuilder report, ReportModel.Scenario exampleSce`
`121`	`121`	`var failingStep = scenario.Steps.FirstOrDefault(s => s.Result == Result.Failed);`
`122`	`122`	`var error = failingStep == null`
`123`	`123`	`? null`
`124`		`- : string.Format("Step: {0} failed with exception: {1}", HttpUtility.HtmlEncode(failingStep.Title), CreateExceptionMessage(failingStep));`
	`124`	`+ : string.Format("Step: {0} failed with exception: {1}", WebUtility.HtmlEncode(failingStep.Title), CreateExceptionMessage(failingStep));`
`125`	`125`
`126`	`126`	`addRow(scenario.Example.Values.Select(e => e.GetValueAsString()), scenario.Result.ToString(), error);`
`127`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{`
	`1`	`+{`
`2`	`2`	`"version": "1.0.0-*",`
`3`	`3`	`"packOptions": {`
`4`	`4`	`},`
`@@ -20,7 +20,9 @@`
`20`	`20`	`"netstandard1.5": {`
`21`	`21`	`"imports": "dnxcore50",`
`22`	`22`	`"dependencies": {`
`23`		`- "NETStandard.Library": "1.5.0-rc2-24027"`
	`23`	`+ "NETStandard.Library": "1.5.0-rc2-24027",`
	`24`	`+ "System.Linq.Expressions": "4.0.11-rc2-24027",`
	`25`	`+ "System.Runtime.Extensions": "4.1.0-rc2-24027"`
`24`	`26`	`}`
`25`	`27`	`}`
`26`	`28`	`}`