Restructure deployment

[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 f9a42a16ed8e4f37ad520ec5dbf57732a4110b51..aec7a68b40aab5935c28d06104fda662aac61e98 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
@@ -5,15 +5,17 @@ import org.springframework.oxm.Unmarshaller;
 import org.springframework.xml.transform.StringResult;\r
 import org.springframework.xml.transform.StringSource;\r
 import org.springframework.xml.validation.XmlValidator;\r
-import org.springframework.xml.xsd.XsdSchema;\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
+import static org.argeo.slc.unit.UnitUtils.assertDateSec;\r
+import static org.argeo.slc.unit.test.tree.TreeTestResultTestUtils.createCompleteTreeTestResult;\r
+import static org.argeo.slc.unit.test.tree.TreeTestResultTestUtils.createSimpleResultPartRequest;\r
 \r
 import org.argeo.slc.core.structure.tree.TreeSPath;\r
-import org.argeo.slc.core.test.TestResultPart;\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
@@ -35,13 +37,7 @@ public class TreeTestResultCastorTest extends AbstractSpringTestCase {
        public void testMarshUnmarsh() throws Exception {\r
                TreeTestResult ttr = createCompleteTreeTestResult();\r
 \r
-               StringResult xml = new StringResult();\r
-               marshaller.marshal(ttr, xml);\r
-\r
-               log.info("Marshalled TreeTestResult: " + xml);\r
-\r
-               UnitXmlUtils.assertXmlValidation(getBean(XmlValidator.class),\r
-                               new StringSource(xml.toString()));\r
+               StringResult xml = marshallAndValidate(ttr);\r
 \r
                TreeTestResult ttrUnm = (TreeTestResult) unmarshaller\r
                                .unmarshal(new StringSource(xml.toString()));\r
@@ -53,13 +49,7 @@ public class TreeTestResultCastorTest extends AbstractSpringTestCase {
                CreateTreeTestResultRequest req = new CreateTreeTestResultRequest();\r
                req.setTreeTestResult(createCompleteTreeTestResult());\r
 \r
-               StringResult xml = new StringResult();\r
-               marshaller.marshal(req, xml);\r
-\r
-               log.info("Marshalled CreateTreeTestResult Request: " + xml);\r
-\r
-               UnitXmlUtils.assertXmlValidation(getBean(XmlValidator.class),\r
-                               new StringSource(xml.toString()));\r
+               StringResult xml = marshallAndValidate(req);\r
 \r
                CreateTreeTestResultRequest reqUnm = (CreateTreeTestResultRequest) unmarshaller\r
                                .unmarshal(new StringSource(xml.toString()));\r
@@ -70,28 +60,41 @@ public class TreeTestResultCastorTest extends AbstractSpringTestCase {
 \r
        public void testResultPartRequest() throws Exception {\r
                TreeTestResult ttr = createCompleteTreeTestResult();\r
+               ResultPartRequest req = createSimpleResultPartRequest(ttr);\r
 \r
-               TreeSPath path = ttr.getCurrentPath();\r
-               PartSubList lst = ttr.getResultParts().get(path);\r
-               //TestResultPart part = lst.getParts().get(lst.getParts().size() - 1);\r
-               TestResultPart part = lst.getParts().get(2);\r
+               StringResult xml = marshallAndValidate(req);\r
 \r
-               ResultPartRequest req = new ResultPartRequest(ttr, path, part);\r
-               req.setPath(ttr.getCurrentPath());\r
+               ResultPartRequest reqUnm = (ResultPartRequest) unmarshaller\r
+                               .unmarshal(new StringSource(xml.toString()));\r
 \r
-               StringResult xml = new StringResult();\r
-               marshaller.marshal(req, xml);\r
+               UnitTestTreeUtil\r
+                               .assertPart(req.getResultPart(), reqUnm.getResultPart());\r
+       }\r
 \r
-               log.info("Marshalled ResultPart Request: " + xml);\r
+       public void testCloseTreeTestResultRequest() throws Exception {\r
+               TreeTestResult ttr = createCompleteTreeTestResult();\r
+               ttr.close();\r
 \r
-               UnitXmlUtils.assertXmlValidation(getBean(XmlValidator.class),\r
-                               new StringSource(xml.toString()));\r
+               CloseTreeTestResultRequest req = new CloseTreeTestResultRequest(ttr\r
+                               .getUuid(), ttr.getCloseDate());\r
 \r
-               ResultPartRequest reqUnm = (ResultPartRequest) unmarshaller\r
+               StringResult xml = marshallAndValidate(req);\r
+\r
+               CloseTreeTestResultRequest reqUnm = (CloseTreeTestResultRequest) unmarshaller\r
                                .unmarshal(new StringSource(xml.toString()));\r
 \r
-               UnitTestTreeUtil\r
-                               .assertPart(req.getResultPart(), reqUnm.getResultPart());\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
+\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