X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.core%2Fsrc%2Ftest%2Fjava%2Forg%2Fargeo%2Fslc%2Fhibernate%2Ftest%2Ftree%2FTreeTestResultDaoHibernateTest.java;h=bb80ddca0c29de9d8667bf5f84566813118df305;hb=0a985ad4d014b575429384ca8f5247d6c7ad7d40;hp=ff2176280fca144bb84412893109c4ba12baa0bc;hpb=92dec409c3cd491dcd8f706f4e17613ba64b4077;p=gpl%2Fargeo-slc.git

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