X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.support.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fjcr%2FSlcJcrUtils.java;h=51ea14e98d0d0a24b790da8e70a7d1168fb6d665;hb=86fc845e533e99358ec3de7182ea0c01bcd1c432;hp=c4a14ff2926284bb98191397ffcf40f8e1770bdf;hpb=a0e8f9b4d92028975baaba0317899536045804c8;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcJcrUtils.java b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcJcrUtils.java
index c4a14ff29..51ea14e98 100644
--- a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcJcrUtils.java
+++ b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcJcrUtils.java
@@ -4,6 +4,7 @@ import java.util.Calendar;
 import java.util.GregorianCalendar;
 
 import javax.jcr.Node;
+import javax.jcr.NodeIterator;
 import javax.jcr.RepositoryException;
 
 import org.argeo.jcr.JcrUtils;
@@ -11,12 +12,13 @@ import org.argeo.slc.SlcException;
 import org.argeo.slc.core.execution.PrimitiveAccessor;
 import org.argeo.slc.core.execution.PrimitiveUtils;
 import org.argeo.slc.deploy.ModuleDescriptor;
+import org.argeo.slc.test.TestStatus;
 
 /**
  * Utilities around the SLC JCR model. Note that it relies on fixed base paths
  * (convention over configuration) for optimization purposes.
  */
-public class SlcJcrUtils {
+public class SlcJcrUtils implements SlcNames {
 	public final static Integer AGENT_FACTORY_DEPTH = 3;
 
 	/** Extracts the path of a flow relative to its execution module */
@@ -84,7 +86,7 @@ public class SlcJcrUtils {
 		setPrimitiveAsProperty(node, propertyName, type, value);
 	}
 
-	/** Map a primitive value to JCR ptoperty value. */
+	/** Map a primitive value to JCR property value. */
 	public static void setPrimitiveAsProperty(Node node, String propertyName,
 			String type, Object value) {
 		if (value == null)
@@ -114,6 +116,65 @@ public class SlcJcrUtils {
 		}
 	}
 
+	/** Aggregates the {@link TestStatus} of this sub-tree. */
+	public static Integer aggregateTestStatus(Node node) {
+		try {
+			Integer status = TestStatus.PASSED;
+			if (node.isNodeType(SlcTypes.SLC_CHECK))
+				if (node.getProperty(SLC_SUCCESS).getBoolean())
+					status = TestStatus.PASSED;
+				else if (node.hasProperty(SLC_ERROR_MESSAGE))
+					status = TestStatus.ERROR;
+				else
+					status = TestStatus.FAILED;
+
+			NodeIterator it = node.getNodes();
+			while (it.hasNext()) {
+				Integer childStatus = aggregateTestStatus(it.nextNode());
+				if (childStatus > status)
+					status = childStatus;
+			}
+			return status;
+		} catch (Exception e) {
+			throw new SlcException("Could not aggregate test status from "
+					+ node, e);
+		}
+	}
+
+	/**
+	 * Aggregates the {@link TestStatus} of this sub-tree.
+	 * 
+	 * @return the same {@link StringBuffer}, for convenience (typically calling
+	 *         toString() on it)
+	 */
+	public static StringBuffer aggregateTestMessages(Node node,
+			StringBuffer messages) {
+		try {
+			if (node.isNodeType(SlcTypes.SLC_CHECK)) {
+				if (node.hasProperty(SLC_MESSAGE)) {
+					if (messages.length() > 0)
+						messages.append('\n');
+					messages.append(node.getProperty(SLC_MESSAGE).getString());
+				}
+				if (node.hasProperty(SLC_ERROR_MESSAGE)) {
+					if (messages.length() > 0)
+						messages.append('\n');
+					messages.append(node.getProperty(SLC_ERROR_MESSAGE)
+							.getString());
+				}
+			}
+			NodeIterator it = node.getNodes();
+			while (it.hasNext()) {
+				Node child = it.nextNode();
+				aggregateTestMessages(child, messages);
+			}
+			return messages;
+		} catch (Exception e) {
+			throw new SlcException("Could not aggregate test messages from "
+					+ node, e);
+		}
+	}
+	
 	/** Prevents instantiation */
 	private SlcJcrUtils() {