Merge pull request ShamrockLee#2 from ShamrockLee/mock-fix

Stop ignoreing the *.config files and fix the mock tests

Author: ShamrockLee

.gitignore

@@ -1,2 +1 @@
-labview_path*.config
 

CHANGELOG.md

@@ -9,6 +9,10 @@
 *   Fix the `README.md` typo about the missing double-quote (`"`)
     in the `git config` setting, and the table about the default configuration on Windows.
 
+*   Stop excluding *.config files from the project tree.
+
+*   Fix and rename the LabVIEW mock tests.
+
 ### Enhancements
 *   Remove the `sed` and `grep` dependencies.
 

git-labview-integration-posix/test/labview_path_posix.config

@@ -0,0 +1,22 @@
+## LabVIEW executable absolute path
+## or a way to call it
+## This can be hard-coded
+## as well as programmatically defined
+LABVIEW_EXECUTABLE="pseudo-labview"
+
+## LvCompare executable absolute path
+LVCOMPARE_EXECUTABLE="$(dirname "$BASH_SOURCE")/mock-labview"
+
+## LvMerge executable absolute path
+LVMERGE_EXECUTABLE="$(dirname "$BASH_SOURCE")/mock-labview"
+
+## The location of this script. DO NOT EDIT.
+CONFIGURATION_SOURCE="$BASH_SOURCE"
+
+## The directory level from the project root to this configuration
+## Default to 0 since this configuration is usually placed at the source root
+CONFIGURATION_DIRECTORY_LEVEL=2
+
+## Project root (optional)
+## Override the auto-detection result and the CONFIGURATION_DIRECTORY_LEVEL setting
+# PROJECT_ROOT_FORCED="$HOME/Projects/my-project"

git-labview-integration-posix/test/pseudo-lv renamed to git-labview-integration-posix/test/mock-labview

@@ -2,18 +2,21 @@
 
 setup_file() {
 	PROJECT_ROOT="$(cd "$BATS_TEST_DIRNAME/../.."; pwd)"
+	export PROJECT_ROOT
 }
 
 @test "Check lvcompare_as_difftool.sh" {
+	bats_require_minimum_version 1.5.0
 	run --separate-stderr bash "$PROJECT_ROOT/git-labview-integration-posix/lvcompare_as_difftool.sh" "$PROJECT_ROOT/git-labview-integration-posix/test/labview_path_posix.config" "remote.lv" "local.lv"
-	outputExpected="$("$PROJECT_ROOT/git-labview-integration-posix/test/pseudo-lv" "$PROJECT_ROOT/remote.lv" "$PROJECT_ROOT/local.lv" "-lvpath" "pseudo-labview" "-nobdcosm" "-nobdpos" "-nofppos")"
+	outputExpected="$("$PROJECT_ROOT/git-labview-integration-posix/test/mock-labview" "$PROJECT_ROOT/remote.lv" "$PROJECT_ROOT/local.lv" "-lvpath" "pseudo-labview" "-nobdcosm" "-nobdpos" "-nofppos")"
 	diff <(echo "$output") <(echo "$outputExpected")
 	[ "$output" == "$outputExpected" ]
 }
 
 @test "Check lvmerge_as_mergetool.sh" {
+	bats_require_minimum_version 1.5.0
 	run --separate-stderr bash "$PROJECT_ROOT/git-labview-integration-posix/lvmerge_as_mergetool.sh" "$PROJECT_ROOT/git-labview-integration-posix/test/labview_path_posix.config" "base.lv" "remote.lv" "local.lv" "merged.lv"
-	outputExpected="$("$PROJECT_ROOT/git-labview-integration-posix/test/pseudo-lv" "pseudo-labview" "$PROJECT_ROOT/base.lv" "$PROJECT_ROOT/remote.lv" "$PROJECT_ROOT/local.lv" "$PROJECT_ROOT/merged.lv")"
+	outputExpected="$("$PROJECT_ROOT/git-labview-integration-posix/test/mock-labview" "pseudo-labview" "$PROJECT_ROOT/base.lv" "$PROJECT_ROOT/remote.lv" "$PROJECT_ROOT/local.lv" "$PROJECT_ROOT/merged.lv")"
 	diff <(echo "$output") <(echo "$outputExpected")
 	[ "$output" == "$outputExpected" ]
 }