X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.core%2Fsrc%2Ftest%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Ftest%2Ftree%2FTreeTestResultCastorTest.java;h=fbce288c1d6418f8f18449482d6cb2ea73f18bd0;hb=22a03283f23241864e433943ba2bea57bfb0afeb;hp=8479c95ca5a91622675aab7e9d2989304e28a669;hpb=ff5078359b2bfda024f7d39a471918c75dcf27f0;p=gpl%2Fargeo-slc.git

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 8479c95ca..fbce288c1 100644
--- 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
@@ -11,17 +11,26 @@ import org.apache.commons.logging.LogFactory;
 
 import static org.argeo.slc.core.test.tree.TreeTestResultTestUtils.createCompleteTreeTestResult;
 
+import org.argeo.slc.msg.test.tree.TreeTestResultRequest;
 import org.argeo.slc.unit.AbstractSpringTestCase;
 import org.argeo.slc.unit.UnitXmlUtils;
 import org.argeo.slc.unit.test.tree.UnitTestTreeUtil;
 
 public class TreeTestResultCastorTest extends AbstractSpringTestCase {
 	private Log log = LogFactory.getLog(getClass());
+	
+	private Marshaller marshaller;
+	private Unmarshaller unmarshaller;
+
+	@Override
+	public void setUp() {
+		marshaller = getBean("marshaller");
+		unmarshaller = getBean("marshaller");
+	}
+
 
-	public void testMarshUnmarsh() throws Exception {
-		Marshaller marshaller = getBean("marshaller");
-		Unmarshaller unmarshaller = getBean("marshaller");
 
+	public void testMarshUnmarsh() throws Exception {
 		TreeTestResult ttr = createCompleteTreeTestResult();
 
 		StringResult xml = new StringResult();
@@ -37,6 +46,24 @@ public class TreeTestResultCastorTest extends AbstractSpringTestCase {
 				.unmarshal(new StringSource(xml.toString()));
 
 		UnitTestTreeUtil.assertTreeTestResult(ttr, ttrUnm);
+	}
+	
+	public void testTreeTestResultRequest() throws Exception{
+		TreeTestResultRequest req = new TreeTestResultRequest();
+		req.setTreeTestResult(createCompleteTreeTestResult());
+		
+		StringResult xml = new StringResult();
+		marshaller.marshal(req, xml);
+
+		log.info("Marshalled TreeTestResult Request: " + xml);
+
+		XsdSchema schema = getBean("schema");
+		UnitXmlUtils.assertXsdSchemaValidation(schema, new StringSource(xml
+				.toString()));
+
+		TreeTestResultRequest reqUnm = (TreeTestResultRequest) unmarshaller
+				.unmarshal(new StringSource(xml.toString()));
 
+		UnitTestTreeUtil.assertTreeTestResult(req.getTreeTestResult(), reqUnm.getTreeTestResult());
 	}
 }