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

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 fc9c113da..9b26ac8fa 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
@@ -1,21 +1,51 @@
 package org.argeo.slc.core.test.tree;
 
 import java.util.Date;
+import java.util.UUID;
 
-import org.argeo.slc.core.test.NumericTRId;
+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.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.setUuid(UUID.randomUUID().toString());
 		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();
+		SimpleSElement elem = new SimpleSElement("Unit Test");
+		elem.getTags().put("myTag", "myTagValue");
+		registry.register(path, elem);
+
+		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 +53,24 @@ 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;
 	}
-	
-	private TreeTestResultTestUtils(){
-		
+
+	public static SimpleResultPart createSimpleResultPartError() {
+		SimpleResultPart partFailed = new SimpleResultPart();
+		String msgFailed = "crashed";
+		partFailed.setStatus(TestStatus.ERROR);
+		partFailed.setMessage(msgFailed);
+		partFailed.setException(new Exception("Test Exception"));
+		return partFailed;
+	}
+
+	private TreeTestResultTestUtils() {
+
 	}
 }