You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ki...@apache.org on 2019/01/18 23:08:48 UTC
svn commit: r1851656 [13/28] - in /xmlbeans/trunk: ./ external/ lib/
resources/ resources/typeimpl/ resources/typeimpl/org/
resources/typeimpl/org/apache/ resources/typeimpl/org/apache/xmlbeans/
resources/typeimpl/org/apache/xmlbeans/impl/ resources/ty...
Modified: xmlbeans/trunk/test/src/tools/inst2xsd/common/Inst2XsdTestBase.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/tools/inst2xsd/common/Inst2XsdTestBase.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/tools/inst2xsd/common/Inst2XsdTestBase.java (original)
+++ xmlbeans/trunk/test/src/tools/inst2xsd/common/Inst2XsdTestBase.java Fri Jan 18 23:08:44 2019
@@ -14,124 +14,81 @@
*/
package tools.inst2xsd.common;
+import common.Common;
import org.apache.xmlbeans.*;
import org.apache.xmlbeans.impl.inst2xsd.Inst2Xsd;
import org.apache.xmlbeans.impl.inst2xsd.Inst2XsdOptions;
import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
+import tools.xml.XmlComparator;
-import java.util.Collection;
import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.Collection;
-import tools.xml.XmlComparator;
-import common.Common;
+import static org.junit.Assert.assertNotNull;
public class Inst2XsdTestBase extends Common {
public static tools.inst2xsd.common.Inst2XsdCommon common;
- public static boolean _verbose = true;
+ private static boolean _verbose = true;
- public static final String fwroot = FWROOT;
- public static String caseroot = XBEAN_CASE_ROOT;
+ private static String caseroot = XBEAN_CASE_ROOT;
//location of files under "cases folder"
- public static String miscDir = caseroot + P + "tools";
- public static String inst2xsdDir = miscDir + P + "inst2xsd" + P;
- public static String OPTION_CASES_DIR = inst2xsdDir + P + "options" + P;
- public static String SCHEMA_CASES_DIR = inst2xsdDir + P + "schema" + P;
- public static String VALIDATION_CASES_DIR = inst2xsdDir + P + "validation" + P;
- public static final String BASEXML = OPTION_CASES_DIR + "base.xml";
- public static final String EXPBASEXML = OPTION_CASES_DIR + "base0.xsd";
-
-
- private static String base_start = "<a xmlns=\"typeTests\">";
- private static String base_end = "</a>";
+ private static String miscDir = caseroot + P + "tools";
+ private static String inst2xsdDir = miscDir + P + "inst2xsd" + P;
+ protected static String OPTION_CASES_DIR = inst2xsdDir + P + "options" + P;
+ protected static String SCHEMA_CASES_DIR = inst2xsdDir + P + "schema" + P;
+ protected static final String BASEXML = OPTION_CASES_DIR + "base.xml";
+ protected static final String EXPBASEXML = OPTION_CASES_DIR + "base0.xsd";
- private static String attr_base_start = "<a xmlns=\"attrTests\" a=\"";
- private static String attr_base_end = "\" />";
-
- public Inst2XsdTestBase(String name) {
- super(name);
- }
-
- public static final String test_getRootFilePath() throws IllegalStateException {
- String root = System.getProperty("xbean.rootdir");
- log("xbean.rootdir: " + root);
- if (root == null)
- throw new IllegalStateException("xbean.rootdir system property not found");
-
- return root;
- }
-
-
- public XmlObject getTypeXml(String val) throws Exception {
+ protected XmlObject getTypeXml(String val) throws Exception {
return XmlObject.Factory.parse(setTypeVal(val));
}
- public String setTypeVal(String val) {
+ private String setTypeVal(String val) {
+ String base_start = "<a xmlns=\"typeTests\">";
+ String base_end = "</a>";
return base_start + val + base_end;
}
- public XmlObject getAttrTypeXml(String val) throws Exception {
+ protected XmlObject getAttrTypeXml(String val) throws Exception {
return XmlObject.Factory.parse(setAttrVal(val));
}
- public String setAttrVal(String val) {
+ private String setAttrVal(String val) {
+ String attr_base_end = "\" />";
+ String attr_base_start = "<a xmlns=\"attrTests\" a=\"";
return attr_base_start + val + attr_base_end;
}
//attribute testing methods
- public String getAttrTypeXmlVenetian(String primType, String derType) {
- return "<schema attributeFormDefault=\"unqualified\" elementFormDefault=\"qualified\" " +
- "targetNamespace=\"attrTests\" xmlns=\"http://www.w3.org/2001/XMLSchema\">" +
- "<element name=\"a\" type=\"att:aType\" xmlns:att=\"attrTests\"/>" +
- "<complexType name=\"aType\">" +
- "<simpleContent>" +
- "<extension base=\"xs:" + primType + "\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">" +
- "<attribute type=\"xs:" + derType + "\" name=\"a\"/>" +
- "</extension>" +
- "</simpleContent></complexType></schema>";
- }
-
- public String getAttrTypeXmlVenetian(String type) {
- return "<schema attributeFormDefault=\"unqualified\" elementFormDefault=\"qualified\" " +
- "targetNamespace=\"attrTests\" xmlns=\"http://www.w3.org/2001/XMLSchema\">" +
- "<element name=\"a\" type=\"att:aType\" xmlns:att=\"attrTests\"/>" +
- "<complexType name=\"aType\">" +
- "<simpleContent>" +
- "<extension base=\"xs:string\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">" +
- "<attribute type=\"xs:" + type + "\" name=\"a\"/>" +
- "</extension>" +
- "</simpleContent></complexType></schema>";
- }
- public String getAttrTypeXmlRDandSS(String primType, String derType) {
+ private String getAttrTypeXmlVenetian(String type) {
return "<schema attributeFormDefault=\"unqualified\" elementFormDefault=\"qualified\" " +
- "targetNamespace=\"attrTests\" xmlns=\"http://www.w3.org/2001/XMLSchema\">" +
- "<element name=\"a\">" +
- "<complexType>" +
- "<simpleContent>" +
- "<extension base=\"xs:" + primType + "\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">" +
- "<attribute type=\"xs:" + derType + "\" name=\"a\"/>" +
- "</extension>" +
- "</simpleContent>" +
- "</complexType></element></schema>";
+ "targetNamespace=\"attrTests\" xmlns=\"http://www.w3.org/2001/XMLSchema\">" +
+ "<element name=\"a\" type=\"att:aType\" xmlns:att=\"attrTests\"/>" +
+ "<complexType name=\"aType\">" +
+ "<simpleContent>" +
+ "<extension base=\"xs:string\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">" +
+ "<attribute type=\"xs:" + type + "\" name=\"a\"/>" +
+ "</extension>" +
+ "</simpleContent></complexType></schema>";
}
- public String getAttrTypeXmlRDandSS(String type) {
+ private String getAttrTypeXmlRDandSS(String type) {
return "<schema attributeFormDefault=\"unqualified\" elementFormDefault=\"qualified\" " +
- "targetNamespace=\"attrTests\" xmlns=\"http://www.w3.org/2001/XMLSchema\">" +
- "<element name=\"a\">" +
- "<complexType>" +
- "<simpleContent>" +
- "<extension base=\"xs:string\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">" +
- "<attribute type=\"xs:" + type + "\" name=\"a\"/>" +
- "</extension>" +
- "</simpleContent>" +
- "</complexType></element></schema>";
+ "targetNamespace=\"attrTests\" xmlns=\"http://www.w3.org/2001/XMLSchema\">" +
+ "<element name=\"a\">" +
+ "<complexType>" +
+ "<simpleContent>" +
+ "<extension base=\"xs:string\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">" +
+ "<attribute type=\"xs:" + type + "\" name=\"a\"/>" +
+ "</extension>" +
+ "</simpleContent>" +
+ "</complexType></element></schema>";
}
- public void runAttrTypeChecking(XmlObject act, String expType) throws Exception {
+ protected void runAttrTypeChecking(XmlObject act, String expType) throws Exception {
log("=== Venetian options ===");
runAttrTypeChecking(act, expType, Inst2XsdCommon.getVenetianOptions());
@@ -143,40 +100,12 @@ public class Inst2XsdTestBase extends Co
runAttrTypeChecking(act, expType, Inst2XsdCommon.getDefaultInstOptions());
}
- public void runAttrTypeChecking(XmlObject act, String primType, String derType) throws Exception {
-
- log("=== Venetian options ===");
- runAttrTypeChecking(act, primType, derType, Inst2XsdCommon.getVenetianOptions());
- log("=== Russian options ===");
- runAttrTypeChecking(act, primType, derType, Inst2XsdCommon.getRussianOptions());
- log("=== Salami options ===");
- runAttrTypeChecking(act, primType, derType, Inst2XsdCommon.getSalamiOptions());
- log("=== Default options ===");
- runAttrTypeChecking(act, primType, derType, Inst2XsdCommon.getDefaultInstOptions());
- }
-
- private void runAttrTypeChecking(XmlObject act, String primType, String derType, Inst2XsdOptions opt) throws Exception {
- SchemaDocument[] venetian = (SchemaDocument[]) runInst2Xsd(act, opt);
- checkLength(venetian, 1);
-
- if (opt.getDesign() == Inst2XsdOptions.DESIGN_RUSSIAN_DOLL ||
- opt.getDesign() == Inst2XsdOptions.DESIGN_SALAMI_SLICE)
- compare(venetian[0], XmlObject.Factory.parse(getAttrTypeXmlRDandSS(primType, derType)));
- else if (opt.getDesign() == Inst2XsdOptions.DESIGN_VENETIAN_BLIND)
- compare(venetian[0], XmlObject.Factory.parse(getAttrTypeXmlVenetian(primType, derType)));
- else
- throw new Exception("Design style was not found");
-
- checkInstance(venetian, new XmlObject[]{act});
-
- }
-
private void runAttrTypeChecking(XmlObject act, String expType, Inst2XsdOptions opt) throws Exception {
SchemaDocument[] venetian = (SchemaDocument[]) runInst2Xsd(act, opt);
checkLength(venetian, 1);
if (opt.getDesign() == Inst2XsdOptions.DESIGN_RUSSIAN_DOLL ||
- opt.getDesign() == Inst2XsdOptions.DESIGN_SALAMI_SLICE)
+ opt.getDesign() == Inst2XsdOptions.DESIGN_SALAMI_SLICE)
compare(venetian[0], XmlObject.Factory.parse(getAttrTypeXmlRDandSS(expType)));
else if (opt.getDesign() == Inst2XsdOptions.DESIGN_VENETIAN_BLIND)
compare(venetian[0], XmlObject.Factory.parse(getAttrTypeXmlVenetian(expType)));
@@ -188,7 +117,7 @@ public class Inst2XsdTestBase extends Co
}
//element value test methods
- public void runTypeChecking(XmlObject act, String expType) throws Exception {
+ protected void runTypeChecking(XmlObject act, String expType) throws Exception {
log("=== Venetian options ===");
runTypeChecking(act, expType, Inst2XsdCommon.getVenetianOptions());
log("=== Russian options ===");
@@ -209,17 +138,17 @@ public class Inst2XsdTestBase extends Co
compare(venetian[0], XmlObject.Factory.parse(getExpTypeXml(expType)));
}
- public String getExpTypeXml(String type) {
+ private String getExpTypeXml(String type) {
return "<xs:schema attributeFormDefault=\"unqualified\" " +
- "elementFormDefault=\"qualified\" targetNamespace=\"typeTests\"" +
- " xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" >" +
- "<xs:element name=\"a\" type=\"xs:" + type + "\"" +
- " xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" />" +
- "</xs:schema>";
+ "elementFormDefault=\"qualified\" targetNamespace=\"typeTests\"" +
+ " xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" >" +
+ "<xs:element name=\"a\" type=\"xs:" + type + "\"" +
+ " xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" />" +
+ "</xs:schema>";
}
//type coercion/LCD test methods
- public void runLCDTypeCheckTest(String val1, String val2, String expType) throws Exception {
+ protected void runLCDTypeCheckTest(String val1, String val2, String expType) throws Exception {
log("=== Venetian options ===");
runLCDTypeChecking(val1, val2, expType, Inst2XsdCommon.getVenetianOptions());
log("=== Russian options ===");
@@ -248,101 +177,88 @@ public class Inst2XsdTestBase extends Co
compare(venetian[0], getExpLCDXml_vb(expType));
}
- public String getTypeCoerceXmlString(String val1, String val2) {
+ private String getTypeCoerceXmlString(String val1, String val2) {
return "<a xmlns=\"typeCoercion\">" +
- " <b c=\"" + val1 + "\">" + val1 + "</b>" +
- " <b c=\"" + val2 + "\">" + val2 + "</b>" +
- "</a>";
+ " <b c=\"" + val1 + "\">" + val1 + "</b>" +
+ " <b c=\"" + val2 + "\">" + val2 + "</b>" +
+ "</a>";
}
- public XmlObject getTypeCoerceXml(String val1, String val2) throws XmlException {
+ private XmlObject getTypeCoerceXml(String val1, String val2) throws XmlException {
return XmlObject.Factory.parse(getTypeCoerceXmlString(val1, val2));
}
- public XmlObject getExpLCDXml_vb(String type) throws XmlException {
+ private XmlObject getExpLCDXml_vb(String type) throws XmlException {
return XmlObject.Factory.parse("<xs:schema attributeFormDefault=\"unqualified\" elementFormDefault=\"qualified\" targetNamespace=\"typeCoercion\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">\n" +
- " <xs:element name=\"a\" type=\"typ:aType\" xmlns:typ=\"typeCoercion\"/>\n" +
- " <xs:complexType name=\"aType\">\n" +
- " <xs:sequence>\n" +
- " <xs:element type=\"typ:bType\" name=\"b\" maxOccurs=\"unbounded\" minOccurs=\"0\" xmlns:typ=\"typeCoercion\"/>\n" +
- " </xs:sequence>\n" +
- " </xs:complexType>\n" +
- " <xs:complexType name=\"bType\">\n" +
- " <xs:simpleContent>\n" +
- " <xs:extension base=\"xs:" + type + "\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">\n" +
- " <xs:attribute type=\"xs:" + type + "\" name=\"c\" use=\"optional\"/>\n" +
- " </xs:extension>\n" +
- " </xs:simpleContent>\n" +
- " </xs:complexType>\n" +
- "</xs:schema>");
+ " <xs:element name=\"a\" type=\"typ:aType\" xmlns:typ=\"typeCoercion\"/>\n" +
+ " <xs:complexType name=\"aType\">\n" +
+ " <xs:sequence>\n" +
+ " <xs:element type=\"typ:bType\" name=\"b\" maxOccurs=\"unbounded\" minOccurs=\"0\" xmlns:typ=\"typeCoercion\"/>\n" +
+ " </xs:sequence>\n" +
+ " </xs:complexType>\n" +
+ " <xs:complexType name=\"bType\">\n" +
+ " <xs:simpleContent>\n" +
+ " <xs:extension base=\"xs:" + type + "\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">\n" +
+ " <xs:attribute type=\"xs:" + type + "\" name=\"c\" use=\"optional\"/>\n" +
+ " </xs:extension>\n" +
+ " </xs:simpleContent>\n" +
+ " </xs:complexType>\n" +
+ "</xs:schema>");
}
- public XmlObject getExpLCDXml_ss(String type) throws XmlException {
+ private XmlObject getExpLCDXml_ss(String type) throws XmlException {
return XmlObject.Factory.parse("<xs:schema attributeFormDefault=\"unqualified\" elementFormDefault=\"qualified\" targetNamespace=\"typeCoercion\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">\n" +
- " <xs:element name=\"b\">\n" +
- " <xs:complexType>\n" +
- " <xs:simpleContent>\n" +
- " <xs:extension base=\"xs:"+type+"\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">\n" +
- " <xs:attribute type=\"xs:"+type+"\" name=\"c\" use=\"optional\"/>\n" +
- " </xs:extension>\n" +
- " </xs:simpleContent>\n" +
- " </xs:complexType>\n" +
- " </xs:element>\n" +
- " <xs:element name=\"a\">\n" +
- " <xs:complexType>\n" +
- " <xs:sequence>\n" +
- " <xs:element ref=\"typ:b\" maxOccurs=\"unbounded\" minOccurs=\"0\" xmlns:typ=\"typeCoercion\"/>\n" +
- " </xs:sequence>\n" +
- " </xs:complexType>\n" +
- " </xs:element>\n" +
- "</xs:schema>");
+ " <xs:element name=\"b\">\n" +
+ " <xs:complexType>\n" +
+ " <xs:simpleContent>\n" +
+ " <xs:extension base=\"xs:" + type + "\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">\n" +
+ " <xs:attribute type=\"xs:" + type + "\" name=\"c\" use=\"optional\"/>\n" +
+ " </xs:extension>\n" +
+ " </xs:simpleContent>\n" +
+ " </xs:complexType>\n" +
+ " </xs:element>\n" +
+ " <xs:element name=\"a\">\n" +
+ " <xs:complexType>\n" +
+ " <xs:sequence>\n" +
+ " <xs:element ref=\"typ:b\" maxOccurs=\"unbounded\" minOccurs=\"0\" xmlns:typ=\"typeCoercion\"/>\n" +
+ " </xs:sequence>\n" +
+ " </xs:complexType>\n" +
+ " </xs:element>\n" +
+ "</xs:schema>");
}
- public XmlObject getExpLCDXml_rd(String type) throws XmlException {
+ private XmlObject getExpLCDXml_rd(String type) throws XmlException {
return XmlObject.Factory.parse("<xs:schema attributeFormDefault=\"unqualified\" elementFormDefault=\"qualified\" targetNamespace=\"typeCoercion\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">\n" +
- " <xs:element name=\"a\">\n" +
- " <xs:complexType>\n" +
- " <xs:sequence>\n" +
- " <xs:element name=\"b\" maxOccurs=\"unbounded\" minOccurs=\"0\">\n" +
- " <xs:complexType>\n" +
- " <xs:simpleContent>\n" +
- " <xs:extension base=\"xs:" + type + "\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">\n" +
- " <xs:attribute type=\"xs:" + type + "\" name=\"c\" use=\"optional\"/>\n" +
- " </xs:extension>\n" +
- " </xs:simpleContent>\n" +
- " </xs:complexType>\n" +
- " </xs:element>\n" +
- " </xs:sequence>\n" +
- " </xs:complexType>\n" +
- " </xs:element>\n" +
- "</xs:schema>");
+ " <xs:element name=\"a\">\n" +
+ " <xs:complexType>\n" +
+ " <xs:sequence>\n" +
+ " <xs:element name=\"b\" maxOccurs=\"unbounded\" minOccurs=\"0\">\n" +
+ " <xs:complexType>\n" +
+ " <xs:simpleContent>\n" +
+ " <xs:extension base=\"xs:" + type + "\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">\n" +
+ " <xs:attribute type=\"xs:" + type + "\" name=\"c\" use=\"optional\"/>\n" +
+ " </xs:extension>\n" +
+ " </xs:simpleContent>\n" +
+ " </xs:complexType>\n" +
+ " </xs:element>\n" +
+ " </xs:sequence>\n" +
+ " </xs:complexType>\n" +
+ " </xs:element>\n" +
+ "</xs:schema>");
}
- public static XmlObject[] runInst2Xsd(String inst) throws XmlException {
- return runInst2Xsd(new XmlObject[]{XmlObject.Factory.parse(inst, Inst2XsdCommon.getXmlOptions())},
- Inst2XsdCommon.getDefaultInstOptions());
- }
-
- public static XmlObject[] runInst2Xsd(XmlObject inst) {
- return Inst2Xsd.inst2xsd(new XmlObject[]{inst}, Inst2XsdCommon.getDefaultInstOptions());
- }
-
- public static XmlObject[] runInst2Xsd(XmlObject[] inst) {
- return Inst2Xsd.inst2xsd(inst, Inst2XsdCommon.getDefaultInstOptions());
- }
-
- public static XmlObject[] runInst2Xsd(XmlObject inst, Inst2XsdOptions options) {
+ protected static XmlObject[] runInst2Xsd(XmlObject inst, Inst2XsdOptions options) {
return Inst2Xsd.inst2xsd(new XmlObject[]{inst}, options);
}
- public static XmlObject[] runInst2Xsd(XmlObject[] inst, Inst2XsdOptions options) {
+ protected static XmlObject[] runInst2Xsd(XmlObject[] inst, Inst2XsdOptions options) {
return Inst2Xsd.inst2xsd(inst, options);
}
- public static SchemaDocument[] getSchemaDoc(XmlObject[] inst) throws XmlException {
+ protected static SchemaDocument[] getSchemaDoc(XmlObject[] inst) throws XmlException {
SchemaDocument[] docs = new SchemaDocument[inst.length];
for (int i = 0; i < docs.length; i++) {
docs[i] = SchemaDocument.Factory.parse(inst[i].xmlText());
@@ -351,7 +267,7 @@ public class Inst2XsdTestBase extends Co
}
- public static void runSchemaBuild(XmlObject inst, Inst2XsdOptions opts, XmlObject exp) throws Exception {
+ protected static void runSchemaBuild(XmlObject inst, Inst2XsdOptions opts, XmlObject exp) throws Exception {
XmlObject[] genSchema = runInst2Xsd(inst, opts);
log(genSchema);
checkInstanceToAll(genSchema, inst, exp);
@@ -360,7 +276,7 @@ public class Inst2XsdTestBase extends Co
}
- public static void runSchemaBuild(XmlObject inst, Inst2XsdOptions opts, XmlObject[] exp) throws Exception {
+ protected static void runSchemaBuild(XmlObject inst, Inst2XsdOptions opts, XmlObject[] exp) throws XmlException {
XmlObject[] genSchema = runInst2Xsd(inst, opts);
log(genSchema);
checkInstanceToAll(genSchema, new XmlObject[]{inst}, exp);
@@ -369,33 +285,19 @@ public class Inst2XsdTestBase extends Co
}
- public static void runSchemaBuild(XmlObject[] inst, Inst2XsdOptions opts, XmlObject[] exp) throws Exception {
- XmlObject[] genSchema = runInst2Xsd(inst, opts);
- checkInstanceToAll(genSchema, inst, exp);
- log(genSchema);
- compare(genSchema, exp);
-
- }
-
//TODO: Make this error narrowed
- public static void checkLength(Object[] obj, int val) throws Exception {
+ protected static void checkLength(Object[] obj, int val) throws XmlException {
log("Length = " + obj.length + " exp: " + val);
- if (obj.length == val) {
- return;
- } else if (obj.length < val) {
- throw new Exception("Actual was smaller than expected");
+ if (obj.length < val) {
+ throw new XmlException("Actual was smaller than expected");
} else if (obj.length > val) {
- throw new Exception("Actual was larger than expected");
- } else {
- throw new Exception("Array Indexes did not compare correctly");
+ throw new XmlException("Actual was larger than expected");
}
-
-
}
- public static void compare(XmlObject[] act, XmlObject[] exp) throws XmlException, Exception {
+ public static void compare(XmlObject[] act, XmlObject[] exp) throws XmlException {
checkLength(act, exp.length);
//Arrays.sort(act);
//Arrays.sort(exp);
@@ -408,14 +310,13 @@ public class Inst2XsdTestBase extends Co
}
- public static void compare(XmlObject act, XmlObject exp)
- throws XmlException, Exception {
+ public static void compare(XmlObject act, XmlObject exp) throws XmlException {
XmlComparator.Diagnostic diag = XmlComparator.lenientlyCompareTwoXmlStrings(act.xmlText(Inst2XsdCommon.getXmlOptions()),
- exp.xmlText(Inst2XsdCommon.getXmlOptions()));
+ exp.xmlText(Inst2XsdCommon.getXmlOptions()));
if (diag.hasMessage()) {
log("Expected: \n" + exp.xmlText(Inst2XsdCommon.getXmlOptions()));
log("Actual: \n" + act.xmlText(Inst2XsdCommon.getXmlOptions()));
- throw new Exception("Xml Comparison Failed:\n" + diag.toString());
+ throw new XmlException("Xml Comparison Failed:\n" + diag.toString());
}
}
@@ -438,33 +339,18 @@ public class Inst2XsdTestBase extends Co
}
- public static boolean checkInstanceToAll(XmlObject[] actSchemaDoc, XmlObject inst,
- XmlObject expSchemas) throws Exception {
- return checkInstanceToAll(getSchemaDoc(actSchemaDoc), new XmlObject[]{inst}, getSchemaDoc(new XmlObject[]{expSchemas}));
- }
-
- public static boolean checkInstanceToAll(XmlObject[] actSchemaDoc, XmlObject[] inst,
- XmlObject[] expSchemas) throws Exception {
- return checkInstanceToAll(getSchemaDoc(actSchemaDoc), inst, getSchemaDoc(expSchemas));
- }
-
- public static boolean checkInstanceToAll(XmlObject[] actSchemaDoc, XmlObject[] inst,
- XmlObject expSchemas) throws Exception {
- return checkInstanceToAll(getSchemaDoc(actSchemaDoc), inst, getSchemaDoc(new XmlObject[]{expSchemas}));
- }
-
- public static boolean checkInstanceToAll(SchemaDocument[] actSchemaDoc, XmlObject inst,
- SchemaDocument expSchemas) throws Exception {
- return checkInstanceToAll(actSchemaDoc, new XmlObject[]{inst}, getSchemaDoc(new XmlObject[]{expSchemas}));
+ private static void checkInstanceToAll(XmlObject[] actSchemaDoc, XmlObject inst,
+ XmlObject expSchemas) throws Exception {
+ checkInstanceToAll(getSchemaDoc(actSchemaDoc), new XmlObject[]{inst}, getSchemaDoc(new XmlObject[]{expSchemas}));
}
- public static boolean checkInstanceToAll(SchemaDocument[] actSchemaDoc, XmlObject inst,
- SchemaDocument[] expSchemas) throws Exception {
- return checkInstanceToAll(actSchemaDoc, new XmlObject[]{inst}, expSchemas);
+ private static void checkInstanceToAll(XmlObject[] actSchemaDoc, XmlObject[] inst,
+ XmlObject[] expSchemas) throws XmlException {
+ checkInstanceToAll(getSchemaDoc(actSchemaDoc), inst, getSchemaDoc(expSchemas));
}
- public static boolean checkInstanceToAll(SchemaDocument[] actSchemaDoc, XmlObject[] inst,
- SchemaDocument[] expSchemas) throws Exception {
+ private static void checkInstanceToAll(SchemaDocument[] actSchemaDoc, XmlObject[] inst,
+ SchemaDocument[] expSchemas) throws XmlException {
log("-= Comparing Actual to instance=-");
if (checkInstance(actSchemaDoc, inst))
log("-= Instance validated actual =-");
@@ -473,25 +359,20 @@ public class Inst2XsdTestBase extends Co
if (checkInstance(expSchemas, inst))
log("-= Instance validated Expected =-");
- return true;
}
- public static boolean checkInstance(SchemaDocument[] sDocs, XmlObject[] inst) throws Exception {
+ private static boolean checkInstance(SchemaDocument[] sDocs, XmlObject[] inst) throws XmlException {
if (validateInstances(sDocs, inst)) {
return true;
} else {
- throw new Exception("Instance Failed to validate");
+ throw new XmlException("Instance Failed to validate");
}
}
/**
* Copied from inst2Xsd as option may be removed
- *
- * @param sDocs
- * @param instances
- * @return
*/
- public static boolean validateInstances(SchemaDocument[] sDocs, XmlObject[] instances) {
+ private static boolean validateInstances(SchemaDocument[] sDocs, XmlObject[] instances) {
SchemaTypeLoader sLoader;
Collection compErrors = new ArrayList();
@@ -504,8 +385,7 @@ public class Inst2XsdTestBase extends Co
e.printStackTrace(System.out);
}
System.out.println("Schema invalid");
- for (Iterator errors = compErrors.iterator(); errors.hasNext();)
- System.out.println(errors.next());
+ for (Object compError : compErrors) System.out.println(compError);
return false;
}
@@ -517,6 +397,7 @@ public class Inst2XsdTestBase extends Co
XmlObject xobj;
try {
+ assertNotNull(sLoader);
xobj = sLoader.parse(instance, null, new XmlOptions().setLoadLineNumbers());
} catch (XmlException e) {
System.out.println("Error:\n" + instance + " not loadable: " + e);
@@ -535,8 +416,8 @@ public class Inst2XsdTestBase extends Co
System.out.println("Instance[" + i + "] valid.");
else {
System.out.println("Instance[" + i + "] NOT valid.");
- for (Iterator it = errors.iterator(); it.hasNext();) {
- System.out.println(" " + it.next());
+ for (Object error : errors) {
+ System.out.println(" " + error);
}
result = false;
}
Modified: xmlbeans/trunk/test/src/tools/inst2xsd/detailed/ComplexDetailedTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/tools/inst2xsd/detailed/ComplexDetailedTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/tools/inst2xsd/detailed/ComplexDetailedTest.java (original)
+++ xmlbeans/trunk/test/src/tools/inst2xsd/detailed/ComplexDetailedTest.java Fri Jan 18 23:08:44 2019
@@ -14,20 +14,18 @@
*/
package tools.inst2xsd.detailed;
+import org.apache.xmlbeans.XmlObject;
+import org.apache.xmlbeans.impl.inst2xsd.Inst2XsdOptions;
+import org.junit.Ignore;
+import org.junit.Test;
import tools.inst2xsd.common.Inst2XsdTestBase;
import java.io.File;
-import java.io.IOException;
-
-import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.impl.inst2xsd.Inst2XsdOptions;
+@Ignore
public class ComplexDetailedTest extends Inst2XsdTestBase {
- public ComplexDetailedTest(String name) {
- super(name);
- }
-
+ @Test
public void test_complex_enum() throws Exception {
XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "complex" + P + "enum" + P + "enum.xml"));
@@ -42,6 +40,7 @@ public class ComplexDetailedTest extends
XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "complex" + P + "enum" + P + "enum2_ss0.xsd")));
}
+ @Test
public void test_complex_enum_never() throws Exception {
XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "complex" + P + "enum" + P + "enum.xml"));
@@ -57,9 +56,9 @@ public class ComplexDetailedTest extends
log("-= SCS Options =-");
runSchemaBuild(inst, opts,
XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "complex" + P + "enum" + P + "enum_vb_scs_enum0.xsd")));
-
}
+ @Test
public void test_complex_qname_enum() throws Exception {
XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "complex" + P + "enum" + P + "enumQName.xml"));
@@ -74,6 +73,7 @@ public class ComplexDetailedTest extends
XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "complex" + P + "enum" + P + "enumQName_vb_eN0.xsd")));
}
+ @Test
public void test_complex_nestedNSArray() throws Exception {
XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "complex" + P + "nestedNSArray" + P + "nestedNSArray.xml"));
@@ -100,6 +100,7 @@ public class ComplexDetailedTest extends
});
}
+ @Test
public void test_example_po() throws Exception {
XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "po" + P + "po.xml"));
@@ -144,6 +145,7 @@ public class ComplexDetailedTest extends
/**
* java.lang.IllegalStateException: Not on a container
*/
+ @Test
public void test_complex_attrenum() throws Exception {
XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "complex" + P + "enum" + P + "attr"+P+"attrenum.xml"));
Modified: xmlbeans/trunk/test/src/tools/inst2xsd/detailed/DetailedLCDTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/tools/inst2xsd/detailed/DetailedLCDTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/tools/inst2xsd/detailed/DetailedLCDTest.java (original)
+++ xmlbeans/trunk/test/src/tools/inst2xsd/detailed/DetailedLCDTest.java Fri Jan 18 23:08:44 2019
@@ -14,15 +14,14 @@
*/
package tools.inst2xsd.detailed;
+import org.junit.Ignore;
+import org.junit.Test;
import tools.inst2xsd.common.Inst2XsdTestBase;
import org.apache.xmlbeans.XmlObject;
+@Ignore
public class DetailedLCDTest extends Inst2XsdTestBase {
- public DetailedLCDTest(String name) {
- super(name);
- }
-
// List of precedence for smart simple primitive type determination
// byte, short, int, long, integer, float, double, decimal,
// boolean
@@ -67,6 +66,7 @@ public class DetailedLCDTest extends Ins
runLCDTypeCheckTest("P1347Y", "-P1347M", "duration");
} */
+ @Test
public void test_lcd_anyuri() throws Exception {
runLCDTypeCheckTest("abc",
"http://www.math.uio.no/faq/compression-faq/part1.html", "string");
@@ -76,6 +76,7 @@ public class DetailedLCDTest extends Ins
//runLCDTypeCheckTest("ftp://ftp.is.co.za/rfc/rfc1808.txt", "gopher://spinaltap.micro.umn.edu/00/Weather/California/Los%20Angeles", "anyURI");
}
+ @Test
public void test_lcd_byte() throws Exception {
runLCDTypeCheckTest("122", "123", "byte");
runLCDTypeCheckTest("-1", "+100", "byte");
@@ -100,9 +101,9 @@ public class DetailedLCDTest extends Ins
runLCDTypeCheckTest("1267.43233E12", "-1", "float");
runLCDTypeCheckTest("INF", "0", "float");
runLCDTypeCheckTest("abc", "127", "string");
-
}
+ @Test
public void test_lcd_short() throws Exception {
runLCDTypeCheckTest("32767","-129", "short");
runLCDTypeCheckTest("-32768","128", "short");
@@ -126,6 +127,7 @@ public class DetailedLCDTest extends Ins
runLCDTypeCheckTest("abc", "-3000", "string");
}
+ @Test
public void test_lcd_int() throws Exception {
runLCDTypeCheckTest("32768","39000", "int");
runLCDTypeCheckTest("32768","32768", "int");
@@ -150,6 +152,7 @@ public class DetailedLCDTest extends Ins
runLCDTypeCheckTest("abc", "32768", "string");
}
+ @Test
public void test_lcd_long() throws Exception {
runLCDTypeCheckTest("-9223372036854775808","2147483648", "long");
runLCDTypeCheckTest("-9223372036854775808","-2147483649", "long");
@@ -168,6 +171,7 @@ public class DetailedLCDTest extends Ins
runLCDTypeCheckTest("abc", "2150000000", "string");
}
+ @Test
public void test_lcd_integer() throws Exception {
runLCDTypeCheckTest("9223372036854775808","9300000000000000000", "integer");
runLCDTypeCheckTest("9223372036854775808","-9300000000000000000", "integer");
@@ -182,6 +186,7 @@ public class DetailedLCDTest extends Ins
runLCDTypeCheckTest("abc", "9223372036854775808", "string");
}
+ @Test
public void test_lcd_float() throws Exception {
runLCDTypeCheckTest("+100000.00","12.78e-2", "float");
runLCDTypeCheckTest("+100000.00","1267.43233E12", "float");
@@ -227,12 +232,13 @@ public class DetailedLCDTest extends Ins
//runLCDTypeCheckTest("","1999"), "gYear");
//}
-
+ @Test
public void test_lcd_date() throws Exception {
runLCDTypeCheckTest("abc", "1999-05-31", "string");
runLCDTypeCheckTest("1999-06-15","1999-05-31", "date");
}
+ @Test
public void test_lcd_dateTime() throws Exception {
runLCDTypeCheckTest("abc", "1999-05-31T13:20:00-05:00", "string");
runLCDTypeCheckTest("1999-05-31T13:20:00-08:00","1999-05-31T13:20:00-05:00", "dateTime");
@@ -240,6 +246,7 @@ public class DetailedLCDTest extends Ins
runLCDTypeCheckTest("1999-05-15T13:20:00-05:00","2000-03-04T23:00:00+03:00", "dateTime");
}
+ @Test
public void test_lcd_time() throws Exception {
runLCDTypeCheckTest("abc", "13:20:00-05:00", "string");
runLCDTypeCheckTest("00:00:00","13:20:00-05:00", "time");
@@ -258,7 +265,4 @@ public class DetailedLCDTest extends Ins
runAttrTypeChecking(xsdString, "QName");
runAttrTypeChecking(foobaz, "QName");
}*/
-
-
-
}
Modified: xmlbeans/trunk/test/src/tools/inst2xsd/detailed/Inst2XsdDetailedAttrTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/tools/inst2xsd/detailed/Inst2XsdDetailedAttrTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/tools/inst2xsd/detailed/Inst2XsdDetailedAttrTest.java (original)
+++ xmlbeans/trunk/test/src/tools/inst2xsd/detailed/Inst2XsdDetailedAttrTest.java Fri Jan 18 23:08:44 2019
@@ -14,15 +14,12 @@
*/
package tools.inst2xsd.detailed;
+import org.junit.Test;
import tools.inst2xsd.common.Inst2XsdTestBase;
import org.apache.xmlbeans.XmlObject;
public class Inst2XsdDetailedAttrTest extends Inst2XsdTestBase {
- public Inst2XsdDetailedAttrTest(String name) {
- super(name);
- }
-
// List of precedence for smart simple primitive type determination
// byte, short, int, long, integer, float, double, decimal,
// boolean
@@ -72,6 +69,7 @@ public class Inst2XsdDetailedAttrTest ex
//runAttrTypeChecking(getAttrTypeXml("1999"), "gYear");
//}
+ @Test
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");
@@ -88,6 +86,7 @@ public class Inst2XsdDetailedAttrTest ex
* 0, and 1 get picked up by byte
* true, false are strings
*/
+ @Test
public void test_attrboolean() throws Exception {
runAttrTypeChecking(getAttrTypeXml("true"), "string");
runAttrTypeChecking(getAttrTypeXml("false"), "string");
@@ -96,11 +95,7 @@ public class Inst2XsdDetailedAttrTest ex
//runAttrTypeChecking(getAttrTypeXml("false"), "boolean");
}
-
-
-
-
-
+ @Test
public void test_attrQName() throws Exception {
XmlObject xsdString = XmlObject.Factory.parse("<a xmlns=\"attrTests\" " +
"xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" a=\"xsd:string\"></a>");
@@ -111,7 +106,4 @@ public class Inst2XsdDetailedAttrTest ex
runAttrTypeChecking(xsdString, "QName");
runAttrTypeChecking(foobaz, "QName");
}
-
-
-
}
Modified: xmlbeans/trunk/test/src/tools/inst2xsd/detailed/Inst2XsdDetailedOptionsTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/tools/inst2xsd/detailed/Inst2XsdDetailedOptionsTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/tools/inst2xsd/detailed/Inst2XsdDetailedOptionsTest.java (original)
+++ xmlbeans/trunk/test/src/tools/inst2xsd/detailed/Inst2XsdDetailedOptionsTest.java Fri Jan 18 23:08:44 2019
@@ -14,23 +14,19 @@
*/
package tools.inst2xsd.detailed;
-import tools.inst2xsd.common.Inst2XsdTestBase;
-import org.apache.xmlbeans.impl.inst2xsd.Inst2XsdOptions;
+import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.impl.inst2xsd.Inst2Xsd;
-
+import org.apache.xmlbeans.impl.inst2xsd.Inst2XsdOptions;
+import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
+import org.junit.Ignore;
+import org.junit.Test;
+import tools.inst2xsd.common.Inst2XsdTestBase;
import java.io.File;
-import java.io.IOException;
-
-import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
public class Inst2XsdDetailedOptionsTest extends Inst2XsdTestBase {
- public Inst2XsdDetailedOptionsTest(String name) {
- super(name);
- }
-
+ @Test
public void test_simpleContentString_Russian() throws Exception {
Inst2XsdOptions opt = common.getRussianOptions();
opt.setSimpleContentTypes(Inst2XsdOptions.SIMPLE_CONTENT_TYPES_STRING);
@@ -54,6 +50,8 @@ public class Inst2XsdDetailedOptionsTest
}
+ @Test
+ @Ignore
public void test_simpleContentString_Salami() throws Exception {
Inst2XsdOptions opt = common.getSalamiOptions();
opt.setSimpleContentTypes(Inst2XsdOptions.SIMPLE_CONTENT_TYPES_STRING);
@@ -75,6 +73,7 @@ public class Inst2XsdDetailedOptionsTest
compare(api[0], exp);
}
+ @Test
public void test_simpleContentString_Venetian() throws Exception {
Inst2XsdOptions opt = common.getVenetianOptions();
opt.setSimpleContentTypes(Inst2XsdOptions.SIMPLE_CONTENT_TYPES_STRING);
@@ -97,7 +96,7 @@ public class Inst2XsdDetailedOptionsTest
compare(api[0], exp);
}
-
+ @Test
public void test_simpleContentSmart_Russian() throws Exception {
Inst2XsdOptions opt = common.getRussianOptions();
opt.setSimpleContentTypes(Inst2XsdOptions.SIMPLE_CONTENT_TYPES_SMART);
@@ -119,6 +118,8 @@ public class Inst2XsdDetailedOptionsTest
compare(api[0], exp);
}
+ @Test
+ @Ignore
public void test_simpleContentSmart_Salami() throws Exception {
Inst2XsdOptions opt = common.getSalamiOptions();
opt.setSimpleContentTypes(Inst2XsdOptions.SIMPLE_CONTENT_TYPES_SMART);
@@ -140,6 +141,7 @@ public class Inst2XsdDetailedOptionsTest
compare(api[0], exp);
}
+ @Test
public void test_simpleContentSmart_Venetian() throws Exception {
Inst2XsdOptions opt = common.getVenetianOptions();
opt.setSimpleContentTypes(Inst2XsdOptions.SIMPLE_CONTENT_TYPES_SMART);
@@ -161,7 +163,7 @@ public class Inst2XsdDetailedOptionsTest
compare(api[0], exp);
}
-
+ @Test
public void test_simpleContentSmart_NeverEnum_Russian() throws Exception {
Inst2XsdOptions opt = common.getRussianOptions();
opt.setSimpleContentTypes(Inst2XsdOptions.SIMPLE_CONTENT_TYPES_SMART);
@@ -185,6 +187,8 @@ public class Inst2XsdDetailedOptionsTest
compare(api[0], exp);
}
+ @Test
+ @Ignore
public void test_simpleContentSmart_NeverEnum_Salami() throws Exception {
Inst2XsdOptions opt = common.getSalamiOptions();
opt.setSimpleContentTypes(Inst2XsdOptions.SIMPLE_CONTENT_TYPES_SMART);
@@ -208,6 +212,7 @@ public class Inst2XsdDetailedOptionsTest
compare(api[0], exp);
}
+ @Test
public void test_simpleContentSmart_NeverEnum_Venetian() throws Exception {
Inst2XsdOptions opt = common.getVenetianOptions();
opt.setUseEnumerations(Inst2XsdOptions.ENUMERATION_NEVER);
@@ -231,6 +236,7 @@ public class Inst2XsdDetailedOptionsTest
compare(api[0], exp);
}
+ @Test
public void test_simpleContentString_NeverEnum_Russian() throws Exception {
Inst2XsdOptions opt = common.getRussianOptions();
opt.setSimpleContentTypes(Inst2XsdOptions.SIMPLE_CONTENT_TYPES_STRING);
@@ -254,6 +260,8 @@ public class Inst2XsdDetailedOptionsTest
compare(api[0], exp);
}
+ @Test
+ @Ignore
public void test_simpleContentString_NeverEnum_Salami() throws Exception {
Inst2XsdOptions opt = common.getSalamiOptions();
opt.setSimpleContentTypes(Inst2XsdOptions.SIMPLE_CONTENT_TYPES_STRING);
@@ -277,6 +285,7 @@ public class Inst2XsdDetailedOptionsTest
compare(api[0], exp);
}
+ @Test
public void test_simpleContentString_NeverEnum_Venetian() throws Exception {
Inst2XsdOptions opt = common.getVenetianOptions();
opt.setUseEnumerations(Inst2XsdOptions.ENUMERATION_NEVER);
@@ -302,6 +311,7 @@ public class Inst2XsdDetailedOptionsTest
//TODO: move to checkin - cursor issue
+ @Test
public void test_simpleContentSmart() throws Exception {
Inst2XsdOptions opt = common.getDefaultInstOptions();
opt.setSimpleContentTypes(Inst2XsdOptions.SIMPLE_CONTENT_TYPES_SMART);
@@ -322,6 +332,7 @@ public class Inst2XsdDetailedOptionsTest
}
//TODO: move to checkin - cursor issue
+ @Test
public void test_neverEnum() throws Exception {
Inst2XsdOptions opt = common.getVenetianOptions();
opt.setUseEnumerations(Inst2XsdOptions.ENUMERATION_NEVER);
@@ -340,6 +351,7 @@ public class Inst2XsdDetailedOptionsTest
}
//TODO: move to checkin - cursor issue
+ @Test
public void test_simpleContentString() throws Exception {
Inst2XsdOptions opt = common.getDefaultInstOptions();
opt.setSimpleContentTypes(Inst2XsdOptions.SIMPLE_CONTENT_TYPES_STRING);
@@ -371,6 +383,7 @@ public class Inst2XsdDetailedOptionsTest
}
//TODO: move to checkin - cursor issue
+ @Test
public void test_RussianDesign() throws Exception {
SchemaDocument[] sDoc = getSchemaDoc(runInst2Xsd(XmlObject.Factory.parse(common.base),
common.getRussianOptions()));
@@ -389,6 +402,8 @@ public class Inst2XsdDetailedOptionsTest
}
//TODO: move to checkin - cursor issue
+ @Test
+ @Ignore
public void test_SalamiDesign() throws Exception {
SchemaDocument[] sDoc = getSchemaDoc(runInst2Xsd(XmlObject.Factory.parse(common.base),
common.getSalamiOptions()));
@@ -407,6 +422,7 @@ public class Inst2XsdDetailedOptionsTest
}
//TODO: move to checkin - cursor issue
+ @Test
public void test_VenetianDesign() throws Exception {
SchemaDocument[] sDoc = getSchemaDoc(runInst2Xsd(new XmlObject[]{XmlObject.Factory.parse(common.base)},
common.getVenetianOptions()));
Modified: xmlbeans/trunk/test/src/tools/inst2xsd/detailed/Inst2XsdDetailedTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/tools/inst2xsd/detailed/Inst2XsdDetailedTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/tools/inst2xsd/detailed/Inst2XsdDetailedTest.java (original)
+++ xmlbeans/trunk/test/src/tools/inst2xsd/detailed/Inst2XsdDetailedTest.java Fri Jan 18 23:08:44 2019
@@ -14,21 +14,19 @@
*/
package tools.inst2xsd.detailed;
+import org.apache.xmlbeans.XmlObject;
+import org.apache.xmlbeans.impl.inst2xsd.Inst2XsdOptions;
+import org.junit.Ignore;
+import org.junit.Test;
import tools.inst2xsd.common.Inst2XsdTestBase;
import java.io.File;
-import java.io.IOException;
-
-import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.impl.inst2xsd.Inst2XsdOptions;
+@Ignore
public class Inst2XsdDetailedTest extends Inst2XsdTestBase {
- public Inst2XsdDetailedTest(String name) {
- super(name);
- }
-
//TODO: move to checkin
+ @Test
public void test_ns_duplicate_salami() throws Exception {
XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "namespaces" + P + "duplicatedNS.xml"));
log("-= Salami =-");
@@ -37,6 +35,7 @@ public class Inst2XsdDetailedTest extend
}
//TODO: move to checkin
+ @Test
public void test_ns_duplicate_venetian() throws Exception {
XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "namespaces" + P + "duplicatedNS.xml"));
log("-= venetian =-");
@@ -46,6 +45,7 @@ public class Inst2XsdDetailedTest extend
}
//TODO: move to checkin QName:bug
+ @Test
public void test_examples_xmlnews() throws Exception {
XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "xmlnews.xml"));
@@ -61,6 +61,7 @@ public class Inst2XsdDetailedTest extend
}
//TODO: move to checkin QName:bug
+ @Test
public void test_examples_slashdotrdf() throws Exception {
XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "slashdot.rdf.xml"));
@@ -82,6 +83,7 @@ public class Inst2XsdDetailedTest extend
}
//TODO: move to checkin QName:bug
+ @Test
public void test_examples_xsl() throws Exception {
XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "xsl_example.xml"));
@@ -103,6 +105,7 @@ public class Inst2XsdDetailedTest extend
}
//TODO: move to checkin QName:bug
+ @Test
public void test_examples_rss092() throws Exception {
XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "sampleRss092.xml"));
@@ -117,6 +120,7 @@ public class Inst2XsdDetailedTest extend
XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "sampleRss092_ss0.xsd")));
}
+ @Test
public void test_types_comments() throws Exception {
XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "types" + P + "comments.xml"));
@@ -131,6 +135,7 @@ public class Inst2XsdDetailedTest extend
XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "types" + P + "comments_ss0.xsd")));
}
+ @Test
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();
@@ -152,6 +157,7 @@ public class Inst2XsdDetailedTest extend
}
/** This case fails validation because comment is not recognized */
+ @Test
public void test_types_innercomment() throws Exception {
XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "types" + P + "innercomment.xml"));
@@ -159,6 +165,7 @@ public class Inst2XsdDetailedTest extend
XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "types" + P + "innercomment_vb0.xsd")));
}
+ @Test
public void test_types_nillable() throws Exception {
XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "types" + P + "xsinil.xml"));
Modified: xmlbeans/trunk/test/src/tools/inst2xsd/detailed/Inst2XsdDetailedTypeTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/tools/inst2xsd/detailed/Inst2XsdDetailedTypeTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/tools/inst2xsd/detailed/Inst2XsdDetailedTypeTest.java (original)
+++ xmlbeans/trunk/test/src/tools/inst2xsd/detailed/Inst2XsdDetailedTypeTest.java Fri Jan 18 23:08:44 2019
@@ -14,15 +14,12 @@
*/
package tools.inst2xsd.detailed;
-import tools.inst2xsd.common.Inst2XsdTestBase;
import org.apache.xmlbeans.XmlObject;
+import org.junit.Test;
+import tools.inst2xsd.common.Inst2XsdTestBase;
public class Inst2XsdDetailedTypeTest extends Inst2XsdTestBase {
- public Inst2XsdDetailedTypeTest(String name) {
- super(name);
- }
-
// List of precedence for smart simple primitive type determination
// byte, short, int, long, integer, float, double, decimal,
// boolean
@@ -67,6 +64,7 @@ public class Inst2XsdDetailedTypeTest ex
// runTypeChecking(getTypeXml("0FB7"), "hexBinary");
//}
+ @Test
public void test_anyuri() throws Exception {
runTypeChecking(getTypeXml("http://www.math.uio.no/faq/compression-faq/part1.html"), "anyURI");
runTypeChecking(getTypeXml("http://www.example.com/doc.html#ID5"), "anyURI");
@@ -86,6 +84,7 @@ public class Inst2XsdDetailedTypeTest ex
* true and false are strings
*
*/
+ @Test
public void test_boolean() throws Exception {
//runTypeChecking(getTypeXml("true"), "boolean");
//runTypeChecking(getTypeXml("false"), "boolean");
@@ -94,6 +93,7 @@ public class Inst2XsdDetailedTypeTest ex
}
+ @Test
public void test_QName() throws Exception {
XmlObject xsdString = XmlObject.Factory.parse("<a xmlns=\"typeTests\" " +
"xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" >xsd:string</a>");
@@ -109,8 +109,4 @@ public class Inst2XsdDetailedTypeTest ex
runTypeChecking(xsiint, "QName");
runTypeChecking(foobaz, "QName");
}
-
-
-
-
}
Modified: xmlbeans/trunk/test/src/tools/inst2xsd/detailed/Inst2XsdMiscTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/tools/inst2xsd/detailed/Inst2XsdMiscTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/tools/inst2xsd/detailed/Inst2XsdMiscTest.java (original)
+++ xmlbeans/trunk/test/src/tools/inst2xsd/detailed/Inst2XsdMiscTest.java Fri Jan 18 23:08:44 2019
@@ -14,20 +14,14 @@
*/
package tools.inst2xsd.detailed;
-import tools.inst2xsd.common.Inst2XsdTestBase;
-import org.apache.xmlbeans.impl.inst2xsd.Inst2XsdOptions;
+import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.impl.inst2xsd.Inst2Xsd;
-import org.apache.xmlbeans.impl.common.IOUtil;
-import org.apache.xmlbeans.impl.tool.CommandLine;
-
+import org.apache.xmlbeans.impl.inst2xsd.Inst2XsdOptions;
+import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
+import org.junit.Test;
+import tools.inst2xsd.common.Inst2XsdTestBase;
-import java.io.File;
-import java.io.IOException;
import java.io.FileReader;
-import java.io.PrintStream;
-
-import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
public class Inst2XsdMiscTest extends Inst2XsdTestBase {
@@ -43,10 +37,7 @@ public class Inst2XsdMiscTest extends In
" </xs:complexType>\n" +
"</xs:schema>";
- public Inst2XsdMiscTest(String name) {
- super(name);
- }
-
+ @Test
public void test_usingReader() throws Exception {
FileReader[] fReader = new FileReader[]{new FileReader(BASEXML)};
SchemaDocument[] doc = Inst2Xsd.inst2xsd( fReader, common.getDefaultInstOptions());
@@ -56,6 +47,7 @@ public class Inst2XsdMiscTest extends In
compare(doc[0],XmlObject.Factory.parse(EXPBASEXML) );
}
+ @Test
public void test_nulloptions() throws Exception {
FileReader[] fReader = new FileReader[]{new FileReader(BASEXML)};
SchemaDocument[] doc = Inst2Xsd.inst2xsd(fReader, null);
@@ -64,6 +56,7 @@ public class Inst2XsdMiscTest extends In
compare(doc[0], XmlObject.Factory.parse(EXPBASEXML));
}
+ @Test
public void test_notverboseoptions() throws Exception {
FileReader[] fReader = new FileReader[]{new FileReader(BASEXML)};
Inst2XsdOptions opts = common.getDefaultInstOptions();
Modified: xmlbeans/trunk/test/src/xmlcursor/checkin/AddToSelectionTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/xmlcursor/checkin/AddToSelectionTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/xmlcursor/checkin/AddToSelectionTest.java (original)
+++ xmlbeans/trunk/test/src/xmlcursor/checkin/AddToSelectionTest.java Fri Jan 18 23:08:44 2019
@@ -16,61 +16,37 @@
package xmlcursor.checkin;
-import org.apache.xmlbeans.XmlOptions;
-import junit.framework.*;
-import junit.framework.Assert.*;
-
-import java.io.*;
-
-import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlBeans;
-import org.apache.xmlbeans.XmlCursor.TokenType;
-import org.apache.xmlbeans.XmlDocumentProperties;
-import org.apache.xmlbeans.XmlCursor.XmlBookmark;
-
-import javax.xml.namespace.QName;
-
+import org.apache.xmlbeans.XmlObject;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import xmlcursor.common.BasicCursorTestCase;
-import java.net.URL;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
-/**
- *
- *
- */
-public class AddToSelectionTest extends BasicCursorTestCase
-{
+public class AddToSelectionTest extends BasicCursorTestCase {
- static String sXml = "<foo><b>0</b><b>1</b><b>2</b><b attr=\"a3\">3</b><b>4</b><b>5</b><b>6</b></foo>";
-
- public AddToSelectionTest(String sName)
- {
- super(sName);
- }
+ private static String sXml = "<foo><b>0</b><b>1</b><b>2</b><b attr=\"a3\">3</b><b>4</b><b>5</b><b>6</b></foo>";
- public static Test suite()
- {
- return new TestSuite(AddToSelectionTest.class);
- }
-
- public void testAddToSelectionEnd()
- {
+ @Test
+ public void testAddToSelectionEnd() {
m_xc.toEndDoc();
m_xc.addToSelection();
assertEquals(1, m_xc.getSelectionCount());
}
- public void testAddToSelectionStart()
- {
+ @Test
+ public void testAddToSelectionStart() {
m_xc.toStartDoc();
m_xc.addToSelection();
assertEquals(1, m_xc.getSelectionCount());
}
- public void testAddToSelectionAll() throws Exception
- {
+ @Test
+ public void testAddToSelectionAll() throws Exception {
sXml = "<foo></foo>";
m_xc = XmlObject.Factory.parse(sXml).newCursor();
XmlCursor.TokenType tok;
@@ -91,12 +67,12 @@ public class AddToSelectionTest extends
m_xc.toNextSelection();
}
//second cursor should be at the end of selections too...
- assertEquals(false, m_xc.toNextSelection());
+ assertFalse(m_xc.toNextSelection());
m_xc1.dispose();
}
- public void testAddToSelectionSet()
- {
+ @Test
+ public void testAddToSelectionSet() {
//not set but bag semantics
int expRes = 100;
@@ -108,28 +84,20 @@ public class AddToSelectionTest extends
assertEquals(expRes, m_xc.getSelectionCount());
}
- public void testAddAfterDispose()
- {
+ @Test(expected = Throwable.class)
+ public void testAddAfterDispose() {
m_xc.dispose();
- boolean error = false;
- try {
- m_xc.addToSelection();
- } catch (Throwable e) {
- error = true;
- }
- assertEquals(true, error);
+ m_xc.addToSelection();
}
-
- public void setUp() throws Exception
- {
+ @Before
+ public void setUp() throws Exception {
m_xc = XmlObject.Factory.parse(sXml).newCursor();
- super.setUp();
}
- public void tearDown()
- {
+ @After
+ public void tearDown() {
if (m_xc == null) return;
try {
m_xc.clearSelections();
Modified: xmlbeans/trunk/test/src/xmlcursor/checkin/AnnotationsTests.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/xmlcursor/checkin/AnnotationsTests.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/xmlcursor/checkin/AnnotationsTests.java (original)
+++ xmlbeans/trunk/test/src/xmlcursor/checkin/AnnotationsTests.java Fri Jan 18 23:08:44 2019
@@ -15,63 +15,48 @@
package xmlcursor.checkin;
-import java.io.File;
import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlBeans;
import org.apache.xmlbeans.XmlObject;
-import junit.framework.Assert;
-import junit.framework.TestCase;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
+import org.junit.Test;
import xmlcursor.common.Common;
-public class AnnotationsTests extends TestCase
-{
- public AnnotationsTests(String name) { super(name); }
- public static Test suite() { return new TestSuite(AnnotationsTests.class); }
-
- static String[] _args;
- static String _test;
-
-
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
- static class TestBookmark extends XmlCursor.XmlBookmark
- {
+public class AnnotationsTests {
+ private static class TestBookmark extends XmlCursor.XmlBookmark {
}
//
// Basic load up a file and iterate through it
//
-
- public void testBasicXml( )
- throws Exception
- {
+ @Test
+ public void testBasicXml() throws Exception {
XmlCursor c = XmlObject.Factory.parse(Common.XML_ATTR_TEXT, null).newCursor();
TestBookmark a1 = new TestBookmark();
- c.setBookmark( a1 );
-
+ c.setBookmark(a1);
+
TestBookmark a2 = new TestBookmark();
c.toNextToken();
c.toNextToken();
-
- c.setBookmark( a2 );
-
+
+ c.setBookmark(a2);
+
c.toPrevToken();
c.toPrevToken();
- Assert.assertEquals( c.getBookmark( TestBookmark.class ), a1 );
-
+ assertEquals(c.getBookmark(TestBookmark.class), a1);
+
c.toNextToken();
c.toNextToken();
-
- Assert.assertEquals( c.getBookmark( TestBookmark.class ), a2 );
-
+
+ assertEquals(c.getBookmark(TestBookmark.class), a2);
+
c.toNextToken();
-
- Assert.assertTrue( c.getBookmark( TestBookmark.class ) == null );
+
+ assertNull(c.getBookmark(TestBookmark.class));
}
}
Modified: xmlbeans/trunk/test/src/xmlcursor/checkin/BeginElementTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/xmlcursor/checkin/BeginElementTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/xmlcursor/checkin/BeginElementTest.java (original)
+++ xmlbeans/trunk/test/src/xmlcursor/checkin/BeginElementTest.java Fri Jan 18 23:08:44 2019
@@ -15,111 +15,74 @@
package xmlcursor.checkin;
-import org.apache.xmlbeans.XmlOptions;
-import junit.framework.*;
-import junit.framework.Assert.*;
-
-import java.io.*;
-
-import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlBeans;
import org.apache.xmlbeans.XmlCursor.TokenType;
+import org.apache.xmlbeans.XmlObject;
+import org.junit.Test;
+import xmlcursor.common.BasicCursorTestCase;
+import xmlcursor.common.Common;
import javax.xml.namespace.QName;
-import xmlcursor.common.Common;
-import xmlcursor.common.BasicCursorTestCase;
-
-import java.net.URL;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
-/**
- *
- *
- */
public class BeginElementTest extends BasicCursorTestCase {
- XmlCursor.TokenType tok;
- String sLocalName="localName";
- String sUri="fakeURI";
- String sDefaultPrefix=sUri.substring(0,3); //$BUGBUG:WHY???
- String sExpectedStart="<"+sDefaultPrefix+":localName xmlns:"+sDefaultPrefix+"=\"fakeURI\"/>";
-
- String sInputDoc=Common.XML_FOO_DIGITS;
-
-
- public BeginElementTest(String sName) {
- super(sName);
- }
-
- public static Test suite() {
- return new TestSuite(BeginElementTest.class);
- }
-
-
-
- public void testBeginElementStr()throws Exception {
- //same for string API
- m_xc= XmlObject.Factory.parse(sInputDoc).newCursor();
- toNextTokenOfType(m_xc, TokenType.START);
- m_xc.beginElement(sLocalName,sUri);
- toPrevTokenOfType(m_xc, TokenType.START);
- /*System.out.println(" SAW "+m_xc.xmlText());
- System.out.println(" Wanted "+sExpectedStart);
- System.out.println(" Java Wanted "+new QName(sUri,sLocalName));
- */
- assertEquals(m_xc.xmlText(),sExpectedStart);
- }
-
- public void testBeginElementQName() throws Exception{
- //Qname call
-
- m_xc= XmlObject.Factory.parse(sInputDoc).newCursor();
- //insert new under the first element
- toNextTokenOfType(m_xc, TokenType.START);
- QName qName=new QName(sUri,sLocalName);
- m_xc.beginElement(qName);
- checkResult(qName);
- }
- public void testBeginElementQNamePrefix() throws Exception{
- //Qname with prefix
- String sPrefix="pre";
- m_xc= XmlObject.Factory.parse(sInputDoc).newCursor();
- toNextTokenOfType(m_xc, TokenType.START);
- QName qName=new QName(sUri,sLocalName,sPrefix);
- System.out.println("Java prefix Qname: "+qName);
- m_xc.beginElement(qName);
- checkResult(qName);
- }
-
- //pre: cursor is not moved after beginElt call
- private void checkResult(QName qName){
- tok=m_xc.toPrevToken();
-
- assertEquals(m_xc.getName(),qName);
-
- }
-
- public void testBeginElementStartDoc(String sLocalName, String sUri)throws Exception {
- m_xc= XmlObject.Factory.parse(sInputDoc).newCursor();
- m_xc.beginElement(sLocalName,sUri);
- m_xc.toPrevToken();
- m_xc.toPrevToken();
- assertEquals(true,m_xc.isStartdoc());
-
- }
-
- //
- public static void main(String[] rgs){
- try{
- BeginElementTest test=(new BeginElementTest(""));
- test.testBeginElementQNamePrefix();
- // test.testBeginElementQName();
- System.out.println("getName(): "+test.m_xc.getName());
- System.out.println("cmlText(): "+test.m_xc.xmlText());
- }catch (Exception e){
+ private String sLocalName="localName";
+ private String sUri="fakeURI";
+ private String sDefaultPrefix=sUri.substring(0,3); //$BUGBUG:WHY???
+ private String sExpectedStart="<"+sDefaultPrefix+":localName xmlns:"+sDefaultPrefix+"=\"fakeURI\"/>";
+
+ private String sInputDoc=Common.XML_FOO_DIGITS;
+
+
+ @Test
+ public void testBeginElementStr() throws Exception {
+ //same for string API
+ m_xc = XmlObject.Factory.parse(sInputDoc).newCursor();
+ toNextTokenOfType(m_xc, TokenType.START);
+ m_xc.beginElement(sLocalName, sUri);
+ toPrevTokenOfType(m_xc, TokenType.START);
+ assertEquals(m_xc.xmlText(), sExpectedStart);
+ }
+
+ @Test
+ public void testBeginElementQName() throws Exception {
+ //Qname call
+
+ m_xc = XmlObject.Factory.parse(sInputDoc).newCursor();
+ //insert new under the first element
+ toNextTokenOfType(m_xc, TokenType.START);
+ QName qName = new QName(sUri, sLocalName);
+ m_xc.beginElement(qName);
+ checkResult(qName);
+ }
+
+ @Test
+ public void testBeginElementQNamePrefix() throws Exception {
+ //Qname with prefix
+ String sPrefix = "pre";
+ m_xc = XmlObject.Factory.parse(sInputDoc).newCursor();
+ toNextTokenOfType(m_xc, TokenType.START);
+ QName qName = new QName(sUri, sLocalName, sPrefix);
+ System.out.println("Java prefix Qname: " + qName);
+ m_xc.beginElement(qName);
+ checkResult(qName);
+ }
+
+ //pre: cursor is not moved after beginElt call
+ private void checkResult(QName qName) {
+ TokenType tok = m_xc.toPrevToken();
+ assertEquals(m_xc.getName(), qName);
+ }
+ public void testBeginElementStartDoc(String sLocalName, String sUri) throws Exception {
+ m_xc = XmlObject.Factory.parse(sInputDoc).newCursor();
+ m_xc.beginElement(sLocalName, sUri);
+ m_xc.toPrevToken();
+ m_xc.toPrevToken();
+ assertTrue(m_xc.isStartdoc());
}
- }
}
Modified: xmlbeans/trunk/test/src/xmlcursor/checkin/ClearBookmarkTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/xmlcursor/checkin/ClearBookmarkTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/xmlcursor/checkin/ClearBookmarkTest.java (original)
+++ xmlbeans/trunk/test/src/xmlcursor/checkin/ClearBookmarkTest.java Fri Jan 18 23:08:44 2019
@@ -15,35 +15,22 @@
package xmlcursor.checkin;
-import junit.framework.*;
-
-
-import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.XmlCursor.XmlBookmark;
-
-
+import org.apache.xmlbeans.XmlObject;
+import org.junit.Test;
import xmlcursor.common.BasicCursorTestCase;
import xmlcursor.common.Common;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
-/**
- *
- *
- */
public class ClearBookmarkTest extends BasicCursorTestCase {
private Bookmark0 _theAnnotation0 = new Bookmark0("value0");
private Bookmark1 _theAnnotation1 = new Bookmark1("value1");
private Bookmark2 _theAnnotation2 = new Bookmark2("value2");
- public ClearBookmarkTest(String sName) {
- super(sName);
- }
-
- public static Test suite() {
- return new TestSuite(ClearBookmarkTest.class);
- }
-
+ @Test
public void testClearIndependent() throws Exception {
m_xo = XmlObject.Factory.parse(Common.XML_FOO_TEXT);
m_xc = m_xo.newCursor();
@@ -66,6 +53,7 @@ public class ClearBookmarkTest extends B
assertEquals("value2", ann2.text);
}
+ @Test
public void testClearNullKey() throws Exception {
m_xo = XmlObject.Factory.parse(Common.XML_FOO_TEXT);
m_xc = m_xo.newCursor();
@@ -75,6 +63,7 @@ public class ClearBookmarkTest extends B
assertEquals("value0", ann0.text);
}
+ @Test
public void testClearSuperClass() throws Exception {
m_xo = XmlObject.Factory.parse(Common.XML_FOO_TEXT);
m_xc = m_xo.newCursor();
@@ -84,6 +73,7 @@ public class ClearBookmarkTest extends B
assertEquals("value0", ann0.text);
}
+ @Test
public void testClearInvalidClass() throws Exception {
m_xo = XmlObject.Factory.parse(Common.XML_FOO_TEXT);
m_xc = m_xo.newCursor();
Modified: xmlbeans/trunk/test/src/xmlcursor/checkin/ClearSelectionTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/xmlcursor/checkin/ClearSelectionTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/xmlcursor/checkin/ClearSelectionTest.java (original)
+++ xmlbeans/trunk/test/src/xmlcursor/checkin/ClearSelectionTest.java Fri Jan 18 23:08:44 2019
@@ -16,26 +16,16 @@
package xmlcursor.checkin;
import org.apache.xmlbeans.XmlObject;
+import org.junit.Test;
import tools.util.JarUtil;
import xmlcursor.common.BasicCursorTestCase;
import xmlcursor.common.Common;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
-/**
- *
- *
- */
public class ClearSelectionTest extends BasicCursorTestCase {
- public ClearSelectionTest(String sName) {
- super(sName);
- }
-
- public static Test suite() {
- return new TestSuite(ClearSelectionTest.class);
- }
-
+ @Test
public void testClearSelection() throws Exception {
//m_xo = XmlObject.Factory.parse(Common.XML_PURCHASEORDER);
m_xo = XmlObject.Factory.parse(
@@ -48,17 +38,17 @@ public class ClearSelectionTest extends
assertEquals("Mill Valley", m_xc.getTextValue());
assertEquals("<po:city "+exp_ns+">Mill Valley</po:city>", m_xc.xmlText());
m_xc.clearSelections();
- assertEquals(false, m_xc.toNextSelection());
+ assertFalse(m_xc.toNextSelection());
assertEquals("Mill Valley", m_xc.getTextValue());
assertEquals("<po:city "+exp_ns+">Mill Valley</po:city>", m_xc.xmlText());
}
+ @Test
public void testClearSelectionNoSelection() throws Exception {
m_xo = XmlObject.Factory.parse(
JarUtil.getResourceFromJar(Common.TRANXML_FILE_XMLCURSOR_PO));
m_xc = m_xo.newCursor();
m_xc.clearSelections();
}
-
}
Modified: xmlbeans/trunk/test/src/xmlcursor/checkin/ComparePositionTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/xmlcursor/checkin/ComparePositionTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/xmlcursor/checkin/ComparePositionTest.java (original)
+++ xmlbeans/trunk/test/src/xmlcursor/checkin/ComparePositionTest.java Fri Jan 18 23:08:44 2019
@@ -19,25 +19,15 @@ package xmlcursor.checkin;
import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.XmlCursor.TokenType;
import org.apache.xmlbeans.XmlObject;
+import org.junit.Test;
import xmlcursor.common.BasicCursorTestCase;
import xmlcursor.common.Common;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import static org.junit.Assert.assertEquals;
-/**
- *
- *
- */
-public class ComparePositionTest extends BasicCursorTestCase {
- public ComparePositionTest(String sName) {
- super(sName);
- }
-
- public static Test suite() {
- return new TestSuite(ComparePositionTest.class);
- }
+public class ComparePositionTest extends BasicCursorTestCase {
+ @Test
public void testComparePositionThis() throws Exception {
m_xo = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT);
m_xc = m_xo.newCursor();
@@ -45,6 +35,7 @@ public class ComparePositionTest extends
assertEquals(0, m_xc.comparePosition(m_xc));
}
+ @Test(expected = IllegalArgumentException.class)
public void testComparePositionDifferentDocs() throws Exception {
m_xc = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT).newCursor();
XmlCursor xc0 = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT).newCursor();
@@ -52,23 +43,19 @@ public class ComparePositionTest extends
xc0.toFirstChild();
try {
m_xc.comparePosition(xc0);
- fail("Expected IllegalArgumentException");
- } catch (IllegalArgumentException ise) {
} finally {
xc0.dispose();
}
}
+ @Test(expected = IllegalArgumentException.class)
public void testComparePositionNull() throws Exception {
m_xc = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT).newCursor();
m_xc.toFirstChild();
- try {
- m_xc.comparePosition(null);
- fail("Expected IllegalArgumentException");
- } catch (IllegalArgumentException ise) {
- }
+ m_xc.comparePosition(null);
}
+ @Test
public void testComparePositionRightInTEXT() throws Exception {
m_xc = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT).newCursor();
XmlCursor xc0 = m_xc.newCursor();
@@ -82,6 +69,7 @@ public class ComparePositionTest extends
}
}
+ @Test
public void testComparePositionLeftInTEXT() throws Exception {
m_xc = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT).newCursor();
XmlCursor xc0 = m_xc.newCursor();
@@ -95,6 +83,7 @@ public class ComparePositionTest extends
}
}
+ @Test
public void testComparePositionENDandENDDOC() throws Exception {
m_xc = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT).newCursor();
XmlCursor xc0 = m_xc.newCursor();
Modified: xmlbeans/trunk/test/src/xmlcursor/checkin/CopyTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/xmlcursor/checkin/CopyTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/xmlcursor/checkin/CopyTest.java (original)
+++ xmlbeans/trunk/test/src/xmlcursor/checkin/CopyTest.java Fri Jan 18 23:08:44 2019
@@ -20,43 +20,26 @@ package xmlcursor.checkin;
import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.XmlCursor.TokenType;
import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.XmlException;
+import org.junit.Test;
import tools.util.JarUtil;
import xmlcursor.common.BasicCursorTestCase;
import xmlcursor.common.Common;
-import junit.framework.Test;
-import junit.framework.TestSuite;
import javax.xml.namespace.QName;
+import static org.junit.Assert.assertEquals;
-/**
- *
- *
- */
public class CopyTest extends BasicCursorTestCase {
- public CopyTest(String sName) {
- super(sName);
- }
-
- public static Test suite() {
- return new TestSuite(CopyTest.class);
- }
-
+ @Test(expected = IllegalArgumentException.class)
public void testCopyToNull() throws Exception {
m_xo = XmlObject.Factory.parse(Common.XML_FOO_DIGITS);
m_xc = m_xo.newCursor();
toNextTokenOfType(m_xc, TokenType.TEXT);
- try {
- m_xc.copyXml(null);
- fail(
- "Expected IllegalArgumentException. Can't copy to foreign document");
- }
- catch (IllegalArgumentException ise) {
- }
+ m_xc.copyXml(null);
}
+ @Test
public void testCopyDifferentStoresLoadedByParse() throws Exception {
m_xo = XmlObject.Factory.parse(Common.XML_FOO_DIGITS);
m_xc = m_xo.newCursor();
@@ -75,11 +58,10 @@ public class CopyTest extends BasicCurso
/**
* Method testCopyDifferentStoresLoadedFromFile
- * <p/>
- * Tests copy from document w/ namespaces to doc w/o
*
- * @throws Exception
+ * Tests copy from document w/ namespaces to doc w/o
*/
+ @Test
public void testCopyDifferentStoresLoadedFromFile() throws Exception {
// load the documents and obtain a cursor
XmlObject xobj0 = XmlObject.Factory.parse(
@@ -120,11 +102,10 @@ public class CopyTest extends BasicCurso
/**
* Method testCopyDifferentStoresLoadedFromFile2
- * <p/>
- * Tests copy from document w/o namespaces to document with namespaces
*
- * @throws Exception
+ * Tests copy from document w/o namespaces to document with namespaces
*/
+ @Test
public void testCopyDifferentStoresLoadedFromFile2() throws Exception {
// load the documents and obtain a cursor
XmlObject xobj0 = XmlObject.Factory.parse(
@@ -166,6 +147,7 @@ public class CopyTest extends BasicCurso
}
+ @Test
public void testCopySameLocation() throws Exception {
m_xo = XmlObject.Factory.parse(Common.XML_FOO_DIGITS);
m_xc = m_xo.newCursor();
@@ -178,6 +160,7 @@ public class CopyTest extends BasicCurso
assertEquals("0123401234", m_xc.getTextValue());
}
+ @Test
public void testCopyNewLocation() throws Exception {
m_xo = XmlObject.Factory.parse(
JarUtil.getResourceFromJar(Common.TRANXML_FILE_XMLCURSOR_PO));
@@ -200,8 +183,8 @@ public class CopyTest extends BasicCurso
}
+ @Test
public void testCopyElementToMiddleOfTEXT() throws Exception {
-
String ns="declare namespace po=\"http://xbean.test/xmlcursor/PurchaseOrder\"; ";
String exp_ns="xmlns:po=\"http://xbean.test/xmlcursor/PurchaseOrder\"";
m_xo = XmlObject.Factory.parse(
@@ -229,8 +212,4 @@ public class CopyTest extends BasicCurso
// verify m_xc
assertEquals("<po:city "+exp_ns+">Mill Valley</po:city>", m_xc.xmlText());
}
-
-
-
}
-
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org