[Spring] Do not invoke after test method if test failed to start (#2585)

Author: mpkorstanje

CHANGELOG.md

@@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 * [Java] Process glue classes distinctly ([#2582](https://github.com/cucumber/cucumber-jvm/pull/2582) M.P. Korstanje)
+* [Spring] Do not invoke after test methods if test failed to start ([#2585](https://github.com/cucumber/cucumber-jvm/pull/2585) M.P. Korstanje)
 
 ## [7.4.1] (2022-06-23)
 

spring/src/main/java/io/cucumber/spring/TestContextAdaptor.java

@@ -21,6 +21,7 @@ class TestContextAdaptor {
     private final TestContextManager delegate;
     private final ConfigurableApplicationContext applicationContext;
     private final Collection<Class<?>> glueClasses;
+    private Object delegateTestInstance;
 
     TestContextAdaptor(
             TestContextManager delegate,
@@ -51,7 +52,7 @@ public final void start() {
     private void notifyTestContextManagerAboutBeforeTestMethod() {
         try {
             Class<?> delegateTestClass = delegate.getTestContext().getTestClass();
-            Object delegateTestInstance = applicationContext.getBean(delegateTestClass);
+            delegateTestInstance = applicationContext.getBean(delegateTestClass);
             Method dummyMethod = TestContextAdaptor.class.getMethod("cucumberDoesNotHaveASingleTestMethod");
             delegate.beforeTestMethod(delegateTestInstance, dummyMethod);
         } catch (Exception e) {
@@ -106,7 +107,10 @@ public final void stop() {
         // session. This is not ideal, but Cucumber only supports 1 set of
         // before/after semantics while JUnit and Spring have 2 sets.
         if (CucumberTestContext.getInstance().isActive()) {
-            notifyTestContextManagerAboutAfterTestMethod();
+            if(delegateTestInstance != null) {
+                notifyTestContextManagerAboutAfterTestMethod();
+                delegateTestInstance = null;
+            }
             CucumberTestContext.getInstance().stop();
         }
         notifyTestContextManagerAboutAfterTestClass();

spring/src/test/java/io/cucumber/spring/SpringFactoryTest.java

@@ -349,6 +349,7 @@ void shouldBeStoppableWhenFacedWithMissingContextConfiguration() {
     @ValueSource(classes = {
             FailedBeforeTestClassContextConfiguration.class,
             FailedBeforeTestMethodContextConfiguration.class,
+            FailedTestInstanceContextConfiguration.class
     })
     void shouldBeStoppableWhenFacedWithFailedApplicationContext(Class<?> contextConfiguration) {
         final ObjectFactory factory = new SpringFactory();
@@ -424,6 +425,14 @@ public void beforeTestMethod(TestContext testContext) throws Exception {
         }
 
     }
+    @CucumberContextConfiguration
+    @ContextConfiguration("classpath:cucumber.xml")
+    public static class FailedTestInstanceContextConfiguration {
+
+        public FailedTestInstanceContextConfiguration(){
+            throw new RuntimeException();
+        }
+    }
 
     public static class StubException extends Exception {