Spring/spring-ws
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pushed Xml Schema test down into CommonsXsdSchemaTest

Browse Source
This commit is contained in:
Arjen Poutsma
2008-12-21 20:58:17 +00:00
parent 0efc706c6b
commit 26e6756410
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
xml/src/test/java/org/springframework/xml/xsd/AbstractXsdSchemaTestCase.java
View File

@@ -21,12 +21,10 @@ import javax.xml.parsers.DocumentBuilderFactory;
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 abstract class AbstractXsdSchemaTestCase extends XMLTestCase {
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);

18
xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaTest.java
View File

@@ -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 @@ public class CommonsXsdSchemaTest extends AbstractXsdSchemaTestCase {
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"));
}
}