From 938c026bef8d4ce10848831479944642ac6da853 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Tue, 4 Nov 2014 21:26:40 -0800 Subject: Various combinations of if-else work --- .../src/test/scala/scalatex/ParserTests.scala | 34 ++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) (limited to 'scalatexApi/src/test/scala/scalatex/ParserTests.scala') diff --git a/scalatexApi/src/test/scala/scalatex/ParserTests.scala b/scalatexApi/src/test/scala/scalatex/ParserTests.scala index c2f35cc..c012328 100644 --- a/scalatexApi/src/test/scala/scalatex/ParserTests.scala +++ b/scalatexApi/src/test/scala/scalatex/ParserTests.scala @@ -119,8 +119,8 @@ object ParserTests extends utest.TestSuite{ } 'Block{ - * - check("{i am a cow}", _.TBlock.run(), Block(Seq(Block.Text("i am a cow")))) - * - check("{i @am a @cow}", _.TBlock.run(), + * - check("{i am a cow}", _.BraceBlock.run(), Block(Seq(Block.Text("i am a cow")))) + * - check("{i @am a @cow}", _.BraceBlock.run(), Block(Seq( Block.Text("i "), Chain("am",Seq()), @@ -170,6 +170,36 @@ object ParserTests extends utest.TestSuite{ _.IfElse.run(), IfElse("if(true)", Block(Seq(Text("lol"))), Some(Block(Seq(Text(" omg "))))) ) + 'ifBlock- check( + """@if(true) + | omg""".stripMargin, + _.IfElse.run(), + IfElse("if(true)", Block(Seq(Text("\n "), Text("omg"))), None) + ) + 'ifBlockElseBlock - check( + """@if(true) + | omg + |@else + | wtf""".stripMargin, + _.IfElse.run(), + IfElse( + "if(true)", + Block(Seq(Text("\n "), Text("omg"))), + Some(Block(Seq(Text("\n "), Text("wtf")))) + ) + ) + 'ifElseBlock - check( + """@if(true){ + | omg + |}else + | wtf""".stripMargin, + _.IfElse.run(), + IfElse( + "if(true)", + Block(Seq(Text("\n "), Text("omg"), Text("\n"))), + Some(Block(Seq(Text("\n "), Text("wtf")))) + ) + ) } 'Body{ 'indents - check( -- cgit v1.2.3