Revamp event data model

src/jat.sh.skel

@@ -138,7 +138,7 @@ jat__cmd() {
     #     jat__cmd [-o R_OUT] [-e R_ERR] [-s R_ESF] [-S ES_EXPR] [--] CMD [ARG]..
     #
     # Run CMD with all ARGs and if exit status is zero, announce assertion
-    # success (PASS), otherwise announce assertion failure (FAIL).
+    # success (ASSERT.PASS), otherwise announce assertion failure (ASSERT.FAIL).
     #
     # Exit status expectation can be changed from zero to ES_EXPR, which
     # must be in form of comma-separated list of integer values or ranges
@@ -164,7 +164,7 @@ jat__cmd() {
     local __jat__hint
     local __jat__beids=()
     local __jat__caseid
-    local __jat__etype=TEST_ERROR
+    local __jat__etype=MESSAGE.ERROR
     local __jat__r_out
     local __jat__r_err
     local __jat__r_esf
@@ -200,12 +200,12 @@ jat__cmd() {
          || jat__log_error "error writing R_ESF file: $__jat__r_esf"
     fi
     if __jat__es_match "$__jat__o_es" "$__jat__r_es"; then
-        __jat__etype=PASS
+        __jat__etype=ASSERT.PASS
     else
-        __jat__etype=FAIL
+        __jat__etype=ASSERT.FAIL
     fi
     __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"
+        "t.cmd=${__jat__cmd[*]}" "o.es_expr=$__jat__o_es" "r.es=$__jat__r_es"
     return "$__jat__r_es"
 }
 
@@ -218,7 +218,7 @@ jat__cmp() {
     #     jat__cmp [assert-options] RVAL OP OVAL
     #
     # Compare RVAL (result value) to OVAL (oracle value) and announce
-    # assertion success (PASS) or assertion failure (FAIL).
+    # assertion success (ASSERT.PASS) or assertion failure (ASSERT.FAIL).
     #
     # OP can be any of `eq`, `ne`, `lt`, `gt`, `le`, `ge` for numeric values,
     # `==` and `re` for string values.  In case of `re`, OVAL is expected to
@@ -252,12 +252,12 @@ jat__cmp() {
     __jat__cmp_match; cmpes=$?
     case $cmpes in
         0)
-            __jat__assert PASS "$hint" "$caseid" "${beids[@]}" \
-                -- "r.val=$RVal" "t.op=$Op" "o.val=$OVal"
+            __jat__assert ASSERT.PASS "$hint" "$caseid" "${beids[@]}" \
+                "r.val=$RVal" "t.op=$Op" "o.val=$OVal"
             ;;
         1)
-            __jat__assert FAIL "$hint" "$caseid" "${beids[@]}" \
-                -- "r.val=$RVal" "t.op=$Op" "o.val=$OVal"
+            __jat__assert ASSERT.FAIL "$hint" "$caseid" "${beids[@]}" \
+                "r.val=$RVal" "t.op=$Op" "o.val=$OVal"
             ;;
         *)
             __jat__usage "bad syntax: $RVal $Op $OVal"
@@ -275,7 +275,7 @@ jat__eval() {
     #     jat__eval [assert-options] [-s R_ESF] [-S ES_EXPR] [--] CODE
     #
     # Run CODE using eval builtin and if exit status is zero, announce assertion
-    # success (PASS), otherwise announce assertion failure (FAIL).
+    # success (ASSERT.PASS), otherwise announce assertion failure (ASSERT.FAIL).
     #
     # Exit status expectation can be changed from zero to ES_EXPR, which
     # must be in form of comma-separated list of integer values or ranges
@@ -303,7 +303,7 @@ jat__eval() {
     local __jat__o_es=0
     local __jat__hint
     local __jat__beids=()
-    local __jat__etype=TEST_ERROR
+    local __jat__etype=MESSAGE.ERROR
     #
     # NOTE: names need to be qualified because they might interfere
     #       with the actual execution of the assert command.
@@ -334,12 +334,12 @@ jat__eval() {
     fi
     debug -v __jat__r_es
     if __jat__es_match "$__jat__o_es" "$__jat__r_es"; then
-        __jat__etype=PASS
+        __jat__etype=ASSERT.PASS
     else
-        __jat__etype=FAIL
+        __jat__etype=ASSERT.FAIL
     fi
     __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"
+        "t.code=$__jat__code" "o.es_expr=$__jat__o_es" "r.es=$__jat__r_es"
     return "$__jat__r_es"
 }
 
@@ -359,16 +359,14 @@ jat__fail() {
     #
     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" "$caseid" "${beids[@]}"
+    __jat__assert ASSERT.FAIL "$hint" "$caseid" "${beids[@]}"
 }
 
 jat__filebackup() {
@@ -501,7 +499,7 @@ jat__sfinish() {
     }
     es=$(__jat__final_es)
     __jat__show_sfinish
-    __jat__log_event SINFO "finishing session"
+    __jat__log_event SESSION.END "finishing session"
     __jat__writelog <<<"finalized: true"
     __jat__writelog <<<"end: $(__jat__newstamp)"
     fileas=$(__jat__sd_keyr fileas)
@@ -524,9 +522,9 @@ jat__log_error() {
         $head || msg+=$'\n'; head=false
         msg+="$line"
     done
-    echo "error" >> "$(__jat__sd_path "llog")"
-    echo "error" >> "$(__jat__sd_path "P.llog")"
-    __jat__log_event TEST_ERROR "$msg"
+    echo "MESSAGE.ERROR" >> "$(__jat__sd_path "llog")"
+    echo "MESSAGE.ERROR" >> "$(__jat__sd_path "P.llog")"
+    __jat__log_event MESSAGE.ERROR "$msg"
 }
 
 jat__log_info() {
@@ -541,9 +539,9 @@ jat__log_info() {
         $head || msg+=$'\n'; head=false
         msg+="$line"
     done
-    echo "info" >> "$(__jat__sd_path "llog")"
-    echo "info" >> "$(__jat__sd_path "P.llog")"
-    __jat__log_event SINFO "$msg"
+    echo "MESSAGE.INFO" >> "$(__jat__sd_path "llog")"
+    echo "MESSAGE.INFO" >> "$(__jat__sd_path "P.llog")"
+    __jat__log_event MESSAGE.INFO "$msg"
 }
 
 jat__log_warning() {
@@ -558,9 +556,9 @@ jat__log_warning() {
         $head || msg+=$'\n'; head=false
         msg+="$line"
     done
-    echo "warning" >> "$(__jat__sd_path "llog")"
-    echo "warning" >> "$(__jat__sd_path "P.llog")"
-    __jat__log_event TEST_WARNING "$msg"
+    echo "MESSAGE.WARNING" >> "$(__jat__sd_path "llog")"
+    echo "MESSAGE.WARNING" >> "$(__jat__sd_path "P.llog")"
+    __jat__log_event MESSAGE.WARNING "$msg"
 }
 
 jat__pass() {
@@ -588,7 +586,7 @@ jat__pass() {
     esac done
     test -n "$1" && { __jat__usage "extra arguments: $*"; return 2; }
     debug -v hint beids
-    __jat__assert PASS "$hint" "$caseid" "${beids[@]}"
+    __jat__assert ASSERT.PASS "$hint" "$caseid" "${beids[@]}"
 }
 
 jat__promise_asserts() {
@@ -600,8 +598,8 @@ jat__promise_asserts() {
         __jat__usage "no NUM?"
         return 2
     }
-    __jat__log_event PROMISE "assert number: $num" "" \
-        -- "num=$num"
+    __jat__log_event TEST.PROMISE "assert number: $num" "" \
+        "num=$num"
 }
 
 jat__sinit() {
@@ -633,8 +631,7 @@ jat__sinit() {
             warn -v JAT__TEST_VERSION old_test_version
             die "cannot reload session of different test version"
         }
-        __jat__log_event SINFO "reloaded session" "" \
-            -- \
+        __jat__log_event SESSION.RELOAD "reloaded session" "" \
             "JAT__LOG_FMT=$__JAT__LOG_FMT" \
             "JAT__VERSION=$__JAT__SELF_VERSION"
         __jat__show_sinitr
@@ -653,7 +650,7 @@ jat__sinit() {
         __jat__sd_keyw test_id "$JAT__TEST_ID"
         __jat__sd_keyw test_version "$JAT__TEST_VERSION"
         __jat__pdummy
-        __jat__log_event SINFO "started new session"
+        __jat__log_event SESSION.START "started new session"
         __jat__show_sinitn
     fi
 }
@@ -678,16 +675,16 @@ jat__stat() {
     #
     local which=$1
     case $which in
-        swarc)  grep -cxF warning "$(__jat__sd_path "llog")" ;;
-        pwarc)  grep -cxF warning "$(__jat__sd_path "P.llog")" ;;
-        serrc)  grep -cxF error "$(__jat__sd_path "llog")" ;;
-        perrc)  grep -cxF error "$(__jat__sd_path "P.llog")" ;;
-        sfailc) grep -cxF FAIL "$(__jat__sd_path "vlog")" ;;
-        pfailc) grep -cxF FAIL "$(__jat__sd_path "P.vlog")" ;;
-        ppassc) grep -cxF PASS "$(__jat__sd_path "P.vlog")" ;;
-        spassc) grep -cxF PASS "$(__jat__sd_path "vlog")" ;;
-        pasrtc) grep -cx 'PASS\|FAIL' "$(__jat__sd_path "P.vlog")" ;;
-        sasrtc) grep -cx 'PASS\|FAIL' "$(__jat__sd_path "vlog")" ;;
+        swarc)  grep -cxF MESSAGE.WARNING "$(__jat__sd_path "llog")" ;;
+        pwarc)  grep -cxF MESSAGE.WARNING "$(__jat__sd_path "P.llog")" ;;
+        serrc)  grep -cxF MESSAGE.ERROR "$(__jat__sd_path "llog")" ;;
+        perrc)  grep -cxF MESSAGE.ERROR "$(__jat__sd_path "P.llog")" ;;
+        sfailc) grep -cxF ASSERT.FAIL "$(__jat__sd_path "vlog")" ;;
+        pfailc) grep -cxF ASSERT.FAIL "$(__jat__sd_path "P.vlog")" ;;
+        ppassc) grep -cxF ASSERT.PASS "$(__jat__sd_path "P.vlog")" ;;
+        spassc) grep -cxF ASSERT.PASS "$(__jat__sd_path "vlog")" ;;
+        pasrtc) grep -cx 'ASSERT.PASS\|ASSERT.FAIL' "$(__jat__sd_path "P.vlog")" ;;
+        sasrtc) grep -cx 'ASSERT.PASS\|ASSERT.FAIL' "$(__jat__sd_path "vlog")" ;;
         *) __jat__usage "invalid statistic field: $which"
            return 2 ;;
     esac
@@ -705,7 +702,7 @@ jat__pend() {
     }
     __jat__show_pend
     __jat__pdummy
-    __jat__log_event SINFO
+    __jat__log_event PHASE.END
 }
 
 jat__pstartd() {
@@ -783,8 +780,8 @@ __jat__assert() {
     # Use this function to create own asserts
     #
     case $1 in
-        PASS)   __jat__show_pass "$2" ;;
-        FAIL)   __jat__show_fail "$2" ;;
+        ASSERT.PASS)   __jat__show_pass "$2" ;;
+        ASSERT.FAIL)   __jat__show_fail "$2" ;;
     esac
     __jat__log_event "$@"
 }
@@ -861,117 +858,92 @@ __jat__final_es() {
 
 __jat__log_event() {
     #
-    # Pass YAML log event to __jat__writelog()
+    # Log event to YAML log via __jat__writelog()
     #
     # Usage:
     #
-    #     __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
-    # phase start/end events).
-    #
-    # HINT and BEIDs are explained in COMMON ARGUMENTS section of this
-    # manual.
-    #
-    # You can provide any amount of KEY=VALUE pairs, meaning of which
-    # is specific to every assert function.  (The assert function name
-    # is auto-detected and logged so that you can infer KEY meanings
-    # later.)  Each KEY must be simple word, except that prefixes of
-    # `t.`, `r.`, and `o.` are allowed to signify that the value logged
-    # is relevant to test method, result or oracle, respectively.
-    local etype=$1; shift
-    local hint=$1;    shift
-    local acaseid=$1; shift
-    local arg
+    #     __jat__log_event SESSION.START|SESSION.RELOAD|SESSION.END
+    #     __jat__log_event PHASE.END
+    #     __jat__log_event PHASE.START ID TYPE NAME [K=V]
+    #     __jat__log_event ASSERT.PASS|ASSERT.FAIL [-h HINT] [-c CASEID] [-b BEID..] [-d K=V..]
+    #     __jat__log_event MESSAGE.INFO|MESSAGE.WARNING|MESSAGE.ERROR MSG [K=V]
+    #
+    local EType=$1; shift
+    local msg
+    local meatfn
+    local caseid=$JAT__TEST_ID
     local beids=()
-    local pairs=()
-    local real_beids=()
-    local caseid="$JAT__TEST_ID"
-    local pcaseid
-    local reading=beids
-    local pair
+    local data=()
     local origin=${FUNCNAME[1]}
+    local pcaseid
+    local CaseIdBase=$JAT__TEST_ID
     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"
-            etype=TEST_ERROR ;;
+    test -n "$pcaseid" && CaseIdBase+=":$pcaseid"
+    case $EType in
+        ASSERT.PASS|ASSERT.FAIL) : ;;
+        MESSAGE.INFO|MESSAGE.ERROR|MESSAGE.WARNING) : ;;
+        PHASE.START|PHASE.END) : ;;
+        SESSION.START|SESSION.RELOAD|SESSION.END) : ;;
+        *)  __jat__usage "bad ETYPE: $EType"
+            return 2 ;;
     esac
-    case $etype:$origin in
-        PASS:__jat__assert)        : ;;
-        FAIL:__jat__assert)        : ;;
-        TEST_ERROR:__jat__usage)   : ;;
-        SINFO:jat__sinit)          : ;;
-        SINFO:jat__sfinish)        : ;;
-        SINFO:__jat__pstart)       : ;;
-        SINFO:jat__pend)           : ;;
-        SINFO:jat__log_info)       : ;;
-        TEST_ERROR:jat__log_error) : ;;
-        TEST_WARNING:jat__log_warning) : ;;
-        *)  __jat__show_error "illegal call of __jat__log_event: $etype from $origin"
-            etype=TEST_ERROR ;;
+    case $EType:$origin in
+        PHASE.END:jat__pend)                meatfn="true" ;;
+        PHASE.START:__jat__pstart)          meatfn="__jat__log_evt_pstart" ;;
+        SESSION.END:jat__sfinish)           meatfn="true" ;;
+        SESSION.RELOAD:jat__sinit)          meatfn="true" ;;
+        SESSION.START:jat__sinit)           meatfn="true" ;;
+        ASSERT.FAIL:__jat__assert)          meatfn="__jat__log_evt_assert" ;;
+        ASSERT.PASS:__jat__assert)          meatfn="__jat__log_evt_assert" ;;
+        MESSAGE.ERROR:__jat__usage)         meatfn="__jat__log_evt_message" ;;
+        MESSAGE.ERROR:jat__log_error)       meatfn="__jat__log_evt_message" ;;
+        MESSAGE.INFO:jat__log_info)         meatfn="__jat__log_evt_message" ;;
+        MESSAGE.WARNING:jat__log_warning)   meatfn="__jat__log_evt_message" ;;
+        *)  __jat__show_error "illegal call of __jat__log_event: $EType from $origin"
+            EType=MESSAGE.ERROR ;;
     esac
-    for arg in "$@"; do
-        case $reading:$arg in
-            *:)
-                shift
-                ;;
-            beids:--)
-                shift
-                reading=pairs
-                ;;
-            beids:*)
-                __jat__valid_beid "$arg" || {
-                    beids=(); pairs=(); etype=API_BUG
-                    hint="bad BEID syntax (must be simple id): '$arg'"
-                    __jat__show_error "$hint"
-                    break
-                }
-                beids+=("$arg")
-                shift
-                ;;
-            pairs:*)
-                __jat__valid_pair "$arg" || {
-                    beids=(); pairs=(); etype=API_BUG
-                    hint="bad K=V syntax: '$arg'"
-                    __jat__show_error "$hint"
-                    break
-                }
-                pairs+=("$arg")
-                shift
-                ;;
-        esac
-    done
-    for beid in "${beids[@]}"; do
-        case $beid in
-            "")     : ;;
-            *.*)    real_beids+=("$beid") ;;
-            *)      real_beids+=("$JAT__BEID_NS.$beid") ;;
-        esac
-    done
-    echo "$etype" >> "$(__jat__sd_path "vlog")"
-    echo "$etype" >> "$(__jat__sd_path "P.vlog")"
+    echo "$EType" >> "$(__jat__sd_path "vlog")"
+    echo "$EType" >> "$(__jat__sd_path "P.vlog")"
     {
-        # NOTE: some scalars are printed directly for performance
-        #       reasons (these will never be null nor will they
-        #       contain YAML special chars)
-        #
-        echo "-"
-        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[@]}"
-        echo "    phase:"
-        echo "        id: $(__jat__sd_keyr phase)"
-        echo "        name: $(__jat__sd_keyr P.name)"
-        echo "        type: $(__jat__sd_keyr P.type)"
-    } | sed 's/^/    /' | __jat__writelog
+        echo "    -"
+        echo "        etype: $EType"
+        echo "        stamp: $(__jat__newstamp)"
+        $meatfn "$@"
+    } | __jat__writelog
+}
+
+__jat__log_evt_pstart() {
+    #
+    #     __jat__log_event PHASE.START ID NAME TYPE [caseid=CASEID] [pdir=PDIR]
+    #
+    local pid=$1; shift
+    local pname=$1; shift
+    local ptype=$1; shift
+    local data=("$@")
+    echo "        phase:"
+    echo "            id: $pid"
+    echo "            type: $ptype"
+    echo "            name: |-4"
+    echo "                $pname"
+    __jat__yamld 2 data "${data[@]}"
+}
+
+__jat__log_evt_message() {
+    #     __jat__log_event MESSAGE.INFO|MESSAGE.WARNING|MESSAGE.ERROR MSG
+    local msg=$1; shift
+    local data=("$@")
+    __jat__yamls 2 message "$msg"
+    __jat__yamld 2 data "${data[@]}"
+}
+
+__jat__log_evt_assert() {
+    #     __jat__log_event ASSERT.PASS|ASSERT.FAIL HINT CASEID [K=V..]
+    local hint=$1; shift
+    local caseid=$1; shift
+    local data=("$@")
+    __jat__yamls 2 hint "$hint"
+    __jat__yamls 2 caseid "$caseid"
+    __jat__yamld 2 data "${data[@]}"
 }
 
 __jat__newstamp() {
@@ -1003,6 +975,7 @@ __jat__pstart() {
     local pdir      # ^^ directory
     local pcaseid   # ^^ case id, if assigned
     local oldphase  # current phase id
+    local newphase  # new phase id
     while true; do case $1 in
         -t) type="$2"; shift 2 || return 2 ;;
         -c) pcaseid="$2"; shift 2 || return 2 ;;
@@ -1016,12 +989,13 @@ __jat__pstart() {
         jat__pend
     }
     debug -v type name pdir
-    __jat__sd_keyw phase "$(__jat__bumpid phasid)"
+    newphase=$(__jat__bumpid phasid)
+    __jat__sd_keyw phase "$newphase"
     __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
+    __jat__log_event PHASE.START "$newphase" "$name" "$type" "caseid=$pcaseid" "pdir=$pdir"
     test -n "$pdir" && {
         __jat__sd_keyw P.pdir "$pdir"
         __jat__sd_keyw P.PWD "$PWD"
@@ -1259,8 +1233,8 @@ __jat__usage() {
     for patt in "${patts[@]}"; do
         __jat__show_error "usage: $parent $patt"
     done
-    __jat__log_event TEST_ERROR "bad usage: $parent()" "" \
-        -- "PATTERNS=${patts[*]}"
+    __jat__log_event MESSAGE.ERROR "bad usage: $parent()" "" \
+        "PATTERNS=${patts[*]}"
 }
 
 __jat__writelog() {
@@ -1294,12 +1268,15 @@ __jat__yamls() {
     #
     # Print a scalar field named $1 with value $2
     #
+    local nest=$1; shift
     local name=$1
     local value=$2
+    local sp
+    sp=$(__jat__yamlnest "$nest")
     case $value in
-        "") echo "    $name: ~" ;;
-        *)  echo "    $name: |-"
-            sed "s/^/        /" <<<"$value" ;;
+        "") echo "$sp$name: ~" ;;
+        *)  echo "$sp$name: |-4"
+            sed "s/^/$sp    /" <<<"$value" ;;
     esac
 }
 
@@ -1307,35 +1284,52 @@ __jat__yamla() {
     #
     # Print an array field named $1 with array of values $2..
     #
+    local nest=$1; shift
     local name=$1; shift
     local value
+    local sp
+    sp=$(__jat__yamlnest "$nest")
     test $# -eq 0 && echo "    $name: []" && return 0
-    echo "    $name:"
+    echo "$sp$name:"
     for value in "$@"; do
         case $value in
-            "") echo "        - ~" ;;
-            *)  echo "        - |"
-                echo "            $value" ;;
+            "") echo "$sp    - ~" ;;
+            *)  echo "$sp    - |-4"
+                echo "$sp        $value" ;;
         esac
     done
 }
 
+__jat__yamlnest() {
+    #
+    # Print $1 x 4 of spaces
+    #
+    local n=$1
+    while test "$n" -gt 0; do
+        echo -n '    '
+        (( n-- ))
+    done
+}
+
 __jat__yamld() {
     #
     # Print a dict field named $1 and composed of KEY=VALUE pairs $2..
     #
+    local nest=$1; shift
     local name=$1; shift
     local pair
     local key
     local value
-    test $# -eq 0 && echo "    $name: {}" && return 0
-    echo "    $name:"
+    local sp
+    sp=$(__jat__yamlnest "$nest")
+    test $# -eq 0 && echo "$sp$name: {}" && return 0
+    echo "$sp$name:"
     for pair in "$@"; do
         key=${pair%%=*}; value=${pair#$key=}
         case $value in
-            "") echo "        $key: ~" ;;
-            *)  echo "        $key: |"
-                echo "            $value" ;;
+            "") echo "$sp    $key: ~" ;;
+            *)  echo "$sp    $key: |-4"
+                echo "$sp        $value" ;;
         esac
     done
 }

tests/basic/oracle/ylog_both.stdout

@@ -7,118 +7,62 @@ test:
 start: time-1
 events:
     -
-        origin: jat__sinit
-        etype: SINFO
+        etype: SESSION.START
         stamp: time-2
-        caseid: _jat_anon_test_
-        hint: |-
-            started new session
-        beids: []
-        data: {}
-        phase:
-            id: dummy
-            name: _jat_dummy_phase_
-            type: none
     -
-        origin: __jat__pstart
-        etype: SINFO
+        etype: PHASE.START
         stamp: time-3
-        caseid: _jat_anon_test_
-        hint: ~
-        beids: []
-        data: {}
         phase:
             id: phasid-1
-            name: _jat_anon_phase_
             type: test
+            name: |-4
+                _jat_anon_phase_
+        data:
+            caseid: ~
+            pdir: ~
     -
-        origin: jat__log_info
-        etype: SINFO
+        etype: MESSAGE.INFO
         stamp: time-4
-        caseid: _jat_anon_test_
-        hint: |-
+        message: |-4
             CMD: true
-        beids: []
         data: {}
-        phase:
-            id: phasid-1
-            name: _jat_anon_phase_
-            type: test
     -
-        origin: __jat__assert
-        etype: PASS
+        etype: ASSERT.PASS
         stamp: time-5
-        caseid: _jat_anon_test_
-        hint: |-
+        hint: |-4
             true is true
-        beids: []
+        caseid: ~
         data:
-            t.cmd: |
+            t.cmd: |-4
                 true
-            o.es_expr: |
+            o.es_expr: |-4
                 0
-            r.es: |
+            r.es: |-4
                 0
-        phase:
-            id: phasid-1
-            name: _jat_anon_phase_
-            type: test
     -
-        origin: jat__log_info
-        etype: SINFO
+        etype: MESSAGE.INFO
         stamp: time-6
-        caseid: _jat_anon_test_
-        hint: |-
+        message: |-4
             CMD: false
-        beids: []
         data: {}
-        phase:
-            id: phasid-1
-            name: _jat_anon_phase_
-            type: test
     -
-        origin: __jat__assert
-        etype: FAIL
+        etype: ASSERT.FAIL
         stamp: time-7
-        caseid: _jat_anon_test_
-        hint: |-
+        hint: |-4
             false is true
-        beids: []
+        caseid: ~
         data:
-            t.cmd: |
+            t.cmd: |-4
                 false
-            o.es_expr: |
+            o.es_expr: |-4
                 0
-            r.es: |
+            r.es: |-4
                 1
-        phase:
-            id: phasid-1
-            name: _jat_anon_phase_
-            type: test
     -
-        origin: jat__pend
-        etype: SINFO
+        etype: PHASE.END
         stamp: time-8
-        caseid: _jat_anon_test_
-        hint: ~
-        beids: []
-        data: {}
-        phase:
-            id: dummy
-            name: _jat_dummy_phase_
-            type: none
     -
-        origin: jat__sfinish
-        etype: SINFO
+        etype: SESSION.END
         stamp: time-9
-        caseid: _jat_anon_test_
-        hint: |-
-            finishing session
-        beids: []
-        data: {}
-        phase:
-            id: dummy
-            name: _jat_dummy_phase_
-            type: none
 finalized: true
 end: time-10

tests/basic/oracle/ylog_fail.stdout

@@ -7,118 +7,62 @@ test:
 start: time-1
 events:
     -
-        origin: jat__sinit
-        etype: SINFO
+        etype: SESSION.START
         stamp: time-2
-        caseid: _jat_anon_test_
-        hint: |-
-            started new session
-        beids: []
-        data: {}
-        phase:
-            id: dummy
-            name: _jat_dummy_phase_
-            type: none
     -
-        origin: __jat__pstart
-        etype: SINFO
+        etype: PHASE.START
         stamp: time-3
-        caseid: _jat_anon_test_
-        hint: ~
-        beids: []
-        data: {}
         phase:
             id: phasid-1
-            name: _jat_anon_phase_
             type: test
+            name: |-4
+                _jat_anon_phase_
+        data:
+            caseid: ~
+            pdir: ~
     -
-        origin: jat__log_info
-        etype: SINFO
+        etype: MESSAGE.INFO
         stamp: time-4
-        caseid: _jat_anon_test_
-        hint: |-
+        message: |-4
             CMD: true
-        beids: []
         data: {}
-        phase:
-            id: phasid-1
-            name: _jat_anon_phase_
-            type: test
     -
-        origin: __jat__assert
-        etype: FAIL
+        etype: ASSERT.FAIL
         stamp: time-5
-        caseid: _jat_anon_test_
-        hint: |-
+        hint: |-4
             true is false
-        beids: []
+        caseid: ~
         data:
-            t.cmd: |
+            t.cmd: |-4
                 true
-            o.es_expr: |
+            o.es_expr: |-4
                 1
-            r.es: |
+            r.es: |-4
                 0
-        phase:
-            id: phasid-1
-            name: _jat_anon_phase_
-            type: test
     -
-        origin: jat__log_info
-        etype: SINFO
+        etype: MESSAGE.INFO
         stamp: time-6
-        caseid: _jat_anon_test_
-        hint: |-
+        message: |-4
             CMD: false
-        beids: []
         data: {}
-        phase:
-            id: phasid-1
-            name: _jat_anon_phase_
-            type: test
     -
-        origin: __jat__assert
-        etype: FAIL
+        etype: ASSERT.FAIL
         stamp: time-7
-        caseid: _jat_anon_test_
-        hint: |-
+        hint: |-4
             false is true
-        beids: []
+        caseid: ~
         data:
-            t.cmd: |
+            t.cmd: |-4
                 false
-            o.es_expr: |
+            o.es_expr: |-4
                 0
-            r.es: |
+            r.es: |-4
                 1
-        phase:
-            id: phasid-1
-            name: _jat_anon_phase_
-            type: test
     -
-        origin: jat__pend
-        etype: SINFO
+        etype: PHASE.END
         stamp: time-8
-        caseid: _jat_anon_test_
-        hint: ~
-        beids: []
-        data: {}
-        phase:
-            id: dummy
-            name: _jat_dummy_phase_
-            type: none
     -
-        origin: jat__sfinish
-        etype: SINFO
+        etype: SESSION.END
         stamp: time-9
-        caseid: _jat_anon_test_
-        hint: |-
-            finishing session
-        beids: []
-        data: {}
-        phase:
-            id: dummy
-            name: _jat_dummy_phase_
-            type: none
 finalized: true
 end: time-10

tests/basic/oracle/ylog_pass.stdout

@@ -7,118 +7,62 @@ test:
 start: time-1
 events:
     -
-        origin: jat__sinit
-        etype: SINFO
+        etype: SESSION.START
         stamp: time-2
-        caseid: _jat_anon_test_
-        hint: |-
-            started new session
-        beids: []
-        data: {}
-        phase:
-            id: dummy
-            name: _jat_dummy_phase_
-            type: none
     -
-        origin: __jat__pstart
-        etype: SINFO
+        etype: PHASE.START
         stamp: time-3
-        caseid: _jat_anon_test_
-        hint: ~
-        beids: []
-        data: {}
         phase:
             id: phasid-1
-            name: _jat_anon_phase_
             type: test
+            name: |-4
+                _jat_anon_phase_
+        data:
+            caseid: ~
+            pdir: ~
     -
-        origin: jat__log_info
-        etype: SINFO
+        etype: MESSAGE.INFO
         stamp: time-4
-        caseid: _jat_anon_test_
-        hint: |-
+        message: |-4
             CMD: true
-        beids: []
         data: {}
-        phase:
-            id: phasid-1
-            name: _jat_anon_phase_
-            type: test
     -
-        origin: __jat__assert
-        etype: PASS
+        etype: ASSERT.PASS
         stamp: time-5
-        caseid: _jat_anon_test_
-        hint: |-
+        hint: |-4
             true is true
-        beids: []
+        caseid: ~
         data:
-            t.cmd: |
+            t.cmd: |-4
                 true
-            o.es_expr: |
+            o.es_expr: |-4
                 0
-            r.es: |
+            r.es: |-4
                 0
-        phase:
-            id: phasid-1
-            name: _jat_anon_phase_
-            type: test
     -
-        origin: jat__log_info
-        etype: SINFO
+        etype: MESSAGE.INFO
         stamp: time-6
-        caseid: _jat_anon_test_
-        hint: |-
+        message: |-4
             CMD: false
-        beids: []
         data: {}
-        phase:
-            id: phasid-1
-            name: _jat_anon_phase_
-            type: test
     -
-        origin: __jat__assert
-        etype: PASS
+        etype: ASSERT.PASS
         stamp: time-7
-        caseid: _jat_anon_test_
-        hint: |-
+        hint: |-4
             false is false
-        beids: []
+        caseid: ~
         data:
-            t.cmd: |
+            t.cmd: |-4
                 false
-            o.es_expr: |
+            o.es_expr: |-4
                 1
-            r.es: |
+            r.es: |-4
                 1
-        phase:
-            id: phasid-1
-            name: _jat_anon_phase_
-            type: test
     -
-        origin: jat__pend
-        etype: SINFO
+        etype: PHASE.END
         stamp: time-8
-        caseid: _jat_anon_test_
-        hint: ~
-        beids: []
-        data: {}
-        phase:
-            id: dummy
-            name: _jat_dummy_phase_
-            type: none
     -
-        origin: jat__sfinish
-        etype: SINFO
+        etype: SESSION.END
         stamp: time-9
-        caseid: _jat_anon_test_
-        hint: |-
-            finishing session
-        beids: []
-        data: {}
-        phase:
-            id: dummy
-            name: _jat_dummy_phase_
-            type: none
 finalized: true
 end: time-10