Pushed Xml Schema test down into CommonsXsdSchemaTest

Author: poutsma

xml/src/test/java/org/springframework/xml/xsd/AbstractXsdSchemaTestCase.java

@@ -21,12 +21,10 @@
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMResult;
-import javax.xml.transform.dom.DOMSource;
 
 import org.custommonkey.xmlunit.XMLTestCase;
 import org.custommonkey.xmlunit.XMLUnit;
 import org.w3c.dom.Document;
-import org.w3c.dom.Element;
 
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
@@ -100,18 +98,6 @@ public void testXmlNamespace() throws Exception {
         assertXMLEqual("Invalid Source returned", expected, result);
     }
 
-    public void testXmime() throws Exception {
-        Resource resource = new ClassPathResource("xmime.xsd", AbstractXsdSchemaTestCase.class);
-        XsdSchema schema = createSchema(resource);
-        String namespace = "urn:test";
-        assertEquals("Invalid target namespace", namespace, schema.getTargetNamespace());
-        Document result = (Document) ((DOMSource) schema.getSource()).getNode();
-        Element schemaElement = result.getDocumentElement();
-        Element elementElement = (Element) schemaElement.getFirstChild();
-        assertNotNull("No expectedContentTypes found",
-                elementElement.getAttributeNS("http://www.w3.org/2005/05/xmlmime", "expectedContentTypes"));
-    }
-
     public void testCreateValidator() throws Exception {
         Resource resource = new ClassPathResource("single.xsd", AbstractXsdSchemaTestCase.class);
         XsdSchema single = createSchema(resource);

xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaTest.java

@@ -16,9 +16,14 @@
 
 package org.springframework.xml.xsd.commons;
 
+import javax.xml.transform.dom.DOMSource;
+
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaCollection;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
 
+import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.xml.sax.SaxUtils;
 import org.springframework.xml.xsd.AbstractXsdSchemaTestCase;
@@ -32,4 +37,17 @@ protected XsdSchema createSchema(Resource resource) throws Exception {
         return new CommonsXsdSchema(schema);
     }
 
+    public void testXmime() throws Exception {
+        Resource resource = new ClassPathResource("xmime.xsd", AbstractXsdSchemaTestCase.class);
+        XsdSchema schema = createSchema(resource);
+        String namespace = "urn:test";
+        assertEquals("Invalid target namespace", namespace, schema.getTargetNamespace());
+        Document result = (Document) ((DOMSource) schema.getSource()).getNode();
+        Element schemaElement = result.getDocumentElement();
+        Element elementElement = (Element) schemaElement.getFirstChild();
+        assertNotNull("No expectedContentTypes found",
+                elementElement.getAttributeNS("http://www.w3.org/2005/05/xmlmime", "expectedContentTypes"));
+    }
+
+
 }