feat: add CurrentContext method to ScopedFeatureContext and ExecutionStatus methods to ProgramScope and FeatureScope

Author: daantimmer

cucumber_cpp/library/engine/ContextManager.cpp

@@ -114,6 +114,11 @@ namespace cucumber_cpp::library::engine
         contextManager.DisposeFeatureContext();
     }
 
+    const cucumber_cpp::library::engine::CurrentContext& ContextManager::ScopedFeatureContext::CurrentContext() const
+    {
+        return contextManager.FeatureContext();
+    }
+
     ContextManager::ScopedRuleContext::ScopedRuleContext(ContextManager& contextManager)
         : contextManager{ contextManager }
     {}

cucumber_cpp/library/engine/ContextManager.hpp

@@ -124,6 +124,8 @@ namespace cucumber_cpp::library::engine
         explicit ScopedFeatureContext(ContextManager& contextManager);
         ~ScopedFeatureContext();
 
+        const cucumber_cpp::library::engine::CurrentContext& CurrentContext() const;
+
     private:
         ContextManager& contextManager;
     };

cucumber_cpp/library/engine/TestExecution.cpp

@@ -16,19 +16,30 @@ namespace cucumber_cpp::library::engine
     const DryRunPolicy dryRunPolicy;
     const ExecuteRunPolicy executeRunPolicy;
 
-    TestExecution::ProgramScope::ProgramScope(report::ReportForwarder& reportHandler, HookExecutor& hookExecution)
-        : scopedProgramReport{ reportHandler.ProgramStart() }
+    TestExecution::ProgramScope::ProgramScope(cucumber_cpp::library::engine::ContextManager& contextManager, report::ReportForwarder& reportHandler, HookExecutor& hookExecution)
+        : contextManager{ contextManager }
+        , scopedProgramReport{ reportHandler.ProgramStart() }
         , scopedProgramHook{ hookExecution.BeforeAll() }
     {
     }
 
+    Result TestExecution::ProgramScope::ExecutionStatus() const
+    {
+        return contextManager.ProgramContext().ExecutionStatus();
+    }
+
     TestExecution::FeatureScope::FeatureScope(cucumber_cpp::library::engine::ContextManager& contextManager, report::ReportForwarder& reportHandler, HookExecutor& hookExecution, const cucumber_cpp::library::engine::FeatureInfo& featureInfo)
         : scopedFeatureContext{ contextManager.CreateFeatureContext(featureInfo) }
         , scopedFeatureReport{ reportHandler.FeatureStart() }
         , scopedFeatureHook{ hookExecution.FeatureStart() }
     {
     }
 
+    Result TestExecution::FeatureScope::ExecutionStatus() const
+    {
+        return scopedFeatureContext.CurrentContext().ExecutionStatus();
+    }
+
     TestExecution::RuleScope::RuleScope(cucumber_cpp::library::engine::ContextManager& contextManager, report::ReportForwarder& reportHandler, const cucumber_cpp::library::engine::RuleInfo& ruleInfo)
         : scopedRuleContext{ contextManager.CreateRuleContext(ruleInfo) }
         , scopedRuleReport{ reportHandler.RuleStart() }
@@ -64,7 +75,7 @@ namespace cucumber_cpp::library::engine
 
     TestExecution::ProgramScope TestExecutionImpl::StartRun()
     {
-        return ProgramScope{ reportHandler, hookExecution };
+        return ProgramScope{ contextManager, reportHandler, hookExecution };
     }
 
     TestExecution::FeatureScope TestExecutionImpl::StartFeature(const cucumber_cpp::library::engine::FeatureInfo& featureInfo)

cucumber_cpp/library/engine/TestExecution.hpp

@@ -6,6 +6,7 @@
 #include "cucumber_cpp/library/engine/FailureHandler.hpp"
 #include "cucumber_cpp/library/engine/FeatureInfo.hpp"
 #include "cucumber_cpp/library/engine/HookExecutor.hpp"
+#include "cucumber_cpp/library/engine/Result.hpp"
 #include "cucumber_cpp/library/engine/RuleInfo.hpp"
 #include "cucumber_cpp/library/engine/ScenarioInfo.hpp"
 #include "cucumber_cpp/library/engine/StepInfo.hpp"
@@ -40,9 +41,12 @@ namespace cucumber_cpp::library::engine
 
     struct TestExecution::ProgramScope : library::util::Immoveable
     {
-        ProgramScope(report::ReportForwarder& reportHandler, HookExecutor& hookExecution);
+        ProgramScope(cucumber_cpp::library::engine::ContextManager& contextManager, report::ReportForwarder& reportHandler, HookExecutor& hookExecution);
+
+        Result ExecutionStatus() const;
 
     private:
+        cucumber_cpp::library::engine::ContextManager& contextManager;
         report::ReportForwarder::ProgramScope scopedProgramReport;
         HookExecutor::ProgramScope scopedProgramHook;
     };
@@ -51,6 +55,8 @@ namespace cucumber_cpp::library::engine
     {
         FeatureScope(cucumber_cpp::library::engine::ContextManager& contextManager, report::ReportForwarder& reportHandler, HookExecutor& hookExecution, const cucumber_cpp::library::engine::FeatureInfo& featureInfo);
 
+        Result ExecutionStatus() const;
+
     private:
         cucumber_cpp::library::engine::ContextManager::ScopedFeatureContext scopedFeatureContext;
         report::ReportForwarder::FeatureScope scopedFeatureReport;

cucumber_cpp/library/engine/TestRunner.cpp

@@ -2,6 +2,7 @@
 #include "cucumber_cpp/library/engine/TestRunner.hpp"
 #include "cucumber_cpp/library/engine/FeatureFactory.hpp"
 #include "cucumber_cpp/library/engine/FeatureInfo.hpp"
+#include "cucumber_cpp/library/engine/Result.hpp"
 #include "cucumber_cpp/library/engine/RuleInfo.hpp"
 #include "cucumber_cpp/library/engine/StepInfo.hpp"
 #include "cucumber_cpp/library/engine/StepType.hpp"
@@ -40,6 +41,9 @@ namespace cucumber_cpp::library::engine
     {
         auto scope = testExecution.StartRun();
 
+        if (scope.ExecutionStatus() != Result::passed)
+            return;
+
         for (const auto& featurePtr : features)
             RunFeature(*featurePtr);
     }
@@ -57,6 +61,9 @@ namespace cucumber_cpp::library::engine
 
         const auto featureScope = testExecution.StartFeature(feature);
 
+        if (featureScope.ExecutionStatus() != Result::passed)
+            return;
+
         RunRules(feature.Rules());
         RunScenarios(feature.Scenarios());
     }