From 6a0844a9be28ab845272cf194773bf6a2b99c552 Mon Sep 17 00:00:00 2001 From: Johannes Rudolph Date: Tue, 8 Jul 2014 14:24:41 +0200 Subject: fix parsing to allow an arbitrary number of elements on the top-level, fixes #3 --- src/test/scala/spray/boilerplate/GeneratorSpecs.scala | 2 +- src/test/scala/spray/boilerplate/TemplateParserSpecs.scala | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'src/test/scala/spray') diff --git a/src/test/scala/spray/boilerplate/GeneratorSpecs.scala b/src/test/scala/spray/boilerplate/GeneratorSpecs.scala index 7651398..d88010b 100644 --- a/src/test/scala/spray/boilerplate/GeneratorSpecs.scala +++ b/src/test/scala/spray/boilerplate/GeneratorSpecs.scala @@ -5,7 +5,7 @@ import org.specs2.mutable.Specification class GeneratorSpecs extends Specification { "Generation" should { "keep outer template unchanged" in { - gen4("a1b2c3d4") === "a1b2c3d4" pendingUntilFixed + gen4("a1b2c3d4") === "a1b2c3d4" } "inflate 1 in expansion" in { gen4("[#a1#]") === "a1, a2, a3, a4" diff --git a/src/test/scala/spray/boilerplate/TemplateParserSpecs.scala b/src/test/scala/spray/boilerplate/TemplateParserSpecs.scala index 063eaa0..a0ff049 100644 --- a/src/test/scala/spray/boilerplate/TemplateParserSpecs.scala +++ b/src/test/scala/spray/boilerplate/TemplateParserSpecs.scala @@ -7,18 +7,15 @@ class TemplateParserSpecs extends Specification { "TemplateParser.parse" should { "without expansion" in { - parse("abc") === FixedString("abc") pendingUntilFixed + parse("abc") === FixedString("abc") } - "just expansion" in { - parse("[# def #]") === Expand(LiteralString(" def "), ", ") pendingUntilFixed + parse("[# def #]") === Expand(LiteralString(" def "), ", ") } - "multiple expansions" in { parse("[#a#]abc[#b#]") === - Sequence(List(Expand(LiteralString("a"), ", "), FixedString("abc"), Expand(LiteralString("b"), ", "))) pendingUntilFixed + Sequence(List(Expand(LiteralString("a"), ", "), FixedString("abc"), Expand(LiteralString("b"), ", "))) } - "one surrounded expansion" in { parse("abc[#a#]def") === Sequence(List(FixedString("abc"), Expand(LiteralString("a"), ", "), FixedString("def"))) } -- cgit v1.2.3