Merge pull request #225 from jbergens/master

Fixes #226

Author: MehdiK

src/TestStack.BDDfy.Tests/NetToStringTests.cs

@@ -1,3 +1,4 @@
+using System;
 using Shouldly;
 using TestStack.BDDfy.Configuration;
 using Xunit;
@@ -55,6 +56,8 @@ public void OneLetterWordInTheBeginningOfStringIsTurnedIntoAWord()
         [Theory]
         [InlineData("GivenThereAre__start__Cucumbers", "Given there are <start> cucumbers")]
         [InlineData("Given_there_are__start__cucumbers", "Given there are <start> cucumbers")]
+        [InlineData("GivenThereAre__count1__Cucumbers", "Given there are <count 1> cucumbers")]
+        [InlineData("Given_there_are__count2__cucumbers", "Given there are <count2> cucumbers")] // The spacing rules for numbers are not consequential
         [InlineData("GivenMethodTaking__ExampleInt__", "Given method taking <example int>")]
         [InlineData("Given_method_taking__ExampleInt__", "Given method taking <ExampleInt>")]
         [InlineData("__starting__with_example", "<starting> with example")]
@@ -67,5 +70,16 @@ public void CanDealWithExampleStepNames(string stepName, string expectedStepTitl
         {
             NetToString.Convert(stepName).ShouldBe(expectedStepTitle, Case.Sensitive);
         }
+
+        [Theory]
+        [InlineData("GivenThereAre__två__Cucumbers", "Given there are <två> cucumbers")]
+        public void ReportsIllegalExampleStepNames(string stepName, string expectedStepTitle) {
+            var exception = Record.Exception(() => {
+                NetToString.Convert(stepName).ShouldBe(expectedStepTitle, Case.Sensitive);
+            });
+
+            Assert.NotNull(exception);
+            Assert.IsType<ArgumentException>(exception);
+        }
     }
 }

src/TestStack.BDDfy.Tests/Scanner/Examples/FluentWithExamplesAtEnd.FluentCanBeUsedWithExamples.approved.txt

@@ -0,0 +1,6 @@
+
+Scenario: Fluent can be used with examples
+	Given method taking <example int a>
+	When empty method
+	Then all is good
+

src/TestStack.BDDfy.Tests/Scanner/Examples/FluentWithExamplesAtEnd.FluentCanBeUsedWithExamplesEndingInANumber.approved.txt

@@ -0,0 +1,6 @@
+
+Scenario: Fluent can be used with examples ending in a number
+	Given method taking <example int 1>
+	When empty method
+	Then all is good
+

src/TestStack.BDDfy.Tests/Scanner/Examples/FluentWithExamplesAtEnd.cs

@@ -0,0 +1,58 @@
+using System;
+using System.Runtime.CompilerServices;
+using ApprovalTests;
+using Shouldly;
+using TestStack.BDDfy.Reporters;
+using Xunit;
+
+namespace TestStack.BDDfy.Tests.Scanner.Examples
+{
+    public class FluentWithExamplesAtEnd
+    {
+        [Fact]
+        public void FluentCanBeUsedWithExamples()
+        {
+            var story = this
+                .Given(_ => MethodTaking__ExampleIntA__(1), false)
+                .When(_ => WhenEmptyMethod())
+                .Then(_ => ThenAllIsGood())
+                .BDDfy();
+
+            var textReporter = new TextReporter();
+            textReporter.Process(story);
+            Approvals.Verify(textReporter.ToString());
+        }
+
+        // This test crashes BDDfy or causes an infinite loop
+        [Fact]
+        public void FluentCanBeUsedWithExamplesEndingInANumber() {
+            var story = this
+                .Given(_ => MethodTaking__ExampleInt1__(1), false)
+                .When(_ => WhenEmptyMethod())
+                .Then(_ => ThenAllIsGood())
+                .BDDfy();
+
+            var textReporter = new TextReporter();
+            textReporter.Process(story);
+            Approvals.Verify(textReporter.ToString());
+        }
+
+        private void ThenAllIsGood()
+        {
+        }
+
+        private void WhenEmptyMethod()
+        {
+        }
+
+        // Ending an example name with a number seems to cause problems in BDDfy
+        private void MethodTaking__ExampleInt1__(int exampleInt)
+        {
+            exampleInt.ShouldBeInRange(1, 2);
+        }
+
+        private void MethodTaking__ExampleIntA__(int exampleInt) {
+            exampleInt.ShouldBeInRange(1, 2);
+        }
+    }
+}

src/TestStack.BDDfy.Tests/TestStack.BDDfy.Tests.csproj

@@ -87,6 +87,7 @@
     <Compile Include="Reporters\Html\TestableHtmlReporter.cs" />
     <Compile Include="Reporters\ReportApprover.cs" />
     <Compile Include="Scanner\Examples\ExampleActionTests.cs" />
+    <Compile Include="Scanner\Examples\FluentWithExamplesAtEnd.cs" />
     <Compile Include="Scanner\FluentScanner\ComplexStepsTests.cs" />
     <Compile Include="Scanner\FluentScanner\DoesNotConflictWithnSubstitute.cs" />
     <Compile Include="Scanner\Examples\FluentWithExamples.cs" />

src/TestStack.BDDfy/NetToString.cs

@@ -49,11 +49,11 @@ private static bool ShouldAddSpace(char lastChar, char currentChar)
             return false;
         }
 
-        public static readonly Func<string, string> Convert = name =>
-        {
-            if (name.Contains("__"))
-                return ExampleTitle(name);
+        public static readonly Func<string, string> Convert = name => {
+            return name.Contains("__") ? ExampleTitle(name) : ConvertNonExample(name);
+        };
 
+        private static readonly Func<string, string> ConvertNonExample = name => {
             if (name.Contains("_"))
                 return FromUnderscoreSeparatedWords(name);
 
@@ -62,11 +62,16 @@ private static bool ShouldAddSpace(char lastChar, char currentChar)
 
         private static string ExampleTitle(string name)
         {
-            name = Regex.Replace(name, "__([a-zA-Z]+)__", " <$1> ");
+            // Compare contains("__") with a regex match
+            string newName = Regex.Replace(name, "__([a-zA-Z][a-zA-Z0-9]*)__", " <$1> ");
+
+            if (newName == name) {
+                throw new ArgumentException("Illegal example title in name '" + name + "'!");
+            }
 
             // for when there are two consequetive example placeholders in the word; e.g. Given__one____two__parameters
-            name = name.Replace("  ", " ");
-            return Convert(name).Trim();
+            newName = newName.Replace("  ", " ");
+            return Convert(newName).Trim();
         }
     }
 }