From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 25 Apr 2008 14:37:39 +0000 (+0000)
Subject: Provide a generic framework for unit tests on test tree results
X-Git-Tag: argeo-slc-2.1.7~2966
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=a7e8f19d1411b48aeef694b6f0cc25104e77d8aa;p=gpl%2Fargeo-slc.git

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 4f07231d5..d1cc9631e 100644
--- 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;
 
 import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertNotNull;
 import static junit.framework.Assert.assertNull;
 import static junit.framework.Assert.fail;
 
@@ -28,6 +29,16 @@ public class UnitTestTreeUtil {
 			}
 			assertPartSubList(lstExpected, lstReached);
 		}
+
+		assertEquals(expected.getPathNames().size(), reached.getPathNames()
+				.size());
+		for (TreeSPath path : expected.getPathNames().keySet()) {
+			String nameExpected = expected.getPathNames().get(path);
+			String nameReached = expected.getPathNames().get(path);
+			assertNotNull(nameReached);
+			assertEquals(nameExpected, nameReached);
+		}
+
 	}
 
 	public static void assertPartSubList(PartSubList lstExpected,
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 820abb3e7..28fdd8fc3 100644
--- 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;
 
 import java.util.Date;
 
+import org.argeo.slc.core.process.SlcExecution;
+import org.argeo.slc.core.process.SlcExecutionStep;
+import org.argeo.slc.core.process.SlcExecutionTestUtils;
+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.NumericTRId;
 import org.argeo.slc.core.test.SimpleResultPart;
 import org.argeo.slc.core.test.TestStatus;
 
 public abstract class TreeTestResultTestUtils {
 
-	public static TreeTestResult createSimpleTreeTestResult(){
+	public static TreeTestResult createSimpleTreeTestResult() {
 		TreeTestResult treeTestResult = new TreeTestResult();
-		treeTestResult.setNumericResultId( new NumericTRId(System.currentTimeMillis()));
+		treeTestResult.setNumericResultId(new NumericTRId(System
+				.currentTimeMillis()));
 		treeTestResult.setCloseDate(new Date());
 		return treeTestResult;
 	}
-	
-	public static SimpleResultPart createSimpleResultPartPassed(){
+
+	public static TreeTestResult createCompleteTreeTestResult() {
+		SlcExecution slcExecution = SlcExecutionTestUtils
+				.createSimpleSlcExecution();
+		SlcExecutionStep step = new SlcExecutionStep("LOG", "JUnit step");
+		slcExecution.getSteps().add(step);
+
+		String pathStr = "/test";
+		TreeSPath path = TreeSPath.parseToCreatePath(pathStr);
+
+		TreeSRegistry registry = new TreeSRegistry();
+		registry.register(path, new SimpleSElement("Unit Test"));
+
+		TreeTestResult ttr = createSimpleTreeTestResult();
+		ttr.notifySlcExecution(slcExecution);
+		ttr.notifyCurrentPath(registry, path);
+
+		ttr.addResultPart(createSimpleResultPartPassed());
+		ttr.addResultPart(createSimpleResultPartFailed());
+		ttr.addResultPart(createSimpleResultPartError());
+		return ttr;
+	}
+
+	public static SimpleResultPart createSimpleResultPartPassed() {
 		SimpleResultPart partPassed = new SimpleResultPart();
 		String msgPassed = "message";
 		partPassed.setStatus(TestStatus.PASSED);
@@ -23,15 +52,15 @@ public abstract class TreeTestResultTestUtils {
 		return partPassed;
 	}
 
-	public static SimpleResultPart createSimpleResultPartFailed(){
+	public static SimpleResultPart createSimpleResultPartFailed() {
 		SimpleResultPart partFailed = new SimpleResultPart();
 		String msgFailed = "too bad";
 		partFailed.setStatus(TestStatus.FAILED);
 		partFailed.setMessage(msgFailed);
 		return partFailed;
 	}
-	
-	public static SimpleResultPart createSimpleResultPartError(){
+
+	public static SimpleResultPart createSimpleResultPartError() {
 		SimpleResultPart partFailed = new SimpleResultPart();
 		String msgFailed = "crashed";
 		partFailed.setStatus(TestStatus.ERROR);
@@ -39,8 +68,8 @@ public abstract class TreeTestResultTestUtils {
 		partFailed.setException(new Exception("Test Exception"));
 		return partFailed;
 	}
-	
-	private TreeTestResultTestUtils(){
-		
+
+	private TreeTestResultTestUtils() {
+
 	}
 }
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 01d42f443..d7dd103a7 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,7 @@
 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.createSimpleResultPartError;
-
-import org.argeo.slc.core.process.SlcExecution;
-import org.argeo.slc.core.process.SlcExecutionStep;
-import org.argeo.slc.core.process.SlcExecutionTestUtils;
-import org.argeo.slc.core.structure.tree.TreeSPath;
+import static org.argeo.slc.core.test.tree.TreeTestResultTestUtils.createCompleteTreeTestResult;
+
 import org.argeo.slc.core.test.tree.TreeTestResult;
 import org.argeo.slc.dao.test.tree.TreeTestResultDao;
 import org.argeo.slc.unit.AbstractSpringTestCase;
@@ -20,29 +13,12 @@ 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());
-		ttr.addResultPart(createSimpleResultPartError());
-
+		TreeTestResult ttr = createCompleteTreeTestResult();
 		testResultDao.create(ttr);
 
 		TreeTestResult ttrPersisted = (TreeTestResult) testResultDao
 				.getTestResult(ttr.getTestResultId());
+		
 		UnitTestTreeUtil.assertTreeTestResult(ttr, ttrPersisted);
 	}