refactor to reduce nesting

Author: daantimmer

cucumber_cpp/library/assemble/AssembleTestSuites.cpp

@@ -39,31 +39,21 @@ namespace cucumber_cpp::library::assemble
         {
             return pair.second.has_value();
         }
-    }
-
-    std::vector<AssembledTestSuite> AssembleTestSuites(support::SupportCodeLibrary supportCodeLibrary,
-        std::string_view testRunStartedId,
-        util::Broadcaster& broadcaster,
-        const std::list<support::PickleSource>& sourcedPickles,
-        cucumber::gherkin::id_generator_ptr idGenerator)
-    {
-        std::list<std::string> testUris;
-        std::map<std::string, AssembledTestSuite> assembledTestSuiteMap;
 
-        for (const auto& pickleSource : sourcedPickles)
+        void AssembleBeforeHooks(support::SupportCodeLibrary supportCodeLibrary, const support::PickleSource& pickleSource, cucumber::messages::test_case& testCase, cucumber::gherkin::id_generator_ptr idGenerator)
         {
-            cucumber::messages::test_case testCase{
-                .id = idGenerator->next_id(),
-                .pickle_id = pickleSource.pickle->id,
-                .test_steps = {},
-                .test_run_started_id = std::make_optional<std::string>(testRunStartedId)
-            };
-
-            testCase.test_steps.reserve(pickleSource.pickle->steps.size() * 2); // steps + hooks
-
             for (const auto& hookId : supportCodeLibrary.hookRegistry.FindIds(HookType::before, pickleSource.pickle->tags))
                 testCase.test_steps.emplace_back(hookId, idGenerator->next_id());
+        }
 
+        void AssembleAfterHooks(support::SupportCodeLibrary supportCodeLibrary, const support::PickleSource& pickleSource, cucumber::messages::test_case& testCase, cucumber::gherkin::id_generator_ptr idGenerator)
+        {
+            for (const auto& hookId : supportCodeLibrary.hookRegistry.FindIds(HookType::after, pickleSource.pickle->tags) | std::views::reverse)
+                testCase.test_steps.emplace_back(hookId, idGenerator->next_id());
+        }
+
+        void AssembleSteps(support::SupportCodeLibrary supportCodeLibrary, const support::PickleSource& pickleSource, cucumber::messages::test_case& testCase, cucumber::gherkin::id_generator_ptr idGenerator)
+        {
             for (const auto& step : pickleSource.pickle->steps)
             {
                 const auto& stepDefinitions = supportCodeLibrary.stepRegistry.StepDefinitions();
@@ -85,9 +75,37 @@ namespace cucumber_cpp::library::assemble
                         argumentList.step_match_arguments.emplace_back(result.Group(), result.Name().empty() ? std::nullopt : std::make_optional(result.Name()));
                 }
             }
+        }
 
-            for (const auto& hookId : supportCodeLibrary.hookRegistry.FindIds(HookType::after, pickleSource.pickle->tags) | std::views::reverse)
-                testCase.test_steps.emplace_back(hookId, idGenerator->next_id());
+        void AssembleTestSteps(support::SupportCodeLibrary supportCodeLibrary, const support::PickleSource& pickleSource, cucumber::messages::test_case& testCase, cucumber::gherkin::id_generator_ptr idGenerator)
+        {
+            AssembleBeforeHooks(supportCodeLibrary, pickleSource, testCase, idGenerator);
+            AssembleSteps(supportCodeLibrary, pickleSource, testCase, idGenerator);
+            AssembleAfterHooks(supportCodeLibrary, pickleSource, testCase, idGenerator);
+        }
+    }
+
+    std::vector<AssembledTestSuite> AssembleTestSuites(support::SupportCodeLibrary supportCodeLibrary,
+        std::string_view testRunStartedId,
+        util::Broadcaster& broadcaster,
+        const std::list<support::PickleSource>& sourcedPickles,
+        cucumber::gherkin::id_generator_ptr idGenerator)
+    {
+        std::list<std::string> testUris;
+        std::map<std::string, AssembledTestSuite> assembledTestSuiteMap;
+
+        for (const auto& pickleSource : sourcedPickles)
+        {
+            cucumber::messages::test_case testCase{
+                .id = idGenerator->next_id(),
+                .pickle_id = pickleSource.pickle->id,
+                .test_steps = {},
+                .test_run_started_id = std::make_optional<std::string>(testRunStartedId)
+            };
+
+            testCase.test_steps.reserve(pickleSource.pickle->steps.size() * 2); // steps + hooks
+
+            AssembleTestSteps(supportCodeLibrary, pickleSource, testCase, idGenerator);
 
             broadcaster.BroadcastEvent(cucumber::messages::envelope{ .test_case = testCase });