You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlbeans.apache.org by da...@apache.org on 2004/11/08 23:49:09 UTC
cvs commit: xml-xmlbeans/v2/test/src/scomp/derivation/restriction/facets/detailed FacetRestrictionTest.java FacetsTest.java
daveremy 2004/11/08 14:49:09
Modified: v2/test/cases/xbean/scomp/derivation/facets Facets.xsd
v2/test/src/scomp/derivation/restriction/facets/detailed
FacetsTest.java
Added: v2/test/cases/xbean/scomp/derivation/facets
FacetRestriction.xsd
v2/test/src/scomp/derivation/restriction/facets/detailed
FacetRestrictionTest.java
Log:
Contributed by:Yana Kadiyska. Adding facet restriction tests
Revision Changes Path
1.2 +2 -2 xml-xmlbeans/v2/test/cases/xbean/scomp/derivation/facets/Facets.xsd
Index: Facets.xsd
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/cases/xbean/scomp/derivation/facets/Facets.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Facets.xsd 4 Nov 2004 00:25:32 -0000 1.1
+++ Facets.xsd 8 Nov 2004 22:49:08 -0000 1.2
@@ -50,8 +50,8 @@
<xs:simpleType name="DigitsT">
<xs:restriction base="xs:decimal">
- <xs:totalDigits value="3"/>
- <xs:fractionDigits value="1"/>
+ <xs:totalDigits value="4"/>
+ <xs:fractionDigits value="2"/>
</xs:restriction>
</xs:simpleType>
1.1 xml-xmlbeans/v2/test/cases/xbean/scomp/derivation/facets/FacetRestriction.xsd
Index: FacetRestriction.xsd
===================================================================
<xs:schema
xmlns:xs="http://www.w3.org/2001/XMLSchema"
targetNamespace="http://xbean/scomp/derivation/facets/FacetRestriction"
xmlns="http://xbean/scomp/derivation/facets/FacetRestriction"
xmlns:base="http://xbean/scomp/derivation/facets/Facets"
>
<xs:simpleType name="MinMaxInclusiveT">
<xs:restriction base="base:MinMaxInclusiveT">
<xs:minInclusive value="3"/>
<xs:maxInclusive value="9"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="MinMaxInclusiveDateT">
<xs:restriction base="base:MinMaxInclusiveDateT">
<xs:minInclusive value="2003-12-11"/>
<xs:maxInclusive value="2003-12-23"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="MinMaxExclusiveT">
<xs:restriction base="base:MinMaxExclusiveT">
<xs:minExclusive value="3"/>
<xs:maxExclusive value="9"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="MinMaxExclusiveDateT">
<xs:restriction base="base:MinMaxExclusiveDateT">
<xs:minExclusive value="2003-12-11"/>
<xs:maxExclusive value="2003-12-24"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="LengthT">
<xs:restriction base="base:LengthT">
<xs:length value="1"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="MinMaxLengthT">
<xs:restriction base="base:MinMaxLengthT">
<xs:minLength value="3"/>
<xs:maxLength value="4"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="DigitsT">
<xs:restriction base="base:DigitsT">
<xs:totalDigits value="3"/>
<xs:fractionDigits value="1"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="WST">
<xs:restriction base="base:WST">
<xs:whiteSpace value="replace"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="EnumT">
<xs:restriction base="base:EnumT">
<xs:enumeration value="a"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="PatternT">
<xs:restriction base="base:PatternT">
<xs:pattern value="(a[^bc]d){2}"/>
</xs:restriction>
</xs:simpleType>
<xs:element name="MinMaxInclusiveElt" type="MinMaxInclusiveT"/>
<xs:element name="MinMaxInclusiveDateElt" type="MinMaxInclusiveDateT"/>
<xs:element name="MinMaxExclusiveElt" type="MinMaxExclusiveT"/>
<xs:element name="MinMaxExclusiveDateElt" type="MinMaxExclusiveDateT"/>
<xs:element name="LengthElt" type="LengthT"/>
<xs:element name="MinMaxLengthElt" type="MinMaxLengthT"/>
<xs:element name="DigitsElt" type="DigitsT"/>
<xs:element name="WSElt" type="WST"/>
<xs:element name="EnumElt" type="EnumT"/>
<xs:element name="PatternElt" type="PatternT"/>
</xs:schema>
1.2 +3 -3 xml-xmlbeans/v2/test/src/scomp/derivation/restriction/facets/detailed/FacetsTest.java
Index: FacetsTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/scomp/derivation/restriction/facets/detailed/FacetsTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FacetsTest.java 4 Nov 2004 00:25:32 -0000 1.1
+++ FacetsTest.java 8 Nov 2004 22:49:08 -0000 1.2
@@ -190,11 +190,11 @@
String[] errExpected = new String[]{
XmlErrorCodes.DATATYPE_TOTAL_DIGITS_VALID};
- doc.setDigitsElt(new BigDecimal("234.5"));
+ doc.setDigitsElt(new BigDecimal("234.25"));
assertTrue(!doc.validate(validateOptions));
assertTrue(compareErrorCodes(errExpected));
- doc.setDigitsElt(new BigDecimal("12.3"));
+ doc.setDigitsElt(new BigDecimal("12.13"));
try {
assertTrue(doc.validate(validateOptions));
} catch (Throwable t) {
@@ -204,7 +204,7 @@
clearErrors();
errExpected = new String[]{
XmlErrorCodes.DATATYPE_FRACTION_DIGITS_VALID};
- doc.setDigitsElt(new BigDecimal(".45"));
+ doc.setDigitsElt(new BigDecimal(".145"));
assertTrue(!doc.validate(validateOptions));
assertTrue(compareErrorCodes(errExpected));
1.1 xml-xmlbeans/v2/test/src/scomp/derivation/restriction/facets/detailed/FacetRestrictionTest.java
Index: FacetRestrictionTest.java
===================================================================
package scomp.derivation.restriction.facets.detailed;
import org.apache.xmlbeans.XmlErrorCodes;
import xbean.scomp.derivation.facets.facetRestriction.*;
import scomp.common.BaseCase;
import java.util.TimeZone;
import java.util.Calendar;
import java.util.GregorianCalendar;
import java.math.BigDecimal;
/**
* Date: Nov 8, 2004
* Time: 11:34:46 AM
*
* @owner ykadiysk
*/
public class FacetRestrictionTest extends BaseCase {
public void testMinMaxInclusiveElt() throws Throwable {
MinMaxInclusiveEltDocument doc =
MinMaxInclusiveEltDocument.Factory.newInstance();
doc.setMinMaxInclusiveElt(3);
try {
assertTrue(doc.validate(validateOptions));
} catch (Throwable t) {
showErrors();
throw t;
}
String[] errExpected = new String[]{
XmlErrorCodes.DATATYPE_MIN_INCLUSIVE_VALID};
doc.setMinMaxInclusiveElt(2);
assertTrue(!doc.validate(validateOptions));
assertTrue(compareErrorCodes(errExpected));
clearErrors();
errExpected = new String[]{
XmlErrorCodes.DATATYPE_MAX_INCLUSIVE_VALID};
doc.setMinMaxInclusiveElt(10);
assertTrue(!doc.validate(validateOptions));
assertTrue(compareErrorCodes(errExpected));
}
public void testMinMaxInclusiveDateElt() throws Throwable {
MinMaxInclusiveDateEltDocument doc =
MinMaxInclusiveDateEltDocument.Factory.newInstance();
TimeZone tz = TimeZone.getDefault();
Calendar c = new GregorianCalendar(tz);
c.set(2003, 11, 22);
doc.setMinMaxInclusiveDateElt(c);
try {
assertTrue(doc.validate(validateOptions));
} catch (Throwable t) {
showErrors();
throw t;
}
c = new GregorianCalendar(2003, 11, 24);
doc.setMinMaxInclusiveDateElt(c);
String[] errExpected = new String[]{
XmlErrorCodes.DATATYPE_MAX_INCLUSIVE_VALID};
assertTrue(!doc.validate(validateOptions));
assertTrue(compareErrorCodes(errExpected));
}
public void testMinMaxExclusiveElt() throws Throwable {
MinMaxExclusiveEltDocument doc =
MinMaxExclusiveEltDocument.Factory.newInstance();
String[] errExpected = new String[]{
XmlErrorCodes.DATATYPE_MIN_EXCLUSIVE_VALID};
doc.setMinMaxExclusiveElt(3);
assertTrue(!doc.validate(validateOptions));
assertTrue(compareErrorCodes(errExpected));
clearErrors();
doc.setMinMaxExclusiveElt(2);
try {
assertTrue(doc.validate(validateOptions));
} catch (Throwable t) {
showErrors();
throw t;
}
doc.setMinMaxExclusiveElt(10);
try {
assertTrue(doc.validate(validateOptions));
} catch (Throwable t) {
showErrors();
throw t;
}
}
public void testMinMaxExclusiveDateElt() throws Throwable {
MinMaxExclusiveDateEltDocument doc = MinMaxExclusiveDateEltDocument.Factory.newInstance();
Calendar c = new GregorianCalendar(2003, 11, 24);
doc.setMinMaxExclusiveDateElt(c);
String[] errExpected = new String[]{
XmlErrorCodes.DATATYPE_MAX_EXCLUSIVE_VALID};
assertTrue(!doc.validate(validateOptions));
assertTrue(compareErrorCodes(errExpected));
clearErrors();
c = new GregorianCalendar(2003, 11, 25);
doc.setMinMaxExclusiveDateElt(c);
try {
assertTrue(doc.validate(validateOptions));
} catch (Throwable t) {
showErrors();
throw t;
}
}
public void testLengthElt() throws Throwable {
LengthEltDocument doc = LengthEltDocument.Factory.newInstance();
doc.setLengthElt("foobar");
String[] errExpected = new String[]{
XmlErrorCodes.DATATYPE_LENGTH_VALID$STRING};
assertTrue(!doc.validate(validateOptions));
assertTrue(compareErrorCodes(errExpected));
doc.setLengthElt("fo");
clearErrors();
assertTrue(!doc.validate(validateOptions));
assertTrue(compareErrorCodes(errExpected));
doc.setLengthElt("f");
try {
assertTrue(doc.validate(validateOptions));
} catch (Throwable t) {
showErrors();
throw t;
}
}
public void testMinMaxLengthElt() throws Throwable {
MinMaxLengthEltDocument doc = MinMaxLengthEltDocument.Factory.newInstance();
String[] errExpected = new String[]{
XmlErrorCodes.DATATYPE_MAX_LENGTH_VALID$STRING};
doc.setMinMaxLengthElt("fooba");
assertTrue(!doc.validate(validateOptions));
assertTrue(compareErrorCodes(errExpected));
doc.setMinMaxLengthElt("fo");
errExpected = new String[]{
XmlErrorCodes.DATATYPE_MIN_LENGTH_VALID$STRING};
clearErrors();
assertTrue(!doc.validate(validateOptions));
assertTrue(compareErrorCodes(errExpected));
doc.setMinMaxLengthElt("foo");
try {
assertTrue(doc.validate(validateOptions));
} catch (Throwable t) {
showErrors();
throw t;
}
doc.setMinMaxLengthElt("foob");
try {
assertTrue(doc.validate(validateOptions));
} catch (Throwable t) {
showErrors();
throw t;
}
}
public void testDigitsElt() throws Throwable {
DigitsEltDocument doc = DigitsEltDocument.Factory.newInstance();
String[] errExpected = new String[]{
XmlErrorCodes.DATATYPE_TOTAL_DIGITS_VALID};
doc.setDigitsElt(new BigDecimal("122.2"));
assertTrue(!doc.validate(validateOptions));
assertTrue(compareErrorCodes(errExpected));
doc.setDigitsElt(new BigDecimal("12.3"));
try {
assertTrue(doc.validate(validateOptions));
} catch (Throwable t) {
showErrors();
throw t;
}
clearErrors();
errExpected = new String[]{
XmlErrorCodes.DATATYPE_FRACTION_DIGITS_VALID};
doc.setDigitsElt(new BigDecimal("2.45"));
assertTrue(!doc.validate(validateOptions));
assertTrue(compareErrorCodes(errExpected));
}
public void testWSElt() throws Throwable {
fail("do this test");
}
public void testEnumElt() throws Throwable {
EnumEltDocument doc = EnumEltDocument.Factory.newInstance();
doc.setEnumElt(EnumT.A);
try {
assertTrue(doc.validate(validateOptions));
} catch (Throwable t) {
showErrors();
throw t;
}
doc = EnumEltDocument.Factory.parse("<EnumElt " +
"xmlns=\"http://xbean/scomp/derivation/facets/FacetRestriction\">" +
"b" +
"</EnumElt>");
String[] errExpected = new String[]{
XmlErrorCodes.DATATYPE_ENUM_VALID};
assertTrue(!doc.validate(validateOptions));
assertTrue(compareErrorCodes(errExpected));
}
public void testPatternElt() throws Throwable {
PatternEltDocument doc = PatternEltDocument.Factory.newInstance();
doc.setPatternElt("aedafd");
try {
assertTrue(doc.validate(validateOptions));
} catch (Throwable t) {
showErrors();
throw t;
}
String[] errExpected = new String[]{
XmlErrorCodes.DATATYPE_VALID$PATTERN_VALID};
doc.setPatternElt("aedaedaed");
assertTrue(!doc.validate(validateOptions));
assertTrue(compareErrorCodes(errExpected));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlbeans.apache.org
For additional commands, e-mail: commits-help@xmlbeans.apache.org