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=6f5e7b63b56864ceba761f81858caf3f0a4bba2e;hb=1d3622f2ece5951a4396bcb70e2f182a577f3084;hp=d1cc9631e10fe5414c01eeacef4e77a0b09e2835;hpb=a7e8f19d1411b48aeef694b6f0cc25104e77d8aa;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 d1cc9631e..6f5e7b63b 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
@@ -4,7 +4,9 @@ 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.argeo.slc.core.structure.SimpleSElement;
 import org.argeo.slc.core.structure.tree.TreeSPath;
 import org.argeo.slc.core.test.SimpleResultPart;
 import org.argeo.slc.core.test.TestResultPart;
@@ -16,7 +18,7 @@ public class UnitTestTreeUtil {
 	public static void assertTreeTestResult(TreeTestResult expected,
 			TreeTestResult reached) {
 		assertEquals(expected.getTestResultId(), reached.getTestResultId());
-		assertEquals(expected.getCloseDate(), reached.getCloseDate());
+		assertDateSec(expected.getCloseDate(), reached.getCloseDate());
 
 		assertEquals(expected.getResultParts().size(), reached.getResultParts()
 				.size());
@@ -30,17 +32,33 @@ public class UnitTestTreeUtil {
 			assertPartSubList(lstExpected, lstReached);
 		}
 
-		assertEquals(expected.getPathNames().size(), reached.getPathNames()
+		assertEquals(expected.getElements().size(), reached.getElements()
 				.size());
-		for (TreeSPath path : expected.getPathNames().keySet()) {
-			String nameExpected = expected.getPathNames().get(path);
-			String nameReached = expected.getPathNames().get(path);
-			assertNotNull(nameReached);
-			assertEquals(nameExpected, nameReached);
+		for (TreeSPath path : expected.getElements().keySet()) {
+			// String nameExpected = expected.getElements().get(path);
+			// String nameReached = expected.getElements().get(path);
+			SimpleSElement elemExpected = (SimpleSElement) expected
+					.getElements().get(path);
+			SimpleSElement elemReached = (SimpleSElement) expected
+					.getElements().get(path);
+			assertNotNull(elemReached);
+			assertElements(elemExpected, elemReached);
 		}
 
 	}
 
+	public static void assertElements(SimpleSElement expected,
+			SimpleSElement reached) {
+		assertEquals(expected.getLabel(), reached.getLabel());
+		assertEquals(expected.getTags().size(), reached.getTags().size());
+		for (String tagName : expected.getTags().keySet()) {
+			String expectedTagValue = expected.getTags().get(tagName);
+			String reachedTagValue = reached.getTags().get(tagName);
+			assertNotNull(reachedTagValue);
+			assertEquals(expectedTagValue, reachedTagValue);
+		}
+	}
+
 	public static void assertPartSubList(PartSubList lstExpected,
 			PartSubList lstReached) {
 		if (lstExpected.getSlcExecutionUuid() == null) {