Update Snapshots

leonard84 · Dec 28, 2024 · 5d50b53 · 5d50b53
1 parent 8984c44
commit 5d50b53
Show file tree

Hide file tree

Showing 24 changed files with 104 additions and 176 deletions.
diff --git a/...ramework/smoke/ast/AstSpec/Primitive_types_are_used_in_AST_transformation_Groovy____3.txt b/...ramework/smoke/ast/AstSpec/Primitive_types_are_used_in_AST_transformation_Groovy____3.txt
@@ -41,12 +41,8 @@ public class apackage/TestSpec extends spock/lang/Specification implements groov
     ALOAD 3
     POP
     ALOAD 0
-    INVOKEVIRTUAL org/spockframework/lang/SpecInternals.getSpecificationContext ()Lorg/spockframework/lang/ISpecificationContext;
-    LDC Lorg/spockframework/runtime/SpecificationContext;.class
-    INVOKESTATIC org/codehaus/groovy/runtime/ScriptBytecodeAdapter.castToType (Ljava/lang/Object;Ljava/lang/Class;)Ljava/lang/Object;
-    CHECKCAST org/spockframework/runtime/SpecificationContext
     ICONST_0
-    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockEntered (Lorg/spockframework/runtime/SpecificationContext;I)V
+    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockEntered (Lspock/lang/Specification;I)V
     ACONST_NULL
     POP
    L0
@@ -97,21 +93,13 @@ public class apackage/TestSpec extends spock/lang/Specification implements groov
    L13
    FRAME SAME
     ALOAD 0
-    INVOKEVIRTUAL org/spockframework/lang/SpecInternals.getSpecificationContext ()Lorg/spockframework/lang/ISpecificationContext;
-    LDC Lorg/spockframework/runtime/SpecificationContext;.class
-    INVOKESTATIC org/codehaus/groovy/runtime/ScriptBytecodeAdapter.castToType (Ljava/lang/Object;Ljava/lang/Class;)Ljava/lang/Object;
-    CHECKCAST org/spockframework/runtime/SpecificationContext
     ICONST_0
-    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockExited (Lorg/spockframework/runtime/SpecificationContext;I)V
+    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockExited (Lspock/lang/Specification;I)V
     ACONST_NULL
     POP
     ALOAD 0
-    INVOKEVIRTUAL org/spockframework/lang/SpecInternals.getSpecificationContext ()Lorg/spockframework/lang/ISpecificationContext;
-    LDC Lorg/spockframework/runtime/SpecificationContext;.class
-    INVOKESTATIC org/codehaus/groovy/runtime/ScriptBytecodeAdapter.castToType (Ljava/lang/Object;Ljava/lang/Class;)Ljava/lang/Object;
-    CHECKCAST org/spockframework/runtime/SpecificationContext
     ICONST_1
-    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockEntered (Lorg/spockframework/runtime/SpecificationContext;I)V
+    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockEntered (Lspock/lang/Specification;I)V
     ACONST_NULL
     POP
     ALOAD 0
@@ -158,21 +146,13 @@ public class apackage/TestSpec extends spock/lang/Specification implements groov
    L16
    FRAME SAME
     ALOAD 0
-    INVOKEVIRTUAL org/spockframework/lang/SpecInternals.getSpecificationContext ()Lorg/spockframework/lang/ISpecificationContext;
-    LDC Lorg/spockframework/runtime/SpecificationContext;.class
-    INVOKESTATIC org/codehaus/groovy/runtime/ScriptBytecodeAdapter.castToType (Ljava/lang/Object;Ljava/lang/Class;)Ljava/lang/Object;
-    CHECKCAST org/spockframework/runtime/SpecificationContext
     ICONST_1
-    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockExited (Lorg/spockframework/runtime/SpecificationContext;I)V
+    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockExited (Lspock/lang/Specification;I)V
     ACONST_NULL
     POP
     ALOAD 0
-    INVOKEVIRTUAL org/spockframework/lang/SpecInternals.getSpecificationContext ()Lorg/spockframework/lang/ISpecificationContext;
-    LDC Lorg/spockframework/runtime/SpecificationContext;.class
-    INVOKESTATIC org/codehaus/groovy/runtime/ScriptBytecodeAdapter.castToType (Ljava/lang/Object;Ljava/lang/Class;)Ljava/lang/Object;
-    CHECKCAST org/spockframework/runtime/SpecificationContext
     ICONST_2
-    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockEntered (Lorg/spockframework/runtime/SpecificationContext;I)V
+    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockEntered (Lspock/lang/Specification;I)V
     ACONST_NULL
     POP
    L17
@@ -187,12 +167,8 @@ public class apackage/TestSpec extends spock/lang/Specification implements groov
     INVOKEINTERFACE org/codehaus/groovy/runtime/callsite/CallSite.callCurrent (Lgroovy/lang/GroovyObject;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; (itf)
     POP
     ALOAD 0
-    INVOKEVIRTUAL org/spockframework/lang/SpecInternals.getSpecificationContext ()Lorg/spockframework/lang/ISpecificationContext;
-    LDC Lorg/spockframework/runtime/SpecificationContext;.class
-    INVOKESTATIC org/codehaus/groovy/runtime/ScriptBytecodeAdapter.castToType (Ljava/lang/Object;Ljava/lang/Class;)Ljava/lang/Object;
-    CHECKCAST org/spockframework/runtime/SpecificationContext
     ICONST_2
-    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockExited (Lorg/spockframework/runtime/SpecificationContext;I)V
+    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockExited (Lspock/lang/Specification;I)V
     ACONST_NULL
     POP
     ALOAD 0

diff --git a/...ramework/smoke/ast/AstSpec/Primitive_types_are_used_in_AST_transformation_Groovy____4.txt b/...ramework/smoke/ast/AstSpec/Primitive_types_are_used_in_AST_transformation_Groovy____4.txt
@@ -52,16 +52,8 @@ public class apackage/TestSpec extends spock/lang/Specification implements groov
     ALOAD 2
     POP
     ALOAD 0
-    INVOKEVIRTUAL org/spockframework/lang/SpecInternals.getSpecificationContext ()Lorg/spockframework/lang/ISpecificationContext;
-    INVOKEDYNAMIC cast(Lorg/spockframework/lang/ISpecificationContext;)Lorg/spockframework/runtime/SpecificationContext; [
-      // handle kind 0x6 : INVOKESTATIC
-      org/codehaus/groovy/vmplugin/v8/IndyInterface.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;I)Ljava/lang/invoke/CallSite;
-      // arguments:
-      "()", 
-      0
-    ]
     ICONST_0
-    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockEntered (Lorg/spockframework/runtime/SpecificationContext;I)V
+    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockEntered (Lspock/lang/Specification;I)V
     ACONST_NULL
     POP
    L0
@@ -112,29 +104,13 @@ public class apackage/TestSpec extends spock/lang/Specification implements groov
    L13
    FRAME SAME
     ALOAD 0
-    INVOKEVIRTUAL org/spockframework/lang/SpecInternals.getSpecificationContext ()Lorg/spockframework/lang/ISpecificationContext;
-    INVOKEDYNAMIC cast(Lorg/spockframework/lang/ISpecificationContext;)Lorg/spockframework/runtime/SpecificationContext; [
-      // handle kind 0x6 : INVOKESTATIC
-      org/codehaus/groovy/vmplugin/v8/IndyInterface.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;I)Ljava/lang/invoke/CallSite;
-      // arguments:
-      "()", 
-      0
-    ]
     ICONST_0
-    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockExited (Lorg/spockframework/runtime/SpecificationContext;I)V
+    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockExited (Lspock/lang/Specification;I)V
     ACONST_NULL
     POP
     ALOAD 0
-    INVOKEVIRTUAL org/spockframework/lang/SpecInternals.getSpecificationContext ()Lorg/spockframework/lang/ISpecificationContext;
-    INVOKEDYNAMIC cast(Lorg/spockframework/lang/ISpecificationContext;)Lorg/spockframework/runtime/SpecificationContext; [
-      // handle kind 0x6 : INVOKESTATIC
-      org/codehaus/groovy/vmplugin/v8/IndyInterface.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;I)Ljava/lang/invoke/CallSite;
-      // arguments:
-      "()", 
-      0
-    ]
     ICONST_1
-    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockEntered (Lorg/spockframework/runtime/SpecificationContext;I)V
+    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockEntered (Lspock/lang/Specification;I)V
     ACONST_NULL
     POP
     ALOAD 0
@@ -186,29 +162,13 @@ public class apackage/TestSpec extends spock/lang/Specification implements groov
    L16
    FRAME SAME
     ALOAD 0
-    INVOKEVIRTUAL org/spockframework/lang/SpecInternals.getSpecificationContext ()Lorg/spockframework/lang/ISpecificationContext;
-    INVOKEDYNAMIC cast(Lorg/spockframework/lang/ISpecificationContext;)Lorg/spockframework/runtime/SpecificationContext; [
-      // handle kind 0x6 : INVOKESTATIC
-      org/codehaus/groovy/vmplugin/v8/IndyInterface.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;I)Ljava/lang/invoke/CallSite;
-      // arguments:
-      "()", 
-      0
-    ]
     ICONST_1
-    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockExited (Lorg/spockframework/runtime/SpecificationContext;I)V
+    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockExited (Lspock/lang/Specification;I)V
     ACONST_NULL
     POP
     ALOAD 0
-    INVOKEVIRTUAL org/spockframework/lang/SpecInternals.getSpecificationContext ()Lorg/spockframework/lang/ISpecificationContext;
-    INVOKEDYNAMIC cast(Lorg/spockframework/lang/ISpecificationContext;)Lorg/spockframework/runtime/SpecificationContext; [
-      // handle kind 0x6 : INVOKESTATIC
-      org/codehaus/groovy/vmplugin/v8/IndyInterface.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;I)Ljava/lang/invoke/CallSite;
-      // arguments:
-      "()", 
-      0
-    ]
     ICONST_2
-    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockEntered (Lorg/spockframework/runtime/SpecificationContext;I)V
+    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockEntered (Lspock/lang/Specification;I)V
     ACONST_NULL
     POP
    L17
@@ -226,16 +186,8 @@ public class apackage/TestSpec extends spock/lang/Specification implements groov
     ]
     POP
     ALOAD 0
-    INVOKEVIRTUAL org/spockframework/lang/SpecInternals.getSpecificationContext ()Lorg/spockframework/lang/ISpecificationContext;
-    INVOKEDYNAMIC cast(Lorg/spockframework/lang/ISpecificationContext;)Lorg/spockframework/runtime/SpecificationContext; [
-      // handle kind 0x6 : INVOKESTATIC
-      org/codehaus/groovy/vmplugin/v8/IndyInterface.bootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;I)Ljava/lang/invoke/CallSite;
-      // arguments:
-      "()", 
-      0
-    ]
     ICONST_2
-    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockExited (Lorg/spockframework/runtime/SpecificationContext;I)V
+    INVOKESTATIC org/spockframework/runtime/SpockRuntime.callBlockExited (Lspock/lang/Specification;I)V
     ACONST_NULL
     POP
     ALOAD 0

diff --git a/.../org/spockframework/smoke/ast/AstSpec/astToSourceFeatureBody_can_render_everything.groovy b/.../org/spockframework/smoke/ast/AstSpec/astToSourceFeatureBody_can_render_everything.groovy
@@ -7,9 +7,9 @@ public class apackage.ASpec extends spock.lang.Specification {
 
     @org.spockframework.runtime.model.FeatureMetadata(name = 'a feature', ordinal = 0, line = 1, blocks = [@org.spockframework.runtime.model.BlockMetadata(kind = org.spockframework.runtime.model.BlockKind.SETUP, texts = [])], parameterNames = [])
     public void $spock_feature_0_0() {
-        org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 0)
+        org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 0)
         java.lang.Object nothing = null
-        org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 0)
+        org.spockframework.runtime.SpockRuntime.callBlockExited(this, 0)
         this.getSpecificationContext().getMockController().leaveScope()
     }
 

diff --git a/...ork/smoke/ast/AstSpec/astToSourceFeatureBody_can_render_everything__Groovy_4_0_2__.groovy b/...ork/smoke/ast/AstSpec/astToSourceFeatureBody_can_render_everything__Groovy_4_0_2__.groovy
@@ -7,9 +7,9 @@ public class apackage.ASpec extends spock.lang.Specification implements groovy.l
 
     @org.spockframework.runtime.model.FeatureMetadata(name = 'a feature', ordinal = 0, line = 1, blocks = [@org.spockframework.runtime.model.BlockMetadata(kind = org.spockframework.runtime.model.BlockKind.SETUP, texts = [])], parameterNames = [])
     public void $spock_feature_0_0() {
-        org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 0)
+        org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 0)
         java.lang.Object nothing = null
-        org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 0)
+        org.spockframework.runtime.SpockRuntime.callBlockExited(this, 0)
         this.getSpecificationContext().getMockController().leaveScope()
     }
 

diff --git a/.../AstSpec/astToSourceFeatureBody_renders_only_methods_and_its_annotation_by_default.groovy b/.../AstSpec/astToSourceFeatureBody_renders_only_methods_and_its_annotation_by_default.groovy
@@ -6,9 +6,9 @@ class ASpec extends Specification {
 /*--------- tag::snapshot[] ---------*/
 @org.spockframework.runtime.model.FeatureMetadata(name = 'a feature', ordinal = 0, line = 1, blocks = [@org.spockframework.runtime.model.BlockMetadata(kind = org.spockframework.runtime.model.BlockKind.SETUP, texts = [])], parameterNames = [])
 public void $spock_feature_0_0() {
-    org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 0)
+    org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 0)
     java.lang.Object nothing = null
-    org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 0)
+    org.spockframework.runtime.SpockRuntime.callBlockExited(this, 0)
     this.getSpecificationContext().getMockController().leaveScope()
 }
 /*--------- end::snapshot[] ---------*/

diff --git a/...y_methods__fields__properties__object_initializers_and_their_annotation_by_default.groovy b/...y_methods__fields__properties__object_initializers_and_their_annotation_by_default.groovy
@@ -12,9 +12,9 @@ private java.lang.Object $spock_initializeFields() {
 
 @org.spockframework.runtime.model.FeatureMetadata(name = 'a feature', ordinal = 0, line = 3, blocks = [@org.spockframework.runtime.model.BlockMetadata(kind = org.spockframework.runtime.model.BlockKind.SETUP, texts = [])], parameterNames = [])
 public void $spock_feature_0_0() {
-    org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 0)
+    org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 0)
     java.lang.Object nothing = null
-    org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 0)
+    org.spockframework.runtime.SpockRuntime.callBlockExited(this, 0)
     this.getSpecificationContext().getMockController().leaveScope()
 }
 /*--------- end::snapshot[] ---------*/

diff --git a/...s/org/spockframework/smoke/ast/BlocksAst/all_observable_blocks_with_GString_labels.groovy b/...s/org/spockframework/smoke/ast/BlocksAst/all_observable_blocks_with_GString_labels.groovy
@@ -9,30 +9,30 @@ public void $spock_feature_0_0() {
     org.spockframework.runtime.ErrorCollector $spock_errorCollector = org.spockframework.runtime.ErrorRethrower.INSTANCE
     org.spockframework.runtime.ValueRecorder $spock_valueRecorder = new org.spockframework.runtime.ValueRecorder()
     java.lang.Integer idx = 0
-    org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 0)
+    org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 0)
     "given ${( idx )++}"
-    org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 0)
-    org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 1)
+    org.spockframework.runtime.SpockRuntime.callBlockExited(this, 0)
+    org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 1)
     try {
         org.spockframework.runtime.SpockRuntime.verifyCondition($spock_errorCollector, $spock_valueRecorder.reset(), '\"expect \${idx++}\"', 3, 13, null, $spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(2), "${$spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(1), ( idx )++)}expect "))
     }
     catch (java.lang.Throwable $spock_condition_throwable) {
         org.spockframework.runtime.SpockRuntime.conditionFailedWithException($spock_errorCollector, $spock_valueRecorder, '\"expect \${idx++}\"', 3, 13, null, $spock_condition_throwable)}
     finally {
     }
-    org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 1)
-    org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 2)
+    org.spockframework.runtime.SpockRuntime.callBlockExited(this, 1)
+    org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 2)
     "when ${( idx )++}"
-    org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 2)
-    org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 3)
+    org.spockframework.runtime.SpockRuntime.callBlockExited(this, 2)
+    org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 3)
     try {
         org.spockframework.runtime.SpockRuntime.verifyCondition($spock_errorCollector, $spock_valueRecorder.reset(), '\"then \${idx++}\"', 5, 11, null, $spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(2), "${$spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(1), ( idx )++)}then "))
     }
     catch (java.lang.Throwable $spock_condition_throwable) {
         org.spockframework.runtime.SpockRuntime.conditionFailedWithException($spock_errorCollector, $spock_valueRecorder, '\"then \${idx++}\"', 5, 11, null, $spock_condition_throwable)}
     finally {
     }
-    org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 3)
+    org.spockframework.runtime.SpockRuntime.callBlockExited(this, 3)
     this.getSpecificationContext().getMockController().leaveScope()
 }
 /*--------- end::snapshot[] ---------*/

diff --git a/...ots/org/spockframework/smoke/ast/BlocksAst/all_observable_blocks_with_empty_labels.groovy b/...ots/org/spockframework/smoke/ast/BlocksAst/all_observable_blocks_with_empty_labels.groovy
@@ -8,14 +8,14 @@ class ASpec extends Specification {
 public void $spock_feature_0_0() {
     java.lang.Throwable $spock_feature_throwable
     try {
-        org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 0)
-        org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 0)
-        org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 1)
-        org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 1)
-        org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 2)
-        org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 2)
-        org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 3)
-        org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 3)
+        org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 0)
+        org.spockframework.runtime.SpockRuntime.callBlockExited(this, 0)
+        org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 1)
+        org.spockframework.runtime.SpockRuntime.callBlockExited(this, 1)
+        org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 2)
+        org.spockframework.runtime.SpockRuntime.callBlockExited(this, 2)
+        org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 3)
+        org.spockframework.runtime.SpockRuntime.callBlockExited(this, 3)
     }
     catch (java.lang.Throwable $spock_tmp_throwable) {
         $spock_feature_throwable = $spock_tmp_throwable
@@ -27,8 +27,8 @@ public void $spock_feature_0_0() {
             if ( $spock_feature_throwable != null) {
                 $spock_failedBlock = this.getSpecificationContext().getCurrentBlock()
             }
-            org.spockframework.runtime.SpockRuntime.callBlockEntered(this.getSpecificationContext(), 4)
-            org.spockframework.runtime.SpockRuntime.callBlockExited(this.getSpecificationContext(), 4)
+            org.spockframework.runtime.SpockRuntime.callBlockEntered(this, 4)
+            org.spockframework.runtime.SpockRuntime.callBlockExited(this, 4)
         }
         catch (java.lang.Throwable $spock_tmp_throwable) {
             if ( $spock_feature_throwable != null) {