test/local: clean up lib/test.sh routines a little bitv2.1.2

13 files changed, 35 insertions, 30 deletions

diff --git a/test/local/lib/test.sh b/test/local/lib/test.sh
index b6e444e..43cf55b 100644
--- a/test/local/lib/test.sh
+++ b/test/local/lib/test.sh
@@ -3,6 +3,8 @@
 # For details, see https://github.com/egor-tensin/config-links
 # Distributed under the MIT License.
 
+test_should_fail=
+
 src_dir_name='src'
 dest_dir_name='dest'
 alt_dest_dir_name='alt_dest'
@@ -39,7 +41,7 @@ test_setup_symlink() {
 }
 
 test_setup_dir_symlink() {
-    test_setup "${FUNCNAME[1]}"
+    test_setup
 
     # Files will get symlinks in the directory pointed to by $DEST, as well as
     # by $ALT_DEST.
@@ -47,7 +49,10 @@ test_setup_dir_symlink() {
 }
 
 test_cleanup_default() {
-    [ -n "$test_root_dir" ] && rm -rf -- "$test_root_dir"
+    if [ -n "$test_root_dir" ]; then
+        log "Removing test's root directory: $test_root_dir"
+        rm -rf -- "$test_root_dir"
+    fi
 }
 
 test_run_script() {
@@ -55,7 +60,9 @@ test_run_script() {
     msg="$msg$( printf -- ' %q' "$@" --shared-dir "$test_src_dir" --database "$test_root_dir/links.bin" )"
     log "$msg"
 
-    DEST="$test_dest_dir" ALT_DEST="$test_alt_dest_dir" "$@" --shared-dir "$test_src_dir" --database "$test_root_dir/links.bin"
+    DEST="$test_dest_dir" ALT_DEST="$test_alt_dest_dir" "$@" \
+        --shared-dir "$test_src_dir" \
+        --database "$test_root_dir/links.bin"
 }
 
 test_run_update() {
@@ -72,14 +79,12 @@ test_run_chmod() {
 
 test_verify_output() {
     if [ "$#" -lt 1 ] || [ "$#" -gt 2 ]; then
-        echo "usage: ${FUNCNAME[0]} EXPECTED_OUTPUT [DEST_DIR]" >&2
+        echo "usage: ${FUNCNAME[0]} DEST_DIR EXPECTED_OUTPUT" >&2
         return 1
     fi
 
-    local expected_output="$1"
-
-    local dest_dir="$test_dest_dir"
-    [ "$#" -ge 2 ] && dest_dir="$2"
+    local dest_dir="$1"
+    local expected_output="$2"
 
     log "Verifying directory structure in $dest_dir..."
 
@@ -96,12 +101,12 @@ test_verify_output() {
 
 test_verify_mode() {
     if [ "$#" -ne 2 ]; then
-        echo "usage: ${FUNCNAME[0]} EXPECTED_MODE FILE" >&2
+        echo "usage: ${FUNCNAME[0]} PATH EXPECTED_MODE" >&2
         return 1
     fi
 
-    local expected_mode="$1"
-    local path="$2"
+    local path="$1"
+    local expected_mode="$2"
 
     log "Checking permissions for file: $path"
 
diff --git a/test/local/tst-chmod.sh b/test/local/tst-chmod.sh
index dcf5045..b118e5e 100644
--- a/test/local/tst-chmod.sh
+++ b/test/local/tst-chmod.sh
@@ -12,11 +12,11 @@ $test_dest_dir/bar/baz->
 $test_dest_dir/bar/baz/4.txt->$test_src_dir/%DEST%/bar/baz/4.txt
 $test_dest_dir/foo->
 $test_dest_dir/foo/2.txt->$test_src_dir/%DEST%/foo/2.txt"
-    test_verify_output "$expected_output"
+    test_verify_output "$test_dest_dir" "$expected_output"
 
     log "Verifying 1.txt's (the shared file) permissions..."
 
-    test_verify_mode 0644 "$test_src_dir/%DEST%/1.txt"
+    test_verify_mode "$test_src_dir/%DEST%/1.txt" 0644
     test_run_chmod 0600
-    test_verify_mode 0600 "$test_src_dir/%DEST%/1.txt"
+    test_verify_mode "$test_src_dir/%DEST%/1.txt" 0600
 }
diff --git a/test/local/tst-dir-symlink-delete.sh b/test/local/tst-dir-symlink-delete.sh
index c8a9b46..f53d87c 100644
--- a/test/local/tst-dir-symlink-delete.sh
+++ b/test/local/tst-dir-symlink-delete.sh
@@ -18,8 +18,8 @@ $test_dest_dir/bar/baz/4.txt->$test_src_dir/%DEST%/bar/baz/4.txt
 $test_dest_dir/foo->
 $test_dest_dir/foo/2.txt->$test_src_dir/%DEST%/foo/2.txt"
 
-    test_verify_output "$expected_output"
+    test_verify_output "$test_dest_dir" "$expected_output"
 
     expected_output="$test_alt_dest_dir->"
-    test_verify_output "$expected_output" "$test_alt_dest_dir"
+    test_verify_output "$test_alt_dest_dir" "$expected_output"
 }
diff --git a/test/local/tst-dir-symlink-remove-shared-file.sh b/test/local/tst-dir-symlink-remove-shared-file.sh
index 7ac246b..3e20ab0 100644
--- a/test/local/tst-dir-symlink-remove-shared-file.sh
+++ b/test/local/tst-dir-symlink-remove-shared-file.sh
@@ -16,7 +16,7 @@ $test_dest_dir/bar/baz/4.txt->$test_src_dir/%DEST%/bar/baz/4.txt
 $test_dest_dir/foo->
 $test_dest_dir/foo/2.txt->$test_src_dir/%DEST%/foo/2.txt"
 
-    test_verify_output "$expected_output"
+    test_verify_output "$test_dest_dir" "$expected_output"
 
     expected_output="$test_alt_dest_dir->
 $test_alt_dest_dir/1.txt->$test_src_dir/%ALT_DEST%/1.txt
@@ -26,5 +26,5 @@ $test_alt_dest_dir/bar/baz/4.txt->$test_src_dir/%ALT_DEST%/bar/baz/4.txt
 $test_alt_dest_dir/foo->
 $test_alt_dest_dir/foo/2.txt->$test_src_dir/%ALT_DEST%/foo/2.txt"
 
-    test_verify_output "$expected_output" "$test_alt_dest_dir"
+    test_verify_output "$test_alt_dest_dir" "$expected_output"
 }
diff --git a/test/local/tst-remove-dir-symlink.sh b/test/local/tst-remove-dir-symlink.sh
index ae32250..c524ee6 100644
--- a/test/local/tst-remove-dir-symlink.sh
+++ b/test/local/tst-remove-dir-symlink.sh
@@ -6,8 +6,8 @@ test_run() {
     test_run_remove
 
     local expected_output="$test_dest_dir->"
-    test_verify_output "$expected_output"
+    test_verify_output "$test_dest_dir" "$expected_output"
 
     expected_output="$test_alt_dest_dir->"
-    test_verify_output "$expected_output" "$test_alt_dest_dir"
+    test_verify_output "$test_alt_dest_dir" "$expected_output"
 }
diff --git a/test/local/tst-remove-does-not-delete-user-dirs.sh b/test/local/tst-remove-does-not-delete-user-dirs.sh
index 83c3869..aa013c8 100644
--- a/test/local/tst-remove-does-not-delete-user-dirs.sh
+++ b/test/local/tst-remove-does-not-delete-user-dirs.sh
@@ -15,5 +15,5 @@ test_run() {
 $test_dest_dir/bar->
 $test_dest_dir/bar/my-file->"
 
-    test_verify_output "$expected_output"
+    test_verify_output "$test_dest_dir" "$expected_output"
 }
diff --git a/test/local/tst-remove-does-not-overwrite-files.sh b/test/local/tst-remove-does-not-overwrite-files.sh
index 14641de..baef2ef 100644
--- a/test/local/tst-remove-does-not-overwrite-files.sh
+++ b/test/local/tst-remove-does-not-overwrite-files.sh
@@ -16,5 +16,5 @@ test_run() {
 $test_dest_dir/bar->
 $test_dest_dir/bar/3.txt->"
 
-    test_verify_output "$expected_output"
+    test_verify_output "$test_dest_dir" "$expected_output"
 }
diff --git a/test/local/tst-remove-symlink.sh b/test/local/tst-remove-symlink.sh
index a8f768f..aa27435 100644
--- a/test/local/tst-remove-symlink.sh
+++ b/test/local/tst-remove-symlink.sh
@@ -6,7 +6,7 @@ test_run() {
     test_run_remove
 
     local expected_output="$test_dest_dir->"
-    test_verify_output "$expected_output"
+    test_verify_output "$test_dest_dir" "$expected_output"
 
     log 'Verifying 3_copy.txt (the shared file) is valid...'
 
diff --git a/test/local/tst-remove.sh b/test/local/tst-remove.sh
index 9e262c3..c79a3b4 100644
--- a/test/local/tst-remove.sh
+++ b/test/local/tst-remove.sh
@@ -7,5 +7,5 @@ test_run() {
     test_run_remove
 
     local expected_output="$test_dest_dir->"
-    test_verify_output "$expected_output"
+    test_verify_output "$test_dest_dir" "$expected_output"
 }
diff --git a/test/local/tst-update-chmod.sh b/test/local/tst-update-chmod.sh
index 8873c82..a78ee15 100644
--- a/test/local/tst-update-chmod.sh
+++ b/test/local/tst-update-chmod.sh
@@ -13,7 +13,7 @@ $test_dest_dir/bar/baz->
 $test_dest_dir/bar/baz/4.txt->$test_src_dir/%DEST%/bar/baz/4.txt
 $test_dest_dir/foo->
 $test_dest_dir/foo/2.txt->$test_src_dir/%DEST%/foo/2.txt"
-    test_verify_output "$expected_output"
 
-    test_verify_mode "$expected_mode" "$test_src_dir/%DEST%/1.txt"
+    test_verify_output "$test_dest_dir" "$expected_output"
+    test_verify_mode "$test_src_dir/%DEST%/1.txt" "$expected_mode"
 }
diff --git a/test/local/tst-update-dir-symlink.sh b/test/local/tst-update-dir-symlink.sh
index 5736481..27418ab 100644
--- a/test/local/tst-update-dir-symlink.sh
+++ b/test/local/tst-update-dir-symlink.sh
@@ -14,7 +14,7 @@ $test_dest_dir/bar/baz/4.txt->$test_src_dir/%DEST%/bar/baz/4.txt
 $test_dest_dir/foo->
 $test_dest_dir/foo/2.txt->$test_src_dir/%DEST%/foo/2.txt"
 
-    test_verify_output "$expected_output"
+    test_verify_output "$test_dest_dir" "$expected_output"
 
     expected_output="$test_alt_dest_dir->
 $test_alt_dest_dir/1.txt->$test_src_dir/%ALT_DEST%/1.txt
@@ -25,5 +25,5 @@ $test_alt_dest_dir/bar/baz/4.txt->$test_src_dir/%ALT_DEST%/bar/baz/4.txt
 $test_alt_dest_dir/foo->
 $test_alt_dest_dir/foo/2.txt->$test_src_dir/%ALT_DEST%/foo/2.txt"
 
-    test_verify_output "$expected_output" "$test_alt_dest_dir"
+    test_verify_output "$test_alt_dest_dir" "$expected_output"
 }
diff --git a/test/local/tst-update-symlink.sh b/test/local/tst-update-symlink.sh
index b081fdf..6a90491 100644
--- a/test/local/tst-update-symlink.sh
+++ b/test/local/tst-update-symlink.sh
@@ -14,7 +14,7 @@ $test_dest_dir/bar/baz/4.txt->$test_src_dir/%DEST%/bar/baz/4.txt
 $test_dest_dir/foo->
 $test_dest_dir/foo/2.txt->$test_src_dir/%DEST%/foo/2.txt"
 
-    test_verify_output "$expected_output"
+    test_verify_output "$test_dest_dir" "$expected_output"
 
     log 'Verifying 3_copy.txt (the symlink) is valid...'
 
diff --git a/test/local/tst-update.sh b/test/local/tst-update.sh
index df22b71..f33b929 100644
--- a/test/local/tst-update.sh
+++ b/test/local/tst-update.sh
@@ -14,5 +14,5 @@ $test_dest_dir/bar/baz/4.txt->$test_src_dir/%DEST%/bar/baz/4.txt
 $test_dest_dir/foo->
 $test_dest_dir/foo/2.txt->$test_src_dir/%DEST%/foo/2.txt"
 
-    test_verify_output "$expected_output"
+    test_verify_output "$test_dest_dir" "$expected_output"
 }