Fix some minor bugs to enhance test processing and analysing

[gpl/argeo-slc.git] / runtime / org.argeo.slc.support.jcr / src / main / resources / org / argeo / slc / jcr / slc.cnd

diff --git a/runtime/org.argeo.slc.support.jcr/src/main/resources/org/argeo/slc/jcr/slc.cnd b/runtime/org.argeo.slc.support.jcr/src/main/resources/org/argeo/slc/jcr/slc.cnd
index cb88e55046e6ed5ccf9f2b9a5811d2341ab967bf..92e81a4ef58a9d0c2489aeb825d3d44e72f79b91 100644 (file)
--- a/runtime/org.argeo.slc.support.jcr/src/main/resources/org/argeo/slc/jcr/slc.cnd
+++ b/runtime/org.argeo.slc.support.jcr/src/main/resources/org/argeo/slc/jcr/slc.cnd
@@ -38,10 +38,11 @@ mixin
 - slc:value (UNDEFINED)
 
 [slc:refSpecAttribute] > slc:executionSpecAttribute
+orderable
 mixin
 // typically a class name
 - slc:type (STRING)
-+ slc:value
+- slc:value (UNDEFINED)
 + * (mix:title)
 
 [slc:executionFlow] > nt:unstructured, mix:title
@@ -53,11 +54,33 @@ mixin
 
 // PROCESS
 [slc:process] > nt:unstructured, mix:created, mix:lastModified
+orderable
 - slc:uuid (STRING) ! m
 - slc:status (STRING) m
 + slc:flow (slc:realizedFlow)
++ slc:log
+
+// The first part of the relative path is the thread name, rest is location
+[slc:logEntry] > nt:unstructured
+abstract
+- slc:message (STRING) !
+- slc:timestamp (STRING)
+
+// Log levels are set via types.
+// Querying one level also queries the higher levels thanks to the inheritance
+// e.g. 'select * from [slc:logWarn]' also returns errors 
+[slc:logTrace] > slc:logEntry
+
+[slc:logDebug] > slc:logTrace
+
+[slc:logInfo] > slc:logDebug
+
+[slc:logWarning] > slc:logInfo
+
+[slc:logError] > slc:logWarning
 
 [slc:realizedFlow] > nt:base
+orderable
 mixin
 // the name of the flow
 // - slc:flow (STRING)
@@ -65,20 +88,48 @@ mixin
 // - slc:spec (STRING)
 - slc:started (DATE)
 - slc:completed (DATE)
+//- slc:status (STRING)
 + slc:address (nt:address)
 + slc:flow (slc:realizedFlow) *
 // the realized execution spec attributes
 + * (slc:executionSpecAttribute) *
 
 // RESULT
-[slc:result] > nt:unstructured, mix:created, mix:lastModified
+[slc:testResult] > nt:unstructured, mix:created, mix:lastModified
 - slc:uuid (STRING) ! m
+- slc:testCase (STRING)
 - slc:completed (DATE)
-
-[slc:check] > nt:unstructured, mix:created
+// Added by the engine once the test has been fully processed. 
+// If the test is killed before it ends, this node is not created
++ slc:status (slc:check)
+// DEPRECATED. This Node is now rather called slc:status (see above)
+// Should be removed in Argeo 2.
++ slc:testStatus (slc:check)
+
+[slc:diffResult] > slc:testResult
++ slc:summary
++ slc:issues
+
+[slc:resultFolder] > nt:unstructured
++ slc:folderStatus (slc:check)
++ * (slc:resultFolder) *
++ * (slc:testResult) *
+
+// base node for user defined and managed result tree
+// simplify UI management
+[slc:myResultRootFolder] > nt:unstructured
++ * (slc:resultFolder) *
++ * (slc:testResult) *
+
+[slc:check] > nt:unstructured
 // true for PASSED, false for FAILED or ERROR
 - slc:success (BOOLEAN) ! m
 - slc:message (STRING)
 // ERROR if set, the check could not be performed because of an unexpected exception
 - slc:errorMessage (STRING)
+// to ease transition with legacy approach
++ * (slc:property) *
 
+[slc:property] > nt:unstructured
+- slc:name (STRING) ! m
+- slc:value (STRING) m