diff --git a/src/test/scala/util/ValidationsSpec.scala b/src/test/scala/util/ValidationsSpec.scala index 41753c8..92b58a2 100644 --- a/src/test/scala/util/ValidationsSpec.scala +++ b/src/test/scala/util/ValidationsSpec.scala @@ -1,22 +1,24 @@ package util import org.specs2.mutable._ +import org.scalatra.i18n.Messages class ValidationsSpec extends Specification with Validations { "identifier" should { "validate id string " in { - identifier.validate("id", "aa_ZZ-00.01") mustEqual None - identifier.validate("id", "_aaaa") mustEqual Some("id starts with invalid character.") - identifier.validate("id", "-aaaa") mustEqual Some("id starts with invalid character.") - identifier.validate("id", "aa_ZZ#01") mustEqual Some("id contains invalid character.") + identifier.validate("id", "aa_ZZ-00.01", null) mustEqual None + identifier.validate("id", "_aaaa", null) mustEqual Some("id starts with invalid character.") + identifier.validate("id", "-aaaa", null) mustEqual Some("id starts with invalid character.") + identifier.validate("id", "aa_ZZ#01", null) mustEqual Some("id contains invalid character.") } } "color" should { "validate color string " in { - color.validate("color", "#88aaff") mustEqual None - color.validate("color", "#gghhii") mustEqual Some("color must be '#[0-9a-fA-F]{6}'.") + val messages = Messages() + color.validate("color", "#88aaff", messages) mustEqual None + color.validate("color", "#gghhii", messages) mustEqual Some("color must be '#[0-9a-fA-F]{6}'.") } } @@ -26,7 +28,7 @@ // date().validate("date", "2013-10-5" , Map[String, String]()) mustEqual List(("date", "date must be '\\d{4}-\\d{2}-\\d{2}'.")) // } "convert date string " in { - val result = date().convert("2013-10-05") + val result = date().convert("2013-10-05", null) new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(result) mustEqual "2013-10-05 00:00:00" } }