#225 Refactoring

LightBDD · Feb 28, 2021 · 2f928a9 · 2f928a9
1 parent 4965feb
commit 2f928a9
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 11 deletions.
diff --git a/src/LightBDD.Core/ExecutionContext/ScenarioExecutionContext.cs b/src/LightBDD.Core/ExecutionContext/ScenarioExecutionContext.cs
@@ -53,17 +53,11 @@ public static ScenarioExecutionContext Current
         /// </summary>
         public static IScenario CurrentScenario => Current.Get<CurrentScenarioProperty>().Scenario ?? throw new InvalidOperationException("The current task does not run any initialized scenario. Ensure that feature is used within task running fully initialized scenario.");
 
-        /// <summary>
-        /// Returns currently executed scenario fixture object.<br/>
-        /// <exception cref="InvalidOperationException">Thrown if no scenario is executed by current task.</exception>
-        /// </summary>
-        public static object CurrentScenarioFixture => Current.Get<CurrentScenarioProperty>().Fixture ?? throw new InvalidOperationException("The current task does not run any scenario with available fixture object.");
-
         /// <summary>
         /// Returns currently executed scenario fixture object if present or <c>null</c> if no scenario is currently executed.<br/>
         /// <exception cref="InvalidOperationException">Thrown if fixture object is present but not assignable to <typeparam name="TFixture"></typeparam>.</exception>
         /// </summary>
-        public static TFixture GetScenarioFixtureIfPresent<TFixture>() where TFixture : class
+        public static TFixture GetCurrentScenarioFixtureIfPresent<TFixture>() where TFixture : class
         {
             var fixture = CurrentContext.Value?.Get<CurrentScenarioProperty>().Fixture;
 

diff --git a/src/LightBDD.Core/Notification/Implementation/NotificationAdapter.cs b/src/LightBDD.Core/Notification/Implementation/NotificationAdapter.cs
@@ -49,7 +49,7 @@ public void Notify(ProgressEvent e)
 
         private void HandleScenarioStarted(ScenarioStarting scenarioStarting)
         {
-            _scenarioNotifier.Value = _scenarioProgressNotifierProvider.Invoke(ScenarioExecutionContext.CurrentScenarioFixture);
+            _scenarioNotifier.Value = _scenarioProgressNotifierProvider.Invoke(ScenarioExecutionContext.GetCurrentScenarioFixtureIfPresent<object>());
             _scenarioNotifier.Value.NotifyScenarioStart(scenarioStarting.Scenario);
         }
 

diff --git a/src/LightBDD.Framework/Notification/Implementation/NotificationAdapter.cs b/src/LightBDD.Framework/Notification/Implementation/NotificationAdapter.cs
@@ -50,7 +50,7 @@ public void Notify(ProgressEvent e)
 
         private void HandleScenarioStarted(ScenarioStarting scenarioStarting)
         {
-            _scenarioNotifier.Value = _scenarioProgressNotifierProvider.Invoke(ScenarioExecutionContext.CurrentScenarioFixture);
+            _scenarioNotifier.Value = _scenarioProgressNotifierProvider.Invoke(ScenarioExecutionContext.GetCurrentScenarioFixtureIfPresent<object>());
             _scenarioNotifier.Value.NotifyScenarioStart(scenarioStarting.Scenario);
         }
 

diff --git a/src/LightBDD.MsTest2/Implementation/MsTest2ProgressNotifier.cs b/src/LightBDD.MsTest2/Implementation/MsTest2ProgressNotifier.cs
@@ -28,7 +28,7 @@ public static IProgressNotifier CreateProgressNotifier()
 
         public static void WriteTestOutput(string message)
         {
-            ScenarioExecutionContext.GetScenarioFixtureIfPresent<ITestContextProvider>()?.TestContext?.WriteLine(message);
+            ScenarioExecutionContext.GetCurrentScenarioFixtureIfPresent<ITestContextProvider>()?.TestContext?.WriteLine(message);
         }
     }
 }
diff --git a/src/LightBDD.XUnit2/Implementation/XUnit2ProgressNotifier.cs b/src/LightBDD.XUnit2/Implementation/XUnit2ProgressNotifier.cs
@@ -34,6 +34,6 @@ public static IProgressNotifier[] CreateProgressNotifiers()
             };
         }
 
-        private static void WriteTestOutput(string message) => ScenarioExecutionContext.GetScenarioFixtureIfPresent<ITestOutputProvider>()?.TestOutput.WriteLine(message);
+        private static void WriteTestOutput(string message) => ScenarioExecutionContext.GetCurrentScenarioFixtureIfPresent<ITestOutputProvider>()?.TestOutput.WriteLine(message);
     }
 }