diff options
| -rw-r--r-- | src/test/scala/basic.scala | 12 | ||||
| -rw-r--r-- | src/test/scala/helpers.scala | 15 |
2 files changed, 16 insertions, 11 deletions
diff --git a/src/test/scala/basic.scala b/src/test/scala/basic.scala index bf22361..57a58b8 100644 --- a/src/test/scala/basic.scala +++ b/src/test/scala/basic.scala @@ -2,7 +2,7 @@ import org.scalatest.FunSuite import router.Router -class Basic extends FunSuite { +class Basic extends FunSuite with RouterHelpers { val yearRx = """\d{4}""".r val monthRx = """\d|10|11|12""".r val dayRx = """\d|[12]\d|30|31""".r @@ -54,16 +54,6 @@ class Basic extends FunSuite { ) ) - def testRoute (router: Router[Boolean], path: String, mapping: Map[String, String]) { - assert(path === router.uriFor(mapping).get) - val om = router.route(path) - assert(om.isDefined) - val m = om.get - assert(m.mapping.size == mapping.size) - assert(m.mapping.forall { case (k, v) => mapping(k) == v }) - assert(m.target === true) - } - test ("routes match properly") { testRoute( router, "blog", Map( diff --git a/src/test/scala/helpers.scala b/src/test/scala/helpers.scala new file mode 100644 index 0000000..f4d7ceb --- /dev/null +++ b/src/test/scala/helpers.scala @@ -0,0 +1,15 @@ +import org.scalatest.FunSuite + +import router.Router + +trait RouterHelpers { this: FunSuite => + def testRoute (router: Router[Boolean], path: String, mapping: Map[String, String]) { + assert(path === router.uriFor(mapping).get) + val om = router.route(path) + assert(om.isDefined) + val m = om.get + assert(m.mapping.size == mapping.size) + assert(m.mapping.forall { case (k, v) => mapping(k) == v }) + assert(m.target === true) + } +} |