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=bc7dcbdd245977e065cfcd6f765269d5ad454726;hb=5c0582beb72385114c6b971f378719d748b27ffc;hp=820abb3e789d5066b0ab99163469a443795bd70b;hpb=74d3c5530e2d4544ef5a7d9ef6d14f5cb218bb0b;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 820abb3e7..bc7dcbdd2 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,46 +1,106 @@
 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.build.Distribution;
+import org.argeo.slc.core.deploy.DeployedSystem;
+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.SimpleTestRun;
 import org.argeo.slc.core.test.TestStatus;
+import org.argeo.slc.msg.test.tree.ResultPartRequest;
 
 public abstract class TreeTestResultTestUtils {
 
-	public static TreeTestResult createSimpleTreeTestResult(){
+	public static TreeTestResult createSimpleTreeTestResult() {
 		TreeTestResult treeTestResult = new TreeTestResult();
-		treeTestResult.setNumericResultId( new NumericTRId(System.currentTimeMillis()));
-		treeTestResult.setCloseDate(new Date());
+		treeTestResult.setUuid(UUID.randomUUID().toString());
 		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);
+
+		SimpleTestRun testRun = new SimpleTestRun();
+		testRun.setUuid(UUID.randomUUID().toString());
+
+		String pathStr = "/test";
+		TreeSPath path = new TreeSPath(pathStr);
+
+		TreeSRegistry registry = new TreeSRegistry();
+		SimpleSElement elem = new SimpleSElement("Unit Test");
+		elem.getTags().put("myTag", "myTagValue");
+		registry.register(path, elem);
+
+		TreeTestResult ttr = createSimpleTreeTestResult();
+		ttr.notifyCurrentPath(registry, path);
+		ttr.notifyTestRun(testRun);
+		testRun.setTestResult(ttr);
+		testRun.setDeployedSystem(new DeployedSystem() {
+			private String uuid = UUID.randomUUID().toString();
+
+			public String getDeployedSystemId() {
+				return uuid;
+			}
+
+			public Distribution getDistribution() {
+				return null;
+			}
+		});
+		testRun.notifySlcExecution(slcExecution);
+
+		ttr.addResultPart(createSimpleResultPartPassed());
+		ttr.addResultPart(createSimpleResultPartFailed());
+		ttr.addResultPart(createSimpleResultPartError());
+		return ttr;
+	}
+
+	public static SimpleResultPart createSimpleResultPartPassed() {
 		SimpleResultPart partPassed = new SimpleResultPart();
-		String msgPassed = "message";
+		String msgPassed = "message\nnew line";
 		partPassed.setStatus(TestStatus.PASSED);
 		partPassed.setMessage(msgPassed);
 		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";
+		String msgFailed = "crashed\nanother line";
 		partFailed.setStatus(TestStatus.ERROR);
 		partFailed.setMessage(msgFailed);
 		partFailed.setException(new Exception("Test Exception"));
 		return partFailed;
 	}
-	
-	private TreeTestResultTestUtils(){
-		
+
+	public static ResultPartRequest createSimpleResultPartRequest(TreeTestResult ttr) {
+		TreeSPath path = ttr.getCurrentPath();
+		PartSubList lst = ttr.getResultParts().get(path);
+		SimpleResultPart part = (SimpleResultPart) lst.getParts().get(2);
+
+		ResultPartRequest req = new ResultPartRequest(ttr, path, part);
+		req.setPath(ttr.getCurrentPath());
+
+		return req;
+	}
+
+	private TreeTestResultTestUtils() {
+
 	}
 }