@@ -337,13 +337,6 @@ object CompoundSpecs extends Specification with Parsers with ScalaCheck { case Success("test", LineStream()) :: Nil => true case _ => false } - - p2("ing") must beLike { - case Failure("Expected 'test' got 'ing'", LineStream(tail @ _*)) :: Nil => - tail.mkString mustEqual "ing" - - case _ => false - } } } src/spec/scala/CompoundSpecs.scala @@ -112,29 +112,29 @@ object RegexSpecs extends Specification with ScalaCheck with RegexParsers { val p1 = "test" \ ("test" | "ing") p1("test") must beLike { - case Failure("Expected 'test' and not '(test|ing)' in 'test'", LineStream(tail @ _*)) :: Nil => + case Failure("Expected 'test' and not /(test)|(ing)/ in 'test'", LineStream(tail @ _*)) :: Nil => tail.mkString mustEqual "test" case _ => false } - val p2 = "test" \ ("blah" | "ing") + val p2 = "test" \ ("blah" | "ing ") p2("test") must beLike { case Success("test", LineStream()) :: Nil => true case _ => false } - p2("ing") must beLike { - case Failure("Expected 'test' got 'ing'", LineStream(tail @ _*)) :: Nil => - tail.mkString mustEqual "ing" + p2("ing ") must beLike { + case Failure("Expected 'test' got 'ing '", LineStream(tail @ _*)) :: Nil => + tail.mkString mustEqual "ing " case _ => false } p2("blah") must beLike { case Failure("Expected 'test' got 'blah'", LineStream(tail @ _*)) :: Nil => - tail mustEqual "blah" + tail.mkString mustEqual "blah" case _ => false } src/spec/scala/RegexSpecs.scala 46ad725bdfb1e6194a45b709fe08707f5b4bc547 Daniel Spiewak djspiewak@gmail.com http://github.com/djspiewak/gll-combinators/commit/29ff73f7811e4a019893b0352d8b3545bb50079c 29ff73f7811e4a019893b0352d8b3545bb50079c 2009-10-31T10:07:53-07:00 2009-10-31T10:07:53-07:00 Adjusted comparisons to comply with intended result 5ac9e64033f934b03cdf19d5b8f8b13bcda7af50 Daniel Spiewak djspiewak@gmail.com