Validate argument amount in old(...) calls

spockframework · Oct 12, 2023 · 227308e · 227308e
1 parent 03b1d6c
commit 227308e
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/spock-core/src/main/java/org/spockframework/compiler/DeepBlockRewriter.java b/spock-core/src/main/java/org/spockframework/compiler/DeepBlockRewriter.java
@@ -284,6 +284,11 @@ private boolean handleOldCall(MethodCallExpression expr) {
 
     expr.setMethod(new ConstantExpression(expr.getMethodAsString() + "Impl"));
     List<Expression> args = AstUtil.getArgumentList(expr);
+    if (args.size() != 1) {
+      resources.getErrorReporter().error(expr, "old() must have exactly one argument");
+      return true;
+    }
+
     VariableExpression oldValue = resources.captureOldValue(args.get(0));
     args.set(0, oldValue);
 

diff --git a/spock-specs/src/test/groovy/org/spockframework/smoke/AccessingOldValues.groovy b/spock-specs/src/test/groovy/org/spockframework/smoke/AccessingOldValues.groovy
@@ -116,6 +116,24 @@ class AccessingOldValues extends EmbeddedSpecification {
     e.line == 2
   }
 
+  def "old() must have exactly one argument"() {
+    when:
+    compiler.compileFeatureBody """
+    when: true
+    then: old($oldArguments)
+    """
+
+    then:
+    InvalidSpecCompileException e = thrown()
+    e.message == 'old() must have exactly one argument @ line 2, column 11.'
+
+    where:
+    oldArguments << [
+      '',
+      'null, null'
+    ]
+  }
+
   def "may occur outside of a condition"() {
     def list = [1,2,3]