X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.core%2Fsrc%2Ftest%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Fprocess%2FSlcExecutionCastorTest.java;h=efb4cf5133cd352cfc263b39148e9e91ab63dd8f;hb=7a8f034133c1112e187e2a2bfd2c56a8d2452345;hp=062fbb003e163d9d559b12f4d9749b264dbf073a;hpb=ff5078359b2bfda024f7d39a471918c75dcf27f0;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.core/src/test/java/org/argeo/slc/core/process/SlcExecutionCastorTest.java b/org.argeo.slc.core/src/test/java/org/argeo/slc/core/process/SlcExecutionCastorTest.java
index 062fbb003..efb4cf513 100644
--- a/org.argeo.slc.core/src/test/java/org/argeo/slc/core/process/SlcExecutionCastorTest.java
+++ b/org.argeo.slc.core/src/test/java/org/argeo/slc/core/process/SlcExecutionCastorTest.java
@@ -1,13 +1,10 @@
 package org.argeo.slc.core.process;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.StringReader;
-import java.io.StringWriter;
 import java.text.SimpleDateFormat;
 import java.util.UUID;
 
-import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
 import org.apache.commons.io.IOUtils;
@@ -17,12 +14,12 @@ import org.argeo.slc.msg.process.SlcExecutionRequest;
 import org.argeo.slc.msg.process.SlcExecutionStepsRequest;
 import org.argeo.slc.unit.AbstractSpringTestCase;
 import org.argeo.slc.unit.UnitXmlUtils;
-
+import org.argeo.slc.unit.process.SlcExecutionTestUtils;
 import org.springframework.oxm.Marshaller;
 import org.springframework.oxm.Unmarshaller;
 import org.springframework.xml.transform.StringResult;
 import org.springframework.xml.transform.StringSource;
-import org.springframework.xml.xsd.XsdSchema;
+import org.springframework.xml.validation.XmlValidator;
 
 public class SlcExecutionCastorTest extends AbstractSpringTestCase {
 	private Log log = LogFactory.getLog(getClass());
@@ -32,8 +29,8 @@ public class SlcExecutionCastorTest extends AbstractSpringTestCase {
 
 	@Override
 	public void setUp() {
-		marshaller = getBean("marshaller");
-		unmarshaller = getBean("marshaller");
+		marshaller = getBean(Marshaller.class);
+		unmarshaller = getBean(Unmarshaller.class);
 	}
 
 	public void testMarshalling() throws Exception {
@@ -97,9 +94,8 @@ public class SlcExecutionCastorTest extends AbstractSpringTestCase {
 		marshaller.marshal(obj, xml);
 		log.info("Marshalled object: " + xml);
 
-		XsdSchema schema = getBean("schema");
-		UnitXmlUtils.assertXsdSchemaValidation(schema, new StringSource(xml
-				.toString()));
+		UnitXmlUtils.assertXmlValidation(getBean(XmlValidator.class),
+				new StringSource(xml.toString()));
 
 		return xml.toString();
 	}