Merge pull request #342 from matthiasbeyer/imag-link/testing

Imag link/testing

4 files changed, 5 insertions, 61 deletions

diff --git a/imag-store/tests/001-create_test.sh b/imag-store/tests/001-create_test.sh
index 91720c9f..823d8488 100644
--- a/imag-store/tests/001-create_test.sh
+++ b/imag-store/tests/001-create_test.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 
+source $(dirname ${BASH_SOURCE[0]})/../../tests/utils.sh
 source $(dirname ${BASH_SOURCE[0]})/utils.sh
 
 test_call() {
diff --git a/imag-store/tests/002-retrieve_test.sh b/imag-store/tests/002-retrieve_test.sh
index 33b96780..4e2c7d7c 100644
--- a/imag-store/tests/002-retrieve_test.sh
+++ b/imag-store/tests/002-retrieve_test.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 
+source $(dirname ${BASH_SOURCE[0]})/../../tests/utils.sh
 source $(dirname ${BASH_SOURCE[0]})/utils.sh
 
 std_header() {
diff --git a/imag-store/tests/003-delete_test.sh b/imag-store/tests/003-delete_test.sh
index 794f1ad8..9beaba82 100644
--- a/imag-store/tests/003-delete_test.sh
+++ b/imag-store/tests/003-delete_test.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 
+source $(dirname ${BASH_SOURCE[0]})/../../tests/utils.sh
 source $(dirname ${BASH_SOURCE[0]})/utils.sh
 
 create() {
diff --git a/imag-store/tests/utils.sh b/imag-store/tests/utils.sh
index 148eaf87..adf6cd88 100644
--- a/imag-store/tests/utils.sh
+++ b/imag-store/tests/utils.sh
@@ -1,65 +1,6 @@
-#!/usr/bin/env bash
-
-COLOR_OFF='\e[0m'       # Text Reset
-RED='\e[0;31m'          # Red
-YELLOW='\e[0;33m'       # Yellow
-GREEN='\e[0;32m'        # Green
-
-RUNTIME="/tmp"
-STORE="${RUNTIME}/store"
-
-out() {
-    [[ -z "$DEBUG_OUTPUT_OFF" ]] && echo -e "${YELLOW}:: $*${COLOR_OFF}"
-}
-
-success() {
-    [[ -z "$DEBUG_OUTPUT_OFF" ]] && echo -e "${GREEN}>> $*${COLOR_OFF}"
-}
-
-err() {
-    [[ -z "$DEBUG_OUTPUT_OFF" ]] && echo -e "${RED}!! $*${COLOR_OFF}"
-}
-
-silent() {
-    DEBUG_OUTPUT_OFF=1 $*
-}
+source $(dirname ${BASH_SOURCE[0]})/../tests/utils.sh
 
 imag-store() {
-    local searchdir=$(dirname ${BASH_SOURCE[0]})/../target/debug/
-    [[ -d $searchdir ]] || { err "FATAL: No directory $searchdir"; exit 1; }
-    local bin=$(find $searchdir -iname imag-store -type f -executable)
-    local flags="--debug --rtp $RUNTIME"
-    out "Calling '$bin $flags $*'"
-    $bin $flags $*
-}
-
-reset_store() {
-    rm -r "${STORE}"
-}
-
-call_test() {
-    out "-- TESTING: '$1' --"
-    $1
-    result=$?
-    if [[ -z "$DONT_RESET_STORE" ]]; then
-        out "Reseting store"
-        reset_store
-        out "Store reset done"
-    fi
-    [[ $result -eq 0 ]] || { err "-- FAILED: '$1'. Exiting."; exit 1; }
-    success "-- SUCCESS: '$1' --"
-}
-
-invoke_tests() {
-    out "Invoking tests."
-    if [[ ! -z "$INVOKE_TEST" ]]; then
-        out "Invoking only $INVOKE_TEST"
-        call_test "$INVOKE_TEST"
-    else
-        out "Invoking $*"
-        for t in $*; do
-            call_test "$t"
-        done
-    fi
+    imag-call-binary "$(dirname ${BASH_SOURCE[0]})/../target/debug/" imag-store $*
 }