\r
import java.io.IOException;\r
import java.io.StringReader;\r
-import java.io.StringWriter;\r
import java.text.SimpleDateFormat;\r
import java.util.UUID;\r
\r
-import javax.xml.transform.stream.StreamResult;\r
import javax.xml.transform.stream.StreamSource;\r
\r
import org.apache.commons.io.IOUtils;\r
import org.argeo.slc.msg.process.SlcExecutionRequest;\r
import org.argeo.slc.msg.process.SlcExecutionStepsRequest;\r
import org.argeo.slc.unit.AbstractSpringTestCase;\r
+import org.argeo.slc.unit.UnitXmlUtils;\r
+import org.argeo.slc.unit.process.SlcExecutionTestUtils;\r
import org.springframework.oxm.Marshaller;\r
import org.springframework.oxm.Unmarshaller;\r
+import org.springframework.xml.transform.StringResult;\r
+import org.springframework.xml.transform.StringSource;\r
+import org.springframework.xml.validation.XmlValidator;\r
\r
public class SlcExecutionCastorTest extends AbstractSpringTestCase {\r
private Log log = LogFactory.getLog(getClass());\r
\r
- public void testMarshalling() throws Exception {\r
- Marshaller marshaller = getBean("marshaller");\r
- Unmarshaller unmarshaller = getBean("marshaller");\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 testMarshalling() throws Exception {\r
SlcExecution slcExec = SlcExecutionTestUtils.createSimpleSlcExecution();\r
\r
SlcExecutionRequest msgSave = new SlcExecutionRequest();\r
\r
SlcExecutionRequest msgSaveUnm = unmarshall(unmarshaller, msgSaveXml);\r
assertNotNull(msgSaveUnm);\r
- SlcExecutionTestUtils.assertSlcExecution(slcExec, msgSaveUnm.getSlcExecution());\r
+ SlcExecutionTestUtils.assertSlcExecution(slcExec, msgSaveUnm\r
+ .getSlcExecution());\r
\r
SlcExecutionStepsRequest msgNotifUnm = unmarshall(unmarshaller,\r
msgNotifXml);\r
assertNotNull(msgNotifUnm);\r
assertEquals(slcExec.getUuid(), msgNotifUnm.getSlcExecutionUuid());\r
assertEquals(2, msgNotifUnm.getSteps().size());\r
- SlcExecutionTestUtils.assertSlcExecutionStep(step0, msgNotifUnm.getSteps().get(0));\r
- SlcExecutionTestUtils.assertSlcExecutionStep(step1, msgNotifUnm.getSteps().get(1));\r
+ SlcExecutionTestUtils.assertSlcExecutionStep(step0, msgNotifUnm\r
+ .getSteps().get(0));\r
+ SlcExecutionTestUtils.assertSlcExecutionStep(step1, msgNotifUnm\r
+ .getSteps().get(1));\r
\r
SlcExecution slcExecUnm = msgSaveUnm.getSlcExecution();\r
slcExecUnm.getSteps().addAll(msgNotifUnm.getSteps());\r
SlcExecutionRequest msgUpdate = new SlcExecutionRequest();\r
msgUpdate.setSlcExecution(slcExecUnm);\r
String msgUpdateXml = marshallAndLog(marshaller, msgUpdate);\r
+\r
+ SlcExecutionRequest msgUpdateUnm = unmarshall(unmarshaller,\r
+ msgUpdateXml);\r
+ assertNotNull(msgUpdateUnm);\r
}\r
\r
private String marshallAndLog(Marshaller marshaller, Object obj)\r
throws IOException {\r
- StringWriter writer = new StringWriter();\r
- marshaller.marshal(obj, new StreamResult(writer));\r
- String xml = writer.toString();\r
- log.info(xml);\r
- IOUtils.closeQuietly(writer);\r
- return xml;\r
+ StringResult xml = new StringResult();\r
+ marshaller.marshal(obj, xml);\r
+ log.info("Marshalled object: " + xml);\r
+\r
+ UnitXmlUtils.assertXmlValidation(getBean(XmlValidator.class),\r
+ new StringSource(xml.toString()));\r
+\r
+ return xml.toString();\r
}\r
\r
private <T> T unmarshall(Unmarshaller unmarshaller, String xml)\r