Simplify tests using Include: directive

test/README.md

@@ -7,7 +7,7 @@ Test cases for vim-easy-align
 
 ### Run
 
-```vim
+```
-:Vader*
+./run
 ```
 

test/commandline.vader

@@ -1,14 +1,4 @@
-Execute (Clean up test environment):
+Include: include/setup.vader
-  Save g:easy_align_ignore_groups,     g:easy_align_ignore_unmatched
-  Save g:easy_align_indentation,       g:easy_align_delimiter_align
-  Save g:easy_align_interactive_modes, g:easy_align_bang_interactive_modes
-  Save g:easy_align_delimiters
-
-  let g:easy_align_delimiters = {}
-  silent! unlet g:easy_align_ignore_groups
-  silent! unlet g:easy_align_ignore_unmatched
-  silent! unlet g:easy_align_indentation
-  silent! unlet g:easy_align_delimiter_align
 
 Given (fruits):
   apple;:;;banana::cake
@@ -161,5 +151,4 @@ Expect javascript:
     "user:    pass": "r00t: pa55"
   };
 
-Execute:
+Include: include/teardown.vader
-  Restore

test/fixed.vader

@@ -1,5 +1,4 @@
-Execute:
+Include: include/setup.vader
-  Save &tabstop
 
 Given (Table):
   |a|b|c|d|
@@ -118,5 +117,4 @@ Expect:
   		n2gv = {}
   		n2vt = {}
 
-Execute:
+Include: include/teardown.vader
-  Restore

test/fixme.vader

@@ -1,3 +1,5 @@
+Include: include/setup.vader
+
 # It is currently possible that EasyAlign command incorrectly judges
 # that it was executed in block-wise visual mode
 Given:
@@ -18,3 +20,5 @@ Do (TODO Workaround: reset visualmode() on error):
 Expect:
   a | b | c
 
+Include: include/teardown.vader
+

test/include/setup.vader

@@ -0,0 +1,32 @@
+Execute (Clean up test environment):
+  Save g:easy_align_ignore_groups,     g:easy_align_ignore_unmatched
+  Save g:easy_align_indentation,       g:easy_align_delimiter_align
+  Save g:easy_align_interactive_modes, g:easy_align_bang_interactive_modes
+  Save g:easy_align_delimiters,        g:easy_align_bypass_fold
+  Save &tabstop, mapleader
+
+  unlet! g:easy_align_ignore_groups
+  unlet! g:easy_align_ignore_unmatched
+  unlet! g:easy_align_indentation
+  unlet! g:easy_align_delimiter_align
+  unlet! g:easy_align_interactive_modes
+  unlet! g:easy_align_bang_interactive_modes
+  unlet! g:easy_align_bypass_fold
+
+  let g:easy_align_delimiters = {}
+  let mapleader = ' '
+  vnoremap <silent> r<Enter>         :EasyAlign!<Enter>
+  vnoremap <silent> <Leader>r<Enter> :LiveEasyAlign!<Enter>
+
+  " " Legacy
+  " vnoremap <silent> <Enter>          :EasyAlign<Enter>
+  " vnoremap <silent> <Leader><Enter>  :LiveEasyAlign<Enter>
+  " nmap <leader>A <Plug>(EasyAlignOperator)
+
+  set ts=2
+
+  vmap <Enter>         <Plug>(EasyAlign)
+  vmap <leader><Enter> <Plug>(LiveEasyAlign)
+  nmap <leader>A       <Plug>(EasyAlign)
+  vmap <leader>.       <Plug>(EasyAlignRepeat)
+

test/include/teardown.vader

@@ -0,0 +1,3 @@
+Execute:
+  Restore
+

test/interactive.vader

@@ -1,32 +1,4 @@
-Execute (Clean up test environment):
+Include: include/setup.vader
-  Save g:easy_align_ignore_groups,     g:easy_align_ignore_unmatched
-  Save g:easy_align_indentation,       g:easy_align_delimiter_align
-  Save g:easy_align_interactive_modes, g:easy_align_bang_interactive_modes
-  Save g:easy_align_delimiters,        &tabstop
-  Save mapleader
-
-  " TODO: revert after test
-  silent! unlet g:easy_align_ignore_groups
-  silent! unlet g:easy_align_ignore_unmatched
-  silent! unlet g:easy_align_indentation
-  silent! unlet g:easy_align_delimiter_align
-  silent! unlet g:easy_align_interactive_modes
-  silent! unlet g:easy_align_bang_interactive_modes
-
-  let g:easy_align_delimiters = {}
-  let mapleader = ' '
-  vnoremap <silent> r<Enter>         :EasyAlign!<Enter>
-  vnoremap <silent> <Leader>r<Enter> :LiveEasyAlign!<Enter>
-
-  " " Legacy
-  " vnoremap <silent> <Enter>          :EasyAlign<Enter>
-  " vnoremap <silent> <Leader><Enter>  :LiveEasyAlign<Enter>
-  " nmap <leader>A <Plug>(EasyAlignOperator)
-
-  vmap <Enter>         <Plug>(EasyAlign)
-  vmap <leader><Enter> <Plug>(LiveEasyAlign)
-  nmap <leader>A       <Plug>(EasyAlign)
-  vmap <leader>.       <Plug>(EasyAlignRepeat)
 
 ###########################################################
 
@@ -1619,6 +1591,5 @@ Expect:
   :: :: f : 6
 
 ###########################################################
-Execute:
-  Restore
 
+Include: include/teardown.vader

test/run

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+VIMRC=$TMPDIR/mini-vimrc
+SOURCE=$(dirname $BASH_SOURCE)/..
+
+cat > $VIMRC << EOF
+set nocompatible
+syntax on
+
+for dep in ['vader.vim', 'vim-repeat']
+  execute 'set rtp+=' . finddir(dep, expand('~/.vim').'/**')
+endfor
+set rtp+=$SOURCE
+EOF
+
+vim -u $VIMRC +Vader*
+
+rm -f $VIMRC

test/tex.vader

@@ -1,8 +1,6 @@
 # http://en.wikibooks.org/wiki/LaTeX/Tables
-Execute:
+
-  Save g:easy_align_delimiters, g:easy_align_bypass_fold
+Include: include/setup.vader
-  let g:easy_align_delimiters = {}
-  silent! unlet g:easy_align_bypass_fold
 
 Given tex (table with escaped &):
   \begin{tabular}{ l c r }
@@ -157,5 +155,4 @@ Expect tex:
     8192 & 9.45\e2 & 0.0 & 4.51\e2 & 0.0 &  &  &         &     &         &     \\
   \end{tabular}
 
-Execute:
+Include: include/teardown.vader
-  Restore