Test exception

[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 8ec8410bc5cd632dc7f2516b9cf7b37fed801a14..01d42f443a6ae095a7f3e1ba7f8b652d825dff96 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,68 +1,49 @@
 package org.argeo.slc.hibernate.test.tree;\r
 \r
-import java.util.Date;\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.createSimpleResultPartError;\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 org.argeo.slc.core.structure.tree.TreeSPath;\r
-import org.argeo.slc.core.test.NumericTRId;\r
-import org.argeo.slc.core.test.SimpleResultPart;\r
-import org.argeo.slc.core.test.TestStatus;\r
-import org.argeo.slc.core.test.tree.PartSubList;\r
 import org.argeo.slc.core.test.tree.TreeTestResult;\r
-import org.argeo.slc.dao.structure.tree.TreeSPathDao;\r
-import org.argeo.slc.dao.test.TestResultDao;\r
-import org.argeo.slc.unit.SpringBasedTestCase;\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
 \r
-public class TreeTestResultDaoHibernateTest extends SpringBasedTestCase {\r
+public class TreeTestResultDaoHibernateTest extends AbstractSpringTestCase {\r
 \r
        public void testCreate() {\r
-               TreeSPathDao treeSPathDao = (TreeSPathDao) getContext().getBean(\r
-                               "treeSPathDao");\r
+               TreeTestResultDao testResultDao = (TreeTestResultDao) getContext()\r
+                               .getBean("testResultDao");\r
 \r
-               TestResultDao testResultDao = (TestResultDao) getContext().getBean(\r
-                               "testResultDao");\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 treeTestResult = new TreeTestResult();\r
-               SimpleResultPart partPassed = new SimpleResultPart();\r
-               String msgPassed = "message";\r
-               partPassed.setStatus(TestStatus.PASSED);\r
-               partPassed.setMessage(msgPassed);\r
-\r
-               SimpleResultPart partFailed = new SimpleResultPart();\r
-               String msgFailed = "too bad";\r
-               partFailed.setStatus(TestStatus.FAILED);\r
-               partFailed.setMessage(msgFailed);\r
-\r
-               NumericTRId trId = new NumericTRId();\r
-               trId.setValue(1l);\r
-               treeTestResult.setNumericResultId(trId);\r
-               treeTestResult.notifyCurrentPath(null, path);\r
-               treeTestResult.addResultPart(partPassed);\r
-               treeTestResult.addResultPart(partFailed);\r
-\r
-               Date closeDate = new Date();\r
-               treeTestResult.setCloseDate(closeDate);\r
-\r
-               testResultDao.create(treeTestResult);\r
+               // treeSPathDao.create(path);\r
 \r
-               TreeTestResult treeTestResult2 = (TreeTestResult) testResultDao\r
-                               .getTestResult(trId);\r
-               PartSubList list = treeTestResult2.getResultParts().get(path);\r
+               TreeTestResult ttr = createSimpleTreeTestResult();\r
+               ttr.notifySlcExecution(slcExecution);\r
+               ttr.notifyCurrentPath(null, path);\r
 \r
-               assertEquals(2, list.getParts().size());\r
-               SimpleResultPart part0 = (SimpleResultPart) list.getParts().get(0);\r
-               assertEquals(TestStatus.PASSED, (int) part0.getStatus());\r
-               assertEquals(msgPassed, part0.getMessage());\r
+               ttr.addResultPart(createSimpleResultPartPassed());\r
+               ttr.addResultPart(createSimpleResultPartFailed());\r
+               ttr.addResultPart(createSimpleResultPartError());\r
 \r
-               SimpleResultPart part1 = (SimpleResultPart) list.getParts().get(1);\r
-               assertEquals(TestStatus.FAILED, (int) part1.getStatus());\r
-               assertEquals(msgFailed, part1.getMessage());\r
+               testResultDao.create(ttr);\r
 \r
-               assertEquals(closeDate, treeTestResult2.getCloseDate());\r
+               TreeTestResult ttrPersisted = (TreeTestResult) testResultDao\r
+                               .getTestResult(ttr.getTestResultId());\r
+               UnitTestTreeUtil.assertTreeTestResult(ttr, ttrPersisted);\r
        }\r
 \r
        @Override\r