Made the IKeyGenerator api a bit more future proof

Author: MehdiK

TestStack.BDDfy.Tests/Configuration/SequentialKeyGeneratorTests.cs

@@ -9,11 +9,7 @@ public class SequentialKeyGeneratorTests
         [Test]
         public void ShouldReturnOneForFirstScenario()
         {
-            var sut = new SequentialKeyGenerator();
-
-            var result = sut.GetScenarioId();
-
-            Assert.That(result, Is.EqualTo("scenario-1"));
+            Assert.That(new SequentialKeyGenerator().GetScenarioId(null), Is.EqualTo("scenario-1"));
         }
 
         [Test]
@@ -23,18 +19,14 @@ public void ShouldIncrementScenarioIdForEachRequestForScenariId()
 
             for (int i = 1; i <= 12; i++)
             {
-                Assert.That(sut.GetScenarioId(), Is.EqualTo("scenario-" + i));
+                Assert.That(sut.GetScenarioId(null), Is.EqualTo("scenario-" + i));
             }
         }
 
         [Test]
         public void ShouldReturnOneOneForFirstStepOfFirstScenario()
         {
-            var sut = new SequentialKeyGenerator();
-
-            var result = sut.GetStepId();
-
-            Assert.That(result, Is.EqualTo("step-1-1"));
+            Assert.That(new SequentialKeyGenerator().GetStepId(null), Is.EqualTo("step-1-1"));
         }
 
         [Test]
@@ -44,22 +36,18 @@ public void ShouldIncrementStepIdForEachRequestForStepId()
 
             for (int i = 1; i <= 12; i++)
             {
-                Assert.That(sut.GetStepId(), Is.EqualTo("step-1-" + i));
+                Assert.That(sut.GetStepId(null), Is.EqualTo("step-1-" + i));
             }
         }
 
         [Test]
         public void ShouldResetStepCountForNewScenario()
         {
             var sut = new SequentialKeyGenerator();
-            sut.GetStepId();
-            sut.GetScenarioId();
-
-            var result = sut.GetStepId();
+            sut.GetStepId(null);
+            sut.GetScenarioId(null);
 
-            Assert.That(result, Is.EqualTo("step-2-1"));
+            Assert.That(sut.GetStepId(null), Is.EqualTo("step-2-1"));
         }
-
     }
-
 }

TestStack.BDDfy/Configuration/IKeyGenerator.cs

@@ -2,8 +2,8 @@ namespace TestStack.BDDfy.Configuration
 {
     public interface IKeyGenerator
     {
-        string GetScenarioId();
-        string GetStepId();
+        string GetScenarioId(Scenario scenario);
+        string GetStepId(Step step);
         void Reset();
     }
 }

TestStack.BDDfy/Configuration/SequentialKeyGenerator.cs

@@ -5,15 +5,15 @@ public class SequentialKeyGenerator : IKeyGenerator
         private int _currentScenarioNumber = 1;
         private int _currentStepNumber = 1;
 
-        public string GetScenarioId()
+        public string GetScenarioId(Scenario scenario)
         {
             var id = string.Format("scenario-{0}", _currentScenarioNumber);
            _currentScenarioNumber++;
             _currentStepNumber = 1;
             return id;
         }
 
-        public string GetStepId()
+        public string GetStepId(Step step)
         {
             var id = string.Format("step-{0}-{1}", _currentScenarioNumber, _currentStepNumber);
             _currentStepNumber++;

TestStack.BDDfy/Scenario.cs

@@ -12,9 +12,8 @@ public Scenario(object testObject, IEnumerable<Step> steps, string scenarioText)
         {
             TestObject = testObject;
             _steps = steps.OrderBy(o => o.ExecutionOrder).ThenBy(o => o.ExecutionSubOrder).ToList();
-            Id = Configurator.IdGenerator.GetScenarioId();
-
             Title = scenarioText;
+            Id = Configurator.IdGenerator.GetScenarioId(this);
         }
 
         public string Title { get; private set; }

TestStack.BDDfy/Step.cs

@@ -17,9 +17,9 @@ public Step(
             ExecutionOrder = executionOrder;
             ShouldReport = shouldReport;
             Result = Result.NotExecuted;
-            Id = Configurator.IdGenerator.GetStepId();
             Title = title;
             Action = action;
+            Id = Configurator.IdGenerator.GetStepId(this);
         }
 
         public string Id { get; private set; }