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 2004/11/30 20:19:35 UTC
cvs commit: xml-xmlbeans/v2/test/src/scomp/namespace/detailed AttributeWC.java
cezar 2004/11/30 11:19:35
Modified: v2/test/src/scomp/attributes/detailed GlobalAttrDefault.java
LocalAttrFixedDefault.java
v2/test/src/scomp/common BaseCase.java
v2/test/src/scomp/contentType/complex/detailed
AnonymousTest.java EmptyContentTest.java
NamedTest.java
v2/test/src/scomp/contentType/complex/modelGroup/detailed
AllTest.java
v2/test/src/scomp/contentType/simple/detailed
SimpleType.java
v2/test/src/scomp/derivation/extension/detailed
ComplexContentExtensionTest.java
v2/test/src/scomp/derivation/restriction/detailed
AttributeRestriction.java
SimpleContentRestrictionTest.java
v2/test/src/scomp/idConstraint/detailed KeyKeyref.java
v2/test/src/scomp/namespace/detailed AttributeWC.java
Log:
Contributed by: Yana Kadiyska. Fixing tests on XmlObject equality
Revision Changes Path
1.3 +4 -1 xml-xmlbeans/v2/test/src/scomp/attributes/detailed/GlobalAttrDefault.java
Index: GlobalAttrDefault.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/attributes/detailed/GlobalAttrDefault.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GlobalAttrDefault.java 25 Aug 2004 20:58:56 -0000 1.2
+++ GlobalAttrDefault.java 30 Nov 2004 19:19:34 -0000 1.3
@@ -18,6 +18,7 @@
import xbean.scomp.attribute.globalAttrDefault.GlobalAttrDefaultT;
import scomp.common.BaseCase;
import org.apache.xmlbeans.XmlException;
+import org.apache.xmlbeans.XmlErrorCodes;
/**
* @owner: ykadiysk
@@ -74,7 +75,9 @@
GlobalAttrDefaultDocDocument.Factory.parse("<pre:GlobalAttrDefaultDoc" +
" xmlns:pre=\"http://xbean/scomp/attribute/GlobalAttrDefault\" " +
"pre:testattributeInt=\"\"/>").getGlobalAttrDefaultDoc();
- String[] errExpected=new String[]{"cvc-attr"};
+ String[] errExpected=new String[]{
+ XmlErrorCodes.DECIMAL
+ };
assertTrue(!testDoc.validate(validateOptions));
assertEquals(1, errorList.size());
showErrors();
1.2 +10 -9 xml-xmlbeans/v2/test/src/scomp/attributes/detailed/LocalAttrFixedDefault.java
Index: LocalAttrFixedDefault.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/attributes/detailed/LocalAttrFixedDefault.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LocalAttrFixedDefault.java 16 Aug 2004 18:01:53 -0000 1.1
+++ LocalAttrFixedDefault.java 30 Nov 2004 19:19:34 -0000 1.2
@@ -17,6 +17,7 @@
import scomp.common.BaseCase;
import xbean.scomp.attribute.localAttrFixedDefault.LocalAttrFixedDefaultT;
import xbean.scomp.attribute.localAttrFixedDefault.LocalAttrFixedDefaultDocument;
+import org.apache.xmlbeans.XmlErrorCodes;
/**
* @owner: ykadiysk
@@ -37,16 +38,16 @@
.addNewLocalAttrFixedDefault();
assertTrue(testDoc.validate());
assertEquals(2,testDoc.getAttDefault().intValue());
- //what does it mean "to add a fixed value"?
- //in either case, the second case should be valid
+ //second fixed value is ignored
testDoc.setAttFixed("NEWXBeanAttrStr");
- try {
- assertTrue(testDoc.validate(validateOptions));
- }
- catch (Throwable t) {
- showErrors();
- throw t;
- }
+ assertTrue(!testDoc.validate(validateOptions));
+ showErrors();
+ String[] errExpected = new String[]{
+ XmlErrorCodes.ATTR_LOCALLY_VALID$FIXED
+ };
+ assertTrue(compareErrorCodes(errExpected));
+
+
testDoc.setAttFixed("XBeanAttrStr");
try {
assertTrue(testDoc.validate(validateOptions));
1.7 +1 -1 xml-xmlbeans/v2/test/src/scomp/common/BaseCase.java
Index: BaseCase.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/common/BaseCase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BaseCase.java 26 Sep 2004 05:08:38 -0000 1.6
+++ BaseCase.java 30 Nov 2004 19:19:34 -0000 1.7
@@ -87,7 +87,7 @@
public String stringOfCodes(String[] errorCodes, ArrayList actual_errorCodes)
{
StringBuffer res=new StringBuffer();
- res.append("\n Expected codes(from LTGfmt file):\n");
+ res.append("\n Expected codes:\n");
int i=0;
for (;i < errorCodes.length; i++ )
res.append( errorCodes[i]+"\n" );
1.3 +11 -4 xml-xmlbeans/v2/test/src/scomp/contentType/complex/detailed/AnonymousTest.java
Index: AnonymousTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/contentType/complex/detailed/AnonymousTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AnonymousTest.java 18 Aug 2004 20:45:06 -0000 1.2
+++ AnonymousTest.java 30 Nov 2004 19:19:34 -0000 1.3
@@ -70,13 +70,20 @@
assertEquals(null, testElt.xgetChild1());
testElt.setChild2(new BigInteger("5"));
assertEquals(5, testElt.getChild2().intValue());
- assertEquals(
- XmlInteger.Factory.parse("<xml-fragment>5</xml-fragment>"),
- testElt.xgetChild2());
+ assertTrue(
+ XmlInteger.Factory.parse("<xml-fragment>5</xml-fragment>")
+ .valueEquals(
+ testElt.xgetChild2())
+ );
XmlCursor cur = testElt.newCursor();
+ cur.toFirstContentToken();
cur.insertChars("Random mixed content");
testElt.setChild3(new BigInteger("1"));
- assertEquals("", testElt.xmlText());
+ assertEquals("<xml-fragment>Random mixed content" +
+ "<child2>5</child2>" +
+ "<child3>1</child3>" +
+ "</xml-fragment>",
+ testElt.xmlText());
testElt.xsetChild2(XmlInteger.Factory.parse("3"));
assertEquals("", testElt.xmlText());
1.5 +1 -2 xml-xmlbeans/v2/test/src/scomp/contentType/complex/detailed/EmptyContentTest.java
Index: EmptyContentTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/contentType/complex/detailed/EmptyContentTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- EmptyContentTest.java 15 Sep 2004 19:14:21 -0000 1.4
+++ EmptyContentTest.java 30 Nov 2004 19:19:34 -0000 1.5
@@ -48,8 +48,7 @@
expected1.setStringValue("foobar");
System.out.println( expected.equals(expected1));
- //ERIC says this is a BUG
- assertEquals( expected , elt.xgetEmptyAttr());
+ assertTrue( expected.valueEquals(elt.xgetEmptyAttr()) );
elt.unsetEmptyAttr();
assertTrue(!elt.isSetEmptyAttr());
1.3 +25 -14 xml-xmlbeans/v2/test/src/scomp/contentType/complex/detailed/NamedTest.java
Index: NamedTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/contentType/complex/detailed/NamedTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NamedTest.java 4 Nov 2004 00:25:32 -0000 1.2
+++ NamedTest.java 30 Nov 2004 19:19:34 -0000 1.3
@@ -47,22 +47,20 @@
assertEquals("<xml-fragment><child2>5</child2>" +
"<child3>1</child3></xml-fragment>",
testElt.xmlText());
- testElt.setChild1(BigInteger.ONE);
- testElt.xsetChild2(
- XmlInteger.Factory.parse("<xml-fragment>3</xml-fragment>"));
+ testElt.setChild1(BigInteger.ONE);
+ testElt.xsetChild2(XmlInteger.Factory.parse("<xml-fragment>3</xml-fragment>"));
assertEquals("<xml-fragment><child1>1</child1><child2>3</child2>" +
"<child3>1</child3></xml-fragment>",
testElt.xmlText());
- try {
+ try {
assertTrue(testElt.validate(validateOptions));
- }
- catch (Throwable t) {
+ } catch (Throwable t) {
showErrors();
throw t;
}
}
- public void testMixedAnonymous() throws Exception {
+ public void testMixedAnonymous() throws Throwable {
NamedMixedEltDocument doc =
NamedMixedEltDocument.Factory.newInstance();
@@ -75,17 +73,30 @@
assertEquals(5, testElt.getChild2().intValue());
XmlInteger expected = XmlInteger.Factory.newInstance();
expected.setBigIntegerValue(new BigInteger("5"));
- assertEquals(expected,
- testElt.xgetChild2());
+ assertTrue(expected.valueEquals(testElt.xgetChild2()));
+
XmlCursor cur = testElt.newCursor();
+ cur.toFirstContentToken();
cur.insertChars("Random mixed content");
testElt.setChild3(new BigInteger("1"));
- assertEquals("", testElt.xmlText());
-
- testElt.xsetChild2(XmlInteger.Factory.parse("3"));
- assertEquals("", testElt.xmlText());
- assertTrue(testElt.validate());
+ assertEquals("<xml-fragment>Random mixed content" +
+ "<child2>5</child2><child3>1</child3></xml-fragment>",
+ testElt.xmlText());
+ testElt.xsetChild2(XmlInteger.Factory.parse("<xml-fragment>3</xml-fragment>"));
+ assertEquals("<xml-fragment>" +
+ "Random mixed content" +
+ "<child2>3</child2>" +
+ "<child3>1</child3>" +
+ "</xml-fragment>",
+ testElt.xmlText());
+ testElt.xsetChild1(XmlInteger.Factory.parse("<xml-fragment>0</xml-fragment>"));
+ try {
+ assertTrue(testElt.validate(validateOptions));
+ } catch (Throwable t) {
+ showErrors();
+ throw t;
+ }
}
}
1.4 +1 -0 xml-xmlbeans/v2/test/src/scomp/contentType/complex/modelGroup/detailed/AllTest.java
Index: AllTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/contentType/complex/modelGroup/detailed/AllTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AllTest.java 15 Sep 2004 19:14:21 -0000 1.3
+++ AllTest.java 30 Nov 2004 19:19:34 -0000 1.4
@@ -87,6 +87,7 @@
//all will be good: why 2 errors?
String[] errExpected = new String[]{
XmlErrorCodes.ELEM_COMPLEX_TYPE_LOCALLY_VALID$EXPECTED_DIFFERENT_ELEMENT,
+ XmlErrorCodes.ELEM_COMPLEX_TYPE_LOCALLY_VALID$ELEMENT_NOT_ALLOWED,
XmlErrorCodes.ELEM_COMPLEX_TYPE_LOCALLY_VALID$EXPECTED_ELEMENT
};
assertTrue(compareErrorCodes(errExpected));
1.3 +8 -2 xml-xmlbeans/v2/test/src/scomp/contentType/simple/detailed/SimpleType.java
Index: SimpleType.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/contentType/simple/detailed/SimpleType.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SimpleType.java 25 Aug 2004 20:58:59 -0000 1.2
+++ SimpleType.java 30 Nov 2004 19:19:34 -0000 1.3
@@ -16,6 +16,7 @@
import scomp.common.BaseCase;
import xbean.scomp.contentType.simpleType.PantSizeEltDocument;
+import org.apache.xmlbeans.XmlErrorCodes;
/**
* @owner: ykadiysk
@@ -29,13 +30,18 @@
//size> max inclusive
assertTrue(!size.validate(validateOptions));
showErrors();
- String[] errExpected = new String[]{"cvc-attribute"};
+ String[] errExpected = new String[]{
+ XmlErrorCodes.DATATYPE_MAX_INCLUSIVE_VALID
+ };
assertTrue(compareErrorCodes(errExpected));
size.setPantSizeElt(-1);
showErrors();
+ clearErrors();
assertTrue(!size.validate(validateOptions));
- errExpected = new String[]{"cvc-attribute"};
+ errExpected = new String[]{
+ XmlErrorCodes.DATATYPE_VALID$PATTERN_VALID
+ };
assertTrue(compareErrorCodes(errExpected));
1.6 +11 -10 xml-xmlbeans/v2/test/src/scomp/derivation/extension/detailed/ComplexContentExtensionTest.java
Index: ComplexContentExtensionTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/derivation/extension/detailed/ComplexContentExtensionTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ComplexContentExtensionTest.java 24 Sep 2004 20:50:25 -0000 1.5
+++ ComplexContentExtensionTest.java 30 Nov 2004 19:19:34 -0000 1.6
@@ -98,6 +98,10 @@
assertEquals(new BigInteger("10"), elt.getChild1());
assertEquals("foobar", elt.getChild2Array()[0]);
elt.unsetChild1();
+
+ XmlInteger expected = XmlInteger.Factory.newInstance();
+ expected.setBigIntegerValue(BigInteger.ONE);
+ assertTrue( expected.valueEquals(elt.xgetChild3Array()[0]) );
elt.removeExtraEltInt(0);
elt.removeChild2(0);
clearErrors();
@@ -111,21 +115,18 @@
}
- XmlInteger expected = XmlInteger.Factory.newInstance();
- expected.setBigIntegerValue(BigInteger.ONE);
- assertEquals(expected, elt.xgetChild3Array()[0]);
+
+ elt.addExtraEltInt(3);
expected.setBigIntegerValue(BigInteger.ZERO);
- assertEquals(expected, elt.xgetChild3Array()[1]);
- assertEquals(3, elt.getExtraEltIntArray()[0]);
+ assertTrue( expected.valueEquals(elt.xgetChild3Array()[1]) );
+ assertEquals(3, elt.getExtraEltIntArray()[0]);
assertEquals(3, elt.getExtraEltIntArray(0));
clearErrors();
assertTrue(!doc.validate(validateOptions));
showErrors();
errExpected = new String[]{
- XmlErrorCodes.ELEM_COMPLEX_TYPE_LOCALLY_VALID$ELEMENT_NOT_ALLOWED,
- XmlErrorCodes.ELEM_COMPLEX_TYPE_LOCALLY_VALID$ELEMENT_NOT_ALLOWED,
XmlErrorCodes.ELEM_COMPLEX_TYPE_LOCALLY_VALID$ELEMENT_NOT_ALLOWED
- };
+ };
assertTrue(compareErrorCodes(errExpected));
elt.removeExtraEltInt(0);
try {
@@ -137,9 +138,9 @@
}
XmlString expected1 = XmlString.Factory.newInstance();
expected1.setStringValue("extra1");
- assertEquals(expected1, elt.xgetExtraEltStrArray(0));
+ assertTrue( expected1.valueEquals(elt.xgetExtraEltStrArray(0)) );
expected1.setStringValue("extra2");
- assertEquals(expected1, elt.xgetExtraEltStrArray()[1]);
+ assertTrue( expected1.valueEquals(elt.xgetExtraEltStrArray()[1]) );
}
1.5 +1 -1 xml-xmlbeans/v2/test/src/scomp/derivation/restriction/detailed/AttributeRestriction.java
Index: AttributeRestriction.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/derivation/restriction/detailed/AttributeRestriction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AttributeRestriction.java 18 Sep 2004 01:16:11 -0000 1.4
+++ AttributeRestriction.java 30 Nov 2004 19:19:34 -0000 1.5
@@ -50,7 +50,7 @@
assertEquals("b", elt.getB());
XmlString expected=XmlString.Factory.newInstance();
expected.setStringValue("c2");
- assertEquals(expected, elt.xgetC());
+ assertTrue ( expected.valueEquals(elt.xgetC()) );
}
public void testAttributeDEF() throws Throwable {
1.4 +4 -1 xml-xmlbeans/v2/test/src/scomp/derivation/restriction/detailed/SimpleContentRestrictionTest.java
Index: SimpleContentRestrictionTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/derivation/restriction/detailed/SimpleContentRestrictionTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SimpleContentRestrictionTest.java 25 Aug 2004 20:59:06 -0000 1.3
+++ SimpleContentRestrictionTest.java 30 Nov 2004 19:19:34 -0000 1.4
@@ -17,6 +17,7 @@
import xbean.scomp.derivation.simpleExtension.SimpleRestrictionEltDocument;
import xbean.scomp.derivation.simpleExtension.SimpleRestrictionT;
import scomp.common.BaseCase;
+import org.apache.xmlbeans.XmlErrorCodes;
/**
* @owner: ykadiysk
@@ -45,7 +46,9 @@
assertTrue(!doc.validate(validateOptions));
showErrors();
- String[] errExpected = new String[]{"cvc-attribute"};
+ String[] errExpected = new String[]{
+ XmlErrorCodes.DATATYPE_MAX_INCLUSIVE_VALID
+ };
assertTrue(compareErrorCodes(errExpected));
1.7 +9 -9 xml-xmlbeans/v2/test/src/scomp/idConstraint/detailed/KeyKeyref.java
Index: KeyKeyref.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/idConstraint/detailed/KeyKeyref.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- KeyKeyref.java 30 Sep 2004 20:57:50 -0000 1.6
+++ KeyKeyref.java 30 Nov 2004 19:19:35 -0000 1.7
@@ -144,15 +144,15 @@
*/
public void testKeyIllegal() throws Throwable {
String input =
- "<KeyProductList xmlns=\"http://xbean/scomp/idConstraint/Constraint\">" +
- " <product>" +
- " <id>FooBarChart</id>" +
- "</product>" +
- "<product>" +
- " <department name=\"7345\"/>" +
- " <id>FooBarChart</id>" +
- "</product>" +
- "</KeyProductList>";
+ "<xs:KeyProductList xmlns:xs=\"http://xbean/scomp/idConstraint/Constraint\">" +
+ " <xs:product>" +
+ " <xs:id>FooBarChart</xs:id>" +
+ "</xs:product>" +
+ "<xs:product>" +
+ " <xs:department xs:name=\"7345\"/>" +
+ " <xs:id>FooBarChart</xs:id>" +
+ "</xs:product>" +
+ "</xs:KeyProductList>";
KeyProductListDocument doc = KeyProductListDocument.Factory.parse(input);
1.6 +3 -1 xml-xmlbeans/v2/test/src/scomp/namespace/detailed/AttributeWC.java
Index: AttributeWC.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/namespace/detailed/AttributeWC.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AttributeWC.java 24 Sep 2004 20:50:25 -0000 1.5
+++ AttributeWC.java 30 Nov 2004 19:19:35 -0000 1.6
@@ -291,7 +291,9 @@
" foo:LocalAttr=\"foo\"/>");
assertTrue(!doc.validate(validateOptions));
showErrors();
- String[] errExpected = new String[]{"cvc-attribute"};
+ String[] errExpected = new String[]{
+ XmlErrorCodes.DECIMAL
+ };
assertTrue(compareErrorCodes(errExpected));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlbeans.apache.org
For additional commands, e-mail: commits-help@xmlbeans.apache.org