Skip to content

Commit

Permalink
Added proper test environment and fixed tests
Browse files Browse the repository at this point in the history
  • Loading branch information
jakobwesthoff committed Mar 2, 2012
1 parent e20a298 commit 8a6a412
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 8 deletions.
2 changes: 2 additions & 0 deletions tests/data/file-only/level1/.vimrc
@@ -1,2 +1,4 @@
let g:dirsettingsOverwriteTest="level1"
let g:dirsettingsLevel1="level1 loaded"

let g:dirsettingsVimRcVariable="set-by-level1"
2 changes: 2 additions & 0 deletions tests/src/_setup.vim → tests/environment/.vimrc
@@ -1,2 +1,4 @@
source ../../autoload/dirsettings.vim
call dirsettings#Install()

let g:dirsettingsVimRcVariable="set-by-vimrc"
9 changes: 7 additions & 2 deletions tests/runTests.sh
@@ -1,12 +1,17 @@
#!/bin/bash
filepath="$(dirname "$(readlink -f "$0")")"

OLD_VIMRUNTIME="${VIMRUNTIME}"
export VIMRUNTIME="${filepath}/environment"

if [ $# -gt 1 ]; then
env sh ${filepath}/runVimTests/bin/runVimTests.sh --default "$@"
env sh ${filepath}/runVimTests/bin/runVimTests.sh --default --source "${filepath}/environment/.vimrc" "$@"
else
env sh ${filepath}/runVimTests/bin/runVimTests.sh --default "${filepath}/src"
env sh ${filepath}/runVimTests/bin/runVimTests.sh --default --source "${filepath}/environment/.vimrc" "${filepath}/src"
fi

export VIMRUNTIME="${OLD_VIMRUNTIME}"

if [ -z "${TESTDEBUG}" ]; then
rm ${filepath}/src/*.{msgout,out,msgresult} >/dev/null 2>&1
fi
3 changes: 1 addition & 2 deletions tests/src/test001_file_single_level_loaded.vim
@@ -1,5 +1,4 @@
source _setup.vim

set rtp?
edit ../data/file-only/level1/empty

echo g:dirsettingsLevel1
Expand Down
2 changes: 0 additions & 2 deletions tests/src/test002_file_level2_loaded.vim
@@ -1,5 +1,3 @@
source _setup.vim

edit ../data/file-only/level1/level2/empty

echo g:dirsettingsLevel1
Expand Down
2 changes: 0 additions & 2 deletions tests/src/test003_file_level3_loaded.vim
@@ -1,5 +1,3 @@
source _setup.vim

edit ../data/file-only/level1/level2/level3/empty

echo g:dirsettingsLevel1
Expand Down
5 changes: 5 additions & 0 deletions tests/src/test004_vimrc_override.msgok
@@ -0,0 +1,5 @@

set-by-vimrc
"../data/file-only/level1/empty"
"../data/file-only/level1/empty" 0L, 0C
set-by-level1
7 changes: 7 additions & 0 deletions tests/src/test004_vimrc_override.vim
@@ -0,0 +1,7 @@
echo g:dirsettingsVimRcVariable

edit ../data/file-only/level1/empty

echo g:dirsettingsVimRcVariable

quit!

0 comments on commit 8a6a412

Please sign in to comment.