Prepare for release candidate

[gpl/argeo-slc.git] / org.argeo.slc.core / src / main / java / org / argeo / slc / unit / test / tree / UnitTestTreeUtil.java

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