Signed-off-by: Pavlo Shevchenko <pavel.shevchenko.95@gmail.com>

Transform only top-level implicit conditions in helper methods

Signed-off-by: Pavlo Shevchenko <pavel.shevchenko.95@gmail.com>

Author: pshevche

spock-core/src/main/java/org/spockframework/compiler/condition/BaseVerifyMethodRewriter.java

@@ -24,6 +24,7 @@
 import org.spockframework.compiler.StatementReplacingVisitorSupport;
 
 import java.util.List;
+import java.util.ListIterator;
 
 import static org.spockframework.compiler.condition.ImplicitConditionsUtils.checkIsValidImplicitCondition;
 import static org.spockframework.compiler.condition.ImplicitConditionsUtils.isImplicitCondition;
@@ -32,6 +33,7 @@ abstract class BaseVerifyMethodRewriter extends StatementReplacingVisitorSupport
 
   final IRewriteResources resources;
   private final MethodNode methodNode;
+  private Statement currentTopLevelStatement;
   private boolean conditionFound = false;
 
   BaseVerifyMethodRewriter(MethodNode methodNode, IRewriteResources resources) {
@@ -42,24 +44,33 @@ abstract class BaseVerifyMethodRewriter extends StatementReplacingVisitorSupport
   abstract void defineErrorCollector(List<Statement> statements);
 
   public void rewrite() {
-    methodNode.getCode().visit(this);
+    ListIterator<Statement> statements = AstUtil.getStatements(methodNode).listIterator();
+    while (statements.hasNext()) {
+      Statement next = statements.next();
+      currentTopLevelStatement = next;
+      statements.set(replace(next));
+    }
     defineRecorders();
   }
 
   @Override
   public void visitAssertStatement(AssertStatement stat) {
     super.visitAssertStatement(stat);
-    conditionFound();
-    replaceVisitedStatementWith(ConditionRewriter.rewriteExplicitCondition(stat, resources));
+    if (stat == currentTopLevelStatement) {
+      conditionFound();
+      replaceVisitedStatementWith(ConditionRewriter.rewriteExplicitCondition(stat, resources));
+    }
   }
 
   @Override
-  public void visitExpressionStatement(ExpressionStatement statement) {
-    super.visitExpressionStatement(statement);
-    if (isImplicitCondition(statement)) {
-      checkIsValidImplicitCondition(statement, resources.getErrorReporter());
-      conditionFound();
-      replaceVisitedStatementWith(ConditionRewriter.rewriteImplicitCondition(statement, resources));
+  public void visitExpressionStatement(ExpressionStatement stat) {
+    super.visitExpressionStatement(stat);
+    if (isImplicitCondition(stat)) {
+      checkIsValidImplicitCondition(stat, resources.getErrorReporter());
+      if (stat == currentTopLevelStatement) {
+        conditionFound();
+        replaceVisitedStatementWith(ConditionRewriter.rewriteImplicitCondition(stat, resources));
+      }
     }
   }
 

spock-core/src/main/java/spock/lang/Verify.java

@@ -26,7 +26,6 @@
  * and void method invocations will not be considered conditions.
  * The method can be defined in the {@link Specification} class or in a separate class.
  * The method must have a {@code void} return type.
- * Conditions on all levels will be transformed into assertions.
  * The test will fail on the first failing assertion.
  */
 @Target(ElementType.METHOD)

spock-core/src/main/java/spock/lang/VerifyAll.java

@@ -26,7 +26,6 @@
  * and void method invocations will not be considered conditions.
  * The method can be defined inside the {@link Specification} class or in a separate class.
  * The method must have a {@code void} return type.
- * Conditions on all levels will be transformed into assertions.
  * In contrast to {@link Verify}, all conditions will be evaluated before failing the test.
  */
 @Target(ElementType.METHOD)

spock-specs/src/test/groovy/org/spockframework/smoke/ast/condition/BaseVerifyMethodsAstSpec.groovy

@@ -141,7 +141,7 @@ class Assertions {
     snapshotter.assertThat(result.source).matchesSnapshot()
   }
 
-  def "transforms nested conditions"() {
+  def "transforms only top-level conditions"() {
     when:
     def result = compiler.transpile("""
 class Assertions {

…Spec/transforms_nested_conditions.groovy …nsforms_only_top_level_conditions.groovyspock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/condition/VerifyAllMethodsAstSpec/transforms_nested_conditions.groovy renamed to spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/condition/VerifyAllMethodsAstSpec/transforms_only_top_level_conditions.groovy spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/condition/VerifyAllMethodsAstSpec/transforms_nested_conditions.groovy renamed to spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/condition/VerifyAllMethodsAstSpec/transforms_only_top_level_conditions.groovy

@@ -13,13 +13,7 @@ public class Assertions extends java.lang.Object {
             finally {
             }
             if ( a > 0) {
-                try {
-                    org.spockframework.runtime.SpockRuntime.verifyCondition($spock_errorCollector, $spock_valueRecorder.reset(), 'a % 2 == 0', 7, 13, null, $spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(4), $spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(2), $spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(0), a) % $spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(1), 2)) == $spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(3), 0)))
-                }
-                catch (java.lang.Throwable $spock_condition_throwable) {
-                    org.spockframework.runtime.SpockRuntime.conditionFailedWithException($spock_errorCollector, $spock_valueRecorder, 'a % 2 == 0', 7, 13, null, $spock_condition_throwable)}
-                finally {
-                }
+                a % 2 == 0
             }
         }
         finally {

…Spec/transforms_nested_conditions.groovy …nsforms_only_top_level_conditions.groovyspock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/condition/VerifyMethodsAstSpec/transforms_nested_conditions.groovy renamed to spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/condition/VerifyMethodsAstSpec/transforms_only_top_level_conditions.groovy spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/condition/VerifyMethodsAstSpec/transforms_nested_conditions.groovy renamed to spock-specs/src/test/resources/snapshots/org/spockframework/smoke/ast/condition/VerifyMethodsAstSpec/transforms_only_top_level_conditions.groovy

@@ -12,13 +12,7 @@ public class Assertions extends java.lang.Object {
         finally {
         }
         if ( a > 0) {
-            try {
-                org.spockframework.runtime.SpockRuntime.verifyCondition($spock_errorCollector, $spock_valueRecorder.reset(), 'a % 2 == 0', 7, 13, null, $spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(4), $spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(2), $spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(0), a) % $spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(1), 2)) == $spock_valueRecorder.record($spock_valueRecorder.startRecordingValue(3), 0)))
-            }
-            catch (java.lang.Throwable $spock_condition_throwable) {
-                org.spockframework.runtime.SpockRuntime.conditionFailedWithException($spock_errorCollector, $spock_valueRecorder, 'a % 2 == 0', 7, 13, null, $spock_condition_throwable)}
-            finally {
-            }
+            a % 2 == 0
         }
     }