Introduce result reporting

git-svn-id: https://svn.argeo.org/slc/trunk@1098 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/test/tree/CreateTreeTestResultRequest.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/test/tree/CreateTreeTestResultRequest.java
index 156f3b3649bd61bc44c70dd9309fc1decb5fdbba..0a7af822b516d0232006707851f4896f3c865e80 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/test/tree/CreateTreeTestResultRequest.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/test/tree/CreateTreeTestResultRequest.java
@@ -5,6 +5,14 @@ import org.argeo.slc.core.test.tree.TreeTestResult;
 public class CreateTreeTestResultRequest {\r
        private TreeTestResult treeTestResult;\r
 \r
+       public CreateTreeTestResultRequest() {\r
+\r
+       }\r
+\r
+       public CreateTreeTestResultRequest(TreeTestResult treeTestResult) {\r
+               this.treeTestResult = treeTestResult;\r
+       }\r
+\r
        public TreeTestResult getTreeTestResult() {\r
                return treeTestResult;\r
        }\r

diff --git a/org.argeo.slc.core/src/test/java/org/argeo/slc/core/test/tree/TreeTestResultCastorTest.java b/org.argeo.slc.core/src/test/java/org/argeo/slc/core/test/tree/TreeTestResultCastorTest.java
index 1e83dda11f5cf6a3d6799639f3ee4e65bdc45841..a43d8f1209bbfcb6ba5d6512d32787aacd4ad8f5 100644 (file)
--- a/org.argeo.slc.core/src/test/java/org/argeo/slc/core/test/tree/TreeTestResultCastorTest.java
+++ b/org.argeo.slc.core/src/test/java/org/argeo/slc/core/test/tree/TreeTestResultCastorTest.java
@@ -10,6 +10,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;\r
 \r
 import static org.argeo.slc.core.test.tree.TreeTestResultTestUtils.createCompleteTreeTestResult;\r
+import static org.argeo.slc.core.test.tree.TreeTestResultTestUtils.createSimpleResultPartRequest;\r
 \r
 import org.argeo.slc.core.structure.tree.TreeSPath;\r
 import org.argeo.slc.core.test.SimpleResultPart;\r
@@ -57,14 +58,7 @@ public class TreeTestResultCastorTest extends AbstractSpringTestCase {
 \r
        public void testResultPartRequest() throws Exception {\r
                TreeTestResult ttr = createCompleteTreeTestResult();\r
-\r
-               TreeSPath path = ttr.getCurrentPath();\r
-               PartSubList lst = ttr.getResultParts().get(path);\r
-               // TestResultPart part = lst.getParts().get(lst.getParts().size() - 1);\r
-               SimpleResultPart part = (SimpleResultPart) lst.getParts().get(2);\r
-\r
-               ResultPartRequest req = new ResultPartRequest(ttr, path, part);\r
-               req.setPath(ttr.getCurrentPath());\r
+               ResultPartRequest req = createSimpleResultPartRequest(ttr);\r
 \r
                StringResult xml = marshallAndValidate(req);\r
 \r
@@ -81,7 +75,7 @@ public class TreeTestResultCastorTest extends AbstractSpringTestCase {
 \r
                log.info("Marshalled ResultPart Request: " + xml);\r
 \r
-                UnitXmlUtils.assertXmlValidation(getBean(XmlValidator.class),\r
+               UnitXmlUtils.assertXmlValidation(getBean(XmlValidator.class),\r
                                new StringSource(xml.toString()));\r
                return xml;\r
        }\r

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 614367779f05a320423d3bf3403e8b1d5d4c4e1f..60c46af5a18f61fb0daed7148d6fd4faadbfbfb9 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
@@ -14,6 +14,7 @@ import org.argeo.slc.core.structure.tree.TreeSRegistry;
 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
@@ -89,6 +90,17 @@ public abstract class TreeTestResultTestUtils {
                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

diff --git a/org.argeo.slc.core/src/test/java/org/argeo/slc/core/test/tree/TreeTestResultWsIntegrationTest.java b/org.argeo.slc.core/src/test/java/org/argeo/slc/core/test/tree/TreeTestResultWsIntegrationTest.java
index d31b5f8e2684b8c6787435df5e541de6fd1f3531..550cdb90ac80137f5ef496b5605e4c66ac40e6ff 100644 (file)
--- a/org.argeo.slc.core/src/test/java/org/argeo/slc/core/test/tree/TreeTestResultWsIntegrationTest.java
+++ b/org.argeo.slc.core/src/test/java/org/argeo/slc/core/test/tree/TreeTestResultWsIntegrationTest.java
@@ -6,8 +6,10 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import static org.argeo.slc.core.test.tree.TreeTestResultTestUtils.createCompleteTreeTestResult;
+import static org.argeo.slc.core.test.tree.TreeTestResultTestUtils.createSimpleResultPartRequest;
 
 import org.argeo.slc.msg.test.tree.CreateTreeTestResultRequest;
+import org.argeo.slc.msg.test.tree.ResultPartRequest;
 import org.argeo.slc.unit.AbstractSpringTestCase;
 
 public class TreeTestResultWsIntegrationTest extends AbstractSpringTestCase {
@@ -15,13 +17,29 @@ public class TreeTestResultWsIntegrationTest extends AbstractSpringTestCase {
 
        public void testCreateTreeTestResultRequest() {
                WebServiceTemplate template = getBean(WebServiceTemplate.class);
-               CreateTreeTestResultRequest req = new CreateTreeTestResultRequest();
-               req.setTreeTestResult(createCompleteTreeTestResult());
+               CreateTreeTestResultRequest req = new CreateTreeTestResultRequest(createCompleteTreeTestResult());
 
-               log.info("Send SlcExecutionRequest for SlcExecution "
+               log.info("Send CreateTreeTestResultRequest for result "
                                + req.getTreeTestResult().getUuid());
 
                Object resp = template.marshalSendAndReceive(req);
                log.info("Resp: " + resp);
        }
+
+       public void testResultPartRequest() {
+               WebServiceTemplate template = getBean(WebServiceTemplate.class);
+               TreeTestResult ttr = createCompleteTreeTestResult();
+               CreateTreeTestResultRequest reqCreate = new CreateTreeTestResultRequest(ttr);
+               log.info("Send CreateTreeTestResultRequest for result "
+                               + reqCreate.getTreeTestResult().getUuid());
+               Object respCreate = template.marshalSendAndReceive(reqCreate);
+               
+               
+               ResultPartRequest req = createSimpleResultPartRequest(ttr);
+
+               log.info("Send ResultPartRequest for result " + req.getResultUuid());
+
+               Object resp = template.marshalSendAndReceive(req);
+               log.info("Resp: " + resp);
+       }
 }