Merge branch 'master' into release

picklesdoc · Nov 21, 2015 · eec0dd0 · eec0dd0
2 parents 9970718 + eff29c0
commit eec0dd0
Show file tree

Hide file tree

Showing 9 changed files with 363 additions and 8 deletions.
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
diff --git a/build.bat b/build.bat
@@ -1,5 +1,5 @@
 @echo off
-set "picklesVersion=2.0.1"
+set "picklesVersion=2.0.2"
 
 cls
 

diff --git a/src/Pickles/Pickles.BaseDhtmlFiles/css/styles.css b/src/Pickles/Pickles.BaseDhtmlFiles/css/styles.css
@@ -164,7 +164,7 @@ li.step {
 }
 
 .table {
-    width: 0;
+    width: auto;
     max-width: 90%;
 }
 

diff --git a/src/Pickles/Pickles.Test/Pickles.Test.csproj b/src/Pickles/Pickles.Test/Pickles.Test.csproj
@@ -121,6 +121,7 @@
     <Compile Include="TestFrameworks\WhenParsingMultipleMsTestTestResultsFiles.cs" />
     <Compile Include="TestFrameworks\WhenParsingMultipleNUnitResultsFilesForASingleFeature.cs" />
     <Compile Include="TestFrameworks\WhenParsingMultipleTestResultsTests.cs" />
+    <Compile Include="TestFrameworks\WhenParsingProblematicScenarioOutlineResults.cs" />
     <Compile Include="TestFrameworks\WhenParsingSpecRunTestResultsFile.cs" />
     <Compile Include="DirectoryCrawlers\FolderDirectoryTreeNodeTests.cs" />
     <Compile Include="DocumentationBuilders\DHTML\WhenDoingSomeIntegrationTests.cs" />
@@ -194,6 +195,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="TestFrameworks\results-problem-with-outline-results-nunit.xml" />
     <EmbeddedResource Include="TestFrameworks\results-example-xunit2.xml" />
     <EmbeddedResource Include="TestFrameworks\results-example-nunit - Run 1.xml" />
     <EmbeddedResource Include="TestFrameworks\results-example-nunit - Run 2.xml" />

diff --git a/src/Pickles/Pickles.Test/TestFrameworks/WhenParsingProblematicScenarioOutlineResults.cs b/src/Pickles/Pickles.Test/TestFrameworks/WhenParsingProblematicScenarioOutlineResults.cs
@@ -0,0 +1,55 @@
+//  --------------------------------------------------------------------------------------------------------------------
+//  <copyright file="WhenParsingProblematicScenarioOutlineResults.cs" company="PicklesDoc">
+//  Copyright 2011 Jeffrey Cameron
+//  Copyright 2012-present PicklesDoc team and community contributors
+//
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//  </copyright>
+//  --------------------------------------------------------------------------------------------------------------------
+
+using NFluent;
+
+using NUnit.Framework;
+
+using PicklesDoc.Pickles.ObjectModel;
+using PicklesDoc.Pickles.TestFrameworks;
+
+namespace PicklesDoc.Pickles.Test.TestFrameworks
+{
+    [TestFixture]
+    public class WhenParsingProblematicScenarioOutlineResults : WhenParsingTestResultFiles<NUnitResults>
+    {
+        public WhenParsingProblematicScenarioOutlineResults()
+            : base("results-problem-with-outline-results-nunit.xml")
+        {
+        }
+
+        [Test]
+        public void ThenCanReadIndividualResultsFromScenarioOutline_ContainingDollarSigns_ShouldBeTestResultSuccess()
+        {
+            var results = ParseResultsFile();
+            results.SetExampleSignatureBuilder(new NUnitExampleSignatureBuilder());
+
+            var feature = new Feature { Name = "ExampleWebFeature" };
+
+            var scenarioOutline = new ScenarioOutline { Name = "Login", Feature = feature };
+
+            TestResult exampleResultOutline = results.GetScenarioOutlineResult(scenarioOutline);
+            Check.That(exampleResultOutline).IsEqualTo(TestResult.Passed);
+
+            TestResult exampleResult = results.GetExampleResult(scenarioOutline, new[] { "special characters", "$$$" });
+            Check.That(exampleResult).IsEqualTo(TestResult.Passed);
+        }
+    }
+}
diff --git a/src/Pickles/Pickles.Test/TestFrameworks/results-problem-with-outline-results-nunit.xml b/src/Pickles/Pickles.Test/TestFrameworks/results-problem-with-outline-results-nunit.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!--This file represents the results of running a test suite-->
+<test-results name="E:\Google Drive\Documents\Cucumber_Selenium_CSharp\Specflow_Selenium_PO_Example2\Specflow_Selenium_PO_Example2\bin\Debug\Specflow_Selenium_PO_Example2.dll" total="4" errors="0" failures="0" not-run="0" inconclusive="0" ignored="0" skipped="0" invalid="0" date="2015-11-17" time="08:39:12">
+    <environment nunit-version="2.6.4.14350" clr-version="2.0.50727.8009" os-version="Microsoft Windows NT 6.2.9200.0" platform="Win32NT" cwd="E:\Google Drive\Documents\Cucumber_Selenium_CSharp\Specflow_Selenium_PO_Example2\Specflow_Selenium_PO_Example2" machine-name="CHROMEBOOKVM2" user="markwinspear" user-domain="CHROMEBOOKVM2" />
+    <culture-info current-culture="en-GB" current-uiculture="en-US" />
+    <test-suite type="Assembly" name="E:\Google Drive\Documents\Cucumber_Selenium_CSharp\Specflow_Selenium_PO_Example2\Specflow_Selenium_PO_Example2\bin\Debug\Specflow_Selenium_PO_Example2.dll" executed="True" result="Success" success="True" time="39.350" asserts="0">
+        <results>
+            <test-suite type="Namespace" name="Specflow_Selenium_PO_Example2" executed="True" result="Success" success="True" time="39.337" asserts="0">
+                <results>
+                    <test-suite type="Namespace" name="Features" executed="True" result="Success" success="True" time="39.337" asserts="0">
+                        <results>
+                            <test-suite type="TestFixture" name="ExampleFeature" description="example" executed="True" result="Success" success="True" time="0.712" asserts="0">
+                                <results>
+                                    <test-case name="Specflow_Selenium_PO_Example2.Features.ExampleFeature.AddTwoNumbers" description="Add two numbers" executed="True" result="Success" success="True" time="0.270" asserts="0">
+                                        <categories>
+                                            <category name="mytag" />
+                                        </categories>
+                                    </test-case>
+                                </results>
+                            </test-suite>
+                            <test-suite type="TestFixture" name="ExampleWebFeatureFeature" description="ExampleWebFeature" executed="True" result="Success" success="True" time="38.614" asserts="0">
+                                <categories>
+                                    <category name="web" />
+                                </categories>
+                                <results>
+                                    <test-suite type="ParameterizedTest" name="Login" description="Login" executed="True" result="Success" success="True" time="38.611" asserts="0">
+                                        <results>
+                                            <test-case name="Specflow_Selenium_PO_Example2.Features.ExampleWebFeatureFeature.Login(&quot;special characters&quot;,&quot;$$$&quot;,&quot;SuperSecretPassword!&quot;,&quot;failed&quot;,null)" executed="True" result="Success" success="True" time="10.734" asserts="1" />
+                                        </results>
+                                    </test-suite>
+                                </results>
+                            </test-suite>
+                        </results>
+                    </test-suite>
+                </results>
+            </test-suite>
+        </results>
+    </test-suite>
+</test-results>
diff --git a/src/Pickles/Pickles/TestFrameworks/NUnitExampleSignatureBuilder.cs b/src/Pickles/Pickles/TestFrameworks/NUnitExampleSignatureBuilder.cs
@@ -35,7 +35,7 @@ public Regex Build(ScenarioOutline scenarioOutline, string[] row)
 
             foreach (string value in row)
             {
-                stringBuilder.AppendFormat("\"{0}\",", value.ToLowerInvariant().Replace(@"\", string.Empty));
+                stringBuilder.AppendFormat("\"{0}\",", value.ToLowerInvariant().Replace(@"\", string.Empty).Replace(@"$", @"\$"));
             }
 
             stringBuilder.Remove(stringBuilder.Length - 1, 1);

diff --git a/src/Pickles/Pickles/TestFrameworks/xUnitExampleSignatureBuilder.cs b/src/Pickles/Pickles/TestFrameworks/xUnitExampleSignatureBuilder.cs
@@ -35,7 +35,7 @@ public Regex Build(ScenarioOutline scenarioOutline, string[] row)
 
             foreach (string value in row)
             {
-                stringBuilder.AppendFormat("(.*): \"{0}\", ", value.ToLowerInvariant().Replace(@"\", string.Empty));
+                stringBuilder.AppendFormat("(.*): \"{0}\", ", value.ToLowerInvariant().Replace(@"\", string.Empty).Replace(@"$", @"\$"));
             }
 
             stringBuilder.Remove(stringBuilder.Length - 2, 2);

diff --git a/src/Pickles/VersionInfo.cs b/src/Pickles/VersionInfo.cs
@@ -8,10 +8,10 @@
 [assembly: AssemblyTrademarkAttribute("")]
 [assembly: AssemblyCultureAttribute("")]
 [assembly: ComVisibleAttribute(false)]
-[assembly: AssemblyVersionAttribute("2.0.1")]
-[assembly: AssemblyFileVersionAttribute("2.0.1")]
+[assembly: AssemblyVersionAttribute("2.0.2")]
+[assembly: AssemblyFileVersionAttribute("2.0.2")]
 namespace System {
     internal static class AssemblyVersionInformation {
-        internal const string Version = "2.0.1";
+        internal const string Version = "2.0.2";
     }
 }