allow one column data-table to be passed as parameter

spockframework · Aug 30, 2014 · 104c084 · 104c084
1 parent d8d4576
commit 104c084
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/spock-core/src/main/java/org/spockframework/compiler/WhereBlockRewriter.java b/spock-core/src/main/java/org/spockframework/compiler/WhereBlockRewriter.java
@@ -238,6 +238,9 @@ private void turnIntoSimpleParameterization(List<Expression> column) throws Inva
     if (varExpr == null)
       throw new InvalidSpecCompileException(column.get(0),
           "Header of data table may only contain variable names");
+    if (AstUtil.isWildcardRef(varExpr)){
+      return; // ignore wildcards - _ can be used as placeholder for pseudo-second-column in one-column data
+    }
 
     ListExpression listExpr = new ListExpression(column.subList(1, column.size()));
     BinaryExpression binExpr = new BinaryExpression(varExpr, Token.newSymbol(Types.LEFT_SHIFT, -1, -1), listExpr);

diff --git a/spock-specs/src/test/groovy/org/spockframework/smoke/parameterization/DataTables.groovy b/spock-specs/src/test/groovy/org/spockframework/smoke/parameterization/DataTables.groovy
@@ -138,6 +138,15 @@ a | a
     3 | "wow"
   }
 
+  def "allow one column to be passed as parameter"(a) {
+    expect:
+    a == 3
+
+    where:
+    a | _
+    3 | _
+  }
+
   def "tables can be mixed with other parameterizations"() {
     expect:
     [a, b, c, d] == [1, 2, 3, 4]