X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=runtime%2Forg.argeo.slc.support.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fjcr%2FJcrTestResult.java;fp=runtime%2Forg.argeo.slc.support.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fjcr%2FJcrTestResult.java;h=a27217811938bc95310773dad8324abd74f19c42;hb=89114859830f6e159a259937375bd063f25f80c9;hp=d20cf4d8d06692cc2b0cdd0a2f118c44e4baf071;hpb=85b62369433edbaf51d5e3c6e7461b426970eabf;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/JcrTestResult.java b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/JcrTestResult.java
index d20cf4d8d..a27217811 100644
--- a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/JcrTestResult.java
+++ b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/JcrTestResult.java
@@ -128,23 +128,77 @@ public class JcrTestResult implements TestResult, SlcNames, AttachmentsEnabled {
 	public void addResultPart(TestResultPart testResultPart) {
 		Node node = getNode();
 		try {
-			Node resultPartNode = node.addNode(SlcNames.SLC_STATUS,
+			// add the new result part, retrieving status information
+			Node resultPartNode = node.addNode(SlcNames.SLC_RESULT_PART,
 					SlcTypes.SLC_CHECK);
 			resultPartNode.setProperty(SLC_SUCCESS,
 					testResultPart.getStatus() == TestStatus.PASSED);
 			if (testResultPart.getMessage() != null)
 				resultPartNode.setProperty(SLC_MESSAGE,
 						testResultPart.getMessage());
-			if (testResultPart.getExceptionMessage() != null)
+			if (testResultPart.getStatus() == TestStatus.ERROR) {
 				resultPartNode.setProperty(SLC_ERROR_MESSAGE,
-						testResultPart.getExceptionMessage());
+						(testResultPart.getExceptionMessage() == null) ? ""
+								: testResultPart.getExceptionMessage());
+			}
+
+			// helper update aggregate status node
+			Node mainStatus;
+			if (!node.hasNode(SLC_AGGREGATED_STATUS)) {
+
+				mainStatus = node.addNode(SLC_AGGREGATED_STATUS,
+						SlcTypes.SLC_CHECK);
+				mainStatus.setProperty(SLC_SUCCESS,
+						resultPartNode.getProperty(SLC_SUCCESS).getBoolean());
+				if (resultPartNode.hasProperty(SLC_MESSAGE))
+					mainStatus.setProperty(SLC_MESSAGE, resultPartNode
+							.getProperty(SLC_MESSAGE).getString());
+				if (resultPartNode.hasProperty(SLC_ERROR_MESSAGE))
+					mainStatus.setProperty(SLC_ERROR_MESSAGE, resultPartNode
+							.getProperty(SLC_ERROR_MESSAGE).getString());
+			} else {
+				mainStatus = node.getNode(SLC_AGGREGATED_STATUS);
+				if (mainStatus.hasProperty(SLC_ERROR_MESSAGE)) {
+					// main status already in error we do nothing
+				} else if (resultPartNode.hasProperty(SLC_ERROR_MESSAGE)) {
+					// main status was not in error and new result part is in
+					// error; we update main status
+					mainStatus.setProperty(SLC_SUCCESS, false);
+					mainStatus.setProperty(SLC_ERROR_MESSAGE, resultPartNode
+							.getProperty(SLC_ERROR_MESSAGE).getString());
+					if (resultPartNode.hasProperty(SLC_MESSAGE))
+						mainStatus.setProperty(SLC_MESSAGE, resultPartNode
+								.getProperty(SLC_MESSAGE).getString());
+					else
+						// remove old message to remain consistent
+						mainStatus.setProperty(SLC_MESSAGE, "");
+				} else if (!mainStatus.getProperty(SLC_SUCCESS).getBoolean()) {
+					// main status was already failed and new result part is not
+					// in error, we do nothing
+				} else if (!resultPartNode.getProperty(SLC_SUCCESS)
+						.getBoolean()) {
+					// new resultPart that is failed
+					mainStatus.setProperty(SLC_SUCCESS, false);
+					if (resultPartNode.hasProperty(SLC_MESSAGE))
+						mainStatus.setProperty(SLC_MESSAGE, resultPartNode
+								.getProperty(SLC_MESSAGE).getString());
+					else
+						// remove old message to remain consistent
+						mainStatus.setProperty(SLC_MESSAGE, "");
+				} else if (resultPartNode.hasProperty(SLC_MESSAGE)
+						&& (!mainStatus.hasProperty(SLC_MESSAGE) || (""
+								.equals(mainStatus.getProperty(SLC_MESSAGE)
+										.getString().trim())))) {
+					mainStatus.setProperty(SLC_MESSAGE, resultPartNode
+							.getProperty(SLC_MESSAGE).getString());
+				}
+			}
 			JcrUtils.updateLastModified(node);
 			node.getSession().save();
 		} catch (Exception e) {
 			JcrUtils.discardUnderlyingSessionQuietly(node);
 			throw new SlcException("Cannot get UUID from " + node, e);
 		}
-
 	}
 
 	public String getUuid() {