Fix tests

Author: mpkorstanje

core/src/test/java/io/cucumber/core/runner/RunnerTest.java

@@ -5,6 +5,7 @@
 import io.cucumber.core.backend.Glue;
 import io.cucumber.core.backend.HookDefinition;
 import io.cucumber.core.backend.ObjectFactory;
+import io.cucumber.core.backend.StaticHookDefinition;
 import io.cucumber.core.eventbus.EventBus;
 import io.cucumber.core.feature.TestFeatureParser;
 import io.cucumber.core.gherkin.Feature;
@@ -46,36 +47,36 @@ class RunnerTest {
     };
 
     @Test
-    void hooks_execute_when_world_exist() {
-        final HookDefinition beforeHook = addBeforeHook();
-        final HookDefinition afterHook = addAfterHook();
+    void hooks_execute_inside_world_and_around_world() {
+        StaticHookDefinition beforeAllHook = createStaticHook();
+        StaticHookDefinition afterAllHook = createStaticHook();
+        HookDefinition beforeHook = createHook();
+        HookDefinition afterHook = createHook();
 
         Backend backend = mock(Backend.class);
         when(backend.getSnippet()).thenReturn(new TestSnippet());
         ObjectFactory objectFactory = mock(ObjectFactory.class);
         doAnswer(invocation -> {
             Glue glue = invocation.getArgument(0);
-            glue.addAfterHook(afterHook);
+            glue.addBeforeAllHook(beforeAllHook);
+            glue.addAfterAllHook(afterAllHook);
             glue.addBeforeHook(beforeHook);
+            glue.addAfterHook(afterHook);
             return null;
         }).when(backend).loadGlue(any(Glue.class), ArgumentMatchers.anyList());
 
-        new Runner(bus, singletonList(backend), objectFactory, typeRegistryConfigurer, runtimeOptions)
-                .runPickle(createPicklesWithSteps());
+        Runner runner = new Runner(bus, singletonList(backend), objectFactory, typeRegistryConfigurer, runtimeOptions);
+        runner.runBeforeAllHooks();
+        runner.runPickle(createPicklesWithSteps());
+        runner.runAfterAllHooks();
 
-        InOrder inOrder = inOrder(beforeHook, afterHook, backend);
+        InOrder inOrder = inOrder(beforeAllHook,  afterAllHook, beforeHook, afterHook, backend);
+        inOrder.verify(beforeAllHook).execute();
         inOrder.verify(backend).buildWorld();
         inOrder.verify(beforeHook).execute(any(TestCaseState.class));
         inOrder.verify(afterHook).execute(any(TestCaseState.class));
         inOrder.verify(backend).disposeWorld();
-    }
-
-    private HookDefinition addBeforeHook() {
-        return addHook();
-    }
-
-    private HookDefinition addAfterHook() {
-        return addHook();
+        inOrder.verify(afterAllHook).execute();
     }
 
     private Pickle createPicklesWithSteps() {
@@ -86,7 +87,13 @@ private Pickle createPicklesWithSteps() {
         return feature.getPickles().get(0);
     }
 
-    private HookDefinition addHook() {
+    private StaticHookDefinition createStaticHook() {
+        StaticHookDefinition hook = mock(StaticHookDefinition.class);
+        when(hook.getLocation()).thenReturn("");
+        return hook;
+    }
+
+    private HookDefinition createHook() {
         HookDefinition hook = mock(HookDefinition.class);
         when(hook.getTagExpression()).thenReturn("");
         when(hook.getLocation()).thenReturn("");
@@ -98,7 +105,7 @@ void steps_are_skipped_after_failure() {
         StubStepDefinition stepDefinition = spy(new StubStepDefinition("some step"));
         Pickle pickleMatchingStepDefinitions = createPickleMatchingStepDefinitions(stepDefinition);
 
-        final HookDefinition failingBeforeHook = addBeforeHook();
+        final HookDefinition failingBeforeHook = createHook();
         doThrow(new RuntimeException("Boom")).when(failingBeforeHook).execute(ArgumentMatchers.any());
         TestRunnerSupplier runnerSupplier = new TestRunnerSupplier(bus, runtimeOptions) {
             @Override
@@ -155,7 +162,7 @@ public void loadGlue(Glue glue, List<URI> gluePaths) {
     }
 
     private HookDefinition addAfterStepHook() {
-        return addHook();
+        return createHook();
     }
 
     @Test
@@ -185,10 +192,10 @@ public void loadGlue(Glue glue, List<URI> gluePaths) {
 
     @Test
     void hooks_execute_also_after_failure() {
-        final HookDefinition failingBeforeHook = addBeforeHook();
+        final HookDefinition failingBeforeHook = createHook();
         doThrow(new RuntimeException("boom")).when(failingBeforeHook).execute(any(TestCaseState.class));
-        final HookDefinition beforeHook = addBeforeHook();
-        final HookDefinition afterHook = addAfterHook();
+        final HookDefinition beforeHook = createHook();
+        final HookDefinition afterHook = createHook();
 
         TestRunnerSupplier runnerSupplier = new TestRunnerSupplier(bus, runtimeOptions) {
             @Override
@@ -241,8 +248,8 @@ public void loadGlue(Glue glue, List<URI> gluePaths) {
     void hooks_not_executed_in_dry_run_mode() {
         RuntimeOptions runtimeOptions = new RuntimeOptionsBuilder().setDryRun().build();
 
-        final HookDefinition beforeHook = addBeforeHook();
-        final HookDefinition afterHook = addAfterHook();
+        final HookDefinition beforeHook = createHook();
+        final HookDefinition afterHook = createHook();
         final HookDefinition afterStepHook = addAfterStepHook();
 
         TestRunnerSupplier runnerSupplier = new TestRunnerSupplier(bus, runtimeOptions) {
@@ -263,8 +270,8 @@ public void loadGlue(Glue glue, List<URI> gluePaths) {
 
     @Test
     void hooks_not_executed_for_empty_pickles() {
-        final HookDefinition beforeHook = addBeforeHook();
-        final HookDefinition afterHook = addAfterHook();
+        final HookDefinition beforeHook = createHook();
+        final HookDefinition afterHook = createHook();
         final HookDefinition afterStepHook = addAfterStepHook();
 
         TestRunnerSupplier runnerSupplier = new TestRunnerSupplier(bus, runtimeOptions) {