X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Funit%2Ftest%2Ftree%2FUnitTestTreeUtil.java;h=62b4f82263a53b37db5a48ea131e47c691da3e3b;hb=7a8f034133c1112e187e2a2bfd2c56a8d2452345;hp=1862055fa7607fa413fdbd3ead8e0e0e3c8a2431;hpb=e705b3804cd22f56dec2ca69db3de83a53ab010a;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/test/tree/UnitTestTreeUtil.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/test/tree/UnitTestTreeUtil.java
index 1862055fa..62b4f8226 100644
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/test/tree/UnitTestTreeUtil.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/test/tree/UnitTestTreeUtil.java
@@ -1,14 +1,13 @@
 package org.argeo.slc.unit.test.tree;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertNotNull;
 import static junit.framework.Assert.assertNull;
 import static junit.framework.Assert.fail;
 import static org.argeo.slc.unit.UnitUtils.assertDateSec;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.core.structure.SimpleSElement;
 import org.argeo.slc.core.structure.tree.TreeSPath;
 import org.argeo.slc.core.test.SimpleResultPart;
@@ -25,6 +24,17 @@ public class UnitTestTreeUtil {
 		assertEquals(expected.getUuid(), reached.getUuid());
 		assertDateSec(expected.getCloseDate(), reached.getCloseDate());
 
+		// Attributes
+		assertEquals(expected.getAttributes().size(), reached.getAttributes()
+				.size());
+		for (String key : expected.getAttributes().keySet()) {
+			String expectedValue = expected.getAttributes().get(key);
+			String reachedValue = reached.getAttributes().get(key);
+			assertNotNull(reachedValue);
+			assertEquals(expectedValue, reachedValue);
+		}
+
+		// Result parts
 		assertEquals(expected.getResultParts().size(), reached.getResultParts()
 				.size());
 		for (TreeSPath path : expected.getResultParts().keySet()) {
@@ -37,6 +47,7 @@ public class UnitTestTreeUtil {
 			assertPartSubList(lstExpected, lstReached);
 		}
 
+		// Elements
 		assertEquals(expected.getElements().size(), reached.getElements()
 				.size());
 		for (TreeSPath path : expected.getElements().keySet()) {
@@ -108,11 +119,14 @@ public class UnitTestTreeUtil {
 			String expectedTestRunUuid, boolean skipExceptionMessage) {
 		assertEquals(status, part.getStatus());
 
-		if (log.isTraceEnabled()) {
-			log.trace("Expected message:" + message);
-			log.trace("Reached message:" + part.getMessage());
+		if (message != null) {
+			if (log.isTraceEnabled()) {
+				log.trace("Expected message:" + message);
+				log.trace("Reached message:" + part.getMessage());
+			}
+			assertEquals(message, part.getMessage());
 		}
-		assertEquals(message, part.getMessage());
+
 		if (!skipExceptionMessage) {
 			if (exceptionDescription == null) {
 				assertNull(part.getExceptionMessage());
@@ -141,6 +155,31 @@ public class UnitTestTreeUtil {
 
 	}
 
+	public static void describeTreeTestResult(TreeTestResult ttr) {
+		log.info("TreeTestResult #" + ttr.getUuid());
+		log.info(" Close date: " + ttr.getCloseDate());
+		log.info(" Attributes:");
+		for (String key : ttr.getAttributes().keySet())
+			log.info("  " + key + "=" + ttr.getAttributes().get(key));
+
+		log.info(" Result parts: (size=" + ttr.getResultParts().size() + ")");
+		for (TreeSPath path : ttr.getResultParts().keySet()) {
+			log.info(" Path: " + path);
+			PartSubList lst = ttr.getResultParts().get(path);
+			for (TestResultPart part : lst.getParts())
+				log.info("  " + part);
+		}
+
+		log.info(" Elements: (size=" + ttr.getElements().size() + ")");
+		for (TreeSPath path : ttr.getElements().keySet()) {
+			SimpleSElement elem = (SimpleSElement) ttr.getElements().get(path);
+			log.info(" Path: " + path + ", Element: " + elem.getLabel());
+			for (String tag : elem.getTags().keySet())
+				log.info("  " + tag + "=" + elem.getTags().get(tag));
+		}
+
+	}
+
 	/** Makes sure this is a singleton */
 	private UnitTestTreeUtil() {