Sweep colored words under the variable carpet

src/jat.sh.skel

@@ -74,6 +74,24 @@ JAT__TESTID=${JAT__TESTID:-_jat_anon_test_}
 #
 __JAT__SDIR=
 
+#
+# Colored words for `jat__show_*` functions
+#
+__JAT__SWORD_END=${TERMCOLORS_LBLACK}END${TERMCOLORS_NONE}
+__JAT__SWORD_FAIL=${TERMCOLORS_RED}FAIL${TERMCOLORS_NONE}
+__JAT__SWORD_FINALIZE=${TERMCOLORS_LBLACK}FINALIZE${TERMCOLORS_NONE}
+__JAT__SWORD_PASS=${TERMCOLORS_GREEN}PASS${TERMCOLORS_NONE}
+__JAT__SWORD_PHASE=${TERMCOLORS_YELLOW}phase${TERMCOLORS_NONE}
+__JAT__SWORD_RELOAD=${TERMCOLORS_LBLUE}RELOAD${TERMCOLORS_NONE}
+__JAT__SWORD_SESSION=${TERMCOLORS_YELLOW}session${TERMCOLORS_NONE}
+__JAT__SWORD_START=${TERMCOLORS_LBLACK}START${TERMCOLORS_NONE}
+__JAT__SWORD_SUT=${TERMCOLORS_YELLOW}sut${TERMCOLORS_NONE}
+__JAT__SWORD_TERROR=${TERMCOLORS_RED}ERROR${TERMCOLORS_NONE}
+__JAT__SWORD_TEST=${TERMCOLORS_YELLOW}test${TERMCOLORS_NONE}
+__JAT__SWORD_TINFO=${TERMCOLORS_LBLACK}INFO${TERMCOLORS_NONE}
+__JAT__SWORD_TWARNING=${TERMCOLORS_RED}WARNING${TERMCOLORS_NONE}
+
+
 #
 # Make result log deterministic?
 #
@@ -1021,7 +1039,7 @@ __jat__show_fail() {
     # Show assert fail message $1 to stderr
     #
     __jat__show \
-        "  ${TERMCOLORS_YELLOW}sut${TERMCOLORS_NONE}.${TERMCOLORS_RED}FAIL${TERMCOLORS_NONE}: $1"
+        "  $__JAT__SWORD_SUT.$__JAT__SWORD_FAIL: $1"
 }
 
 __jat__show_pass() {
@@ -1029,7 +1047,7 @@ __jat__show_pass() {
     # Show assert fail message $1 to stderr
     #
     __jat__show \
-        "  ${TERMCOLORS_YELLOW}sut${TERMCOLORS_NONE}.${TERMCOLORS_GREEN}PASS${TERMCOLORS_NONE}: $1"
+        "  $__JAT__SWORD_SUT.$__JAT__SWORD_PASS: $1"
 }
 
 __jat__show_pend() {
@@ -1042,11 +1060,11 @@ __jat__show_pend() {
     pname=$(__jat__sd_keyr P.name)
     test "$pname" == "_jat_anon_phase_" || pnhint=" '$pname'"
     case "$(jat__stat pfailc)" in
-        0)  pverd="${TERMCOLORS_GREEN}PASS${TERMCOLORS_NONE}" ;; 
-        *)  pverd="${TERMCOLORS_RED}FAIL${TERMCOLORS_NONE}" ;;
+        0)  pverd="$__JAT__SWORD_PASS" ;;
+        *)  pverd="$__JAT__SWORD_FAIL" ;;
     esac
     __jat__show \
-        "${TERMCOLORS_YELLOW}phase${TERMCOLORS_NONE}.${TERMCOLORS_LBLACK}END${TERMCOLORS_NONE}.$pverd$pnhint" \
+        "$__JAT__SWORD_PHASE.$__JAT__SWORD_END.$pverd$pnhint" \
         ""
 }
 
@@ -1058,7 +1076,7 @@ __jat__show_pstart() {
     local pnhint    # ^^ ^^ display
     test "$pname" == "_jat_anon_phase_" || pnhint=" '$pname'"
     __jat__show \
-        "${TERMCOLORS_YELLOW}phase${TERMCOLORS_NONE}.${TERMCOLORS_LBLACK}START${TERMCOLORS_NONE}$pnhint"
+        "$__JAT__SWORD_PHASE.$__JAT__SWORD_START$pnhint"
 }
 
 __jat__show_sfinish() {
@@ -1067,11 +1085,11 @@ __jat__show_sfinish() {
     #
     local sverd         # session verdict text
     case "$(jat__stat sfailc)" in
-        0)  sverd="${TERMCOLORS_GREEN}PASS${TERMCOLORS_NONE}" ;; 
-        *)  sverd="${TERMCOLORS_RED}FAIL${TERMCOLORS_NONE}" ;;
+        0)  sverd="$__JAT__SWORD_PASS" ;;
+        *)  sverd="$__JAT__SWORD_FAIL" ;;
     esac
     __jat__show \
-        "${TERMCOLORS_YELLOW}session${TERMCOLORS_NONE}.${TERMCOLORS_LBLACK}FINALIZE${TERMCOLORS_NONE}.$sverd"
+        "$__JAT__SWORD_SESSION.$__JAT__SWORD_FINALIZE.$sverd"
 }
 
 __jat__show_sinitn() {
@@ -1079,7 +1097,7 @@ __jat__show_sinitn() {
     # Show message about session initialization to stderr
     #
     __jat__show \
-        "${TERMCOLORS_YELLOW}session${TERMCOLORS_NONE}.${TERMCOLORS_LBLACK}START${TERMCOLORS_NONE}" \
+        "$__JAT__SWORD_SESSION.$__JAT__SWORD_START" \
         ""
 }
 
@@ -1088,7 +1106,7 @@ __jat__show_sinitr() {
     # Show message about session reload to stderr
     #
     __jat__show \
-        "${TERMCOLORS_YELLOW}session${TERMCOLORS_NONE}.${TERMCOLORS_LBLUE}RELOAD${TERMCOLORS_NONE}" \
+        "$__JAT__SWORD_SESSION.$__JAT__SWORD_RELOAD" \
         ""
 }
 
@@ -1099,7 +1117,7 @@ __jat__show_tinfo() {
     local sp=""
     test "$(__jat__sd_keyr phase)" == dummy || sp="  "
     __jat__show \
-        "$sp${TERMCOLORS_YELLOW}test${TERMCOLORS_NONE}.${TERMCOLORS_LBLACK}INFO${TERMCOLORS_NONE}: $1"
+        "$sp$__JAT__SWORD_TEST.$__JAT__SWORD_TINFO: $1"
 }
 
 __jat__show_terror() {
@@ -1109,7 +1127,7 @@ __jat__show_terror() {
     local sp=""
     test "$(__jat__sd_keyr phase)" == dummy || sp="  "
     __jat__show \
-        "$sp${TERMCOLORS_YELLOW}test${TERMCOLORS_NONE}.${TERMCOLORS_RED}ERROR${TERMCOLORS_NONE}: $1"
+        "$sp$__JAT__SWORD_TEST.$__JAT__SWORD_TERROR: $1"
 }
 
 __jat__show_twarning() {
@@ -1119,7 +1137,7 @@ __jat__show_twarning() {
     local sp=""
     test "$(__jat__sd_keyr phase)" == dummy || sp="  "
     __jat__show \
-        "$sp${TERMCOLORS_YELLOW}test${TERMCOLORS_NONE}.${TERMCOLORS_RED}WARNING${TERMCOLORS_NONE}: $1"
+        "$sp$__JAT__SWORD_TEST.$__JAT__SWORD_TWARNING: $1"
 }
 
 __jat__show_error() {