Modular distributions

[gpl/argeo-slc.git] / runtime / org.argeo.slc.support.castor / src / test / java / org / argeo / slc / castor / AbstractCastorTestCase.java

diff --git a/runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/AbstractCastorTestCase.java b/runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/AbstractCastorTestCase.java
index b9dd33638b604a66c4ba1f202c7d56e925317cb7..1cdd7be8fb3feaefb47d986f097a956b267cf611 100644 (file)
--- a/runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/AbstractCastorTestCase.java
+++ b/runtime/org.argeo.slc.support.castor/src/test/java/org/argeo/slc/castor/AbstractCastorTestCase.java
@@ -22,14 +22,24 @@ public abstract class AbstractCastorTestCase extends AbstractSpringTestCase {
                unmarshaller = getBean(Unmarshaller.class);
        }
 
+       protected StringResult marshal(Object obj) throws Exception {
+               return marshal(obj, false);
+       }
+
        protected StringResult marshalAndValidate(Object obj) throws Exception {
+               return marshal(obj, true);
+       }
+
+       protected StringResult marshal(Object obj, boolean validate)
+                       throws Exception {
                StringResult xml = new StringResult();
                marshaller.marshal(obj, xml);
 
-               log.info("Marshalled ResultPart Request: " + xml);
+               log.info("Marshalled " + obj.getClass() + ": " + xml + "\n");
 
-               UnitXmlUtils.assertXmlValidation(getBean(XmlValidator.class),
-                               new StringSource(xml.toString()));
+               if (validate)
+                       UnitXmlUtils.assertXmlValidation(getBean(XmlValidator.class),
+                                       new StringSource(xml.toString()));
                return xml;
        }
 
@@ -38,9 +48,14 @@ public abstract class AbstractCastorTestCase extends AbstractSpringTestCase {
                return (T) unmarshaller.unmarshal(new StringSource(xml.toString()));
        }
 
+       @SuppressWarnings("unchecked")
+       protected <T> T marshUnmarsh(Object obj, boolean validate) throws Exception {
+               StringResult xml = marshal(obj, validate);
+               return (T) unmarshal(xml);
+       }
+
        @SuppressWarnings("unchecked")
        protected <T> T marshUnmarsh(Object obj) throws Exception {
-               StringResult xml = marshalAndValidate(obj);
-               return (T)unmarshal(xml);
+               return (T) marshUnmarsh(obj, true);
        }
 }