X-Git-Url: https://iankelling.org/git/?p=lnf;a=blobdiff_plain;f=test%2Ftest;h=692938a4e26ec6faeeb8713d4fe63e8fded309a0;hp=c2bdb6a95bb612573967deba3f82f8ae00f05b81;hb=e51702380450ee0b4719a17744208975730ddff7;hpb=58d997c51c2cc8aed9e5028e24e770ba7cfb4321

diff --git a/test/test b/test/test
index c2bdb6a..692938a 100755
--- a/test/test
+++ b/test/test
@@ -1,71 +1,82 @@
 #!/bin/bash
 # some basic sanity / verification
-# assumes we have trash-put in path
+
 # I don't recommend actually running this unless you have a reason to,
 # since it creates & deletes files, and being a test, it is not as thoroughly
 # inspected for bugs
 
-err() {
-    echo error
-}
-# target linkname
+# assumes we have trash-put in path, and that lnf-function is in .. to this files location
+
+
+# 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 ]] || err
+    lnf -T a b
+    [[ -L b ]]
 }
 
-# target directory
+# 2 arguments, test that directory in link location is removed and replaced with a link
 case2() {
     mkdir b
-    lnf a b
-    [[ -L b/a ]] || err
+    lnf -T a b
+    [[ -L b ]]
 }
 
-# target
+# single argument, test that an existing non-empty directory is removed and replaced by a link
 case3() {
     mkdir a
     touch a/b
     lnf ../a
-    [[ -L a ]] || err
+    [[ -L a ]]
 }
 
-# target target directory
+# 4 arguments, 2 of the link locations already contain files.
+# test that they got removed and replaced by links
 case4() {
     mkdir a
     touch a/b
     touch a/c
     lnf b c d a
-    [[ -L a/b && -L a/c && -L a/d ]] || err
+    [[ -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
-set -eE;
+
+# trap errors, and output a simple bash stack trace
+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
-trash-put() {
-    rm -rf "$@"
-}
+# test again, using rm -rf in place of trash-put.
+trash-put() { rm -rf -- "$@"; }
+export -f trash-put
 docases
 
-echo success
+rm -rf $tempdir
+echo tests concluded