From 5f2a8a060191f839a7e632d23344a4337e80e877 Mon Sep 17 00:00:00 2001 From: Johannes Rudolph Date: Tue, 8 Jul 2014 14:51:25 +0200 Subject: saner parser and generation model --- src/test/scala/spray/boilerplate/TemplateParserSpecs.scala | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/test') diff --git a/src/test/scala/spray/boilerplate/TemplateParserSpecs.scala b/src/test/scala/spray/boilerplate/TemplateParserSpecs.scala index a0ff049..a0b8603 100644 --- a/src/test/scala/spray/boilerplate/TemplateParserSpecs.scala +++ b/src/test/scala/spray/boilerplate/TemplateParserSpecs.scala @@ -7,17 +7,23 @@ class TemplateParserSpecs extends Specification { "TemplateParser.parse" should { "without expansion" in { - parse("abc") === FixedString("abc") + parse("abc") === LiteralString("abc") } "just expansion" in { parse("[# def #]") === Expand(LiteralString(" def "), ", ") } "multiple expansions" in { parse("[#a#]abc[#b#]") === - Sequence(List(Expand(LiteralString("a"), ", "), FixedString("abc"), Expand(LiteralString("b"), ", "))) + Sequence(List(Expand(LiteralString("a"), ", "), LiteralString("abc"), Expand(LiteralString("b"), ", "))) } "one surrounded expansion" in { - parse("abc[#a#]def") === Sequence(List(FixedString("abc"), Expand(LiteralString("a"), ", "), FixedString("def"))) + parse("abc[#a#]def") === Sequence(List(LiteralString("abc"), Expand(LiteralString("a"), ", "), LiteralString("def"))) + } + "an expanded number" in { + parse("[#T1#]") === Expand(Sequence(List(LiteralString("T"), Offset(1))), ", ") + } + "a quoted number" in { + parse("[#T##1#]") === Expand(LiteralString("T1"), ", ") } } } -- cgit v1.2.3