Replace test result id by UUID

[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 4f07231d518fe3f8b3198daa219f845b66503377..237811ebee583ba94331d3df018e2d81c170aeb7 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,9 +1,12 @@
 package org.argeo.slc.unit.test.tree;\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.argeo.slc.core.structure.SimpleSElement;\r
 import org.argeo.slc.core.structure.tree.TreeSPath;\r
 import org.argeo.slc.core.test.SimpleResultPart;\r
 import org.argeo.slc.core.test.TestResultPart;\r
@@ -14,8 +17,8 @@ import org.argeo.slc.core.test.tree.TreeTestResult;
 public class UnitTestTreeUtil {\r
        public static void assertTreeTestResult(TreeTestResult expected,\r
                        TreeTestResult reached) {\r
-               assertEquals(expected.getTestResultId(), reached.getTestResultId());\r
-               assertEquals(expected.getCloseDate(), reached.getCloseDate());\r
+               assertEquals(expected.getUuid(), reached.getUuid());\r
+               assertDateSec(expected.getCloseDate(), reached.getCloseDate());\r
 \r
                assertEquals(expected.getResultParts().size(), reached.getResultParts()\r
                                .size());\r
@@ -28,6 +31,32 @@ public class UnitTestTreeUtil {
                        }\r
                        assertPartSubList(lstExpected, lstReached);\r
                }\r
+\r
+               assertEquals(expected.getElements().size(), reached.getElements()\r
+                               .size());\r
+               for (TreeSPath path : expected.getElements().keySet()) {\r
+                       // String nameExpected = expected.getElements().get(path);\r
+                       // String nameReached = expected.getElements().get(path);\r
+                       SimpleSElement elemExpected = (SimpleSElement) expected\r
+                                       .getElements().get(path);\r
+                       SimpleSElement elemReached = (SimpleSElement) expected\r
+                                       .getElements().get(path);\r
+                       assertNotNull(elemReached);\r
+                       assertElements(elemExpected, elemReached);\r
+               }\r
+\r
+       }\r
+\r
+       public static void assertElements(SimpleSElement expected,\r
+                       SimpleSElement reached) {\r
+               assertEquals(expected.getLabel(), reached.getLabel());\r
+               assertEquals(expected.getTags().size(), reached.getTags().size());\r
+               for (String tagName : expected.getTags().keySet()) {\r
+                       String expectedTagValue = expected.getTags().get(tagName);\r
+                       String reachedTagValue = reached.getTags().get(tagName);\r
+                       assertNotNull(reachedTagValue);\r
+                       assertEquals(expectedTagValue, reachedTagValue);\r
+               }\r
        }\r
 \r
        public static void assertPartSubList(PartSubList lstExpected,\r