several bug fixes, simplify to just one script file

[lnf] / test / test

diff --git a/test/test b/test/test
index 218b67c1ddd981ebadb9dd2c863c7730cd7ddfa9..692938a4e26ec6faeeb8713d4fe63e8fded309a0 100755 (executable)
--- a/test/test
+++ b/test/test
@@ -11,15 +11,15 @@
 # 2 arguments, test that a file in the link location is removed and replaed with a link
 case1() {
     touch b
-    lnf a b
-    [[ -L b ]] 
+    lnf -T a b
+    [[ -L b ]]
 }
 
 # 2 arguments, test that directory in link location is removed and replaced with a link
 case2() {
     mkdir b
-    lnf a b
-    [[ -L b ]] 
+    lnf -T a b
+    [[ -L b ]]
 }
 
 # single argument, test that an existing non-empty directory is removed and replaced by a link
@@ -27,7 +27,7 @@ case3() {
     mkdir a
     touch a/b
     lnf ../a
-    [[ -L a ]] 
+    [[ -L a ]]
 }
 
 # 4 arguments, 2 of the link locations already contain files.
@@ -37,26 +37,32 @@ case4() {
     touch a/b
     touch a/c
     lnf b c d a
-    [[ -L a/b && -L a/c && -L a/d ]] 
+    [[ -L a/b && -L a/c && -L a/d ]]
 }
 
+# 2 arguments, test that link is made correctly
+case5() {
+    mkdir b
+    lnf a b
+    [[ -L b/a ]]
+}
+
+
+
 cleanup() {
     rm -rf *
 }
 
 
 docases() {
-    case1
-    cleanup
-    case2
-    cleanup
-    case3
-    cleanup
-    case4
-    cleanup
+    for x in {1..5}; do
+        case$x
+        cleanup
+    done
 }
 
-source ${0%/*}/../lnf-function
+PATH="$(readlink -f ${0%/*}/..):$PATH"
+
 # might want to undo this if things go wrong
 # set -x
 
@@ -64,12 +70,13 @@ source ${0%/*}/../lnf-function
 set -E;
 trap 'echo "${BASH_COMMAND:+BASH_COMMAND=\"$BASH_COMMAND\" }
 ${FUNCNAME:+FUNCNAME=\"$FUNCNAME\" }${LINENO:+LINENO=\"$LINENO\"  }\$?=$?"' ERR
-cd $(mktemp -d)
+tempdir=$(mktemp -d)
+cd $tempdir
 docases
 # test again, using rm -rf in place of trash-put.
-# assumes that rm is in /bin and trash-put is in /usr/bin
-PATH="${PATH//:\/usr\/bin}"
-PATH="${PATH//\/usr\/bin:}"
+trash-put() { rm -rf -- "$@"; }
+export -f trash-put
 docases
 
+rm -rf $tempdir
 echo tests concluded