Fixup exception handling on MissingPropertyException

Author: AndreasTu

spock-core/src/main/java/org/spockframework/mock/runtime/GroovyRealGetPropertyInvoker.java

@@ -53,7 +53,7 @@ public Object respond(IMockInvocation invocation) {
       Object receiver = invocation.getMockObject().getInstance();
       try {
         return metaClass.getProperty(sender, receiver, property, useSuper, fromInsideClass);
-      } catch (InvokerInvocationException | MissingMethodException e2) {
+      } catch (InvokerInvocationException | MissingPropertyException e2) {
         e2.addSuppressed(e1);
         throw e2;
         }

spock-core/src/main/java/org/spockframework/mock/runtime/GroovyRealSetPropertyInvoker.java

@@ -55,7 +55,7 @@ public Object respond(IMockInvocation invocation) {
       try {
         metaClass.setProperty(sender, receiver, property, newValue, useSuper, fromInsideClass);
         return null;
-      } catch (InvokerInvocationException | MissingMethodException e2) {
+      } catch (InvokerInvocationException | MissingPropertyException e2) {
         e2.addSuppressed(e1);
         throw e2;
         }

spock-specs/src/test/groovy/org/spockframework/smoke/mock/GroovySpiesThatAreGlobal.groovy

@@ -247,6 +247,49 @@ class GroovySpiesThatAreGlobal extends Specification {
     _ | { PersonWithOverloadedMethods.perform((Pattern) null) }
   }
 
+  def "Accessing non-existing property throws MissingPropertyException"() {
+    when:
+    Enclosing.Super.NON_EXISTING_FIELD
+    then:
+    def ex = thrown(MissingPropertyException)
+    ex.message.contains("NON_EXISTING_FIELD")
+  }
+
+  def "Accessing non-existing property through global spy throws MissingPropertyException"() {
+    given:
+    GroovySpy(Enclosing.Super, global: true)
+
+    when:
+    Enclosing.Super.NON_EXISTING_FIELD
+    then:
+    def ex = thrown(MissingPropertyException)
+    ex.message.contains(" NON_EXISTING_FIELD ")
+    def suppressed = ex.getSuppressed()[0].cause
+    suppressed instanceof MissingMethodException
+    suppressed.message.contains("getNON_EXISTING_FIELD")
+  }
+
+  def "Accessing non-existing property setter throws MissingPropertyException"() {
+    when:
+    Enclosing.Super.NON_EXISTING_FIELD = ""
+    then:
+    thrown(MissingPropertyException)
+  }
+
+  def "Accessing non-existing property setter through global spy throws MissingPropertyException"() {
+    given:
+    GroovySpy(Enclosing.Super, global: true)
+
+    when:
+    Enclosing.Super.NON_EXISTING_FIELD = ""
+    then:
+    def ex = thrown(MissingPropertyException)
+    ex.message.contains(" NON_EXISTING_FIELD ")
+    def suppressed = ex.getSuppressed()[0].cause
+    suppressed instanceof MissingMethodException
+    suppressed.message.contains("setNON_EXISTING_FIELD")
+  }
+
   def "Accessing static field through global spy shall only log single invocation"() {
     given:
     GroovySpy(Enclosing.Super, global: true)