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
public static void assertTreeTestResult(TreeTestResult expected,\r
TreeTestResult reached) {\r
assertEquals(expected.getTestResultId(), reached.getTestResultId());\r
- assertEquals(expected.getCloseDate(), reached.getCloseDate());\r
+ assertDateSec(expected.getCloseDate(), reached.getCloseDate());\r
\r
assertEquals(expected.getResultParts().size(), reached.getResultParts()\r
.size());\r
assertPartSubList(lstExpected, lstReached);\r
}\r
\r
- assertEquals(expected.getPathNames().size(), reached.getPathNames()\r
+ assertEquals(expected.getElements().size(), reached.getElements()\r
.size());\r
- for (TreeSPath path : expected.getPathNames().keySet()) {\r
- String nameExpected = expected.getPathNames().get(path);\r
- String nameReached = expected.getPathNames().get(path);\r
- assertNotNull(nameReached);\r
- assertEquals(nameExpected, nameReached);\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
PartSubList lstReached) {\r
if (lstExpected.getSlcExecutionUuid() == null) {\r