[ISSUE-274] detect whether where: parameters are being executed and s…

…o should be reference in the expect: block

spock-core/src/main/java/org/spockframework/compiler/DeepBlockRewriter.java

@@ -16,16 +16,19 @@
 
 package org.spockframework.compiler;
 
-import java.util.List;
-
-import org.codehaus.groovy.ast.*;
+import org.codehaus.groovy.ast.Parameter;
 import org.codehaus.groovy.ast.expr.*;
-import org.codehaus.groovy.ast.stmt.*;
-
+import org.codehaus.groovy.ast.stmt.AssertStatement;
+import org.codehaus.groovy.ast.stmt.BlockStatement;
+import org.codehaus.groovy.ast.stmt.ExpressionStatement;
+import org.codehaus.groovy.ast.stmt.Statement;
 import org.codehaus.groovy.syntax.Types;
 import org.spockframework.compiler.model.*;
 import org.spockframework.util.Nullable;
 
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * Walks the statement and expression tree to:
  * - rewrite explicit conditions,
@@ -89,13 +92,33 @@ public void visitDeclarationExpression(DeclarationExpression expr) {
   protected void doVisitMethodCallExpression(final MethodCallExpression expr) {
     super.doVisitMethodCallExpression(expr);
 
+    handleImplicitCallOnParam(expr);
+
     boolean handled = handleMockCall(expr)
         || handleThrownCall(expr)
         || handleOldCall(expr)
         || handleInteractionBlockCall(expr)
         || forbidUseOfSuperInFixtureMethod(expr);
   }
 
+  private void handleImplicitCallOnParam(final MethodCallExpression expr) {
+    String methodName = expr.getMethodAsString();
+
+    List<Parameter> params = Arrays.asList(resources.getCurrentMethod().getAst().getParameters());
+    boolean methodIsParam = false;
+
+    for(Parameter param : params) {
+      if (param.getName().equals(methodName)) {
+        methodIsParam = true;
+      }
+    }
+
+    if (methodIsParam) {
+      expr.setMethod(new ConstantExpression("call"));
+      expr.setObjectExpression(new VariableExpression(methodName));
+    }
+  }
+
   private boolean handleInteraction(ExpressionStatement stat) {
     InteractionRewriter rewriter = new InteractionRewriter(resources, getCurrentWithOrMockClosure());
     ExpressionStatement interaction = rewriter.rewrite(stat);

spock-specs/src/test/groovy/org/spockframework/runtime/condition/ClosureAsDataValueCallSpec.groovy

@@ -0,0 +1,24 @@
+package org.spockframework.runtime.condition
+import org.spockframework.EmbeddedSpecification
+import spock.lang.Issue
+
+class ClosureAsDataValueCallSpec extends EmbeddedSpecification {
+
+  @Issue("http://issues.spockframework.org/detail?id=274")
+  def "multi line expression failss"() {
+    when:
+    runner.runSpecBody("""
+    def "multi line expression failing"() {
+      expect:
+      1 == wibble()
+
+      where:
+      wibble = { 1 }
+    }
+    """)
+
+    then:
+    notThrown(Exception)
+  }
+}
+