Merge pull request #64 from cucumber/add-tests-for-parameter-types

Add more tests to parameter types

Author: gaeljw

scala/sources/src/test/resources/tests/parametertypes/ParameterTypes.feature

@@ -1,14 +1,26 @@
 Feature: As Cucumber Scala, I want to handle ParameterType definitions
 
   Scenario: define parameter type with single argument
-    Given string builder parameter, defined by lambda
+    Given "string builder" parameter, defined by lambda
 
   Scenario: define parameter type with two arguments
     Given balloon coordinates 123,456, defined by lambda
 
   Scenario: define parameter type with three arguments
     Given kebab made from mushroom, meat and veg, defined by lambda
 
+  Scenario: define parameter type with parameterized type, string undefined
+    Given an optional string parameter value "" undefined
+
+  Scenario: define parameter type with parameterized type, string defined
+    Given an optional string parameter value "toto" defined
+
+  Scenario: define parameter type with parameterized type, int undefined
+    Given an optional int parameter value undefined
+
+  Scenario: define parameter type with parameterized type, int defined
+    Given an optional int parameter value 5 defined
+
   Scenario: define default parameter transformer
     Given kebab made from anonymous meat, defined by lambda
 

scala/sources/src/test/scala/tests/parametertypes/ParameterTypesSteps.scala

@@ -11,7 +11,7 @@ case class Point(x: Int, y: Int)
 
 class ParameterTypesSteps extends ScalaDsl with EN {
 
-  ParameterType("string-builder", ".*") { str =>
+  ParameterType("string-builder", "\"(.*)\"") { str =>
     new StringBuilder(str)
   }
 
@@ -23,6 +23,14 @@ class ParameterTypesSteps extends ScalaDsl with EN {
     s"-$x-$y-$z-"
   }
 
+  ParameterType("optionalint", """\s?(\d*)\s?""") { str =>
+    Option(str).filter(_.nonEmpty).map(_.toInt)
+  }
+
+  ParameterType("optionalstring", "(.*)") { str =>
+    Option(str).filter(_.nonEmpty)
+  }
+
   DefaultParameterTransformer { (fromValue, toValueType) =>
     new StringBuilder().append(fromValue).append('-').append(toValueType)
   }
@@ -75,4 +83,20 @@ class ParameterTypesSteps extends ScalaDsl with EN {
     assert(table(1).toString() == "Map(dinner -> )-class scala.collection.mutable.StringBuilder")
   }
 
+  Given("""an optional string parameter value "{optionalstring}" undefined""") { value: Option[String] =>
+    assert(value.isEmpty)
+  }
+
+  Given("""an optional string parameter value "{optionalstring}" defined""") { value: Option[String] =>
+    assert(value.contains("toto"))
+  }
+
+  Given("""an optional int parameter value{optionalint}undefined""") { value: Option[Int] =>
+    assert(value.isEmpty)
+  }
+
+  Given("""an optional int parameter value{optionalint}defined""") { value: Option[Int] =>
+    assert(value.contains(5))
+  }
+
 }