From b0d90b1f764674cf8472b7f8681e09ed40b87ae1 Mon Sep 17 00:00:00 2001
From: Marco Hinz <mh.codebro@gmail.com>
Date: Wed, 3 Feb 2016 14:51:54 +0100
Subject: [PATCH] Tests: improve formatting of output

---
 test/feature/session.vader | 19 ++++++++++---------
 test/feature/syntax.vader  | 24 ++++++++++++------------
 test/run                   |  2 +-
 test/vader.vader           |  7 -------
 4 files changed, 23 insertions(+), 29 deletions(-)
 delete mode 100644 test/vader.vader

diff --git a/test/feature/session.vader b/test/feature/session.vader
index 674e9c6..61dd69a 100644
--- a/test/feature/session.vader
+++ b/test/feature/session.vader
@@ -1,18 +1,19 @@
-Execute (Session: :SSave foo):
+Execute (:SSave foo | SClose):
   edit include/testfile.txt
   SSave foo
   SClose
-Do:
-  e
-Expect:
+Do (q):
+  q
+Expect (<blank>):
   
-Execute (Session: :SLoad foo):
-  silent SLoad foo
-Expect:
+
+Execute (:SLoad foo):
+  SLoad foo
+Expect (textfile.txt):
   This is just a simple test file.
   Foo, bar, quux.
 
 Execute (Session: :SDelete! foo):
-  Assert 1 == filereadable(g:startify_session_dir.'/foo')
+  AssertEqual filereadable(g:startify_session_dir.'/foo'), 1
   SDelete! foo
-  Assert 0 == filereadable(g:startify_session_dir.'/foo')
+  AssertEqual filereadable(g:startify_session_dir.'/foo'), 0
diff --git a/test/feature/syntax.vader b/test/feature/syntax.vader
index 20e9dc9..d7ba72d 100644
--- a/test/feature/syntax.vader
+++ b/test/feature/syntax.vader
@@ -2,23 +2,23 @@ Before:
   Startify
   doautocmd CursorMoved
 
-Execute (Syntax: between brackets -> StartifyNumber):
-  Assert SyntaxAt() == 'StartifyNumber'
+Execute (Between brackets -> StartifyNumber):
+  AssertEqual SyntaxAt(), 'StartifyNumber'
 
-Execute (Syntax: brackets -> StartifyBracket):
-  Assert SyntaxAt(3) == 'StartifyBracket'
+Execute (Brackets -> StartifyBracket):
+  AssertEqual SyntaxAt(3), 'StartifyBracket'
 
-Execute (Syntax: first entry -> StartifySpecial):
-  Assert SyntaxAt(9) == 'StartifySpecial'
+Execute (First entry -> StartifySpecial):
+  AssertEqual SyntaxAt(9), 'StartifySpecial'
 
-Execute (Syntax: section header -> StartifySection):
+Execute (Section header -> StartifySection):
   normal! 2j
-  Assert SyntaxAt(9) == 'StartifySection'
+  AssertEqual SyntaxAt(9), 'StartifySection'
 
-Execute (Syntax: second entry (separator) -> StartifySlash):
+Execute (Second entry (separator) -> StartifySlash):
   normal! 4j
-  Assert SyntaxAt(9) == 'StartifySlash'
+  AssertEqual SyntaxAt(9), 'StartifySlash'
 
-Execute (Syntax: second entry (path) -> StartifyFile):
+Execute (Second entry (path) -> StartifyFile):
   normal! 4j
-  Assert SyntaxAt(10) == 'StartifyFile'
+  AssertEqual SyntaxAt(10), 'StartifyFile'
diff --git a/test/run b/test/run
index f547d2f..cf24eef 100755
--- a/test/run
+++ b/test/run
@@ -21,4 +21,4 @@ cp viminfo viminfo.tmp
 trap "{ rm viminfo.tmp; }" EXIT
 
 echo '(Be patient.. testing can take a while.)'
-HOME=/dev/null vim -XNu vimrc -i viminfo.tmp -c 'Vader! vader.vader'
+HOME=/dev/null vim -XNu vimrc -i viminfo.tmp -c 'Vader! feature/*.vader'
diff --git a/test/vader.vader b/test/vader.vader
deleted file mode 100644
index 852eb8b..0000000
--- a/test/vader.vader
+++ /dev/null
@@ -1,7 +0,0 @@
-Execute (:Startify command available):
-  Assert 2 == exists(':Startify')
-
-Include: feature/buffer.vader
-Include: feature/mapping.vader
-Include: feature/session.vader
-Include: feature/syntax.vader