[Bug] Code constraint argument verification fails when a closure is used inside

[mutyonok]

Issue description

After upgrade to spock 1.3-groovy-2.5 and changing argument verification code constraint blocks according to docs (a check per line without assert or &&), tests with closures inside constraint blocks are failing.

How to reproduce

• add mock interaction check with argument code constraint
• add a check with a closure inside that code constraint block
  Result:
• invocation is not found (see gist output)

Link to a gist or similar (optional)

https://gist.github.com/mutyonok/609373367161a0281a494863f4778a2a

Additional Environment information

Java/JDK

1.8.0_201

Groovy version

2.5.3

Build tool version

Gradle

5.3.1

Operating System

macOS X Mojave

IDE

IntelliJ IDEA 2019.1 (Ultimate Edition)
Build #IU-191.6183.87, built on March 27, 2019
JRE: 1.8.0_152-release-991-b1 x86_64
JVM: OpenJDK 64-Bit Server VM by JetBrains s.r.o
macOS 10.14.4

Build-tool dependencies used

Gradle/Grails

testCompile "org.spockframework:spock-core:1.3-groovy-2.5"

[leonard84]

  def "match code argument with inner closure"() {
    List list = Mock()

    when:
    list.add(['foo'])
    then:
    1 * list.add({ outer -> outer.any{ it.length() > 1 } })
  }

The problem seems to be that the inner closure is also treated as a condition closure, which in turn causes it to return null. This becomes even more obvious if the inner condition actually fails, since then it renders as a Condition not satisfied.

[mutyonok]

Nice example. Any ideas how hard would it be to fix?

[tommyli]

Also verified code from leonard84 fails only in Spock 1.3 on both Groovy 2.4. and 2.5 (1.3-groovy-2.4 and 1.3-groovy-2.5 respectively). Passes on 1.2-groovy-2.4 and 1.2-groovy-2.5.

Here's a workaround (which also proves the issue has something to do with using closures inside a closure argument constraint.):

  def "match code argument with inner closure"() {
    List list = Mock()
    def innerPredicate = { it.length() > 1 }

    when:
    list.add(['foo'])

    then:
//    1 * list.add({ outer -> outer.any { it.length() > 1 } })
    1 * list.add({ outer -> outer.any(innerPredicate) })
  }

[leonard84]

I don't really know how hard it will be, but it's in a tricky part of the https://github.com/spockframework/spock/blob/master/spock-core/src/main/java/org/spockframework/compiler/DeepBlockRewriter.java introduced by 1a84301
It will be complicated to get it to work right.