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
+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
\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
.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
\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