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/10/12 00:39:32 UTC
cvs commit: xml-xmlbeans/v2/test/src/tools/inst2xsd/detailed ComplexDetailedTest.java DetailedLCDTest.java Inst2XsdDetailedAttrTest.java Inst2XsdDetailedOptionsTest.java Inst2XsdDetailedTest.java Inst2XsdDetailedTypeTest.java Inst2XsdMiscTest.java
daveremy 2004/10/11 15:39:32
Modified: v2/test/src/tools/inst2xsd/detailed ComplexDetailedTest.java
DetailedLCDTest.java Inst2XsdDetailedAttrTest.java
Inst2XsdDetailedOptionsTest.java
Inst2XsdDetailedTest.java
Inst2XsdDetailedTypeTest.java Inst2XsdMiscTest.java
Log:
Contributed by: Jacob Danner
Test case Updates and moddifications since xsd date-based types (gDuration) type determination will not be supported.
Revision Changes Path
1.2 +2 -2 xml-xmlbeans/v2/test/src/tools/inst2xsd/detailed/ComplexDetailedTest.java
Index: ComplexDetailedTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/tools/inst2xsd/detailed/ComplexDetailedTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ComplexDetailedTest.java 21 Sep 2004 22:15:29 -0000 1.1
+++ ComplexDetailedTest.java 11 Oct 2004 22:39:32 -0000 1.2
@@ -26,10 +26,10 @@
XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "complex" + P + "enum" + P + "enum2_rd0.xsd")));
log("-= Venetian Options =-");
runSchemaBuild(inst, common.getVenetianOptions(),
- XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "complex" + P + "enum" + P + "enum2_ss0.xsd")));
+ XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "complex" + P + "enum" + P + "enum2_vb0.xsd")));
log("-= Salami Options =-");
runSchemaBuild(inst, common.getSalamiOptions(),
- XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "complex" + P + "enum" + P + "enum2_vb0.xsd")));
+ XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "complex" + P + "enum" + P + "enum2_ss0.xsd")));
}
public void test_complex_enum_never() throws Exception {
1.2 +5 -6 xml-xmlbeans/v2/test/src/tools/inst2xsd/detailed/DetailedLCDTest.java
Index: DetailedLCDTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/tools/inst2xsd/detailed/DetailedLCDTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DetailedLCDTest.java 21 Sep 2004 22:15:29 -0000 1.1
+++ DetailedLCDTest.java 11 Oct 2004 22:39:32 -0000 1.2
@@ -25,10 +25,9 @@
// public void test_gYear() throws Exception {
//runTypeChecking(getAttrTypeXml("1999"), "gYear");
//}
-
-
-
- public void test_lcd_gYearMonth() throws Exception {
+ // NOTE: The following features are not supported by the
+ // NOTE: inst2xsd tool
+ /*public void test_lcd_gYearMonth() throws Exception {
runLCDTypeCheckTest("abc","1999-05", "string");
runLCDTypeCheckTest("1998-06", "1999-05", "gYearMonth");
@@ -56,7 +55,7 @@
runLCDTypeCheckTest("P1347Y", "P0Y1347M", "duration");
runLCDTypeCheckTest("P1347Y", "P0Y1347M0D", "duration");
runLCDTypeCheckTest("P1347Y", "-P1347M", "duration");
- }
+ } */
public void test_lcd_anyuri() throws Exception {
runLCDTypeCheckTest("abc",
@@ -64,7 +63,7 @@
runLCDTypeCheckTest("http://www.math.uio.no/faq/compression-faq/part1.html",
"http://www.example.com/doc.html#ID5", "anyURI");
runLCDTypeCheckTest("123", "www.math.uio.no/faq/compression-faq/part1.html", "string");
- runLCDTypeCheckTest("ftp://ftp.is.co.za/rfc/rfc1808.txt", "gopher://spinaltap.micro.umn.edu/00/Weather/California/Los%20Angeles", "anyURI");
+ //runLCDTypeCheckTest("ftp://ftp.is.co.za/rfc/rfc1808.txt", "gopher://spinaltap.micro.umn.edu/00/Weather/California/Los%20Angeles", "anyURI");
}
public void test_lcd_byte() throws Exception {
1.5 +24 -21 xml-xmlbeans/v2/test/src/tools/inst2xsd/detailed/Inst2XsdDetailedAttrTest.java
Index: Inst2XsdDetailedAttrTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/tools/inst2xsd/detailed/Inst2XsdDetailedAttrTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Inst2XsdDetailedAttrTest.java 21 Sep 2004 22:03:45 -0000 1.4
+++ Inst2XsdDetailedAttrTest.java 11 Oct 2004 22:39:32 -0000 1.5
@@ -25,8 +25,9 @@
// public void test_gYear() throws Exception {
//runTypeChecking(getAttrTypeXml("1999"), "gYear");
//}
-
- public void test_attrgYearMonth() throws Exception {
+ // NOTE: The following features are not supported by the
+ // NOTE: inst2xsd tool
+ /*public void test_attrgYearMonth() throws Exception {
runAttrTypeChecking(getAttrTypeXml("1999-05"), "gYearMonth");
}
@@ -40,23 +41,37 @@
public void test_attrgMonth() throws Exception {
runAttrTypeChecking(getAttrTypeXml("--02--"), "gMonth");
- }
+ } */
//THIS becomes string as expected
//public void test_attrhexBinary() throws Exception {
// runAttrTypeChecking(getAttrTypeXml("0FB7"), "hexBinary");
//}
+ //TODO: NOT COMPLETELY SURE HOW TO GET THESE WITHOUT
+ //CAUSING AN Number EXCEPTION
+ //public void test_attrdouble() throws Exception {
+ // runAttrTypeChecking(getAttrTypeXml(""), "double");
+ //}
+
+ //public void test_attrdecimal() throws Exception {
+ // runAttrTypeChecking(getAttrTypeXml(""), "decimal");
+ //}
+ //Value will become number
+ // public void test_attrgYear() throws Exception {
+ //runAttrTypeChecking(getAttrTypeXml("1999"), "gYear");
+ //}
+
public void test_attranyuri() throws Exception {
runAttrTypeChecking(getAttrTypeXml("http://www.math.uio.no/faq/compression-faq/part1.html"), "anyURI");
runAttrTypeChecking(getAttrTypeXml("http://www.example.com/doc.html#ID5"), "anyURI");
runAttrTypeChecking(getAttrTypeXml("www.math.uio.no/faq/compression-faq/part1.html"), "anyURI");
- runAttrTypeChecking(getAttrTypeXml("gopher://spinaltap.micro.umn.edu/00/Weather/California/Los%20Angeles"), "anyURI");
- runAttrTypeChecking(getAttrTypeXml("ftp://ftp.is.co.za/rfc/rfc1808.txt"), "anyURI");
- runAttrTypeChecking(getAttrTypeXml("mailto:mduerst@ifi.unizh.ch"), "string");
- runAttrTypeChecking(getAttrTypeXml("news:comp.infosystems.www.servers.unix"), "anyURI");
- runAttrTypeChecking(getAttrTypeXml("telnet://melvyl.ucop.edu/"), "anyURI");
- runAttrTypeChecking(getAttrTypeXml("./this:that"), "anyURI");
+ //runAttrTypeChecking(getAttrTypeXml("gopher://spinaltap.micro.umn.edu/00/Weather/California/Los%20Angeles"), "anyURI");
+ //runAttrTypeChecking(getAttrTypeXml("ftp://ftp.is.co.za/rfc/rfc1808.txt"), "anyURI");
+ //runAttrTypeChecking(getAttrTypeXml("mailto:mduerst@ifi.unizh.ch"), "string");
+ //runAttrTypeChecking(getAttrTypeXml("news:comp.infosystems.www.servers.unix"), "anyURI");
+ //runAttrTypeChecking(getAttrTypeXml("telnet://melvyl.ucop.edu/"), "anyURI");
+ //runAttrTypeChecking(getAttrTypeXml("./this:that"), "anyURI");
}
/**
@@ -73,19 +88,7 @@
- //TODO: NOT COMPLETELY SURE HOW TO GET THESE WITHOUT
- //CAUSING AN Number EXCEPTION
- //public void test_attrdouble() throws Exception {
- // runAttrTypeChecking(getAttrTypeXml(""), "double");
- //}
- //public void test_attrdecimal() throws Exception {
- // runAttrTypeChecking(getAttrTypeXml(""), "decimal");
- //}
- //Value will become number
- // public void test_attrgYear() throws Exception {
- //runAttrTypeChecking(getAttrTypeXml("1999"), "gYear");
- //}
public void test_attrQName() throws Exception {
1.4 +0 -8 xml-xmlbeans/v2/test/src/tools/inst2xsd/detailed/Inst2XsdDetailedOptionsTest.java
Index: Inst2XsdDetailedOptionsTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/tools/inst2xsd/detailed/Inst2XsdDetailedOptionsTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Inst2XsdDetailedOptionsTest.java 22 Sep 2004 23:46:17 -0000 1.3
+++ Inst2XsdDetailedOptionsTest.java 11 Oct 2004 22:39:32 -0000 1.4
@@ -412,12 +412,4 @@
compare(cmdLine, exp);
}
-
- public void test_no_param() throws Exception {
- XmlObject[] api = runInst2Xsd(new XmlObject[]{null}, null);
- checkLength(api, 1);
- log(api);
- Inst2Xsd.main(null);
-
- }
}
1.3 +64 -11 xml-xmlbeans/v2/test/src/tools/inst2xsd/detailed/Inst2XsdDetailedTest.java
Index: Inst2XsdDetailedTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/tools/inst2xsd/detailed/Inst2XsdDetailedTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Inst2XsdDetailedTest.java 25 Aug 2004 17:36:28 -0000 1.2
+++ Inst2XsdDetailedTest.java 11 Oct 2004 22:39:32 -0000 1.3
@@ -6,6 +6,7 @@
import java.io.IOException;
import org.apache.xmlbeans.XmlObject;
+import org.apache.xmlbeans.impl.inst2xsd.Inst2XsdOptions;
/**
* @author jacobd
@@ -34,16 +35,6 @@
}
-
-
-
-
-
-
-
-
-
-
//TODO: move to checkin QName:bug
public void test_examples_xmlnews() throws Exception {
XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "xmlnews.xml"));
@@ -87,7 +78,7 @@
log("-= Russian Options =-");
runSchemaBuild(inst, common.getRussianOptions(), new XmlObject[]{
XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "xsl_rd0.xsd")),
- XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "xsl_rd0.xsd")),
+ XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "xsl_rd1.xsd")),
});
log("-= Venetian Options =-");
runSchemaBuild(inst, common.getVenetianOptions(), new XmlObject[]{
@@ -114,6 +105,68 @@
log("-= Salami Options =-");
runSchemaBuild(inst, common.getSalamiOptions(),
XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "sampleRss092_ss0.xsd")));
+ }
+
+ public void test_types_comments() throws Exception {
+ XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "types" + P + "comments.xml"));
+
+ log("-= Russian Options =-");
+ runSchemaBuild(inst, common.getRussianOptions(),
+ XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "types" + P + "comments_rd0.xsd")));
+ log("-= Venetian Options =-");
+ runSchemaBuild(inst, common.getVenetianOptions(),
+ XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "types" + P + "comments_vb0.xsd")));
+ log("-= Salami Options =-");
+ runSchemaBuild(inst, common.getSalamiOptions(),
+ XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "types" + P + "comments_ss0.xsd")));
+ }
+
+ public void test_types_commentschoice() throws Exception {
+ XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "types" + P + "commentschoice.xml"));
+ Inst2XsdOptions opts = common.getRussianOptions();
+ opts.setUseEnumerations(Inst2XsdOptions.ENUMERATION_NEVER);
+
+ log("-= Russian Options =-");
+ runSchemaBuild(inst, opts,
+ XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "types" + P + "commentschoice_eNrd0.xsd")));
+
+ opts.setDesign(Inst2XsdOptions.DESIGN_VENETIAN_BLIND);
+ log("-= Venetian Options =-");
+ runSchemaBuild(inst, opts,
+ XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "types" + P + "commentschoice_eNvb0.xsd")));
+
+ opts.setDesign(Inst2XsdOptions.DESIGN_SALAMI_SLICE);
+ log("-= Salami Options =-");
+ runSchemaBuild(inst, opts,
+ XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "types" + P + "commentschoice_eNss0.xsd")));
+ }
+
+ /** This case fails validation because comment is not recognized */
+ public void test_types_innercomment() throws Exception {
+ XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "types" + P + "innercomment.xml"));
+
+ runSchemaBuild(inst, common.getVenetianOptions(),
+ XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "types" + P + "innercomment_vb0.xsd")));
+ }
+
+ public void test_types_nillable() throws Exception {
+ XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "types" + P + "xsinil.xml"));
+
+ log("-= Russian Options =-");
+ runSchemaBuild(inst, common.getRussianOptions(), new XmlObject[]{
+ XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "types" + P + "xsinil_rd0.xsd")),
+ XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "types" + P + "xsinil_rd1.xsd"))
+ });
+ log("-= Venetian Options =-");
+ runSchemaBuild(inst, common.getVenetianOptions(), new XmlObject[]{
+ XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "types" + P + "xsinil_vb0.xsd")),
+ XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "types" + P + "xsinil_vb1.xsd"))
+ });
+ log("-= Salami Options =-");
+ runSchemaBuild(inst, common.getSalamiOptions(), new XmlObject[]{
+ XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "types" + P + "xsinil_ss0.xsd")),
+ XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "types" + P + "xsinil_ss1.xsd"))
+ });
}
1.4 +11 -9 xml-xmlbeans/v2/test/src/tools/inst2xsd/detailed/Inst2XsdDetailedTypeTest.java
Index: Inst2XsdDetailedTypeTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/tools/inst2xsd/detailed/Inst2XsdDetailedTypeTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Inst2XsdDetailedTypeTest.java 21 Sep 2004 22:03:45 -0000 1.3
+++ Inst2XsdDetailedTypeTest.java 11 Oct 2004 22:39:32 -0000 1.4
@@ -25,8 +25,9 @@
// public void test_gYear() throws Exception {
//runTypeChecking(getTypeXml("1999"), "gYear");
//}
-
- public void test_gYearMonth() throws Exception {
+ // NOTE: The following features are not supported by the
+ // NOTE: inst2xsd tool
+ /*public void test_gYearMonth() throws Exception {
runTypeChecking(getTypeXml("1999-05"), "gYearMonth");
}
@@ -49,7 +50,7 @@
runTypeChecking(getTypeXml("P0Y1347M"), "duration");
runTypeChecking(getTypeXml("P0Y1347M0D"), "duration");
runTypeChecking(getTypeXml("-P1347M"), "duration");
- }
+ } */
//THIS becomes string as expected
//public void test_hexBinary() throws Exception {
@@ -60,12 +61,13 @@
runTypeChecking(getTypeXml("http://www.math.uio.no/faq/compression-faq/part1.html"), "anyURI");
runTypeChecking(getTypeXml("http://www.example.com/doc.html#ID5"), "anyURI");
runTypeChecking(getTypeXml("www.math.uio.no/faq/compression-faq/part1.html"), "anyURI");
- runTypeChecking(getTypeXml("gopher://spinaltap.micro.umn.edu/00/Weather/California/Los%20Angeles"), "anyURI");
- runTypeChecking(getTypeXml("ftp://ftp.is.co.za/rfc/rfc1808.txt"), "anyURI");
- runTypeChecking(getTypeXml("mailto:mduerst@ifi.unizh.ch"), "string");
- runTypeChecking(getTypeXml("news:comp.infosystems.www.servers.unix"), "anyURI");
- runTypeChecking(getTypeXml("telnet://melvyl.ucop.edu/"), "anyURI");
- runTypeChecking(getTypeXml("./this:that"), "anyURI");
+ //commenting uri per accepted tool uri
+ //runTypeChecking(getTypeXml("gopher://spinaltap.micro.umn.edu/00/Weather/California/Los%20Angeles"), "anyURI");
+ //runTypeChecking(getTypeXml("ftp://ftp.is.co.za/rfc/rfc1808.txt"), "anyURI");
+ //runTypeChecking(getTypeXml("mailto:mduerst@ifi.unizh.ch"), "string");
+ //runTypeChecking(getTypeXml("news:comp.infosystems.www.servers.unix"), "anyURI");
+ //runTypeChecking(getTypeXml("telnet://melvyl.ucop.edu/"), "anyURI");
+ //runTypeChecking(getTypeXml("./this:that"), "anyURI");
}
/**
1.2 +6 -2 xml-xmlbeans/v2/test/src/tools/inst2xsd/detailed/Inst2XsdMiscTest.java
Index: Inst2XsdMiscTest.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/src/tools/inst2xsd/detailed/Inst2XsdMiscTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Inst2XsdMiscTest.java 22 Sep 2004 23:46:17 -0000 1.1
+++ Inst2XsdMiscTest.java 11 Oct 2004 22:39:32 -0000 1.2
@@ -67,7 +67,8 @@
/*
TODO: Redirect output these tests cause problems
with the xml log
- public void test_main_license() throws Exception {
+ */
+ /*public void test_main_license() throws Exception {
Inst2Xsd.main(new String[]{"-license"});
}
public void test_main_noarg_enum() throws Exception {
@@ -93,7 +94,10 @@
}
public void test_main_noarg_help() throws Exception {
Inst2Xsd.main(new String[]{"-help"});
- } */
+ }
+ public void test_no_param() throws Exception {
+ Inst2Xsd.main(null);
+ }*/
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlbeans.apache.org
For additional commands, e-mail: commits-help@xmlbeans.apache.org