Merge branches 'vampire/mixin-spec-internals' and 'vampire/use-snapshot-id' into 'vampire/flexible-version-check'

Author: Vampire

spock-core/src/main/java/org/spockframework/lang/SpecInternals.java

@@ -14,6 +14,7 @@
 
 package org.spockframework.mock;
 
+import org.spockframework.runtime.GroovyRuntimeUtil;
 import org.spockframework.runtime.extension.IDefaultValueProviderExtension;
 import org.spockframework.util.ReflectionUtil;
 import org.spockframework.util.ThreadSafe;
@@ -160,7 +161,8 @@ private Object createDummy(IMockInvocation invocation) {
     Class<?> type = invocation.getMethod().getReturnType();
     Type genericType = invocation.getMethod().getExactReturnType();
     Specification spec = invocation.getMockObject().getSpecification();
-    return spec.createMock("dummy", genericType, MockNature.STUB, GroovyObject.class.isAssignableFrom(type) ?
+    return GroovyRuntimeUtil.invokeMethod(spec, "createMock",
+        "dummy", genericType, MockNature.STUB, GroovyObject.class.isAssignableFrom(type) ?
         MockImplementation.GROOVY : MockImplementation.JAVA, emptyMap(), null);
   }
 }

spock-core/src/main/java/org/spockframework/mock/EmptyOrDummyResponse.java

@@ -15,10 +15,12 @@
 
 package org.spockframework.runtime;
 
+import org.codehaus.groovy.runtime.DefaultGroovyMethods;
 import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.support.descriptor.EngineDescriptor;
 import org.junit.platform.engine.support.hierarchical.Node;
 import org.junit.platform.engine.support.hierarchical.ThrowableCollector;
+import spock.lang.Specification;
 
 public class SpockEngineDescriptor extends EngineDescriptor implements Node<SpockExecutionContext> {
   private final RunContext runContext;
@@ -35,6 +37,7 @@ public SpockExecutionContext prepare(SpockExecutionContext context) throws Excep
 
   @Override
   public SpockExecutionContext before(SpockExecutionContext context) throws Exception {
+    DefaultGroovyMethods.mixin(Specification.class, SpecialMethodCallTarget.class);
     SpockExecution spockExecution = new SpockExecution(context.getStoreProvider());
     context.getRunContext().startExecution(spockExecution);
     return context;

spock-core/src/main/java/org/spockframework/runtime/SpecialMethodCallTarget.java

@@ -302,8 +302,6 @@ thrown(RuntimeException)
     WrongExceptionThrownError e = thrown()
 
     stackTraceLooksLike e, """
-org.spockframework.lang.SpecInternals|checkExceptionThrown|-
-org.spockframework.lang.SpecInternals|thrownImpl|-
 apackage.ASpec|a feature|5
     """
 

spock-core/src/main/java/org/spockframework/runtime/SpockEngineDescriptor.java

@@ -344,30 +344,10 @@ class Ext <T extends Serializable, V extends Cloneable> {
     snapshotter.assertThat(result.source).matchesSnapshot()
   }
 
-  @Requires({ GroovyRuntimeUtil.MAJOR_VERSION >= 4 })
-  def "Primitive types are used in AST transformation Groovy >= 4"() {
-    when:
-    def result = compiler.transpileWithImports('''
-class TestSpec extends Specification {
-  def 'test'() {
-    expect:
-    true
-    when:
-    true
-    then:
-    thrown(RuntimeException)
-  }
-}
-''',
-        EnumSet.of(Show.METHODS),
-        CompilePhase.OUTPUT)
-
-    then:
-    textSnapshotter.assertThat(result.source).matchesSnapshot()
-  }
+  def "Primitive types are used in AST transformation"() {
+    given:
+    def snapshotId = (GroovyRuntimeUtil.MAJOR_VERSION >= 4) ? "groovy4" : ""
 
-  @Requires({ GroovyRuntimeUtil.MAJOR_VERSION <= 3 })
-  def "Primitive types are used in AST transformation Groovy <= 3"() {
     when:
     def result = compiler.transpileWithImports('''
 class TestSpec extends Specification {
@@ -385,6 +365,6 @@ class TestSpec extends Specification {
         CompilePhase.OUTPUT)
 
     then:
-    textSnapshotter.assertThat(result.source).matchesSnapshot()
+    textSnapshotter.assertThat(result.source).matchesSnapshot(snapshotId)
   }
 }