X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Funit%2Ftest%2Ftree%2FTreeTestResultTestUtils.java;h=fedaa266a89975fa3af7b725f12e00b2249fc97e;hb=1a4b784250a43f6c7421ab5d8567c3bfbf51e990;hp=944fe2e6439c39ed8059c9d84dd3b80a3981c826;hpb=5978e7e4f44af177846149d60cf5ff6e2d7462bf;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/test/tree/TreeTestResultTestUtils.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/test/tree/TreeTestResultTestUtils.java
index 944fe2e64..fedaa266a 100644
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/test/tree/TreeTestResultTestUtils.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/test/tree/TreeTestResultTestUtils.java
@@ -4,6 +4,8 @@ import java.util.UUID;
 
 import org.argeo.slc.core.build.Distribution;
 import org.argeo.slc.core.deploy.DeployedSystem;
+import org.argeo.slc.core.deploy.DeploymentData;
+import org.argeo.slc.core.deploy.TargetData;
 import org.argeo.slc.core.process.SlcExecution;
 import org.argeo.slc.core.process.SlcExecutionStep;
 import org.argeo.slc.core.structure.SimpleSElement;
@@ -28,9 +30,19 @@ public abstract class TreeTestResultTestUtils {
 	public static TreeTestResult createCompleteTreeTestResult() {
 		SlcExecution slcExecution = SlcExecutionTestUtils
 				.createSimpleSlcExecution();
-		SlcExecutionStep step = new SlcExecutionStep("LOG", "JUnit step");
+		SlcExecutionStep step = new SlcExecutionStep("JUnit step");
 		slcExecution.getSteps().add(step);
 
+		TreeTestResult ttr = createMinimalConsistentTreeTestResult(slcExecution);
+
+		ttr.addResultPart(createSimpleResultPartPassed());
+		ttr.addResultPart(createSimpleResultPartFailed());
+		ttr.addResultPart(createSimpleResultPartError());
+		return ttr;
+	}
+
+	public static TreeTestResult createMinimalConsistentTreeTestResult(
+			SlcExecution slcExecution) {
 		SimpleTestRun testRun = new SimpleTestRun();
 		testRun.setUuid(UUID.randomUUID().toString());
 
@@ -43,6 +55,9 @@ public abstract class TreeTestResultTestUtils {
 		registry.register(path, elem);
 
 		TreeTestResult ttr = createSimpleTreeTestResult();
+		ttr.getAttributes().put("testCase", "UNIT");
+
+		// Simulate test run
 		ttr.notifyCurrentPath(registry, path);
 		ttr.notifyTestRun(testRun);
 		testRun.setTestResult(ttr);
@@ -56,12 +71,19 @@ public abstract class TreeTestResultTestUtils {
 			public Distribution getDistribution() {
 				return null;
 			}
+
+			public DeploymentData getDeploymentData() {
+				// TODO Auto-generated method stub
+				return null;
+			}
+
+			public TargetData getTargetData() {
+				// TODO Auto-generated method stub
+				return null;
+			}
+
 		});
 		testRun.notifySlcExecution(slcExecution);
-
-		ttr.addResultPart(createSimpleResultPartPassed());
-		ttr.addResultPart(createSimpleResultPartFailed());
-		ttr.addResultPart(createSimpleResultPartError());
 		return ttr;
 	}
 
@@ -90,7 +112,8 @@ public abstract class TreeTestResultTestUtils {
 		return partFailed;
 	}
 
-	public static ResultPartRequest createSimpleResultPartRequest(TreeTestResult ttr) {
+	public static ResultPartRequest createSimpleResultPartRequest(
+			TreeTestResult ttr) {
 		TreeSPath path = ttr.getCurrentPath();
 		PartSubList lst = ttr.getResultParts().get(path);
 		SimpleResultPart part = (SimpleResultPart) lst.getParts().get(2);