Update SimpleResultPart structure

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

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 8479c95ca5a91622675aab7e9d2989304e28a669..1e83dda11f5cf6a3d6799639f3ee4e65bdc45841 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
@@ -4,13 +4,17 @@ import org.springframework.oxm.Marshaller;
 import org.springframework.oxm.Unmarshaller;\r
 import org.springframework.xml.transform.StringResult;\r
 import org.springframework.xml.transform.StringSource;\r
-import org.springframework.xml.xsd.XsdSchema;\r
+import org.springframework.xml.validation.XmlValidator;\r
 \r
 import org.apache.commons.logging.Log;\r
 import org.apache.commons.logging.LogFactory;\r
 \r
 import static org.argeo.slc.core.test.tree.TreeTestResultTestUtils.createCompleteTreeTestResult;\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.CreateTreeTestResultRequest;\r
+import org.argeo.slc.msg.test.tree.ResultPartRequest;\r
 import org.argeo.slc.unit.AbstractSpringTestCase;\r
 import org.argeo.slc.unit.UnitXmlUtils;\r
 import org.argeo.slc.unit.test.tree.UnitTestTreeUtil;\r
@@ -18,25 +22,67 @@ import org.argeo.slc.unit.test.tree.UnitTestTreeUtil;
 public class TreeTestResultCastorTest extends AbstractSpringTestCase {\r
        private Log log = LogFactory.getLog(getClass());\r
 \r
+       private Marshaller marshaller;\r
+       private Unmarshaller unmarshaller;\r
+\r
+       @Override\r
+       public void setUp() {\r
+               marshaller = getBean(Marshaller.class);\r
+               unmarshaller = getBean(Unmarshaller.class);\r
+       }\r
+\r
        public void testMarshUnmarsh() throws Exception {\r
-               Marshaller marshaller = getBean("marshaller");\r
-               Unmarshaller unmarshaller = getBean("marshaller");\r
+               TreeTestResult ttr = createCompleteTreeTestResult();\r
+\r
+               StringResult xml = marshallAndValidate(ttr);\r
+\r
+               TreeTestResult ttrUnm = (TreeTestResult) unmarshaller\r
+                               .unmarshal(new StringSource(xml.toString()));\r
+\r
+               UnitTestTreeUtil.assertTreeTestResult(ttr, ttrUnm);\r
+       }\r
+\r
+       public void testCreateTreeTestResultRequest() throws Exception {\r
+               CreateTreeTestResultRequest req = new CreateTreeTestResultRequest();\r
+               req.setTreeTestResult(createCompleteTreeTestResult());\r
 \r
+               StringResult xml = marshallAndValidate(req);\r
+\r
+               CreateTreeTestResultRequest reqUnm = (CreateTreeTestResultRequest) unmarshaller\r
+                               .unmarshal(new StringSource(xml.toString()));\r
+\r
+               UnitTestTreeUtil.assertTreeTestResult(req.getTreeTestResult(), reqUnm\r
+                               .getTreeTestResult());\r
+       }\r
+\r
+       public void testResultPartRequest() throws Exception {\r
                TreeTestResult ttr = createCompleteTreeTestResult();\r
 \r
-               StringResult xml = new StringResult();\r
-               marshaller.marshal(ttr, xml);\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
-               log.info("Marshalled TreeTestResult: " + xml);\r
+               ResultPartRequest req = new ResultPartRequest(ttr, path, part);\r
+               req.setPath(ttr.getCurrentPath());\r
 \r
-               XsdSchema schema = getBean("schema");\r
-               UnitXmlUtils.assertXsdSchemaValidation(schema, new StringSource(xml\r
-                               .toString()));\r
+               StringResult xml = marshallAndValidate(req);\r
 \r
-               TreeTestResult ttrUnm = (TreeTestResult) unmarshaller\r
+               ResultPartRequest reqUnm = (ResultPartRequest) unmarshaller\r
                                .unmarshal(new StringSource(xml.toString()));\r
 \r
-               UnitTestTreeUtil.assertTreeTestResult(ttr, ttrUnm);\r
+               UnitTestTreeUtil\r
+                               .assertPart(req.getResultPart(), reqUnm.getResultPart());\r
+       }\r
+\r
+       private StringResult marshallAndValidate(Object obj) throws Exception {\r
+               StringResult xml = new StringResult();\r
+               marshaller.marshal(obj, xml);\r
+\r
+               log.info("Marshalled ResultPart Request: " + xml);\r
 \r
+                UnitXmlUtils.assertXmlValidation(getBean(XmlValidator.class),\r
+                               new StringSource(xml.toString()));\r
+               return xml;\r
        }\r
 }\r