mirror of
https://github.com/gitbucket/gitbucket.git
synced 2025-11-07 05:55:51 +01:00
Fix test case.
This commit is contained in:
@@ -1,22 +1,24 @@
|
|||||||
package util
|
package util
|
||||||
|
|
||||||
import org.specs2.mutable._
|
import org.specs2.mutable._
|
||||||
|
import org.scalatra.i18n.Messages
|
||||||
|
|
||||||
class ValidationsSpec extends Specification with Validations {
|
class ValidationsSpec extends Specification with Validations {
|
||||||
|
|
||||||
"identifier" should {
|
"identifier" should {
|
||||||
"validate id string " in {
|
"validate id string " in {
|
||||||
identifier.validate("id", "aa_ZZ-00.01") mustEqual None
|
identifier.validate("id", "aa_ZZ-00.01", null) mustEqual None
|
||||||
identifier.validate("id", "_aaaa") mustEqual Some("id starts with invalid character.")
|
identifier.validate("id", "_aaaa", null) mustEqual Some("id starts with invalid character.")
|
||||||
identifier.validate("id", "-aaaa") 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") mustEqual Some("id contains invalid character.")
|
identifier.validate("id", "aa_ZZ#01", null) mustEqual Some("id contains invalid character.")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
"color" should {
|
"color" should {
|
||||||
"validate color string " in {
|
"validate color string " in {
|
||||||
color.validate("color", "#88aaff") mustEqual None
|
val messages = Messages()
|
||||||
color.validate("color", "#gghhii") mustEqual Some("color must be '#[0-9a-fA-F]{6}'.")
|
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 @@ class ValidationsSpec extends Specification with Validations {
|
|||||||
// date().validate("date", "2013-10-5" , Map[String, String]()) mustEqual List(("date", "date must be '\\d{4}-\\d{2}-\\d{2}'."))
|
// 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 {
|
"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"
|
new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(result) mustEqual "2013-10-05 00:00:00"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user