Introduce close tree test result request

[gpl/argeo-slc.git] / org.argeo.slc.core / src / test / java / org / argeo / slc / core / test / tree / TreeTestResultTestUtils.java

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 28fdd8fc3affafbf4307ce8dff37a3373b0a5a3c..bc7dcbdd245977e065cfcd6f765269d5ad454726 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
@@ -1,24 +1,26 @@
 package org.argeo.slc.core.test.tree;\r
 \r
 import java.util.Date;\r
+import java.util.UUID;\r
 \r
+import org.argeo.slc.core.build.Distribution;\r
+import org.argeo.slc.core.deploy.DeployedSystem;\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.SimpleTestRun;\r
 import org.argeo.slc.core.test.TestStatus;\r
+import org.argeo.slc.msg.test.tree.ResultPartRequest;\r
 \r
 public abstract class TreeTestResultTestUtils {\r
 \r
        public static TreeTestResult createSimpleTreeTestResult() {\r
                TreeTestResult treeTestResult = new TreeTestResult();\r
-               treeTestResult.setNumericResultId(new NumericTRId(System\r
-                               .currentTimeMillis()));\r
-               treeTestResult.setCloseDate(new Date());\r
+               treeTestResult.setUuid(UUID.randomUUID().toString());\r
                return treeTestResult;\r
        }\r
 \r
@@ -28,15 +30,33 @@ public abstract class TreeTestResultTestUtils {
                SlcExecutionStep step = new SlcExecutionStep("LOG", "JUnit step");\r
                slcExecution.getSteps().add(step);\r
 \r
+               SimpleTestRun testRun = new SimpleTestRun();\r
+               testRun.setUuid(UUID.randomUUID().toString());\r
+\r
                String pathStr = "/test";\r
-               TreeSPath path = TreeSPath.parseToCreatePath(pathStr);\r
+               TreeSPath path = new TreeSPath(pathStr);\r
 \r
                TreeSRegistry registry = new TreeSRegistry();\r
-               registry.register(path, new SimpleSElement("Unit Test"));\r
+               SimpleSElement elem = new SimpleSElement("Unit Test");\r
+               elem.getTags().put("myTag", "myTagValue");\r
+               registry.register(path, elem);\r
 \r
                TreeTestResult ttr = createSimpleTreeTestResult();\r
-               ttr.notifySlcExecution(slcExecution);\r
                ttr.notifyCurrentPath(registry, path);\r
+               ttr.notifyTestRun(testRun);\r
+               testRun.setTestResult(ttr);\r
+               testRun.setDeployedSystem(new DeployedSystem() {\r
+                       private String uuid = UUID.randomUUID().toString();\r
+\r
+                       public String getDeployedSystemId() {\r
+                               return uuid;\r
+                       }\r
+\r
+                       public Distribution getDistribution() {\r
+                               return null;\r
+                       }\r
+               });\r
+               testRun.notifySlcExecution(slcExecution);\r
 \r
                ttr.addResultPart(createSimpleResultPartPassed());\r
                ttr.addResultPart(createSimpleResultPartFailed());\r
@@ -46,7 +66,7 @@ public abstract class TreeTestResultTestUtils {
 \r
        public static SimpleResultPart createSimpleResultPartPassed() {\r
                SimpleResultPart partPassed = new SimpleResultPart();\r
-               String msgPassed = "message";\r
+               String msgPassed = "message\nnew line";\r
                partPassed.setStatus(TestStatus.PASSED);\r
                partPassed.setMessage(msgPassed);\r
                return partPassed;\r
@@ -62,13 +82,24 @@ public abstract class TreeTestResultTestUtils {
 \r
        public static SimpleResultPart createSimpleResultPartError() {\r
                SimpleResultPart partFailed = new SimpleResultPart();\r
-               String msgFailed = "crashed";\r
+               String msgFailed = "crashed\nanother line";\r
                partFailed.setStatus(TestStatus.ERROR);\r
                partFailed.setMessage(msgFailed);\r
                partFailed.setException(new Exception("Test Exception"));\r
                return partFailed;\r
        }\r
 \r
+       public static ResultPartRequest createSimpleResultPartRequest(TreeTestResult ttr) {\r
+               TreeSPath path = ttr.getCurrentPath();\r
+               PartSubList lst = ttr.getResultParts().get(path);\r
+               SimpleResultPart part = (SimpleResultPart) lst.getParts().get(2);\r
+\r
+               ResultPartRequest req = new ResultPartRequest(ttr, path, part);\r
+               req.setPath(ttr.getCurrentPath());\r
+\r
+               return req;\r
+       }\r
+\r
        private TreeTestResultTestUtils() {\r
 \r
        }\r