Introduce close tree test result request

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

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/test/tree/CloseTreeTestResultRequest.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/test/tree/CloseTreeTestResultRequest.java
new file mode 100644 (file)
index 0000000..4aa229d
--- /dev/null
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/test/tree/CloseTreeTestResultRequest.java
@@ -0,0 +1,35 @@
+package org.argeo.slc.msg.test.tree;\r
+\r
+import java.util.Date;\r
+\r
+public class CloseTreeTestResultRequest {\r
+       private String resultUuid;\r
+       private Date closeDate;\r
+\r
+       public CloseTreeTestResultRequest() {\r
+\r
+       }\r
+\r
+       public CloseTreeTestResultRequest(String resultUuid, Date closeDate) {\r
+               super();\r
+               this.resultUuid = resultUuid;\r
+               this.closeDate = closeDate;\r
+       }\r
+\r
+       public String getResultUuid() {\r
+               return resultUuid;\r
+       }\r
+\r
+       public void setResultUuid(String id) {\r
+               this.resultUuid = id;\r
+       }\r
+\r
+       public Date getCloseDate() {\r
+               return closeDate;\r
+       }\r
+\r
+       public void setCloseDate(Date closeDate) {\r
+               this.closeDate = closeDate;\r
+       }\r
+\r
+}\r

diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/msg/mapping.xml b/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/msg/mapping.xml
index 8ae72a5593bb57dc0defbfc3d8a88dc3b6e85a78..9972cac7d7b0d10a74b2a308a84317c1b60ca43b 100644 (file)
--- a/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/msg/mapping.xml
+++ b/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/msg/mapping.xml
@@ -12,6 +12,14 @@
                        type="org.argeo.slc.core.test.tree.TreeTestResult" />\r
        </class>\r
 \r
+       <class\r
+               name="org.argeo.slc.msg.test.tree.CloseTreeTestResultRequest">\r
+               <map-to ns-uri="http://argeo.org/projects/slc/schemas"\r
+                       ns-prefix="slc" />\r
+               <field name="resultUuid" />\r
+               <field name="closeDate" />\r
+       </class>\r
+\r
        <class name="org.argeo.slc.msg.test.tree.ResultPartRequest">\r
                <map-to ns-uri="http://argeo.org/projects/slc/schemas"\r
                        ns-prefix="slc" />\r

diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/xml/slc.xsd b/org.argeo.slc.core/src/main/resources/org/argeo/slc/xml/slc.xsd
index 55bb55afd71bcb5ee2f3eeb067f0bc94e1211b38..0b645c2741cae2d40ba346e2a020eece6fa018f0 100644 (file)
--- a/org.argeo.slc.core/src/main/resources/org/argeo/slc/xml/slc.xsd
+++ b/org.argeo.slc.core/src/main/resources/org/argeo/slc/xml/slc.xsd
@@ -66,31 +66,6 @@
                </xs:sequence>\r
                <xs:attribute name="message" type="xs:string" />\r
        </xs:complexType>\r
-       <!-- \r
-       <xs:complexType name="ExceptionType">\r
-               <xs:all>\r
-                       <xs:element name="stack-trace" minOccurs="0"\r
-                               type="slc:StackTraceType" />\r
-               </xs:all>\r
-               <xs:attribute name="message" type="xs:string" />\r
-       </xs:complexType>\r
-       <xs:complexType name="StackTraceType">\r
-               <xs:sequence>\r
-                       <xs:element name="stack-trace-element"\r
-                               type="slc:StackTraceElementType" maxOccurs="unbounded">\r
-                       </xs:element>\r
-               </xs:sequence>\r
-       </xs:complexType>\r
-       <xs:complexType name="StackTraceElementType">\r
-               <xs:attribute name="declaring-class" type="xs:string"\r
-                       use="required" />\r
-               <xs:attribute name="method-name" type="xs:string"\r
-                       use="required" />\r
-               <xs:attribute name="file-name" type="xs:string" use="required" />\r
-               <xs:attribute name="line-number" type="xs:integer"\r
-                       use="required" />\r
-       </xs:complexType>\r
-       -->\r
        <xs:complexType name="ElementsType">\r
                <xs:sequence>\r
                        <xs:element name="element" type="slc:ElementType"\r
@@ -148,6 +123,15 @@
                </xs:complexType>\r
        </xs:element>\r
 \r
+       <xs:element name="close-tree-test-result-request">\r
+               <xs:complexType>\r
+                       <xs:all>\r
+                               <xs:element name="result-uuid" type="xs:string" />\r
+                               <xs:element name="close-date" type="xs:dateTime" />\r
+                       </xs:all>\r
+               </xs:complexType>\r
+       </xs:element>\r
+\r
        <xs:element name="result-part-request">\r
                <xs:complexType>\r
                        <xs:all>\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 a43d8f1209bbfcb6ba5d6512d32787aacd4ad8f5..b35ea1774a0d6b9fce82e16f1c1db55784b88929 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
@@ -11,9 +11,11 @@ import org.apache.commons.logging.LogFactory;
 \r
 import static org.argeo.slc.core.test.tree.TreeTestResultTestUtils.createCompleteTreeTestResult;\r
 import static org.argeo.slc.core.test.tree.TreeTestResultTestUtils.createSimpleResultPartRequest;\r
+import static org.argeo.slc.unit.UnitUtils.assertDateSec;\r
 \r
 import org.argeo.slc.core.structure.tree.TreeSPath;\r
 import org.argeo.slc.core.test.SimpleResultPart;\r
+import org.argeo.slc.msg.test.tree.CloseTreeTestResultRequest;\r
 import org.argeo.slc.msg.test.tree.CreateTreeTestResultRequest;\r
 import org.argeo.slc.msg.test.tree.ResultPartRequest;\r
 import org.argeo.slc.unit.AbstractSpringTestCase;\r
@@ -69,6 +71,22 @@ public class TreeTestResultCastorTest extends AbstractSpringTestCase {
                                .assertPart(req.getResultPart(), reqUnm.getResultPart());\r
        }\r
 \r
+       public void testCloseTreeTestResultRequest() throws Exception {\r
+               TreeTestResult ttr = createCompleteTreeTestResult();\r
+               ttr.close();\r
+\r
+               CloseTreeTestResultRequest req = new CloseTreeTestResultRequest(ttr\r
+                               .getUuid(), ttr.getCloseDate());\r
+\r
+               StringResult xml = marshallAndValidate(req);\r
+\r
+               CloseTreeTestResultRequest reqUnm = (CloseTreeTestResultRequest) unmarshaller\r
+                               .unmarshal(new StringSource(xml.toString()));\r
+\r
+               assertEquals(ttr.getUuid(), reqUnm.getResultUuid());\r
+               assertDateSec(ttr.getCloseDate(), ttr.getCloseDate());\r
+       }\r
+\r
        private StringResult marshallAndValidate(Object obj) throws Exception {\r
                StringResult xml = new StringResult();\r
                marshaller.marshal(obj, xml);\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 60c46af5a18f61fb0daed7148d6fd4faadbfbfb9..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
@@ -21,7 +21,6 @@ public abstract class TreeTestResultTestUtils {
        public static TreeTestResult createSimpleTreeTestResult() {\r
                TreeTestResult treeTestResult = new TreeTestResult();\r
                treeTestResult.setUuid(UUID.randomUUID().toString());\r
-               treeTestResult.setCloseDate(new Date());\r
                return treeTestResult;\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 550cdb90ac80137f5ef496b5605e4c66ac40e6ff..d6abfea5067157c9e92fc307cbea8e5a65b1550c 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
@@ -8,6 +8,7 @@ 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.CloseTreeTestResultRequest;
 import org.argeo.slc.msg.test.tree.CreateTreeTestResultRequest;
 import org.argeo.slc.msg.test.tree.ResultPartRequest;
 import org.argeo.slc.unit.AbstractSpringTestCase;
@@ -17,7 +18,8 @@ public class TreeTestResultWsIntegrationTest extends AbstractSpringTestCase {
 
        public void testCreateTreeTestResultRequest() {
                WebServiceTemplate template = getBean(WebServiceTemplate.class);
-               CreateTreeTestResultRequest req = new CreateTreeTestResultRequest(createCompleteTreeTestResult());
+               CreateTreeTestResultRequest req = new CreateTreeTestResultRequest(
+                               createCompleteTreeTestResult());
 
                log.info("Send CreateTreeTestResultRequest for result "
                                + req.getTreeTestResult().getUuid());
@@ -29,15 +31,35 @@ public class TreeTestResultWsIntegrationTest extends AbstractSpringTestCase {
        public void testResultPartRequest() {
                WebServiceTemplate template = getBean(WebServiceTemplate.class);
                TreeTestResult ttr = createCompleteTreeTestResult();
-               CreateTreeTestResultRequest reqCreate = new CreateTreeTestResultRequest(ttr);
+               CreateTreeTestResultRequest reqCreate = new CreateTreeTestResultRequest(
+                               ttr);
                log.info("Send CreateTreeTestResultRequest for result "
                                + reqCreate.getTreeTestResult().getUuid());
-               Object respCreate = template.marshalSendAndReceive(reqCreate);
-               
-               
+               template.marshalSendAndReceive(reqCreate);
+
                ResultPartRequest req = createSimpleResultPartRequest(ttr);
 
                log.info("Send ResultPartRequest for result " + req.getResultUuid());
+               Object resp = template.marshalSendAndReceive(req);
+               log.info("Resp: " + resp);
+       }
+
+       public void testCloseTreeTestResultRequest() {
+               WebServiceTemplate template = getBean(WebServiceTemplate.class);
+
+               TreeTestResult ttr = createCompleteTreeTestResult();
+               CreateTreeTestResultRequest reqCreate = new CreateTreeTestResultRequest(
+                               ttr);
+               log.info("Send CreateTreeTestResultRequest for result "
+                               + reqCreate.getTreeTestResult().getUuid());
+               template.marshalSendAndReceive(reqCreate);
+
+               ttr.close();
+               CloseTreeTestResultRequest req = new CloseTreeTestResultRequest(ttr
+                               .getUuid(), ttr.getCloseDate());
+
+               log.info("Send CloseTreeTestResultRequest for result "
+                               + req.getResultUuid());
 
                Object resp = template.marshalSendAndReceive(req);
                log.info("Resp: " + resp);