Replace test result id by UUID

[gpl/argeo-slc.git] / org.argeo.slc.core / src / test / java / org / argeo / slc / hibernate / test / tree / TreeTestResultDaoHibernateTest.java

diff --git a/org.argeo.slc.core/src/test/java/org/argeo/slc/hibernate/test/tree/TreeTestResultDaoHibernateTest.java b/org.argeo.slc.core/src/test/java/org/argeo/slc/hibernate/test/tree/TreeTestResultDaoHibernateTest.java
index ff2176280fca144bb84412893109c4ba12baa0bc..bb80ddca0c29de9d8667bf5f84566813118df305 100644 (file)
--- a/org.argeo.slc.core/src/test/java/org/argeo/slc/hibernate/test/tree/TreeTestResultDaoHibernateTest.java
+++ b/org.argeo.slc.core/src/test/java/org/argeo/slc/hibernate/test/tree/TreeTestResultDaoHibernateTest.java
@@ -1,14 +1,14 @@
 package org.argeo.slc.hibernate.test.tree;\r
 \r
-import static org.argeo.slc.core.test.tree.TreeTestResultTestUtils.createSimpleResultPartFailed;\r
-import static org.argeo.slc.core.test.tree.TreeTestResultTestUtils.createSimpleResultPartPassed;\r
-import static org.argeo.slc.core.test.tree.TreeTestResultTestUtils.createSimpleTreeTestResult;\r
+import static org.argeo.slc.core.test.tree.TreeTestResultTestUtils.createCompleteTreeTestResult;\r
 \r
-import org.argeo.slc.core.process.SlcExecution;\r
-import org.argeo.slc.core.process.SlcExecutionStep;\r
-import org.argeo.slc.core.process.SlcExecutionTestUtils;\r
+import java.util.Date;\r
+\r
+import org.argeo.slc.core.structure.SimpleSElement;\r
 import org.argeo.slc.core.structure.tree.TreeSPath;\r
+import org.argeo.slc.core.structure.tree.TreeSRegistry;\r
 import org.argeo.slc.core.test.tree.TreeTestResult;\r
+import org.argeo.slc.core.test.tree.TreeTestResultTestUtils;\r
 import org.argeo.slc.dao.test.tree.TreeTestResultDao;\r
 import org.argeo.slc.unit.AbstractSpringTestCase;\r
 import org.argeo.slc.unit.test.tree.UnitTestTreeUtil;\r
@@ -19,31 +19,56 @@ public class TreeTestResultDaoHibernateTest extends AbstractSpringTestCase {
                TreeTestResultDao testResultDao = (TreeTestResultDao) getContext()\r
                                .getBean("testResultDao");\r
 \r
-               // SLC Execution\r
-               SlcExecution slcExecution = SlcExecutionTestUtils\r
-                               .createSimpleSlcExecution();\r
-               SlcExecutionStep step = new SlcExecutionStep("LOG", "JUnit step");\r
-               slcExecution.getSteps().add(step);\r
-\r
-               String pathParentStr = "/root/testParent";\r
-               String pathStr = pathParentStr + "/test";\r
-               TreeSPath path = TreeSPath.parseToCreatePath(pathStr);\r
-               // treeSPathDao.create(path);\r
-\r
-               TreeTestResult ttr = createSimpleTreeTestResult();\r
-               ttr.notifySlcExecution(slcExecution);\r
-               ttr.notifyCurrentPath(null, path);\r
-\r
-               ttr.addResultPart(createSimpleResultPartPassed());\r
-               ttr.addResultPart(createSimpleResultPartFailed());\r
-\r
+               TreeTestResult ttr = createCompleteTreeTestResult();\r
                testResultDao.create(ttr);\r
 \r
                TreeTestResult ttrPersisted = (TreeTestResult) testResultDao\r
-                               .getTestResult(ttr.getTestResultId());\r
+                               .getTestResult(ttr.getUuid());\r
+               \r
                UnitTestTreeUtil.assertTreeTestResult(ttr, ttrPersisted);\r
        }\r
 \r
+       public void testUpdate() {\r
+               TreeTestResultDao testResultDao = (TreeTestResultDao) getContext()\r
+                               .getBean("testResultDao");\r
+\r
+               TreeTestResult ttr = createCompleteTreeTestResult();\r
+               testResultDao.create(ttr);\r
+\r
+               TreeTestResult ttrUpdated = (TreeTestResult) testResultDao\r
+                               .getTestResult(ttr.getUuid());\r
+               \r
+               // Modifying ttrUpdated\r
+               \r
+               /** this closeDate update commented because \r
+                * the assertTreeTestResult will find a unexpected \r
+                * discrepancy in the date.\r
+                * ttrUpdated.setCloseDate(new Date()); \r
+                */\r
+               \r
+               String pathStr = "/test";\r
+               TreeSPath path = TreeSPath.parseToCreatePath(pathStr);\r
+\r
+               TreeSRegistry registry = new TreeSRegistry();\r
+               SimpleSElement elem = new SimpleSElement("Unit Test");\r
+               elem.getTags().put("myTag", "myTagValue");\r
+               registry.register(path, elem);\r
+\r
+               ttrUpdated.notifyCurrentPath(registry, path);\r
+               \r
+               ttrUpdated.addResultPart(TreeTestResultTestUtils.createSimpleResultPartPassed());\r
+               ttrUpdated.addResultPart(TreeTestResultTestUtils.createSimpleResultPartFailed());\r
+               ttrUpdated.addResultPart(TreeTestResultTestUtils.createSimpleResultPartError());\r
+               \r
+               testResultDao.update(ttrUpdated);\r
+               \r
+               // comparison of ttrUpdated and ttrRetrieved\r
+               TreeTestResult ttrRetrieved = (TreeTestResult) testResultDao\r
+               .getTestResult(ttr.getUuid());\r
+               \r
+               UnitTestTreeUtil.assertTreeTestResult(ttrRetrieved, ttrUpdated);\r
+       }\r
+       \r
        @Override\r
        protected String getApplicationContextLocation() {\r
                return "org/argeo/slc/hibernate/applicationContext.xml";\r