You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@synapse.apache.org by in...@apache.org on 2007/03/14 06:17:51 UTC

svn commit: r518021 - in /webservices/synapse/trunk/java/modules: core/src/test/java/org/apache/synapse/config/xml/ extensions/src/test/java/org/apache/synapse/mediators/ extensions/src/test/java/org/apache/synapse/mediators/validate/

Author: indika
Date: Tue Mar 13 22:17:50 2007
New Revision: 518021

URL: http://svn.apache.org/viewvc?view=rev&rev=518021
Log:
Remove use of XML Comparator for XMl comparison  

Modified:
    webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/AbstractTestCase.java
    webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/AbstractTestCase.java
    webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/validate/ValidateMediatorSerializationTest.java

Modified: webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/AbstractTestCase.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/AbstractTestCase.java?view=diff&rev=518021&r1=518020&r2=518021
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/AbstractTestCase.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/AbstractTestCase.java Tue Mar 13 22:17:50 2007
@@ -16,11 +16,8 @@
 
 package org.apache.synapse.config.xml;
 
-import junit.framework.TestCase;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-import org.apache.axiom.om.impl.exception.XMLComparisonException;
-import org.apache.axiom.om.impl.llom.util.XMLComparator;
 import org.apache.synapse.Mediator;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Modified: webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/AbstractTestCase.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/AbstractTestCase.java?view=diff&rev=518021&r1=518020&r2=518021
==============================================================================
--- webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/AbstractTestCase.java (original)
+++ webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/AbstractTestCase.java Tue Mar 13 22:17:50 2007
@@ -15,10 +15,7 @@
 */
 package org.apache.synapse.mediators;
 
-import junit.framework.TestCase;
-import org.apache.axiom.om.impl.llom.util.XMLComparator;
 import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-import org.apache.axiom.om.impl.exception.XMLComparisonException;
 import org.apache.axiom.om.OMElement;
 import org.apache.synapse.config.xml.MediatorFactory;
 import org.apache.synapse.config.xml.MediatorSerializer;

Modified: webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/validate/ValidateMediatorSerializationTest.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/validate/ValidateMediatorSerializationTest.java?view=diff&rev=518021&r1=518020&r2=518021
==============================================================================
--- webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/validate/ValidateMediatorSerializationTest.java (original)
+++ webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/validate/ValidateMediatorSerializationTest.java Tue Mar 13 22:17:50 2007
@@ -19,23 +19,9 @@
 
 package org.apache.synapse.mediators.validate;
 
-import org.apache.axiom.om.impl.exception.XMLComparisonException;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-import org.apache.axiom.om.impl.llom.util.XMLComparator;
-import org.apache.axiom.om.OMElement;
-import org.apache.synapse.mediators.validate.ValidateMediatorSerializer;
-import org.apache.synapse.mediators.validate.ValidateMediatorFactory;
-import org.apache.synapse.config.xml.MediatorFactory;
-import org.apache.synapse.config.xml.MediatorSerializer;
-import org.apache.synapse.Mediator;
-import org.apache.xmlbeans.xml.stream.XMLStreamException;
-import junit.framework.TestCase;
-
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLInputFactory;
-import java.io.StringReader;
+import org.apache.synapse.mediators.AbstractTestCase;
 
-public class ValidateMediatorSerializationTest extends TestCase {
+public class ValidateMediatorSerializationTest extends AbstractTestCase {
 
     private ValidateMediatorFactory validateMediatorFactory = null;
     private ValidateMediatorSerializer validateMediatorSerializer = null;
@@ -61,27 +47,5 @@
         }
     }
 
-    private boolean serialization(String inputXml, MediatorFactory mediatorFactory, MediatorSerializer mediatorSerializer) throws XMLComparisonException {
-
-        XMLComparator comparator = new XMLComparator();
-
-        OMElement inputOM = createOMElement(inputXml);
-        Mediator mediator = mediatorFactory.createMediator(inputOM);
-        OMElement resultOM = mediatorSerializer.serializeMediator(null, mediator);
-        return comparator.compare(resultOM, inputOM);
-    }
-
-    private OMElement createOMElement(String xml) {
-        try {
-
-            XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(new StringReader(xml));
-            StAXOMBuilder builder = new StAXOMBuilder(reader);
-            OMElement omElement = builder.getDocumentElement();
-            return omElement;
-        }
-        catch (javax.xml.stream.XMLStreamException e) {
-            throw new RuntimeException(e);
-        }
-    }
 }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: synapse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: synapse-dev-help@ws.apache.org