better logging and better testing

1 files changed, 17 insertions, 3 deletions

diff --git a/modules/assert.source.sh b/modules/assert.source.sh
index 3367809d..d7c507a4 100644
--- a/modules/assert.source.sh
+++ b/modules/assert.source.sh
@@ -1,10 +1,11 @@
 assert::equals () {
     local -r result="$1"; shift
     local -r expected="$1"; shift
+    local -r callee=${FUNCNAME[1]}
 
     if [ "$result" != "$expected" ]; then
-        cat <<ERROR
-Expected
+        cat <<ERROR | log::pipe ERROR
+In $callee expected
     '$expected'
 But got
     '$result'
@@ -12,5 +13,18 @@ ERROR
         exit 2
     fi
 
-    echo "Assert OK: $expected"
+    log VERBOSE "Result in $callee as expected: '$expected'"
+}
+
+assert::not_empty () {
+    local -r name="$1"; shift
+    local -r content="$1"; shift
+    local -r callee=${FUNCNAME[1]}
+
+    if [ -z "$content" ]; then
+        log ERROR "In $callee expected '$name' not to be empty!"
+        exit 2
+    fi
+
+    log VERBOSE "Result in $callee as expected not empty"
 }