Add tests support via vader.vim

bergercookie · Jan 8, 2018 · 7099036 · 7099036
1 parent df70a4a
commit 7099036
Show file tree

Hide file tree

Showing 20 changed files with 127 additions and 23 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 tags
+a.*
diff --git a/README.md b/README.md
@@ -121,5 +121,7 @@ vim.org](https://vim.sourceforge.io/scripts/script.php?script_id=5634)
 - [ ] Append to current line if that is empty
 - [x] Support repeat.vim
 - [ ] Use an assertion module
-
-
+- [x] Use vader.vim for TDD
+- [ ] Extend vader support for rest of languages
+- [ ] Use travis for CI
+- [x] Bug with changing the filename of the current file
diff --git a/ftplugin/c.vim b/ftplugin/c.vim
@@ -9,4 +9,4 @@ function! s:DebugStringFun()
     return DebugStringFunC()
 endfunc
 
-command -buffer -nargs=0 AddDebugString put=s:DebugStringFun()
+command! -buffer -nargs=0 AddDebugString put=s:DebugStringFun()
diff --git a/ftplugin/cmake.vim b/ftplugin/cmake.vim
@@ -11,6 +11,6 @@ function! s:DebugStringFunExpr(expr)
     return l:debug_str
 endfunc
 
-command -buffer -nargs=0 AddDebugString put=s:DebugStringFun()
-command -buffer -nargs=1 AddDebugStringExpr put=s:DebugStringFunExpr(<args>)
+command! -buffer -nargs=0 AddDebugString put=s:DebugStringFun()
+command! -buffer -nargs=1 AddDebugStringExpr put=s:DebugStringFunExpr(<args>)
 
diff --git a/ftplugin/cpp.vim b/ftplugin/cpp.vim
@@ -22,6 +22,6 @@ function! s:DebugStringFunExpr(expr)
     return l:debug_str
 endfunc
 
-command -buffer -nargs=0 AddDebugString :put=s:DebugStringFun()
-command -buffer -nargs=1 AddDebugStringExpr :put=s:DebugStringFunExpr(<args>)
+command! -buffer -nargs=0 AddDebugString :put=s:DebugStringFun()
+command! -buffer -nargs=1 AddDebugStringExpr :put=s:DebugStringFunExpr(<args>)
 
diff --git a/ftplugin/fortran.vim b/ftplugin/fortran.vim
@@ -3,8 +3,8 @@ function! s:DebugStringFunBase(desc, var)
     return l:debug_str
 endfunc
 
-command -buffer -nargs=0 AddDebugString
+command! -buffer -nargs=0 AddDebugString
             \ put=s:DebugStringFunBase(g:DebugstringPrefixStr(), g:debugStringCounter)
-command -buffer -nargs=1 AddDebugStringExpr
+command! -buffer -nargs=1 AddDebugStringExpr
             \ put=s:DebugStringFunBase(<args> . ': ', <args>)
 
diff --git a/ftplugin/haskell.vim b/ftplugin/haskell.vim
@@ -3,7 +3,7 @@ function! s:DebugStringFunBase(desc, var)
     return l:debug_str
 endfunc
 
-command -buffer -nargs=0 AddDebugString
+command! -buffer -nargs=0 AddDebugString
             \ put=s:DebugStringFunBase(g:DebugstringPrefixStr(), g:debugStringCounter)
-command -buffer -nargs=1 AddDebugStringExpr
+command! -buffer -nargs=1 AddDebugStringExpr
             \ put=s:DebugStringFunBase(<args> . ': ', <args>)
diff --git a/ftplugin/java.vim b/ftplugin/java.vim
@@ -3,7 +3,7 @@ function! s:DebugStringFunBase(desc, var)
     return l:debug_str
 endfunc
 
-command -buffer -nargs=0 AddDebugString
+command! -buffer -nargs=0 AddDebugString
             \ put=s:DebugStringFunBase(g:DebugstringPrefixStr(), g:debugStringCounter)
-command -buffer -nargs=1 AddDebugStringExpr
+command! -buffer -nargs=1 AddDebugStringExpr
             \ put=s:DebugStringFunBase(<args> . ': ', <args>)
diff --git a/ftplugin/javascript.vim b/ftplugin/javascript.vim
@@ -3,4 +3,4 @@ function! s:DebugStringFun()
     :return l:debug_str
 endfunc
 
-command -buffer -nargs=0 AddDebugString put=s:DebugStringFun()
+command! -buffer -nargs=0 AddDebugString put=s:DebugStringFun()
diff --git a/ftplugin/php.vim b/ftplugin/php.vim
@@ -10,7 +10,7 @@ function! s:DebugStringFun(desc, ...)
     return l:debug_str
 endfunc
 
-command -buffer -nargs=0 AddDebugString
+command! -buffer -nargs=0 AddDebugString
             \ put=s:DebugStringFun(g:DebugstringPrefixStr() . g:debugStringCounter)
-command -buffer -nargs=1 AddDebugStringExpr
+command! -buffer -nargs=1 AddDebugStringExpr
             \ put=s:DebugStringFun(<args> . ': ', <args>)
diff --git a/ftplugin/python.vim b/ftplugin/python.vim
@@ -5,5 +5,5 @@ function! s:DebugStringFun()
     return DebugStringFunPython()
 endfunc
 
-command -buffer -nargs=0 AddDebugString put=s:DebugStringFun()
+command! -buffer -nargs=0 AddDebugString put=s:DebugStringFun()
 
diff --git a/ftplugin/r.vim b/ftplugin/r.vim
@@ -5,4 +5,4 @@ function! s:DebugStringFun()
     return DebugStringFunPython()
 endfunc
 
-command -buffer -nargs=0 AddDebugString put=s:DebugStringFun()
+command! -buffer -nargs=0 AddDebugString put=s:DebugStringFun()
diff --git a/ftplugin/ruby.vim b/ftplugin/ruby.vim
@@ -3,4 +3,4 @@ function! s:DebugStringFun()
     return l:debug_str
 endfunc
 
-command -buffer -nargs=0 AddDebugString put=s:DebugStringFun()
+command! -buffer -nargs=0 AddDebugString put=s:DebugStringFun()
diff --git a/ftplugin/sh.vim b/ftplugin/sh.vim
@@ -10,7 +10,7 @@ function! s:DebugStringFun(desc, ...)
 
 endfunc
 
-command -buffer -nargs=0 AddDebugString
+command! -buffer -nargs=0 AddDebugString
             \ put=s:DebugStringFun(g:DebugstringPrefixStr() . g:debugStringCounter)
-command -buffer -nargs=1 AddDebugStringExpr
+command! -buffer -nargs=1 AddDebugStringExpr
             \ put=s:DebugStringFun(<args> . ': ', <args>)
diff --git a/ftplugin/vim.vim b/ftplugin/vim.vim
@@ -3,7 +3,7 @@ function! s:DebugStringFunBase(desc, var)
     return l:debug_str
 endfunc
 
-command -buffer -nargs=0 AddDebugString
+command! -buffer -nargs=0 AddDebugString
             \ put=s:DebugStringFunBase(g:DebugstringPrefixStr(), g:debugStringCounter)
-command -buffer -nargs=1 AddDebugStringExpr
+command! -buffer -nargs=1 AddDebugStringExpr
             \ put=s:DebugStringFunBase(<args> . ': ', <args>)
diff --git a/test/basic.vader b/test/basic.vader
@@ -0,0 +1,67 @@
+# Test case
+
+# mapleader is set in the local vimrc
+#
+# Line +Text: 3
+# Line -Text: 8
+
+Include: text_setup.vader
+Include: env_setup.vader
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Execute (C +std_debug +Text):
+  :set filetype=c
+  3
+  AssertEqual getline('.'), 'And each in your season', "Current line contents don't match"
+  :normal ,ds
+  :normal .
+
+  Log join(getline(1,'$'), "\n")
+
+Then ():
+  4
+  Log join(getline(1,'$'), "\n")
+  AssertEqual getline('.'), 'printf("[[Vader-workbench]:4] DEBUGGING STRING ==> 0\n");'
+  6
+  AssertEqual getline('.'), 'printf("[[Vader-workbench]:6] DEBUGGING STRING ==> 1\n");'
+
+================================================================================
+
+Execute (C +std_debug -Text):
+  :set filetype=c
+  8
+  AssertEqual getline('.'), '', "Current line is not empty"
+  :normal ,ds
+
+Then ():
+  8
+  AssertEqual getline('.'), 'printf("[[Vader-workbench]:8] DEBUGGING STRING ==> 0\n");'
+
+================================================================================
+
+Execute (C +var_debug -Text TODO):
+  :set filetype=c
+Then ():
+================================================================================
+Execute (C +var_debug +Text TODO):
+  :set filetype=c
+Then ():
+================================================================================
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# cmake
+# cpp
+# fortran
+# haskell
+# javascript
+# java
+# php
+# python
+# ruby
+# r
+# sh
+# vim
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/test/env_setup.vader b/test/env_setup.vader
@@ -0,0 +1,2 @@
+Before (setup):
+  ResetDebugCounter
diff --git a/test/run-tests.sh b/test/run-tests.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+# file taken directly from https://github.com/junegunn/vader.vim
+
+# Do not "cd" to any existing "test" dir from CDPATH!
+unset CDPATH
+
+cd "$(dirname "${BASH_SOURCE[0]}")" && vim -Nu vimrc -c 'Vader! basic.vader' \
+    > /dev/null
diff --git a/test/text_setup.vader b/test/text_setup.vader
@@ -0,0 +1,11 @@
+Given (stars-javert):
+  You know your place in the sky
+  You hold your course and your aim
+  And each in your season
+  Returns and returns
+  And is always the same
+  And if you fall as Lucifer fell
+  You fall in flame!
+
+  Source: https://www.youtube.com/watch?v=lXsJ3Q5Z7cM
+
diff --git a/test/vimrc b/test/vimrc
@@ -0,0 +1,13 @@
+filetype off
+let mapleader = ","
+
+set runtimepath+=~/.vim/bundle/vader.vim
+set runtimepath+=~/.vim/bundle/vim-debugstring
+set runtimepath+=~/.vim/bundle/vim-repeat
+
+filetype plugin indent on
+syntax enable
+set nomore
+set noswapfile
+set viminfo=
+