Author: peterjm
Date: Fri Apr 7 07:57:42 2006
New Revision: 392310
URL: http://svn.apache.org/viewcvs?rev=392310&view=rev
Log:
Adding tests to verify that the root-type-definition property works with
built-in types.
Added:
xerces/java/trunk/tests/schema/config/RootSimpleTypeDefinitionTest.java
xerces/java/trunk/tests/schema/config/simpleType.xml
Modified:
xerces/java/trunk/tests/schema/config/AllTests.java
xerces/java/trunk/tests/schema/config/base.xsd
Modified: xerces/java/trunk/tests/schema/config/AllTests.java
URL:
http://svn.apache.org/viewcvs/xerces/java/trunk/tests/schema/config/AllTests.java?rev=392310&r1=392309&r2=392310&view=diff
==============================================================================
--- xerces/java/trunk/tests/schema/config/AllTests.java (original)
+++ xerces/java/trunk/tests/schema/config/AllTests.java Fri Apr 7 07:57:42 2006
@@ -33,6 +33,7 @@
TestSuite suite = new TestSuite("Tests for various schema validation
configurations.");
suite.addTestSuite(BasicTest.class);
suite.addTestSuite(RootTypeDefinitionTest.class);
+ suite.addTestSuite(RootSimpleTypeDefinitionTest.class);
suite.addTestSuite(IgnoreXSIType_C_A_Test.class);
suite.addTestSuite(IgnoreXSIType_C_C_Test.class);
suite.addTestSuite(IgnoreXSIType_A_A_Test.class);
Added: xerces/java/trunk/tests/schema/config/RootSimpleTypeDefinitionTest.java
URL:
http://svn.apache.org/viewcvs/xerces/java/trunk/tests/schema/config/RootSimpleTypeDefinitionTest.java?rev=392310&view=auto
==============================================================================
--- xerces/java/trunk/tests/schema/config/RootSimpleTypeDefinitionTest.java
(added)
+++ xerces/java/trunk/tests/schema/config/RootSimpleTypeDefinitionTest.java Fri
Apr 7 07:57:42 2006
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package schema.config;
+
+import javax.xml.XMLConstants;
+import javax.xml.namespace.QName;
+
+import junit.framework.Assert;
+
+import org.apache.xerces.xs.ItemPSVI;
+import org.xml.sax.SAXException;
+
+/**
+ * @author Peter McCracken, IBM
+ * @version $Id: RootTypeDefinitionTest.java 381005 2006-02-25 22:14:10Z
mrglavas $
+ */
+public class RootSimpleTypeDefinitionTest extends BaseTest {
+
+ private QName typeString;
+ private QName typeNonNegInt;
+
+ private final static String INVALID_TYPE_ERROR = "cvc-type.3.1.3";
+ private final static String MININCLUSIVE_DERIVATION_ERROR =
"cvc-minInclusive-valid";
+
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(RootSimpleTypeDefinitionTest.class);
+ }
+
+ protected String getXMLDocument() {
+ return "simpleType.xml";
+ }
+
+ protected String getSchemaFile() {
+ return "base.xsd";
+ }
+
+ protected String[] getRelevantErrorIDs() {
+ return new String[] { INVALID_TYPE_ERROR,
MININCLUSIVE_DERIVATION_ERROR };
+ }
+
+ public RootSimpleTypeDefinitionTest(String name) {
+ super(name);
+ typeString = new QName(XMLConstants.W3C_XML_SCHEMA_NS_URI, "string",
"xsd");
+ typeNonNegInt = new QName(XMLConstants.W3C_XML_SCHEMA_NS_URI,
"nonNegativeInteger", "xsd");
+ }
+
+ public void testSettingSimpleType() throws Exception {
+ try {
+ fValidator.setProperty(ROOT_TYPE, typeString);
+ } catch (SAXException e1) {
+ Assert.fail("Problem setting property: " + e1.getMessage());
+ }
+
+ try {
+ validateDocument();
+ } catch (Exception e) {
+ Assert.fail("Validation failed: " + e.getMessage());
+ }
+
+ assertValidity(ItemPSVI.VALIDITY_VALID, fRootNode.getValidity());
+ assertValidationAttempted(ItemPSVI.VALIDATION_FULL, fRootNode
+ .getValidationAttempted());
+ assertElementNull(fRootNode.getElementDeclaration());
+ assertTypeName("string", fRootNode.getTypeDefinition().getName());
+ }
+
+ public void testSettingInvalidSimpleType() throws Exception {
+ try {
+ fValidator.setProperty(ROOT_TYPE, typeNonNegInt);
+ } catch (SAXException e1) {
+ Assert.fail("Problem setting property: " + e1.getMessage());
+ }
+
+ try {
+ validateDocument();
+ } catch (Exception e) {
+ Assert.fail("Validation failed: " + e.getMessage());
+ }
+
+ assertError(INVALID_TYPE_ERROR);
+ assertError(MININCLUSIVE_DERIVATION_ERROR);
+ assertValidity(ItemPSVI.VALIDITY_INVALID, fRootNode.getValidity());
+ assertValidationAttempted(ItemPSVI.VALIDATION_FULL, fRootNode
+ .getValidationAttempted());
+ assertElementNull(fRootNode.getElementDeclaration());
+ assertTypeName("nonNegativeInteger",
fRootNode.getTypeDefinition().getName());
+ }
+}
Modified: xerces/java/trunk/tests/schema/config/base.xsd
URL:
http://svn.apache.org/viewcvs/xerces/java/trunk/tests/schema/config/base.xsd?rev=392310&r1=392309&r2=392310&view=diff
==============================================================================
--- xerces/java/trunk/tests/schema/config/base.xsd (original)
+++ xerces/java/trunk/tests/schema/config/base.xsd Fri Apr 7 07:57:42 2006
@@ -2,6 +2,8 @@
<xsd:element name="A" type="X"/>
+ <xsd:element name="S" type="xsd:int"/>
+
<!-- The purpose of this element is:
a) To have a fixed attribute use
b) To have an attribute with a fixed attribute declaration
Added: xerces/java/trunk/tests/schema/config/simpleType.xml
URL:
http://svn.apache.org/viewcvs/xerces/java/trunk/tests/schema/config/simpleType.xml?rev=392310&view=auto
==============================================================================
--- xerces/java/trunk/tests/schema/config/simpleType.xml (added)
+++ xerces/java/trunk/tests/schema/config/simpleType.xml Fri Apr 7 07:57:42
2006
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<S>-12345</S>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
