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=8ec8410bc5cd632dc7f2516b9cf7b37fed801a14;hpb=faf680e212bf3e18837c4f798587856e061273b3;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 8ec8410bc..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,70 +1,74 @@
 package org.argeo.slc.hibernate.test.tree;
 
+import static org.argeo.slc.core.test.tree.TreeTestResultTestUtils.createCompleteTreeTestResult;
+
 import java.util.Date;
 
+import org.argeo.slc.core.structure.SimpleSElement;
 import org.argeo.slc.core.structure.tree.TreeSPath;
-import org.argeo.slc.core.test.NumericTRId;
-import org.argeo.slc.core.test.SimpleResultPart;
-import org.argeo.slc.core.test.TestStatus;
-import org.argeo.slc.core.test.tree.PartSubList;
+import org.argeo.slc.core.structure.tree.TreeSRegistry;
 import org.argeo.slc.core.test.tree.TreeTestResult;
-import org.argeo.slc.dao.structure.tree.TreeSPathDao;
-import org.argeo.slc.dao.test.TestResultDao;
-import org.argeo.slc.unit.SpringBasedTestCase;
+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;
 
-public class TreeTestResultDaoHibernateTest extends SpringBasedTestCase {
+public class TreeTestResultDaoHibernateTest extends AbstractSpringTestCase {
 
 	public void testCreate() {
-		TreeSPathDao treeSPathDao = (TreeSPathDao) getContext().getBean(
-				"treeSPathDao");
-
-		TestResultDao testResultDao = (TestResultDao) getContext().getBean(
-				"testResultDao");
-
-		String pathParentStr = "/root/testParent";
-		String pathStr = pathParentStr + "/test";
-		TreeSPath path = TreeSPath.parseToCreatePath(pathStr);
-		treeSPathDao.create(path);
-
-		TreeTestResult treeTestResult = new TreeTestResult();
-		SimpleResultPart partPassed = new SimpleResultPart();
-		String msgPassed = "message";
-		partPassed.setStatus(TestStatus.PASSED);
-		partPassed.setMessage(msgPassed);
-
-		SimpleResultPart partFailed = new SimpleResultPart();
-		String msgFailed = "too bad";
-		partFailed.setStatus(TestStatus.FAILED);
-		partFailed.setMessage(msgFailed);
+		TreeTestResultDao testResultDao = (TreeTestResultDao) getContext()
+				.getBean("testResultDao");
 
-		NumericTRId trId = new NumericTRId();
-		trId.setValue(1l);
-		treeTestResult.setNumericResultId(trId);
-		treeTestResult.notifyCurrentPath(null, path);
-		treeTestResult.addResultPart(partPassed);
-		treeTestResult.addResultPart(partFailed);
+		TreeTestResult ttr = createCompleteTreeTestResult();
+		testResultDao.create(ttr);
 
-		Date closeDate = new Date();
-		treeTestResult.setCloseDate(closeDate);
-
-		testResultDao.create(treeTestResult);
-
-		TreeTestResult treeTestResult2 = (TreeTestResult) testResultDao
-				.getTestResult(trId);
-		PartSubList list = treeTestResult2.getResultParts().get(path);
-
-		assertEquals(2, list.getParts().size());
-		SimpleResultPart part0 = (SimpleResultPart) list.getParts().get(0);
-		assertEquals(TestStatus.PASSED, (int) part0.getStatus());
-		assertEquals(msgPassed, part0.getMessage());
+		TreeTestResult ttrPersisted = (TreeTestResult) testResultDao
+				.getTestResult(ttr.getUuid());
+		
+		UnitTestTreeUtil.assertTreeTestResult(ttr, ttrPersisted);
+	}
 
-		SimpleResultPart part1 = (SimpleResultPart) list.getParts().get(1);
-		assertEquals(TestStatus.FAILED, (int) part1.getStatus());
-		assertEquals(msgFailed, part1.getMessage());
+	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);
 
-		assertEquals(closeDate, treeTestResult2.getCloseDate());
+		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";