Rewrite tests to use tinytest framework

Author: eagletmt

.gitignore

@@ -1,4 +1,5 @@
 doc/tags
-test/output
 vimproc
+tinytest
 verbose.log
+stdout.log

install-deps.sh

@@ -1,14 +1,20 @@
 #!/bin/sh
 set -e
 
+if [ -d tinytest ]; then
+  (cd tinytest; git pull origin master)
+else
+  git clone git://github.com/eagletmt/tinytest.git
+fi
+
 if [ -d vimproc ]; then
   cd vimproc
   git pull origin master
 else
-  git clone git://github.com/Shougo/vimproc
+  git clone git://github.com/Shougo/vimproc.git
   cd vimproc
 fi
-
 make -f make_unix.mak
 
+cabal update
 cabal install ghc-mod

test.sh

@@ -2,24 +2,21 @@
 
 shopt -s nullglob
 
-rm -rf test/output
-mkdir -p test/output
-rm -f verbose.log
-
 retval=0
 for f in test/test_*.vim
 do
   testname=${f#test/test_}
   testname=${testname%.vim}
-  if vim -e -N -u NONE -S test/before.vim -S "$f" -c quit < /dev/null; then
-    diff -u test/ok/$testname.ok test/output/$testname.out
-    retval=$[retval + $?]
+  echo "Running $testname"
+  rm -f verbose.log
+  if vim -e -N -u NONE -S test/before.vim -S "$f" < /dev/null; then
+    cat stdout.log
   else
-    echo "$testname: vim exited with $?"
     retval=$[retval + 1]
+    cat stdout.log
+    cat verbose.log
+    echo
   fi
 done
 
-[ $retval -eq 0 ] || cat verbose.log
-
 exit $retval

test/before.vim

@@ -2,7 +2,15 @@ set verbosefile=verbose.log
 
 " Remove user's runtime path
 set runtimepath-=~/.vim runtimepath-=~/.vim/after
-let &runtimepath = printf('%s,%s,%s,%s', &runtimepath, fnamemodify('vimproc', ':p'), fnamemodify('.', ':p'), fnamemodify('./after', ':p'))
+let &runtimepath = join([
+      \ &runtimepath,
+      \ fnamemodify('vimproc', ':p'),
+      \ fnamemodify('tinytest', ':p'),
+      \ fnamemodify('.', ':p'),
+      \ fnamemodify('./after', ':p'),
+      \ ], ',')
 
 syntax enable
 filetype plugin indent on
+
+let g:tinytest_default_config = { 'reporter': 'cli' }

test/ok/basedir.ok

@@ -1,33 +1,52 @@
-let s:outputs = []
-
-function! s:write()
+function! s:basedir()
   " normalize path
-  call add(s:outputs, fnamemodify(ghcmod#basedir(), ':.'))
+  return fnamemodify(ghcmod#basedir(), ':.')
 endfunction
 
-function! s:without_cabal()
-  edit test/data/without-cabal/Main.hs
-  call s:write()
-  edit test/data/without-cabal/Foo/Bar.hs
-  call s:write()
+let s:unit = tinytest#new()
+
+function! s:unit.teardown()
+  bdelete
 endfunction
 
-function! s:with_cabal()
+function! s:unit.test_with_cabal()
   edit test/data/with-cabal/src/Foo.hs
-  call s:write()
+  call self.assert.equal('test/data/with-cabal', s:basedir())
+endfunction
+
+function! s:unit.test_with_cabal_subdir()
   edit test/data/with-cabal/src/Foo/Bar.hs
-  call s:write()
+  call self.assert.equal('test/data/with-cabal', s:basedir())
 endfunction
 
-function! s:main()
-  call s:without_cabal()
-  call s:with_cabal()
+function! s:unit.test_without_cabal()
+  edit test/data/without-cabal/Main.hs
+  call self.assert.equal('test/data/without-cabal', s:basedir())
+endfunction
+
+function! s:unit.test_without_cabal_subdir()
+  edit test/data/without-cabal/Foo/Bar.hs
+  call self.assert.equal('test/data/without-cabal/Foo', s:basedir())
+endfunction
 
+function! s:unit.test_with_cabal_opt()
   let g:ghcmod_use_basedir = 'test/data'
-  call s:without_cabal()
-  call s:with_cabal()
+  try
+    edit test/data/with-cabal/src/Foo/Bar.hs
+    call self.assert.equal(g:ghcmod_use_basedir, s:basedir())
+  finally
+    unlet g:ghcmod_use_basedir
+  endtry
+endfunction
 
-  call writefile(s:outputs, 'test/output/basedir.out')
+function! s:unit.test_without_cabal_opt()
+  let g:ghcmod_use_basedir = 'test/data'
+  try
+    edit test/data/without-cabal/Foo/Bar.hs
+    call self.assert.equal(g:ghcmod_use_basedir, s:basedir())
+  finally
+    unlet g:ghcmod_use_basedir
+  endtry
 endfunction
 
-call s:main()
+call s:unit.run()

test/ok/build_command.ok

@@ -1,36 +1,55 @@
-let s:outputs = []
-
-function! s:write()
-  call extend(s:outputs, map(ghcmod#build_command(['do']), 'fnamemodify(v:val, ":.")'))
-  call add(s:outputs, '######')
+function! s:build()
+  return map(ghcmod#build_command(['do']), 'fnamemodify(v:val, ":.")')
 endfunction
 
-function! s:main()
-  edit test/data/without-cabal/Main.hs
-  call s:write()
+let s:unit = tinytest#new()
+
+function! s:unit.teardown()
+  bdelete
+endfunction
 
-  edit test/data/with-cabal/src/Foo.hs
-  call s:write()
+function! s:unit.test_build()
+  edit test/data/without-cabal/Foo/Bar.hs
+  call self.assert.equal(['ghc-mod', 'do'], s:build())
+endfunction
 
-  edit test/data/with-cabal/src/Foo.hs
+function! s:unit.test_build_with_dist_dir()
   try
     call system('cd test/data/with-cabal; cabal configure; cabal build')
-    call s:write()
+    edit test/data/with-cabal/src/Foo/Bar.hs
+    call self.assert.equal(['ghc-mod',
+          \ '-g', '-i', '-g', 'test/data/with-cabal/dist/build/autogen',
+          \ '-g', '-I', '-g', 'test/data/with-cabal/dist/build/autogen',
+          \ '-g', '-optP-include',
+          \ '-g', '-optP', '-g', 'test/data/with-cabal/dist/build/autogen/cabal_macros.h',
+          \ '-g', '-i', '-g', 'test/data/with-cabal/dist/build',
+          \ '-g', '-I', '-g', 'test/data/with-cabal/dist/build',
+          \ 'do'], s:build())
   finally
     call system('cd test/data/with-cabal; rm -rf dist')
   endtry
+endfunction
 
+function! s:unit.test_build_global_opt()
   let g:ghcmod_ghc_options = ['-Wall']
-  edit test/data/without-cabal/Main.hs
-  call s:write()
+  try
+    edit test/data/without-cabal/Main.hs
+    call self.assert.equal(['ghc-mod', '-g', '-Wall', 'do'], s:build())
+  finally
+    unlet g:ghcmod_ghc_options
+  endtry
+endfunction
 
+function! s:unit.test_build_buffer_opt()
   " If b:ghcmod_ghc_options is set, g:ghcmod_ghc_options is ignored
-  edit test/data/without-cabal/Main.hs
+  edit test/data/without-cabal/Foo/Bar.hs
   let g:ghcmod_ghc_options = ['-Wall']
-  let b:ghcmod_ghc_options = ['-W']
-  call s:write()
-
-  call writefile(s:outputs, 'test/output/build_command.out')
+  try
+    let b:ghcmod_ghc_options = ['-W']
+    call self.assert.equal(['ghc-mod', '-g', '-W', 'do'], s:build())
+  finally
+    unlet g:ghcmod_ghc_options
+  endtry
 endfunction
 
-call s:main()
+call s:unit.run()