From 8a6a412a54bf71ca8f249bf2d2677af18bd8cbe4 Mon Sep 17 00:00:00 2001
From: Jakob Westhoff <jakob@westhoffswelt.de>
Date: Fri, 2 Mar 2012 09:46:17 -0500
Subject: [PATCH] Added proper test environment and fixed tests

---
 tests/data/file-only/level1/.vimrc             | 2 ++
 tests/{src/_setup.vim => environment/.vimrc}   | 2 ++
 tests/runTests.sh                              | 9 +++++++--
 tests/src/test001_file_single_level_loaded.vim | 3 +--
 tests/src/test002_file_level2_loaded.vim       | 2 --
 tests/src/test003_file_level3_loaded.vim       | 2 --
 tests/src/test004_vimrc_override.msgok         | 5 +++++
 tests/src/test004_vimrc_override.vim           | 7 +++++++
 8 files changed, 24 insertions(+), 8 deletions(-)
 rename tests/{src/_setup.vim => environment/.vimrc} (58%)
 create mode 100644 tests/src/test004_vimrc_override.msgok
 create mode 100644 tests/src/test004_vimrc_override.vim

diff --git a/tests/data/file-only/level1/.vimrc b/tests/data/file-only/level1/.vimrc
index 63ba07f..60c7d24 100644
--- a/tests/data/file-only/level1/.vimrc
+++ b/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"
diff --git a/tests/src/_setup.vim b/tests/environment/.vimrc
similarity index 58%
rename from tests/src/_setup.vim
rename to tests/environment/.vimrc
index 394e408..f369bd8 100644
--- a/tests/src/_setup.vim
+++ b/tests/environment/.vimrc
@@ -1,2 +1,4 @@
 source ../../autoload/dirsettings.vim
 call dirsettings#Install()
+
+let g:dirsettingsVimRcVariable="set-by-vimrc"
diff --git a/tests/runTests.sh b/tests/runTests.sh
index ce82682..588ee5a 100755
--- a/tests/runTests.sh
+++ b/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
diff --git a/tests/src/test001_file_single_level_loaded.vim b/tests/src/test001_file_single_level_loaded.vim
index 64b487d..ff0def4 100644
--- a/tests/src/test001_file_single_level_loaded.vim
+++ b/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
diff --git a/tests/src/test002_file_level2_loaded.vim b/tests/src/test002_file_level2_loaded.vim
index 16f5622..653829e 100644
--- a/tests/src/test002_file_level2_loaded.vim
+++ b/tests/src/test002_file_level2_loaded.vim
@@ -1,5 +1,3 @@
-source _setup.vim
-
 edit ../data/file-only/level1/level2/empty
 
 echo g:dirsettingsLevel1
diff --git a/tests/src/test003_file_level3_loaded.vim b/tests/src/test003_file_level3_loaded.vim
index 73dc006..3c1f1bd 100644
--- a/tests/src/test003_file_level3_loaded.vim
+++ b/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
diff --git a/tests/src/test004_vimrc_override.msgok b/tests/src/test004_vimrc_override.msgok
new file mode 100644
index 0000000..35b1c04
--- /dev/null
+++ b/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
diff --git a/tests/src/test004_vimrc_override.vim b/tests/src/test004_vimrc_override.vim
new file mode 100644
index 0000000..d7740ec
--- /dev/null
+++ b/tests/src/test004_vimrc_override.vim
@@ -0,0 +1,7 @@
+echo g:dirsettingsVimRcVariable
+
+edit ../data/file-only/level1/empty
+
+echo g:dirsettingsVimRcVariable
+
+quit!