You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlbeans.apache.org by ce...@apache.org on 2005/05/19 02:57:44 UTC
svn commit: r170848 - in /xmlbeans/trunk/test/src:
misc/common/JiraTestBase.java misc/detailed/CharEncodingTest.java
scomp/contentType/complex/detailed/ComplexContentTest.java
scomp/derivation/extension/detailed/ComplexContentExtensionTest.java
xmlobject/xmlloader/detailed/XmlStreamBeanReader.java
Author: cezar
Date: Wed May 18 17:57:44 2005
New Revision: 170848
URL: http://svn.apache.org/viewcvs?rev=170848&view=rev
Log:
Contributed by Rajiv Balachandran. Test case fixes
Modified:
xmlbeans/trunk/test/src/misc/common/JiraTestBase.java
xmlbeans/trunk/test/src/misc/detailed/CharEncodingTest.java
xmlbeans/trunk/test/src/scomp/contentType/complex/detailed/ComplexContentTest.java
xmlbeans/trunk/test/src/scomp/derivation/extension/detailed/ComplexContentExtensionTest.java
xmlbeans/trunk/test/src/xmlobject/xmlloader/detailed/XmlStreamBeanReader.java
Modified: xmlbeans/trunk/test/src/misc/common/JiraTestBase.java
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/src/misc/common/JiraTestBase.java?rev=170848&r1=170847&r2=170848&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/misc/common/JiraTestBase.java (original)
+++ xmlbeans/trunk/test/src/misc/common/JiraTestBase.java Wed May 18 17:57:44 2005
@@ -12,7 +12,7 @@
public class JiraTestBase extends Common
{
//location of files under "cases folder"
- public static String JIRA_CASES = XBEAN_CASE_ROOT + P + "xbean" + P + "misc" +
+ public static String JIRA_CASES = XBEAN_CASE_ROOT + P + "misc" +
P + "jira" + P;
public static File outputroot = new File(OUTPUTROOT+P+"jiraoutput");
Modified: xmlbeans/trunk/test/src/misc/detailed/CharEncodingTest.java
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/src/misc/detailed/CharEncodingTest.java?rev=170848&r1=170847&r2=170848&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/misc/detailed/CharEncodingTest.java (original)
+++ xmlbeans/trunk/test/src/misc/detailed/CharEncodingTest.java Wed May 18 17:57:44 2005
@@ -69,7 +69,7 @@
// Piccolo has an issue with handling external identifiers when the value is PUBLIC
// refer : http://cafeconleche.org/SAXTest/results/com.bluecast.xml.Piccolo/xmltest/valid/not-sa/009.xml.html
- // results for the SAX conformance suite. This has been fixed in XBeans Piccolo code
+ // results for the SAX conformance suite. This has been fixed in newer versions of Piccolo
public void testExternalPublicIdentifier() {
// repro using piccolo and other parsers via JAXP API
String netPubEntity = "<!DOCTYPE doc PUBLIC \"whatever\" \"http://www.w3.org/2001/XMLSchema.dtd\" [\n" +
Modified: xmlbeans/trunk/test/src/scomp/contentType/complex/detailed/ComplexContentTest.java
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/src/scomp/contentType/complex/detailed/ComplexContentTest.java?rev=170848&r1=170847&r2=170848&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/scomp/contentType/complex/detailed/ComplexContentTest.java (original)
+++ xmlbeans/trunk/test/src/scomp/contentType/complex/detailed/ComplexContentTest.java Wed May 18 17:57:44 2005
@@ -16,16 +16,68 @@
package scomp.contentType.complex.detailed;
import scomp.common.BaseCase;
+import org.apache.xmlbeans.*;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Iterator;
+import java.util.Collection;
+
+import junit.framework.Assert;
/**
*
*
*
*/
-public class ComplexContentTest extends BaseCase{
+public class ComplexContentTest extends BaseCase {
//TODO: this should be a detailed
// test on a complex elt w/ annotations and other such
- public void testRun(){
+ public void testRun() {
fail("Implement me");
+ }
+
+ // complex types with simple content whose content is declared via an inline <simpleType>
+ // Issue fixed with Svn revision 165352
+ public void testSimpleContentDerivation() {
+ String sInputXsd = "<?xml version=\"1.0\"?>\n" +
+ "<xs:schema xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">\n" +
+ " <xs:complexType name=\"myType\">\n" +
+ " <xs:simpleContent>\n" +
+ " <xs:extension base=\"xs:string\"/>\n" +
+ " </xs:simpleContent>\n" +
+ " </xs:complexType>\n" +
+ " <xs:complexType name=\"fooType\">\n" +
+ " <xs:simpleContent>\n" +
+ " <xs:restriction base=\"myType\">\n" +
+ " <xs:simpleType>\n" +
+ " <xs:restriction base=\"xs:string\"/>\n" +
+ " </xs:simpleType>\n" +
+ " </xs:restriction>\n" +
+ " </xs:simpleContent>\n" +
+ " </xs:complexType>\n" +
+ " <xs:element name=\"root\" type=\"fooType\"/>\n" +
+ "</xs:schema>";
+
+ XmlOptions options = new XmlOptions();
+ List errors = new ArrayList();
+ options.setErrorListener(errors);
+
+ try {
+ XmlObject xobj = XmlObject.Factory.parse(sInputXsd);
+ assertTrue("Compiled XmlObject Validation Failed!",xobj.validate());
+ }
+ catch (XmlException xme) {
+ xme.printStackTrace();
+ Assert.fail("XmlException thrown when compiling schema");
+ }
+
+ // check for errors
+ for (Iterator iterator = errors.iterator(); iterator.hasNext();) {
+ System.out.println("Xsd Compilation Errors : " + iterator.next());
+ }
+ if (!errors.isEmpty()) {
+ Assert.fail("Errors found when compiling schema");
+ }
}
}
Modified: xmlbeans/trunk/test/src/scomp/derivation/extension/detailed/ComplexContentExtensionTest.java
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/src/scomp/derivation/extension/detailed/ComplexContentExtensionTest.java?rev=170848&r1=170847&r2=170848&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/scomp/derivation/extension/detailed/ComplexContentExtensionTest.java (original)
+++ xmlbeans/trunk/test/src/scomp/derivation/extension/detailed/ComplexContentExtensionTest.java Wed May 18 17:57:44 2005
@@ -183,18 +183,18 @@
XmlBeans.compileXmlBeans(null, null, compInput, null, XmlBeans.getBuiltinTypeSystem(), null, null);
}
catch (XmlException xme) {
- //assertEquals(2, xme.getErrors().size());
+ assertEquals(2, xme.getErrors().size());
Iterator itr = xme.getErrors().iterator();
XmlError eacherr = (XmlError) itr.next();
- System.out.println("Err:" + eacherr.getMessage());
+ System.out.println("Err:" + eacherr.getMessage() + "," + eacherr.getErrorCode());
assertNotNull(eacherr.getErrorCode());
- assertEquals("cvc-3.4.6", eacherr.getErrorCode());
+ assertEquals(XmlErrorCodes.COMPLEX_TYPE_EXTENSION$FINAL, eacherr.getErrorCode());
eacherr = (XmlError) itr.next();
System.out.println("Err:" + eacherr.getMessage());
assertNotNull(eacherr.getErrorCode());
- assertEquals("cvc-3.4.6", eacherr.getErrorCode());
+ assertEquals(XmlErrorCodes.COMPLEX_TYPE_RESTRICTION$FINAL, eacherr.getErrorCode());
}
}
@@ -231,7 +231,7 @@
XmlError eacherr = (XmlError) xme.getErrors().iterator().next();
System.out.println("error:" + eacherr.getErrorCode());
assertNotNull(eacherr.getErrorCode());
- assertEquals("cvc-3.4.6", eacherr.getErrorCode());
+ assertEquals(XmlErrorCodes.COMPLEX_TYPE_EXTENSION$FINAL, eacherr.getErrorCode());
}
}
@@ -266,7 +266,7 @@
XmlError eacherr = (XmlError) xme.getErrors().iterator().next();
System.out.println("Err:" + eacherr.getMessage());
assertNotNull(eacherr.getErrorCode());
- assertEquals("cvc-3.4.6", eacherr.getErrorCode());
+ assertEquals(XmlErrorCodes.COMPLEX_TYPE_RESTRICTION$FINAL, eacherr.getErrorCode());
}
}
@@ -311,14 +311,14 @@
Iterator itr = xme.getErrors().iterator();
XmlError eacherr = (XmlError) itr.next();
- System.out.println("Err:" + eacherr.getMessage());
+ System.out.println("Err:" + eacherr.getMessage() + "," + eacherr.getErrorCode());
assertNotNull(eacherr.getErrorCode());
- assertEquals("cvc-3.4.6", eacherr.getErrorCode());
+ assertEquals(XmlErrorCodes.COMPLEX_TYPE_EXTENSION$FINAL, eacherr.getErrorCode());
eacherr = (XmlError) itr.next();
System.out.println("Err:" + eacherr.getMessage());
assertNotNull(eacherr.getErrorCode());
- assertEquals("cvc-3.4.6", eacherr.getErrorCode());
+ assertEquals(XmlErrorCodes.COMPLEX_TYPE_RESTRICTION$FINAL, eacherr.getErrorCode());
}
}
Modified: xmlbeans/trunk/test/src/xmlobject/xmlloader/detailed/XmlStreamBeanReader.java
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/src/xmlobject/xmlloader/detailed/XmlStreamBeanReader.java?rev=170848&r1=170847&r2=170848&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/xmlobject/xmlloader/detailed/XmlStreamBeanReader.java (original)
+++ xmlbeans/trunk/test/src/xmlobject/xmlloader/detailed/XmlStreamBeanReader.java Wed May 18 17:57:44 2005
@@ -18,6 +18,7 @@
import org.apache.xmlbeans.XmlOptions;
import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlException;
+import org.apache.xmlbeans.XmlCursor;
import org.openuri.bea.samples.workshop.CreditCardDataDocument;
import javax.xml.stream.XMLInputFactory;
@@ -57,7 +58,7 @@
" </cc:customer>\n" +
" </cc:credit-card-data>";
- //from CR192525
+
public void testXMLStreamReaderLoader () throws XMLStreamException, XmlException {
XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(new ByteArrayInputStream(creditCardXmlwPrefix.getBytes()));
CreditCardDataDocument ccdoc = (CreditCardDataDocument) XmlObject.Factory.parse(reader, new XmlOptions().setDocumentType(CreditCardDataDocument.type));
@@ -65,5 +66,36 @@
}
+
+ // test for IllegalStateException thrown on using XmlStreamReader
+ public void testXmlStreamReaderException() {
+
+ XmlObject xo = XmlObject.Factory.newInstance();
+ XmlCursor xc = xo.newCursor();
+ xc.toNextToken();
+
+ xc.insertElementWithText("int", "http://openuri.org/testNumerals", "5");
+ xc.insertElementWithText("float", "http://openuri.org/testNumerals", "7.654321");
+
+ try {
+
+ XMLStreamReader xsr = xo.newXMLStreamReader();
+
+ while(xsr.hasNext())
+ {
+ xsr.next();
+ }
+ }
+ catch (XMLStreamException xse)
+ {
+ xse.printStackTrace();
+ fail("XMLStreamException thrown with XMLStreamReader usage");
+ }
+ catch (IllegalStateException ise)
+ {
+ ise.printStackTrace();
+ fail("IllegalStateException thrown with XMLStreamReader usage");
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlbeans.apache.org
For additional commands, e-mail: commits-help@xmlbeans.apache.org