Add support for case ids

src/jat.sh.skel

 #     included within the log, see BEHAVIOR EVIDENCE ID section for more
 #     details.
 #
+#  *  `-c CASEID`   Case ID; together with $JAT__TESTID can be used to
+#     uniquely identify a particular test case, with granularity up to
+#     single assert.  CASEID set here is joined with any CASEIDs set
+#     by active phase.
+#
 #  *  `-h HINT`   Human-readable description used to describe meaning of
 #     the assertion to reader.  Note that HINT should be worded in such
 #     way that it makes claim about the reality that matches expectation.
 #
 #  *  `-C DIR`  Change to directory DIR for duration of the phase.
 #
+#  *  `-c CASEID`  Inherit CASEID as Case ID to all asserts in this
+#     phase.  Individual asserts can extend the final case id for
+#     extra granularity and profit.
+#
 #
 # STRINGS
 # =======
     local __jat__o_es=0
     local __jat__hint
     local __jat__beids=()
+    local __jat__caseid
     local __jat__etype=TEST_ERROR
     local __jat__r_out
     local __jat__r_err
     #
     while true; do case $1 in
         -b) __jat__beids+=("$2"); shift 2 || { __jat__usage "missing BEID"; return 2; } ;;
+        -c) __jat__caseid="$2"; shift 2 || { __jat__usage "missing CASEID"; return 2; } ;;
         -h) __jat__hint=$2; shift 2 || { __jat__usage "missing HINT"; return 2; } ;;
         -e) __jat__r_err=$2; shift 2 || { __jat__usage "missing R_ERR"; return 2; } ;;
         -o) __jat__r_out=$2; shift 2 || { __jat__usage "missing R_OUT"; return 2; } ;;
     else
         __jat__etype=FAIL
     fi
-    __jat__assert $__jat__etype "$__jat__hint" "${__jat__beids[@]}" \
+    __jat__assert $__jat__etype "$__jat__hint" "$__jat__caseid" "${__jat__beids[@]}" \
         -- "t.cmd=${__jat__cmd[*]}" "o.es_expr=$__jat__o_es" "r.es=$__jat__r_es"
     return "$__jat__r_es"
 }
     local Op        # operator
     local OVal      # "oracle" value
     local hint      # log hint
+    local caseid    # case id
     local beids=()  # Behavior Evidence IDs
     local cmpes     # comparison exit status
     while true; do case $1 in
         -b) beids+=("$2"); shift 2 || { __jat__usage "missing BEID"; return 2; } ;;
+        -c) caseid="$2"; shift 2 || { __jat__usage "missing CASEID"; return 2; } ;;
         -h) hint=$2; shift 2 || { __jat__usage "missing HINT"; return 2; } ;;
         *) break ;;
     esac done
     __jat__cmp_match; cmpes=$?
     case $cmpes in
         0)
-            __jat__assert PASS "$hint" "${beids[@]}" \
+            __jat__assert PASS "$hint" "$caseid" "${beids[@]}" \
                 -- "r.val=$RVal" "t.op=$Op" "o.val=$OVal"
             ;;
         1)
-            __jat__assert FAIL "$hint" "${beids[@]}" \
+            __jat__assert FAIL "$hint" "$caseid" "${beids[@]}" \
                 -- "r.val=$RVal" "t.op=$Op" "o.val=$OVal"
             ;;
         *)
     # call is incomplete, the exit status will be 2.  If there is syntax error
     # in CODE, the exit status will be 3.
     #
+    local __jat__caseid
     local __jat__code=""
     local __jat__r_es
     local __jat__r_esf
     #
     while true; do case $1 in
         -b) __jat__beids+=("$2"); shift 2 || { __jat__usage "missing BEID"; return 2; } ;;
+        -c) __jat__caseid="$2"; shift 2 || { __jat__usage "missing CASEID"; return 2; } ;;
         -h) __jat__hint=$2; shift 2 || { __jat__usage "missing HINT"; return 2; } ;;
         -s) __jat__r_esf=$2; shift 2 || { __jat__usage "missing R_ESF"; return 2; } ;;
         -S) __jat__o_es=$2; shift 2 || { __jat__usage "missing ES_EXPR"; return 2; } ;;
     else
         __jat__etype=FAIL
     fi
-    __jat__assert $__jat__etype "$__jat__hint" "${__jat__beids[@]}" \
+    __jat__assert $__jat__etype "$__jat__hint" "$__jat__caseid" "${__jat__beids[@]}" \
         -- "t.code=$__jat__code" "o.es_expr=$__jat__o_es" "r.es=$__jat__r_es"
     return "$__jat__r_es"
 }
     # See COMMON ARGUMENTS section for common assert options.
     #
     local hint      # log hint
+    local caseid    # case ID
     local beids=()  # Behavior Evidence IDs
     while true; do case $1 in
         -b) beids+=("$2"); shift 2 || { __jat__usage "missing BEID"; return 2; } ;;
+        -c) caseid="$2"; shift 2 || { __jat__usage "missing CASEID"; return 2; } ;;
         -h) hint=$2; shift 2 || { __jat__usage "missing HINT"; return 2; } ;;
         *) break ;;
     esac done
     test -n "$1" && { __jat__usage "extra arguments: $*"; return 2; }
     debug -v hint beids
-    __jat__assert FAIL "$hint" "${beids[@]}"
+    __jat__assert FAIL "$hint" "$caseid" "${beids[@]}"
 }
 
 jat__filebackup() {
     #
     local hint      # log hint
     local beids=()  # Behavior Evidence IDs
+    local caseid    # case ID
     while true; do case $1 in
         -b) beids+=("$2"); shift 2 || { __jat__usage "missing BEID"; return 2; } ;;
+        -c) caseid="$2"; shift 2 || { __jat__usage "missing CASEID"; return 2; } ;;
         -h) hint=$2; shift 2 || { __jat__usage "missing HINT"; return 2; } ;;
         *) break ;;
     esac done
     test -n "$1" && { __jat__usage "extra arguments: $*"; return 2; }
     debug -v hint beids
-    __jat__assert PASS "$hint" "${beids[@]}"
+    __jat__assert PASS "$hint" "$caseid" "${beids[@]}"
 }
 
 jat__promise_asserts() {
         __jat__usage "no NUM?"
         return 2
     }
-    __jat__log_event PROMISE "assert number: $num" \
+    __jat__log_event PROMISE "assert number: $num" "" \
         -- "num=$num"
 }
 
     export JAT__YLOG
     debug -v reload __JAT__SDIR
     if $reload; then
-        __jat__log_event SINFO "reloaded session" \
+        __jat__log_event SINFO "reloaded session" "" \
             -- \
             "JAT__LOG_FMT=$__JAT__LOG_FMT" \
             "JAT__VERSION=$__JAT__SELF_VERSION"
     #
     # Usage:
     #
-    #     __jat__log_event ETYPE HINT [BEID].. -- [KEY=VALUE]..
+    #     __jat__log_event ETYPE HINT CASEID [BEID].. -- [KEY=VALUE]..
     #
     # ETYPE can be FAIL, PASS, TEST_ERROR or SINFO (the latter two
     # are for events unrelated to SUT, like internal errors or
     # is relevant to test method, result or oracle, respectively.
     local etype=$1; shift
     local hint=$1;    shift
+    local acaseid=$1; shift
     local arg
     local beids=()
     local pairs=()
     local real_beids=()
+    local caseid="$JAT__TESTID"
+    local pcaseid
     local reading=beids
     local pair
     local origin=${FUNCNAME[1]}
+    pcaseid=$(__jat__sd_keyR P.caseid)
+    test -n "$pcaseid" && caseid+=":$pcaseid"
+    test -n "$acaseid" && caseid+=":$acaseid"
     case $etype in
         PASS|FAIL|SINFO|TEST_ERROR|TEST_WARNING|PROMISE) : ;;
         *)  __jat__show_error "bad ETYPE, changing to TEST_ERROR: $etype"
         echo "    origin: $origin"
         echo "    etype: $etype"
         echo "    stamp: $(__jat__newstamp)"
+        echo "    caseid: $caseid"
         __jat__yamls hint "$hint"
         __jat__yamla beids "${real_beids[@]}"
         __jat__yamld data "${pairs[@]}"
     local type      # phase name
     local name      # ^^ name
     local pdir      # ^^ directory
+    local pcaseid   # ^^ case id, if assigned
     local oldphase  # current phase id
     while true; do case $1 in
         -t) type="$2"; shift 2 || return 2 ;;
+        -c) pcaseid="$2"; shift 2 || return 2 ;;
         -C) pdir="$2"; shift 2 || return 2 ;;
         *)  break ;;
     esac done
     __jat__sd_keyw phase "$(__jat__bumpid phasid)"
     __jat__sd_keyw P.type "$type"
     __jat__sd_keyw P.name "$name"
+    __jat__sd_keyw P.caseid "$pcaseid"
     __jat__show_pstart "$name"
     __jat__log_event SINFO
     test -n "$pdir" && {
     for patt in "${patts[@]}"; do
         __jat__show_error "usage: $parent $patt"
     done
-    __jat__log_event TEST_ERROR "bad usage: $parent()" \
+    __jat__log_event TEST_ERROR "bad usage: $parent()" "" \
         -- "PATTERNS=${patts[*]}"
 }
 

tests/basic/oracle/ylog_both.stdout

         origin: jat__sinit
         etype: SINFO
         stamp: time-2
+        caseid: _jat_anon_test_
         hint: |-
             started new session
         beids: []
         origin: __jat__pstart
         etype: SINFO
         stamp: time-3
+        caseid: _jat_anon_test_
         hint: ~
         beids: []
         data: {}
         origin: jat__log_info
         etype: SINFO
         stamp: time-4
+        caseid: _jat_anon_test_
         hint: |-
             CMD: true
         beids: []
         origin: __jat__assert
         etype: PASS
         stamp: time-5
+        caseid: _jat_anon_test_
         hint: |-
             true is true
         beids: []
         origin: jat__log_info
         etype: SINFO
         stamp: time-6
+        caseid: _jat_anon_test_
         hint: |-
             CMD: false
         beids: []
         origin: __jat__assert
         etype: FAIL
         stamp: time-7
+        caseid: _jat_anon_test_
         hint: |-
             false is true
         beids: []
         origin: jat__pend
         etype: SINFO
         stamp: time-8
+        caseid: _jat_anon_test_
         hint: ~
         beids: []
         data: {}
         origin: jat__sfinish
         etype: SINFO
         stamp: time-9
+        caseid: _jat_anon_test_
         hint: |-
             finishing session
         beids: []

tests/basic/oracle/ylog_fail.stdout

         origin: jat__sinit
         etype: SINFO
         stamp: time-2
+        caseid: _jat_anon_test_
         hint: |-
             started new session
         beids: []
         origin: __jat__pstart
         etype: SINFO
         stamp: time-3
+        caseid: _jat_anon_test_
         hint: ~
         beids: []
         data: {}
         origin: jat__log_info
         etype: SINFO
         stamp: time-4
+        caseid: _jat_anon_test_
         hint: |-
             CMD: true
         beids: []
         origin: __jat__assert
         etype: FAIL
         stamp: time-5
+        caseid: _jat_anon_test_
         hint: |-
             true is false
         beids: []
         origin: jat__log_info
         etype: SINFO
         stamp: time-6
+        caseid: _jat_anon_test_
         hint: |-
             CMD: false
         beids: []
         origin: __jat__assert
         etype: FAIL
         stamp: time-7
+        caseid: _jat_anon_test_
         hint: |-
             false is true
         beids: []
         origin: jat__pend
         etype: SINFO
         stamp: time-8
+        caseid: _jat_anon_test_
         hint: ~
         beids: []
         data: {}
         origin: jat__sfinish
         etype: SINFO
         stamp: time-9
+        caseid: _jat_anon_test_
         hint: |-
             finishing session
         beids: []

tests/basic/oracle/ylog_pass.stdout

         origin: jat__sinit
         etype: SINFO
         stamp: time-2
+        caseid: _jat_anon_test_
         hint: |-
             started new session
         beids: []
         origin: __jat__pstart
         etype: SINFO
         stamp: time-3
+        caseid: _jat_anon_test_
         hint: ~
         beids: []
         data: {}
         origin: jat__log_info
         etype: SINFO
         stamp: time-4
+        caseid: _jat_anon_test_
         hint: |-
             CMD: true
         beids: []
         origin: __jat__assert
         etype: PASS
         stamp: time-5
+        caseid: _jat_anon_test_
         hint: |-
             true is true
         beids: []
         origin: jat__log_info
         etype: SINFO
         stamp: time-6
+        caseid: _jat_anon_test_
         hint: |-
             CMD: false
         beids: []
         origin: __jat__assert
         etype: PASS
         stamp: time-7
+        caseid: _jat_anon_test_
         hint: |-
             false is false
         beids: []
         origin: jat__pend
         etype: SINFO
         stamp: time-8
+        caseid: _jat_anon_test_
         hint: ~
         beids: []
         data: {}
         origin: jat__sfinish
         etype: SINFO
         stamp: time-9
+        caseid: _jat_anon_test_
         hint: |-
             finishing session
         beids: []