Provide a generic framework for unit tests on test tree results

git-svn-id: https://svn.argeo.org/slc/trunk@1074 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/test/tree/UnitTestTreeUtil.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/test/tree/UnitTestTreeUtil.java
index 4f07231d518fe3f8b3198daa219f845b66503377..d1cc9631e10fe5414c01eeacef4e77a0b09e2835 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/test/tree/UnitTestTreeUtil.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/test/tree/UnitTestTreeUtil.java
@@ -1,6 +1,7 @@
 package org.argeo.slc.unit.test.tree;\r
 \r
 import static junit.framework.Assert.assertEquals;\r
+import static junit.framework.Assert.assertNotNull;\r
 import static junit.framework.Assert.assertNull;\r
 import static junit.framework.Assert.fail;\r
 \r
@@ -28,6 +29,16 @@ public class UnitTestTreeUtil {
                        }\r
                        assertPartSubList(lstExpected, lstReached);\r
                }\r
+\r
+               assertEquals(expected.getPathNames().size(), reached.getPathNames()\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
+               }\r
+\r
        }\r
 \r
        public static void assertPartSubList(PartSubList lstExpected,\r

diff --git a/org.argeo.slc.core/src/test/java/org/argeo/slc/core/test/tree/TreeTestResultTestUtils.java b/org.argeo.slc.core/src/test/java/org/argeo/slc/core/test/tree/TreeTestResultTestUtils.java
index 820abb3e789d5066b0ab99163469a443795bd70b..28fdd8fc3affafbf4307ce8dff37a3373b0a5a3c 100644 (file)
--- a/org.argeo.slc.core/src/test/java/org/argeo/slc/core/test/tree/TreeTestResultTestUtils.java
+++ b/org.argeo.slc.core/src/test/java/org/argeo/slc/core/test/tree/TreeTestResultTestUtils.java
@@ -2,20 +2,49 @@ package org.argeo.slc.core.test.tree;
 \r
 import java.util.Date;\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.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.NumericTRId;\r
 import org.argeo.slc.core.test.SimpleResultPart;\r
 import org.argeo.slc.core.test.TestStatus;\r
 \r
 public abstract class TreeTestResultTestUtils {\r
 \r
-       public static TreeTestResult createSimpleTreeTestResult(){\r
+       public static TreeTestResult createSimpleTreeTestResult() {\r
                TreeTestResult treeTestResult = new TreeTestResult();\r
-               treeTestResult.setNumericResultId( new NumericTRId(System.currentTimeMillis()));\r
+               treeTestResult.setNumericResultId(new NumericTRId(System\r
+                               .currentTimeMillis()));\r
                treeTestResult.setCloseDate(new Date());\r
                return treeTestResult;\r
        }\r
-       \r
-       public static SimpleResultPart createSimpleResultPartPassed(){\r
+\r
+       public static TreeTestResult createCompleteTreeTestResult() {\r
+               SlcExecution slcExecution = SlcExecutionTestUtils\r
+                               .createSimpleSlcExecution();\r
+               SlcExecutionStep step = new SlcExecutionStep("LOG", "JUnit step");\r
+               slcExecution.getSteps().add(step);\r
+\r
+               String pathStr = "/test";\r
+               TreeSPath path = TreeSPath.parseToCreatePath(pathStr);\r
+\r
+               TreeSRegistry registry = new TreeSRegistry();\r
+               registry.register(path, new SimpleSElement("Unit Test"));\r
+\r
+               TreeTestResult ttr = createSimpleTreeTestResult();\r
+               ttr.notifySlcExecution(slcExecution);\r
+               ttr.notifyCurrentPath(registry, path);\r
+\r
+               ttr.addResultPart(createSimpleResultPartPassed());\r
+               ttr.addResultPart(createSimpleResultPartFailed());\r
+               ttr.addResultPart(createSimpleResultPartError());\r
+               return ttr;\r
+       }\r
+\r
+       public static SimpleResultPart createSimpleResultPartPassed() {\r
                SimpleResultPart partPassed = new SimpleResultPart();\r
                String msgPassed = "message";\r
                partPassed.setStatus(TestStatus.PASSED);\r
@@ -23,15 +52,15 @@ public abstract class TreeTestResultTestUtils {
                return partPassed;\r
        }\r
 \r
-       public static SimpleResultPart createSimpleResultPartFailed(){\r
+       public static SimpleResultPart createSimpleResultPartFailed() {\r
                SimpleResultPart partFailed = new SimpleResultPart();\r
                String msgFailed = "too bad";\r
                partFailed.setStatus(TestStatus.FAILED);\r
                partFailed.setMessage(msgFailed);\r
                return partFailed;\r
        }\r
-       \r
-       public static SimpleResultPart createSimpleResultPartError(){\r
+\r
+       public static SimpleResultPart createSimpleResultPartError() {\r
                SimpleResultPart partFailed = new SimpleResultPart();\r
                String msgFailed = "crashed";\r
                partFailed.setStatus(TestStatus.ERROR);\r
@@ -39,8 +68,8 @@ public abstract class TreeTestResultTestUtils {
                partFailed.setException(new Exception("Test Exception"));\r
                return partFailed;\r
        }\r
-       \r
-       private TreeTestResultTestUtils(){\r
-               \r
+\r
+       private TreeTestResultTestUtils() {\r
+\r
        }\r
 }\r

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 01d42f443a6ae095a7f3e1ba7f8b652d825dff96..d7dd103a7ba9a933d52670199dbfebc950e51933 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,7 @@
 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.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 static org.argeo.slc.core.test.tree.TreeTestResultTestUtils.createCompleteTreeTestResult;\r
+\r
 import org.argeo.slc.core.test.tree.TreeTestResult;\r
 import org.argeo.slc.dao.test.tree.TreeTestResultDao;\r
 import org.argeo.slc.unit.AbstractSpringTestCase;\r
@@ -20,29 +13,12 @@ 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
-               ttr.addResultPart(createSimpleResultPartError());\r
-\r
+               TreeTestResult ttr = createCompleteTreeTestResult();\r
                testResultDao.create(ttr);\r
 \r
                TreeTestResult ttrPersisted = (TreeTestResult) testResultDao\r
                                .getTestResult(ttr.getTestResultId());\r
+               \r
                UnitTestTreeUtil.assertTreeTestResult(ttr, ttrPersisted);\r
        }\r
 \r