From 08ae9246421cf2b7269dc09dab2dbd5dc5d0817a Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 28 Oct 2016 13:01:04 +0200
Subject: Add tests and fixes for trailing description support

---
 unit-tests/test/script/lexer/description-line.test |  8 +++-
 unit-tests/test/script/parser/description.test     | 44 ++++++++++++++++++++++
 unit-tests/test/script/parser/setup-teardown.test  |  8 ++++
 3 files changed, 58 insertions(+), 2 deletions(-)

(limited to 'unit-tests')

diff --git a/unit-tests/test/script/lexer/description-line.test b/unit-tests/test/script/lexer/description-line.test
index f0f0c9f..1d317eb 100644
--- a/unit-tests/test/script/lexer/description-line.test
+++ b/unit-tests/test/script/lexer/description-line.test
@@ -2,16 +2,20 @@ test.arguments += description-line
 
 $* <" foo  bar " >>EOO # full
 ' foo  bar '
+<newline>
 EOO
 
 $* <"  " >>EOO # space
 '  '
+<newline>
 EOO
 
 $* <"" >>EOO # empty
-''
+<newline>
 EOO
 
-$* <:"foo" 2>>EOE != 0 # eof
+$* <:"foo" >>EOO 2>>EOE != 0 # eof
+'foo'
+EOO
 stdin:1:4: error: expected newline at the end of description line
 EOE
diff --git a/unit-tests/test/script/parser/description.test b/unit-tests/test/script/parser/description.test
index 881cb5b..c2c441b 100644
--- a/unit-tests/test/script/parser/description.test
+++ b/unit-tests/test/script/parser/description.test
@@ -6,6 +6,13 @@ EOI
 cmd
 EOO
 
+$* <<EOI >>EOO                                         # trail-id
+cmd : foo
+EOI
+: id:foo
+cmd
+EOO
+
 $* <<EOI >>EOO                                         # summary
 : foo bar
 cmd
@@ -14,6 +21,13 @@ EOI
 cmd
 EOO
 
+$* <<EOI >>EOO                                         # trail-summary
+cmd: foo bar
+EOI
+: sm:foo bar
+cmd
+EOO
+
 $* <<EOI >>EOO                                         # id-summary
 : foo-bar
 : foo bar
@@ -131,6 +145,36 @@ EOI
 cmd
 EOO
 
+$* <<EOI >>EOO                                         # trail-compound
+cmd1;
+cmd2: foo
+EOI
+: id:foo
+cmd1
+cmd2
+EOO
+
+$* <<EOI 2>>EOE != 0                                    # empty
+:
+:
+cmd
+EOI
+testscript:1:1: error: empty description
+EOE
+
+$* <<EOI 2>>EOE != 0                                    # trail-empty
+cmd:
+EOI
+testscript:1:4: error: empty description
+EOE
+
+$* <<EOI 2>>EOE != 0                                    # both
+: foo
+cmd : bar
+EOI
+testscript:2:1: error: both leading and trailing description
+EOE
+
 # Legal places for a description.
 #
 $* <<EOI >>EOO                                         # legal-var
diff --git a/unit-tests/test/script/parser/setup-teardown.test b/unit-tests/test/script/parser/setup-teardown.test
index 57528ad..5d30ed4 100644
--- a/unit-tests/test/script/parser/setup-teardown.test
+++ b/unit-tests/test/script/parser/setup-teardown.test
@@ -2,10 +2,18 @@ $* <"+cmd;" 2>>EOE != 0                 # semi-after-setup
 testscript:1:5: error: ';' after setup command
 EOE
 
+$* <"+cmd:" 2>>EOE != 0                 # colon-after-setup
+testscript:1:5: error: ':' after setup command
+EOE
+
 $* <"-cmd;" 2>>EOE != 0                 # semi-after-tdown
 testscript:1:5: error: ';' after teardown command
 EOE
 
+$* <"-cmd:" 2>>EOE != 0                 # colon-after-tdown
+testscript:1:5: error: ':' after teardown command
+EOE
+
 $* <<EOI 2>>EOE != 0                 # setup-in-test
 cmd;
 +cmd
-- 
cgit v1.1