Clean up tests with better output

Author: BrandonRomano

callable.sh

@@ -1,9 +1,17 @@
+#!/bin/bash
+
 Test__MODULE_TEST_FILE="test.sh"
 
 ##################################################
-# This function is an alias for `ash self:help`.
+# This function will run the test.sh file located
+# in the module passed in
+#
+# @param $1: The name of the module to test.  This
+#   can either be the alias, or the full package
+#   name.
 #
-# @param $1: The name of the module to test
+# @returns $?: A 1 if any test has failed,
+#   or a 0 if all tests have succeeded.
 ##################################################
 Test__callable_main() {
     # Params
@@ -13,7 +21,7 @@ Test__callable_main() {
     local module_directory="$(Ash__find_module_directory "$module_to_test" "1")"
     if [[ "$module_directory" = "" ]]; then
         Logger__error "Module $module_to_test does not exist"
-        return
+        return 1
     fi
 
     # Loading in name of module, as if Ash core loaded it
@@ -24,15 +32,15 @@ Test__callable_main() {
     local test_file="$module_directory/$Test__MODULE_TEST_FILE"
     if [[ ! -f "$test_file" ]]; then
         Logger__error "There is no $Test__MODULE_TEST_FILE file in $module_to_test"
-        return
+        return 1
     fi
     . $test_file
 
     # Loading in config
     local config="$module_directory/$Ash__CONFIG_FILENAME"
     if [[ ! -f "$config" ]]; then
         Logger__error "There is no $Ash__CONFIG_FILENAME file in $module_to_test"
-        return
+        return 1
     fi
     eval $(YamlParse__parse "$config" "Test_module_config_")
 
@@ -45,27 +53,29 @@ Test__callable_main() {
 
     # Call all methods
     local success="$Ash__TRUE"
-    local to_find="$test_prefix"__
     for t in $tests
     do
+        local to_find="$test_prefix"__
         local test_name=$(echo "$t" | sed "s/$to_find//g")
-        Logger__alert "Running $test_name... " -n
-
-        test_output=$($t) # Can't make this local, as I need to capture the exit status!
+        # Can't make this local, as I need to capture the exit status...
+        # local itself has an exit status!
+        test_output=$($t)
         if [[ $? -eq 0 ]]; then
             Test__print_green_check
+            echo " $test_name"
         else
             success="$Ash__FALSE"
             Test__print_red_x
+            echo " $test_name"
 
             # Log output, if any
             if [[ "$test_output" != "" ]]; then
-                echo -n "    "
-                Test__print_red_rightwards_arrow
-                echo -n " "
-                echo -ne '\033[1;31m'
-                echo "${test_output}"
-                echo -ne '\033[1;0m'
+                local red="\033[1;31m"
+                local clear="\033[1;0m"
+                test_output="$(Test__print_red_rightwards_arrow) $red$test_output$clear"
+                test_output="$(echo "${test_output}" | sed "s/^/    /g")"
+                test_output="$(echo "${test_output}" | awk '/^/{if (M!=""){sub("","    ")}else{M=1}}{print}')"
+                echo -e "$test_output"
             fi
         fi
     done

lib/util.sh

@@ -3,7 +3,7 @@
 ##################################################
 Test__print_green_check() {
     echo -ne '\033[0;32m'
-    echo -e '\xe2\x9c\x94'
+    echo -ne '\xe2\x9c\x94'
     echo -ne '\033[1;0m'
 }
 
@@ -12,11 +12,13 @@ Test__print_green_check() {
 ##################################################
 Test__print_red_x() {
     echo -ne '\033[1;31m'
-    echo -e "\xe2\x9c\x98"
+    echo -ne "\xe2\x9c\x98"
     echo -ne '\033[1;0m'
 }
 
-# RIGHTWARDS ARROW
+##################################################
+# Returns a unicode 'RIGHTWARDS ARROW'
+##################################################
 Test__print_red_rightwards_arrow() {
     echo -ne '\033[1;31m'
     echo -ne "\xe2\x86\x92"