Release 2.8.1 (#360)

picklesdoc · Jul 29, 2016 · 928ca1e · 928ca1e
1 parent b3852c0
commit 928ca1e
Show file tree

Hide file tree

Showing 7 changed files with 182 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,12 @@ Features in Experimental are subject to change and removal without being conside
 
 This document is formatted according to the principles of [Keep A CHANGELOG](http://keepachangelog.com).
 
+## [2.8.1] - 2016-07-29
+
+### Fixed
+
+* Blank Example Entries in a Scenario Outline cause Pickles not to Find the matching Scenario Outline ([358](https://github.com/picklesdoc/pickles/pull/358)) (by [@aaronjrich](https://github.com/aaronjrich)).
+
 ## [2.8.0] - 2016-06-29
 
 ### Added

diff --git a/build.bat b/build.bat
@@ -1,5 +1,5 @@
 @echo off
-set "picklesVersion=2.8.0"
+set "picklesVersion=2.8.1"
 
 cls
 

diff --git a/...les.TestFrameworks.UnitTests/MsTest/WhenParsingMsTestResultsFileWithEmptyExampleValues.cs b/...les.TestFrameworks.UnitTests/MsTest/WhenParsingMsTestResultsFileWithEmptyExampleValues.cs
@@ -0,0 +1,69 @@
+//  --------------------------------------------------------------------------------------------------------------------
+//  <copyright file="WhenParsingMsTestResultsFileWithEmptyExampleValues.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 NUnit.Framework;
+using PicklesDoc.Pickles.ObjectModel;
+using PicklesDoc.Pickles.TestFrameworks.MsTest;
+using System.Collections.Generic;
+
+namespace PicklesDoc.Pickles.TestFrameworks.UnitTests.MsTest
+{
+    [TestFixture]
+    public class WhenParsingMsTestResultsFileWithEmptyExampleValues : StandardTestSuite<MsTestResults>
+    {
+        public WhenParsingMsTestResultsFileWithEmptyExampleValues()
+            : base("MsTest." + "resuls-example-mstest-emptyexamplevalues.trx")
+        {
+        }
+
+        [Test]
+        public new void ThenMatchWillBeFoundEvenIfACarriageReturnWasFoundInValueField()
+        {
+            var results = ParseResultsFile();
+
+            var feature = new Feature { Name = "Example With Empty Value" };
+            var scenarioOutline = new ScenarioOutline { Name = "Testing test", Feature = feature };
+            scenarioOutline.Steps = new List<Step>();
+
+            var examples = new Table();
+            examples.HeaderRow = new TableRow();
+            examples.HeaderRow.Cells.Add("result1");
+            examples.HeaderRow.Cells.Add("result2");
+            examples.HeaderRow.Cells.Add("result3");
+            var row = new TableRow();
+            row.Cells.Add("1");
+            row.Cells.Add("2");
+            row.Cells.Add("3");
+            examples.DataRows = new List<TableRow>();
+            examples.DataRows.Add(row);
+            row = new TableRow();
+            row.Cells.Add("1");
+            row.Cells.Add("");
+            row.Cells.Add("4");
+            examples.DataRows.Add(row);
+
+            scenarioOutline.Examples = new List<Example>();
+            scenarioOutline.Examples.Add(new Example() { TableArgument = examples });
+
+            var actualResult = results.GetExampleResult(scenarioOutline, new string[] { "1", "", "4" });             
+        }
+    }
+}
diff --git a/...kles/Pickles.TestFrameworks.UnitTests/MsTest/resuls-example-mstest-emptyexamplevalues.trx b/...kles/Pickles.TestFrameworks.UnitTests/MsTest/resuls-example-mstest-emptyexamplevalues.trx
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<TestRun id="08369b61-b2dd-4c17-9616-cf9211f858ce" name="arich@MIT-L-U18566 2016-07-15 16:31:59" runUser="US\arich" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
+  <TestSettings name="Default Test Settings" id="a7e82ba2-7092-4afc-bb1e-1e4e632e9272">
+    <Execution>
+      <TestTypeSpecific />
+      <AgentRule name="Execution Agents">
+      </AgentRule>
+    </Execution>
+    <Deployment runDeploymentRoot="arich_MIT-L-U18566 2016-07-15 16_31_59" />
+    <Properties />
+  </TestSettings>
+  <Times creation="2016-07-15T16:31:59.4517601-05:00" queuing="2016-07-15T16:32:00.3220211-05:00" start="2016-07-15T16:32:00.4390562-05:00" finish="2016-07-15T16:32:01.0882509-05:00" />
+  <ResultSummary outcome="Completed">
+    <Counters total="2" executed="2" passed="2" error="0" failed="0" timeout="0" aborted="0" inconclusive="0" passedButRunAborted="0" notRunnable="0" notExecuted="0" disconnected="0" warning="0" completed="0" inProgress="0" pending="0" />
+  </ResultSummary>
+  <TestDefinitions>
+    <UnitTest name="TestingTest_Variant1" storage="c:\users\arich\documents\visual studio 2015\projects\webapplication1\webapplication1.tests\bin\debug\webapplication1.tests.dll" id="69ff7a99-f07d-8115-2f69-8497d521ea9e">
+      <Description>Testing test: Variant 1</Description>
+      <Execution id="42003207-4723-4914-9c7a-513f77eaf15c" />
+      <Properties>
+        <Property>
+          <Key>FeatureTitle</Key>
+          <Value>Example With Empty Value</Value>
+        </Property>
+        <Property>
+          <Key>VariantName</Key>
+          <Value>Variant 1</Value>
+        </Property>
+        <Property>
+          <Key>Parameter:result3</Key>
+          <Value>4</Value>
+        </Property>
+        <Property>
+          <Key>Parameter:result1</Key>
+          <Value>1</Value>
+        </Property>
+        <Property>
+          <Key>Parameter:result2</Key>
+          <Value>
+          </Value>
+        </Property>
+      </Properties>
+      <TestMethod codeBase="C:/Users/arich/Documents/visual studio 2015/Projects/WebApplication1/WebApplication1.Tests/bin/Debug/WebApplication1.Tests.DLL" adapterTypeName="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestAdapter, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.Adapter, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" className="WebApplication1.Tests.ExampleWithEmptyValueFeature, WebApplication1.Tests, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="TestingTest_Variant1" />
+    </UnitTest>
+    <UnitTest name="TestingTest_Variant0" storage="c:\users\arich\documents\visual studio 2015\projects\webapplication1\webapplication1.tests\bin\debug\webapplication1.tests.dll" id="60c168af-9792-b4e5-db66-67ffc6d6bad4">
+      <Description>Testing test: Variant 0</Description>
+      <Execution id="85c7fcfc-6130-49e6-9b73-d96db45acf62" />
+      <Properties>
+        <Property>
+          <Key>FeatureTitle</Key>
+          <Value>Example With Empty Value</Value>
+        </Property>
+        <Property>
+          <Key>VariantName</Key>
+          <Value>Variant 0</Value>
+        </Property>
+        <Property>
+          <Key>Parameter:result3</Key>
+          <Value>3</Value>
+        </Property>
+        <Property>
+          <Key>Parameter:result1</Key>
+          <Value>1</Value>
+        </Property>
+        <Property>
+          <Key>Parameter:result2</Key>
+          <Value>2</Value>
+        </Property>
+      </Properties>
+      <TestMethod codeBase="C:/Users/arich/Documents/visual studio 2015/Projects/WebApplication1/WebApplication1.Tests/bin/Debug/WebApplication1.Tests.DLL" adapterTypeName="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestAdapter, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.Adapter, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" className="WebApplication1.Tests.ExampleWithEmptyValueFeature, WebApplication1.Tests, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="TestingTest_Variant0" />
+    </UnitTest>
+  </TestDefinitions>
+  <TestLists>
+    <TestList name="Results Not in a List" id="8c84fa94-04c1-424b-9868-57a2d4851a1d" />
+    <TestList name="All Loaded Results" id="19431567-8539-422a-85d7-44ee4e166bda" />
+  </TestLists>
+  <TestEntries>
+    <TestEntry testId="60c168af-9792-b4e5-db66-67ffc6d6bad4" executionId="85c7fcfc-6130-49e6-9b73-d96db45acf62" testListId="8c84fa94-04c1-424b-9868-57a2d4851a1d" />
+    <TestEntry testId="69ff7a99-f07d-8115-2f69-8497d521ea9e" executionId="42003207-4723-4914-9c7a-513f77eaf15c" testListId="8c84fa94-04c1-424b-9868-57a2d4851a1d" />
+  </TestEntries>
+  <Results>
+    <UnitTestResult executionId="85c7fcfc-6130-49e6-9b73-d96db45acf62" testId="60c168af-9792-b4e5-db66-67ffc6d6bad4" testName="TestingTest_Variant0" computerName="MIT-L-U18566" duration="00:00:00.0491627" startTime="2016-07-15T16:32:00.5140787-05:00" endTime="2016-07-15T16:32:01.0092272-05:00" testType="13cdc9d9-ddb5-4fa4-a97d-d965ccfc6d4b" outcome="Passed" testListId="8c84fa94-04c1-424b-9868-57a2d4851a1d" relativeResultsDirectory="85c7fcfc-6130-49e6-9b73-d96db45acf62">
+      <Output>
+        <StdOut>When I do something
+-&gt; done: StepDefinition1.WhenIDoSomething() (0.0s)
+Then the 1 should equal 2 and return 3
+-&gt; done: StepDefinition1.ThenTheShouldEqualAndReturn("1", "2", "3") (0.0s)</StdOut>
+      </Output>
+    </UnitTestResult>
+    <UnitTestResult executionId="42003207-4723-4914-9c7a-513f77eaf15c" testId="69ff7a99-f07d-8115-2f69-8497d521ea9e" testName="TestingTest_Variant1" computerName="MIT-L-U18566" duration="00:00:00.0003422" startTime="2016-07-15T16:32:01.0232314-05:00" endTime="2016-07-15T16:32:01.0282329-05:00" testType="13cdc9d9-ddb5-4fa4-a97d-d965ccfc6d4b" outcome="Passed" testListId="8c84fa94-04c1-424b-9868-57a2d4851a1d" relativeResultsDirectory="42003207-4723-4914-9c7a-513f77eaf15c">
+      <Output>
+        <StdOut>When I do something
+-&gt; done: StepDefinition1.WhenIDoSomething() (0.0s)
+Then the 1 should equal  and return 4
+-&gt; done: StepDefinition1.ThenTheShouldEqualAndReturn("1", "", "4") (0.0s)</StdOut>
+      </Output>
+    </UnitTestResult>
+  </Results>
+</TestRun>
diff --git a/src/Pickles/Pickles.TestFrameworks.UnitTests/Pickles.TestFrameworks.UnitTests.csproj b/src/Pickles/Pickles.TestFrameworks.UnitTests/Pickles.TestFrameworks.UnitTests.csproj
@@ -62,6 +62,7 @@
     <Compile Include="CucumberJson\WhenParsingCucumberJsonFromJSResultsFile.cs" />
     <Compile Include="CucumberJson\WhenParsingCucumberJsonFromJSResultsFileWithIndividualResults.cs" />
     <Compile Include="CucumberJson\WhenParsingCucumberJsonFromRubyResultsFileWithIndividualResults.cs" />
+    <Compile Include="MsTest\WhenParsingMsTestResultsFileWithEmptyExampleValues.cs" />
     <Compile Include="VsTest\WhenParsingVsTestResultsFile.cs" />
     <Compile Include="VsTest\WhenParsingVsTestResultsFileWithIndividualResults.cs" />
     <Compile Include="VsTest\WhenParsingVsTestResultsFileWithMissingTraits.cs" />
@@ -159,6 +160,7 @@
     <EmbeddedResource Include="VsTest\results-example-vstest.trx">
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="MsTest\resuls-example-mstest-emptyexamplevalues.trx" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/Pickles/Pickles.TestFrameworks/MsTest/MsTestElementExtensions.cs b/src/Pickles/Pickles.TestFrameworks/MsTest/MsTestElementExtensions.cs
@@ -152,7 +152,7 @@ internal static List<string> DetermineValuesInScenario(this XElement element)
             {
                 if ((property.Descendants(Ns + "Key").FirstOrDefault()?.Value ?? string.Empty).StartsWith("Parameter:"))
                 {
-                    valuesInScenario.Add(property.Descendants(Ns + "Value").FirstOrDefault()?.Value ?? string.Empty);
+                    valuesInScenario.Add(property.Descendants(Ns + "Value").FirstOrDefault()?.Value.Trim() ?? string.Empty);
                 }
             }
 

diff --git a/src/Pickles/VersionInfo.cs b/src/Pickles/VersionInfo.cs
@@ -8,11 +8,11 @@
 [assembly: AssemblyTrademarkAttribute("")]
 [assembly: AssemblyCultureAttribute("")]
 [assembly: ComVisibleAttribute(false)]
-[assembly: AssemblyVersionAttribute("2.8.0")]
-[assembly: AssemblyFileVersionAttribute("2.8.0")]
+[assembly: AssemblyVersionAttribute("2.8.1")]
+[assembly: AssemblyFileVersionAttribute("2.8.1")]
 namespace System {
     internal static class AssemblyVersionInformation {
-        internal const string Version = "2.8.0";
-        internal const string InformationalVersion = "2.8.0";
+        internal const string Version = "2.8.1";
+        internal const string InformationalVersion = "2.8.1";
     }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
                 {
                     if ((property.Descendants(Ns + "Key").FirstOrDefault()?.Value ?? string.Empty).StartsWith("Parameter:"))
                     {
-                        valuesInScenario.Add(property.Descendants(Ns + "Value").FirstOrDefault()?.Value ?? string.Empty);
+                        valuesInScenario.Add(property.Descendants(Ns + "Value").FirstOrDefault()?.Value.Trim() ?? string.Empty);
                     }
                 }
@@ Expand Down @@