Add spring7 tests

settings.gradle

@@ -104,6 +104,7 @@ if (variant == 2.5) {
   // require Java 17 which isn't supported by Groovy 2.5
   include "spock-spring:boot3-test"
   include "spock-spring:spring6-test"
+  include "spock-spring:spring7-test"
 }
 
 // https://issues.apache.org/jira/projects/TAP5/issues/TAP5-2588

spock-spring/spring7-test/spring7-test.gradle

@@ -0,0 +1,34 @@
+def springVersion = "7.0.0"
+
+java {
+  toolchain {
+    languageVersion = JavaLanguageVersion.of(17)
+  }
+}
+
+tasks.withType(JavaCompile).configureEach {
+  javaCompiler = javaToolchains.compilerFor {
+    languageVersion = JavaLanguageVersion.of(17)
+  }
+  options.encoding = 'UTF-8'
+}
+
+dependencies {
+  implementation "org.springframework:spring-core"
+
+  testImplementation projects.spockCore
+  testImplementation projects.spockSpring
+  testImplementation libs.junit4
+  testImplementation "org.springframework:spring-context"
+  testImplementation("org.springframework:spring-test")
+
+}
+
+
+configurations.all {
+  resolutionStrategy.eachDependency {
+    if (requested.group == "org.springframework" ) {
+      useVersion(springVersion)
+    }
+  }
+}

spock-spring/spring7-test/src/test/groovy/org/spockframework/spring7/NoMockConfig.groovy

@@ -0,0 +1,35 @@
+package org.spockframework.spring7
+
+import groovy.transform.CompileStatic
+import org.springframework.context.annotation.Bean
+
+import java.util.concurrent.Callable
+import java.util.concurrent.ExecutorService
+
+@CompileStatic
+class NoMockConfig {
+
+  @Bean
+  ExecutorService executor() {
+    throw new RuntimeException("This should not be called")
+  }
+
+  @Bean
+  ServiceExecutor serviceExecutor(ExecutorService executorService) {
+    return new ServiceExecutor(executorService)
+  }
+
+
+}
+
+class ServiceExecutor {
+  private final ExecutorService executorService
+
+  ServiceExecutor(ExecutorService executorService) {
+    this.executorService = executorService
+  }
+
+  def exec() {
+    executorService.submit({"done"} as Callable).get()
+  }
+}

spock-spring/spring7-test/src/test/groovy/org/spockframework/spring7/RuntimeCompatibilitySpec.groovy

@@ -0,0 +1,24 @@
+package org.spockframework.spring7
+
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.test.context.ContextConfiguration
+import spock.lang.Specification
+
+import java.util.concurrent.Executor
+
+@ContextConfiguration(classes = TestConfig)
+class RuntimeCompatibilitySpec extends Specification {
+
+  @Autowired
+  Executor injectMe
+
+  def "no runtime errors are thrown"() {
+    expect:
+    1 == 1
+  }
+
+  def "injection works"() {
+    expect:
+    injectMe != null
+  }
+}

spock-spring/spring7-test/src/test/groovy/org/spockframework/spring7/SpringBeanTest.groovy

@@ -0,0 +1,30 @@
+package org.spockframework.spring7
+
+import org.spockframework.spring.SpringBean
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.test.context.ContextConfiguration
+import spock.lang.Specification
+
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Future
+
+@ContextConfiguration(classes = NoMockConfig)
+class SpringBeanTest extends Specification {
+
+  @Autowired
+  ServiceExecutor serviceExecutor
+
+  @SpringBean
+  ExecutorService executor = Mock()
+
+  def "replace executor"() {
+    when:
+    def result = serviceExecutor.exec()
+
+    then:
+    result == 'mocked'
+    1 * executor.submit(_) >> Stub(Future) {
+      get() >> 'mocked'
+    }
+  }
+}

spock-spring/spring7-test/src/test/groovy/org/spockframework/spring7/SpringRunnerTest.java

@@ -0,0 +1,21 @@
+package org.spockframework.spring7;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * Make sure we still can correctly execute tests executed by the SpringRunner that are not spock tests
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration
+public class SpringRunnerTest {
+
+  @Test
+  public void testThatSpringRunnerExecutesCorrectly() {
+    Assert.assertTrue(true);
+  }
+
+}

spock-spring/spring7-test/src/test/groovy/org/spockframework/spring7/TestConfig.groovy

@@ -0,0 +1,17 @@
+package org.spockframework.spring7
+
+import groovy.transform.CompileStatic
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import spock.mock.DetachedMockFactory
+
+import java.util.concurrent.Executor
+
+@CompileStatic
+@Configuration
+class TestConfig {
+  @Bean
+  Executor executor() {
+    new DetachedMockFactory().Stub(Executor)
+  }
+}