package org.argeo.slc.core.process;\r
\r
import java.io.IOException;\r
-import java.io.InputStream;\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.SlcExecutionStepsRequest;\r
import org.argeo.slc.unit.AbstractSpringTestCase;\r
import org.argeo.slc.unit.UnitXmlUtils;\r
-\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.xsd.XsdSchema;\r
+import org.springframework.xml.validation.XmlValidator;\r
\r
public class SlcExecutionCastorTest extends AbstractSpringTestCase {\r
private Log log = LogFactory.getLog(getClass());\r
\r
@Override\r
public void setUp() {\r
- marshaller = getBean("marshaller");\r
- unmarshaller = getBean("marshaller");\r
+ marshaller = getBean(Marshaller.class);\r
+ unmarshaller = getBean(Unmarshaller.class);\r
}\r
\r
public void testMarshalling() throws Exception {\r
marshaller.marshal(obj, xml);\r
log.info("Marshalled object: " + xml);\r
\r
- XsdSchema schema = getBean("schema");\r
- UnitXmlUtils.assertXsdSchemaValidation(schema, new StringSource(xml\r
- .toString()));\r
+ UnitXmlUtils.assertXmlValidation(getBean(XmlValidator.class),\r
+ new StringSource(xml.toString()));\r
\r
return xml.toString();\r
}\r