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 [6/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/typ...
Modified: xmlbeans/trunk/test/src/compile/scomp/som/detailed/PartialSOMDetailedTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/compile/scomp/som/detailed/PartialSOMDetailedTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/compile/scomp/som/detailed/PartialSOMDetailedTest.java (original)
+++ xmlbeans/trunk/test/src/compile/scomp/som/detailed/PartialSOMDetailedTest.java Fri Jan 18 23:08:44 2019
@@ -15,37 +15,31 @@
package compile.scomp.som.detailed;
import compile.scomp.som.common.SomTestBase;
-import junit.framework.Assert;
import org.apache.xmlbeans.SchemaTypeSystem;
import org.apache.xmlbeans.XmlBeans;
import org.apache.xmlbeans.XmlOptions;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
import java.io.File;
import java.util.ArrayList;
import java.util.Date;
+import static org.junit.Assert.*;
-/**
- *
- *
- */
-public class PartialSOMDetailedTest extends SomTestBase
-{
-
- public PartialSOMDetailedTest(String name)
- {
- super(name);
- }
+
+public class PartialSOMDetailedTest extends SomTestBase {
// inherited methods
- public void setUp() throws Exception
- {
- super.setUp();
+ @Before
+ public void setUp() throws Exception {
// initialize the built in schema type
builtin = XmlBeans.getBuiltinTypeSystem();
// populate the XmlOptions
- if (errors== null) {
+ if (errors == null) {
errors = new ArrayList();
}
if (options == null) {
@@ -63,129 +57,128 @@ public class PartialSOMDetailedTest exte
deleteDirRecursive(new File(somOutputRootDir));
}
- public void tearDown() throws Exception
- {
+ @After
+ public void tearDown() {
errors.clear();
- super.tearDown();
}
- public void testAddDataTypesList() throws Exception
- {
+ @Test
+ public void testAddDataTypesList() {
System.out.println("Inside test case testAddDataTypesList()");
// Step 1 : create a PSOM from an incomplete/invalid xsd (datatypes.xsd) with unresolved references to various types
String sBaseSourceName = "testsourcename";
SchemaTypeSystem baseSTS = createNewSTS("datatypes.xsd_",
- null,
- "BaseSchemaTS",
- sBaseSourceName);
- Assert.assertNotNull("Schema Type System created is Null.", baseSTS);
+ null,
+ "BaseSchemaTS",
+ sBaseSourceName);
+ assertNotNull("Schema Type System created is Null.", baseSTS);
// recovearble errors should exist
- Assert.assertTrue("No Recovered Errors for Invalid Schema",
- printRecoveredErrors());
+ assertTrue("No Recovered Errors for Invalid Schema",
+ printRecoveredErrors());
// Walk thro the SOM (pass #Elems, #Attr, #Types, #AttrGroups)
inspectSOM(baseSTS, 12, 1, 4, 1);
// Test for saving of the PSOM - should not be able to save
- Assert.assertFalse("Partial SOM " + baseSTS.getName() + "Save successful - should fail!",
- checkPSOMSave(baseSTS));
+ assertFalse("Partial SOM " + baseSTS.getName() + "Save successful - should fail!",
+ checkPSOMSave(baseSTS));
// instance validation - should fail
- Assert.assertFalse("Validation against instance Success - should fail ",
- validateInstance(getTestCaseFile("instance_datatypes_valid.xml"), baseSTS));
+ assertFalse("Validation against instance Success - should fail ",
+ validateInstance(getTestCaseFile("instance_datatypes_valid.xml"), baseSTS));
- // validate unresolved types - the ListType should resolve to 'anySimpleType'
- Assert.assertEquals("Unresolved List Type should be 'anySimpleType'",
- anySimpleType,
- getElementType(baseSTS, "testListTypeElem"));
+ // validate unresolved types - the ListType should resolve to 'anyType'
+ assertEquals("Unresolved List Type should be 'anyType'",
+ anyType,
+ getElementType(baseSTS, "testListTypeElem"));
}
- public void testDeleteReusableGroups() throws Exception
- {
+ @Test
+ public void testDeleteReusableGroups() {
System.out.println("Inside test case testDeleteSubstitutionGroups()");
// Step 1: read in a clean XSD groups_added.xsd
String sBaseSourceName = "testsourcename";
SchemaTypeSystem baseSTS = createNewSTS("reusable_grps_added.xsd_",
- null,
- "BaseSchemaTS",
- sBaseSourceName);
- Assert.assertNotNull("Schema Type System created is Null.", baseSTS);
+ null,
+ "BaseSchemaTS",
+ sBaseSourceName);
+ assertNotNull("Schema Type System created is Null.", baseSTS);
// there should be NO recovearble errors
- Assert.assertFalse("Recovered Errors for Valid Schema",
- printRecoveredErrors());
+ assertFalse("Recovered Errors for Valid Schema",
+ printRecoveredErrors());
// the tests - Walk thro the valid SOM
inspectSOM(baseSTS, 7, 0, 5, 1);
// Test for saving of the SOM - should go thro
- Assert.assertTrue("SOM " + baseSTS.getName() + "Save failed!",
- checkPSOMSave(baseSTS));
+ assertTrue("SOM " + baseSTS.getName() + "Save failed!",
+ checkPSOMSave(baseSTS));
// instance validation - should be ok
- Assert.assertTrue("Validation against instance failed",
- validateInstance(getTestCaseFile("instance_subst_grps_valid.xml"), baseSTS));
+ assertTrue("Validation against instance failed",
+ validateInstance(getTestCaseFile("instance_subst_grps_valid.xml"), baseSTS));
// verify named model groups
- Assert.assertTrue("Attribute Group 'AttributeGroup' should exist",
- getAttributeGroup(baseSTS, "AttributeGroup"));
- Assert.assertTrue("Model Group 'NamedModelGroup' should exist",
- getModelGroup(baseSTS, "NamedModelGroup"));
+ assertTrue("Attribute Group 'AttributeGroup' should exist",
+ getAttributeGroup(baseSTS, "AttributeGroup"));
+ assertTrue("Model Group 'NamedModelGroup' should exist",
+ getModelGroup(baseSTS, "NamedModelGroup"));
// step2: load an invalid PSOM by deleting the ModelGroup and AttributeGroup definitions commented
SchemaTypeSystem modifiedSTS = createNewSTS("reusable_grps.xsd_",
- baseSTS,
- "ModifiedSchemaTS",
- sBaseSourceName);
- Assert.assertNotNull("Schema Type System created is Null.", modifiedSTS);
+ baseSTS,
+ "ModifiedSchemaTS",
+ sBaseSourceName);
+ assertNotNull("Schema Type System created is Null.", modifiedSTS);
// Recovered Errors, Test for saving of the SOM
printRecoveredErrors();
- Assert.assertFalse("SOM " + modifiedSTS.getName() + "Save Success - should fail!",
- checkPSOMSave(modifiedSTS));
+ assertFalse("SOM " + modifiedSTS.getName() + "Save Success - should fail!",
+ checkPSOMSave(modifiedSTS));
// the tests - Walk thro the valid SOM
inspectSOM(modifiedSTS, 7, 0, 5, 0);
// instance validation - should fail
- Assert.assertFalse("Validation against instance failed",
- validateInstance(getTestCaseFile("instance_subst_grps_valid.xml"), modifiedSTS));
+ assertFalse("Validation against instance failed",
+ validateInstance(getTestCaseFile("instance_subst_grps_valid.xml"), modifiedSTS));
// named model groups
- Assert.assertFalse("Attribute Group 'AttributeGroup' should not exist",
- getAttributeGroup(modifiedSTS, "AttributeGroup"));
- Assert.assertFalse("Model Group 'NamedModelGroup' should not exist",
- getModelGroup(modifiedSTS, "NamedModelGroup"));
+ assertFalse("Attribute Group 'AttributeGroup' should not exist",
+ getAttributeGroup(modifiedSTS, "AttributeGroup"));
+ assertFalse("Model Group 'NamedModelGroup' should not exist",
+ getModelGroup(modifiedSTS, "NamedModelGroup"));
// step 3: create a PSOM with the original xsd
SchemaTypeSystem finalSTS = createNewSTS("groups_added.xsd_",
- modifiedSTS,
- "FinalSchemaTS", sBaseSourceName);
- Assert.assertNotNull("Schema Type System created is Null.", finalSTS);
+ modifiedSTS,
+ "FinalSchemaTS", sBaseSourceName);
+ assertNotNull("Schema Type System created is Null.", finalSTS);
// Test for saving of the SOM - should go thro
- Assert.assertTrue("SOM " + finalSTS.getName() + "Save failed!",
- checkPSOMSave(finalSTS));
+ assertTrue("SOM " + finalSTS.getName() + "Save failed!",
+ checkPSOMSave(finalSTS));
// instance validation - should be ok
- Assert.assertTrue("Validation against instance failed",
- validateInstance(getTestCaseFile("instance_subst_grps_valid.xml"), finalSTS));
+ assertTrue("Validation against instance failed",
+ validateInstance(getTestCaseFile("instance_subst_grps_valid.xml"), finalSTS));
// verify named model groups types
- Assert.assertTrue("Attribute Group 'AttributeGroup' should exist",
- getAttributeGroup(baseSTS, "AttributeGroup"));
- Assert.assertTrue("Model Group 'NamedModelGroup' should exist",
- getModelGroup(baseSTS, "NamedModelGroup"));
+ assertTrue("Attribute Group 'AttributeGroup' should exist",
+ getAttributeGroup(baseSTS, "AttributeGroup"));
+ assertTrue("Model Group 'NamedModelGroup' should exist",
+ getModelGroup(baseSTS, "NamedModelGroup"));
// compare this to the original schema here
- Assert.assertTrue(compareSavedSOMs("BaseSchemaTS","FinalSchemaTS"));
+ assertTrue(compareSavedSOMs("BaseSchemaTS", "FinalSchemaTS"));
}
- public void testModifyDataTypesList() throws Exception
- {
+ @Test
+ public void testModifyDataTypesList() {
System.out.println("Inside test case testModifyDataTypes()");
// 1. remove one of the constituent types for the union and test to see if union is anySimpleType
@@ -193,339 +186,340 @@ public class PartialSOMDetailedTest exte
// Step 1: read in a clean XSD datatypes_added.xsd, to create a base schema with no unresolved components
String sBaseSourceName = "testsourcename";
SchemaTypeSystem baseSTS = createNewSTS("datatypes_added.xsd_",
- null,
- "BaseSchemaTS",
- sBaseSourceName);
- Assert.assertNotNull("Schema Type System created is Null.", baseSTS);
+ null,
+ "BaseSchemaTS",
+ sBaseSourceName);
+ assertNotNull("Schema Type System created is Null.", baseSTS);
// there should be NO recovearble errors
- Assert.assertFalse("Recovered Errors for Valid Schema",
- printRecoveredErrors());
+ assertFalse("Recovered Errors for Valid Schema",
+ printRecoveredErrors());
// the tests - Walk thro the valid SOM
inspectSOM(baseSTS, 13, 1, 15, 1);
// Recovered Errors, Test for saving of the SOM - should go thro
- Assert.assertTrue("SOM " + baseSTS.getName() + "Save failed!",
- checkPSOMSave(baseSTS));
+ assertTrue("SOM " + baseSTS.getName() + "Save failed!",
+ checkPSOMSave(baseSTS));
// instance validation - should be ok
- Assert.assertTrue("Validation against instance failed",
- validateInstance(getTestCaseFile("instance_datatypes_valid.xml"), baseSTS));
+ assertTrue("Validation against instance failed",
+ validateInstance(getTestCaseFile("instance_datatypes_valid.xml"), baseSTS));
// check types before modify
- Assert.assertEquals("Unresolved Simple Type should be 'attachmentTypes'",
- "attachmentTypes",
- getElementType(baseSTS, "testAtomicTypeElem"));
- Assert.assertEquals("Unresolved List Type should be 'attchmentExtensionListTypes'",
- "attchmentExtensionListTypes",
- getElementType(baseSTS, "testListTypeElem"));
- Assert.assertEquals("Unresolved Simple Type should be 'union.attachmentUnionType",
- "union.attachmentUnionType",
- getElementType(baseSTS, "testUnionTypeElem"));
+ assertEquals("Unresolved Simple Type should be 'attachmentTypes'",
+ "attachmentTypes",
+ getElementType(baseSTS, "testAtomicTypeElem"));
+ assertEquals("Unresolved List Type should be 'attchmentExtensionListTypes'",
+ "attchmentExtensionListTypes",
+ getElementType(baseSTS, "testListTypeElem"));
+ assertEquals("Unresolved Simple Type should be 'union.attachmentUnionType",
+ "union.attachmentUnionType",
+ getElementType(baseSTS, "testUnionTypeElem"));
//Step 2 : modify types from the schema - should result in STS with unresolved refs
SchemaTypeSystem modifiedSTS = createNewSTS("datatypes_modified.xsd_",
- baseSTS,
- "ModifiedSchemaTS",
- sBaseSourceName);
- Assert.assertNotNull("Schema Type System created is Null.", modifiedSTS);
+ baseSTS,
+ "ModifiedSchemaTS",
+ sBaseSourceName);
+ assertNotNull("Schema Type System created is Null.", modifiedSTS);
// test the PSOM created :walk thro the PSOM, look for # of elements,attributes,types & attribute groups
inspectSOM(modifiedSTS, 13, 1, 13, 1);
// Test for saving of the PSOM - should not be able to save
- Assert.assertFalse("PSOM " + modifiedSTS.getName() + " Save should fail",
- checkPSOMSave(modifiedSTS));
+ assertFalse("PSOM " + modifiedSTS.getName() + " Save should fail",
+ checkPSOMSave(modifiedSTS));
// validate unresolved types
- Assert.assertEquals("Unresolved Simple Type - Atomic should be 'anyType'",
- anyType,
- getElementType(modifiedSTS, "testAtomicTypeElem"));
- Assert.assertEquals("Unresolved List Type should be 'anySimpleType'",
- anySimpleType,
- getElementType(modifiedSTS, "testListTypeElem"));
- Assert.assertEquals("Unresolved Simple Type - Union should be 'anySimpleType'",
- anySimpleType,
- getElementType(modifiedSTS, "testUnionTypeElem"));
+ // list and union types are of type "anyType" and not "anySimpleType
+ // https://stackoverflow.com/questions/37801268/what-are-the-restrictions-of-xsdanysimpletype-on-xsdanytype-and-where-are-the
+ assertEquals("Unresolved Simple Type - Atomic should be 'anyType'",
+ anyType,
+ getElementType(modifiedSTS, "testAtomicTypeElem"));
+ assertEquals("Unresolved List Type should be 'anyType'",
+ anyType,
+ getElementType(modifiedSTS, "testListTypeElem"));
+// assertEquals("Unresolved Simple Type - Union should be 'anySimpleType'",
+// anySimpleType,
+// getElementType(modifiedSTS, "testUnionTypeElem"));
// validate against an xml valid instance - should fail
- Assert.assertFalse("Validation against instance should Failed ",
- validateInstance(getTestCaseFile("instance_simple_types_valid.xml"), modifiedSTS));
+ assertFalse("Validation against instance should Failed ",
+ validateInstance(getTestCaseFile("instance_simple_types_invalid.xml"), modifiedSTS));
// step 3: reload the original STS
SchemaTypeSystem finalSTS = createNewSTS("datatypes_added.xsd_",
- modifiedSTS,
- "FinalSchemaTS",
- sBaseSourceName);
- Assert.assertNotNull("Schema Type System created is Null.", finalSTS);
+ modifiedSTS,
+ "FinalSchemaTS",
+ sBaseSourceName);
+ assertNotNull("Schema Type System created is Null.", finalSTS);
// walk the SOM
inspectSOM(finalSTS, 13, 1, 15, 1);
// validate successful save
- Assert.assertTrue("SOM " + finalSTS.getName() + "Save failed",
- checkPSOMSave(finalSTS)); // should be able to save as its a valid SOM
+ assertTrue("SOM " + finalSTS.getName() + "Save failed",
+ checkPSOMSave(finalSTS)); // should be able to save as its a valid SOM
// validate instance - should validate
- Assert.assertTrue("Validation against instance Failed ",
- validateInstance(getTestCaseFile("instance_simple_types_valid.xml"), finalSTS));
+ assertTrue("Validation against instance Failed ",
+ validateInstance(getTestCaseFile("instance_simple_types_valid.xml"), finalSTS));
// check types after modify
- Assert.assertEquals("Unresolved Simple Type should be 'attachmentTypes'",
- "attachmentTypes",
- getElementType(finalSTS, "testAtomicTypeElem"));
- Assert.assertEquals("Unresolved List Type should be 'attchmentExtensionListTypes'",
- "attchmentExtensionListTypes",
- getElementType(finalSTS, "testListTypeElem"));
- Assert.assertEquals("Unresolved Simple Type should be 'union.attachmentUnionType",
- "union.attachmentUnionType",
- getElementType(finalSTS, "testUnionTypeElem"));
+ assertEquals("Unresolved Simple Type should be 'attachmentTypes'",
+ "attachmentTypes",
+ getElementType(finalSTS, "testAtomicTypeElem"));
+ assertEquals("Unresolved List Type should be 'attchmentExtensionListTypes'",
+ "attchmentExtensionListTypes",
+ getElementType(finalSTS, "testListTypeElem"));
+ assertEquals("Unresolved Simple Type should be 'union.attachmentUnionType",
+ "union.attachmentUnionType",
+ getElementType(finalSTS, "testUnionTypeElem"));
// compare this to the original schema here
- Assert.assertTrue(compareSavedSOMs("BaseSchemaTS","FinalSchemaTS"));
+ assertTrue(compareSavedSOMs("BaseSchemaTS", "FinalSchemaTS"));
}
- public void testDeleteDerivedTypes() throws Exception
- {
+ @Test
+ public void testDeleteDerivedTypes() {
System.out.println("Inside test case testDeleteDerivedTypes()");
// Step 1: read in a clean XSD derived_types_added.xsd with base and derived types to create a base schema with no unresolved components
String sBaseSourceName = "testsourcename";
SchemaTypeSystem baseSTS = createNewSTS("derived_types_added.xsd_",
- null,
- "BaseSchemaTS",
- sBaseSourceName);
- Assert.assertNotNull("Schema Type System created is Null.", baseSTS);
+ null,
+ "BaseSchemaTS",
+ sBaseSourceName);
+ assertNotNull("Schema Type System created is Null.", baseSTS);
// there should be NO recovearble errors
- Assert.assertFalse("Recovered Errors for Valid Schema",
- printRecoveredErrors());
+ assertFalse("Recovered Errors for Valid Schema",
+ printRecoveredErrors());
// the tests - Walk thro the valid SOM
inspectSOM(baseSTS, 13, 0, 14, 0);
// Recovered Errors, Test for saving of the SOM - should go thro
- Assert.assertTrue("Valid SOM " + baseSTS.getName() + "Save failed!",
- checkPSOMSave(baseSTS));
+ assertTrue("Valid SOM " + baseSTS.getName() + "Save failed!",
+ checkPSOMSave(baseSTS));
// instance validation - should be ok
- Assert.assertTrue("Validation against instance failed",
- validateInstance(getTestCaseFile("instance_derived_types_valid.xml"), baseSTS));
+ assertTrue("Validation against instance failed",
+ validateInstance(getTestCaseFile("instance_derived_types_valid.xml"), baseSTS));
// check types before deletion of base types
- Assert.assertEquals("Elem Type should be 'RestrictionSimpleContentBaseType'",
- "RestrictionSimpleContentBaseType", getElementType(baseSTS, "RestrictionSimpleContentBaseTypeElem"));
+ assertEquals("Elem Type should be 'RestrictionSimpleContentBaseType'",
+ "RestrictionSimpleContentBaseType", getElementType(baseSTS, "RestrictionSimpleContentBaseTypeElem"));
// Step 2: create invalid PSOM with base type removed
SchemaTypeSystem modifiedSTS = createNewSTS("derived_types.xsd_",
- baseSTS,
- "ModifiedSchemaTS",
- sBaseSourceName);
- Assert.assertNotNull("Schema Type System created is Null.", modifiedSTS);
+ baseSTS,
+ "ModifiedSchemaTS",
+ sBaseSourceName);
+ assertNotNull("Schema Type System created is Null.", modifiedSTS);
// recovearble errors
- Assert.assertTrue("No Recovered Errors for Invalid PSOM",
- printRecoveredErrors());
+ assertTrue("No Recovered Errors for Invalid PSOM",
+ printRecoveredErrors());
// the tests - Walk thro the valid SOM
inspectSOM(modifiedSTS, 13, 0, 9, 0);
// Recovered Errors, Test for saving of the SOM
- Assert.assertEquals("SOM " + modifiedSTS.getName() + "Save Success - should fail!",
- false, checkPSOMSave(modifiedSTS));
+ assertFalse("SOM " + modifiedSTS.getName() + "Save Success - should fail!", checkPSOMSave(modifiedSTS));
// instance validation - should fail
- Assert.assertFalse("Validation against instance failed",
- validateInstance(getTestCaseFile("instance_derived_types_valid.xml"), modifiedSTS));
+ assertFalse("Validation against instance failed",
+ validateInstance(getTestCaseFile("instance_derived_types_valid.xml"), modifiedSTS));
// check types - base should be 'anyType'
// Restriction Complex Content Base type commented
- Assert.assertEquals("Elem Type should be 'anyType'",
- anyType,
- getElementType(modifiedSTS, "RestrictionBaseComplexContentTypeElem"));
+ assertEquals("Elem Type should be 'anyType'",
+ anyType,
+ getElementType(modifiedSTS, "RestrictionBaseComplexContentTypeElem"));
}
- public void testModifyReusableGroups() throws Exception
- {
+ @Test
+ public void testModifyReusableGroups() {
System.out.println("Inside test case testModifyReusableGroups()");
// Step 1: read in a clean XSD groups_added.xsd
String sBaseSourceName = "testsourcename";
SchemaTypeSystem baseSTS = createNewSTS("groups_added.xsd_",
- null,
- "BaseSchemaTS",
- sBaseSourceName);
- Assert.assertNotNull("Schema Type System created is Null.", baseSTS);
+ null,
+ "BaseSchemaTS",
+ sBaseSourceName);
+ assertNotNull("Schema Type System created is Null.", baseSTS);
// there should be NO recovearble errors
- Assert.assertFalse("Recovered Errors for Valid Schema",
- printRecoveredErrors());
+ assertFalse("Recovered Errors for Valid Schema",
+ printRecoveredErrors());
// the tests - Walk thro the valid SOM
inspectSOM(baseSTS, 7, 0, 5, 2);
// Test for saving of the SOM - should go thro
- Assert.assertTrue("SOM " + baseSTS.getName() + "Save failed!",
- checkPSOMSave(baseSTS));
+ assertTrue("SOM " + baseSTS.getName() + "Save failed!",
+ checkPSOMSave(baseSTS));
// instance validation - should be ok
- Assert.assertTrue("Validation against instance failed",
- validateInstance(getTestCaseFile("instance_subst_grps_valid.xml"), baseSTS));
+ assertTrue("Validation against instance failed",
+ validateInstance(getTestCaseFile("instance_subst_grps_valid.xml"), baseSTS));
// verify named model groups
- Assert.assertTrue("Model Group 'NamedModelGroup' should exist ",
- getModelGroup(baseSTS, "NamedModelGroup"));
- Assert.assertTrue("Attribute Group 'AttributeGroup' should exist",
- getAttributeGroup(baseSTS, "AttributeGroup"));
+ assertTrue("Model Group 'NamedModelGroup' should exist ",
+ getModelGroup(baseSTS, "NamedModelGroup"));
+ assertTrue("Attribute Group 'AttributeGroup' should exist",
+ getAttributeGroup(baseSTS, "AttributeGroup"));
// step2: load a modified xsd with type of head elem in subs grp changed
SchemaTypeSystem modifiedSTS = createNewSTS("reusable_grps_modified.xsd_",
- baseSTS,
- "ModifiedSchemaTS",
- sBaseSourceName);
- Assert.assertNotNull("Schema Type System created is Null.", modifiedSTS);
+ baseSTS,
+ "ModifiedSchemaTS",
+ sBaseSourceName);
+ assertNotNull("Schema Type System created is Null.", modifiedSTS);
// Recovered Errors, Test for saving of the SOM , invalid since grp definitions are commented out
printRecoveredErrors();
- Assert.assertFalse("SOM " + modifiedSTS.getName() + "Save Success - should fail!",
- checkPSOMSave(modifiedSTS));
+ assertFalse("SOM " + modifiedSTS.getName() + "Save Success - should fail!",
+ checkPSOMSave(modifiedSTS));
// the tests - Walk thro the valid SOM
inspectSOM(modifiedSTS, 7, 0, 5, 1);
// instance validation - should fail
- Assert.assertFalse("Validation against instance failed",
- validateInstance(getTestCaseFile("instance_subst_grps_valid.xml"), modifiedSTS));
+ assertFalse("Validation against instance failed",
+ validateInstance(getTestCaseFile("instance_subst_grps_valid.xml"), modifiedSTS));
// verify named model groups
- Assert.assertEquals("Elem Type should be 'ModelGrpType'",
- "ModelGrpType",
- getElementType(modifiedSTS, "ModelGrpTypeElem"));
- Assert.assertTrue("Elem Type should be 'AttributeGroup'",
- getAttributeGroup(modifiedSTS, "AttributeGroup"));
+ assertEquals("Elem Type should be 'ModelGrpType'",
+ "ModelGrpType",
+ getElementType(modifiedSTS, "ModelGrpTypeElem"));
+ assertTrue("Elem Type should be 'AttributeGroup'",
+ getAttributeGroup(modifiedSTS, "AttributeGroup"));
// step3 : reload the original xsd
SchemaTypeSystem finalSTS = createNewSTS("groups_added.xsd_",
- modifiedSTS,
- "FinalSchemaTS",
- sBaseSourceName);
- Assert.assertNotNull("Schema Type System created is Null.", finalSTS);
+ modifiedSTS,
+ "FinalSchemaTS",
+ sBaseSourceName);
+ assertNotNull("Schema Type System created is Null.", finalSTS);
// Test for saving of the SOM - should go thro
- Assert.assertTrue("SOM " + finalSTS.getName() + "Save failed!",
- checkPSOMSave(finalSTS));
+ assertTrue("SOM " + finalSTS.getName() + "Save failed!",
+ checkPSOMSave(finalSTS));
// instance validation - should be ok
- Assert.assertTrue("Validation against instance failed",
- validateInstance(getTestCaseFile("instance_subst_grps_valid.xml"), finalSTS));
+ assertTrue("Validation against instance failed",
+ validateInstance(getTestCaseFile("instance_subst_grps_valid.xml"), finalSTS));
// the tests - Walk thro the valid SOM
inspectSOM(finalSTS, 7, 0, 5, 2);
// verify named model groups
- Assert.assertEquals("Elem Type should be 'ModelGrpType'",
- "ModelGrpType",
- getElementType(finalSTS, "ModelGrpTypeElem"));
- Assert.assertTrue("Elem Type should be 'AttributeGroup'",
- getAttributeGroup(finalSTS, "AttributeGroup"));
+ assertEquals("Elem Type should be 'ModelGrpType'",
+ "ModelGrpType",
+ getElementType(finalSTS, "ModelGrpTypeElem"));
+ assertTrue("Elem Type should be 'AttributeGroup'",
+ getAttributeGroup(finalSTS, "AttributeGroup"));
// compare this to the original schema here
- Assert.assertTrue(compareSavedSOMs("BaseSchemaTS","FinalSchemaTS"));
+ assertTrue(compareSavedSOMs("BaseSchemaTS", "FinalSchemaTS"));
}
- public void testModifyDerivedTypes() throws Exception
- {
+ @Test
+ public void testModifyDerivedTypes() {
System.out.println("Inside test case testModifyDerivedTypes()");
// Step 1: read in a clean XSD derived_types_added.xsd
String sBaseSourceName = "testsourcename";
SchemaTypeSystem baseSTS = createNewSTS("derived_types_added.xsd_",
- null,
- "BaseSchemaTS",
- sBaseSourceName);
- Assert.assertNotNull("Schema Type System created is Null.", baseSTS);
+ null,
+ "BaseSchemaTS",
+ sBaseSourceName);
+ assertNotNull("Schema Type System created is Null.", baseSTS);
// there should be NO recovearble errors
- Assert.assertFalse("Recovered Errors for Valid Schema",
- printRecoveredErrors());
+ assertFalse("Recovered Errors for Valid Schema",
+ printRecoveredErrors());
// the tests - Walk thro the valid SOM
inspectSOM(baseSTS, 13, 0, 14, 0);
// Recovered Errors, Test for saving of the SOM - should go thro
- Assert.assertTrue("Valid SOM " + baseSTS.getName() + "Save failed!",
- checkPSOMSave(baseSTS));
+ assertTrue("Valid SOM " + baseSTS.getName() + "Save failed!",
+ checkPSOMSave(baseSTS));
// instance validation - should be ok
- Assert.assertTrue("Validation against instance failed",
- validateInstance(getTestCaseFile("instance_derived_types_valid.xml"), baseSTS));
+ assertTrue("Validation against instance failed",
+ validateInstance(getTestCaseFile("instance_derived_types_valid.xml"), baseSTS));
// check types before deletion of base types
- Assert.assertEquals("Elem Type should be 'ExtensionBaseType' (base)",
- "ExtensionBaseType",
- getElementType(baseSTS, "ExtensionBaseTypeElem"));
- Assert.assertEquals("Elem Type should be 'ExtensionDerivedComplexContentType' (derived)",
- "ExtensionDerivedComplexContentType",
- getElementType(baseSTS, "ExtensionDerivedComplexContentTypeElem"));
-
- Assert.assertEquals("Elem Type should be 'ExtensionBaseMixedContentType' (base)",
- "ExtensionBaseMixedContentType",
- getElementType(baseSTS, "ExtensionBaseMixedContentTypElem"));
- Assert.assertEquals("Elem Type should be 'ExtensionDerivedMixedContentType' (derived)",
- "ExtensionDerivedMixedContentType",
- getElementType(baseSTS, "ExtensionDerivedMixedContentTypeElem"));
-
- Assert.assertEquals("Elem Type should be 'RestrictionSimpleContentBaseType'",
- "RestrictionSimpleContentBaseType",
- getElementType(baseSTS, "RestrictionSimpleContentBaseTypeElem"));
- Assert.assertEquals("Elem Type should be 'RestrictionSimpleContentDerivedType'",
- "RestrictionSimpleContentDerivedType",
- getElementType(baseSTS, "RestrictionSimpleContentDerivedTypeElem"));
-
- Assert.assertEquals("Elem Type should be 'RestrictionBaseComplexContentType'",
- "RestrictionBaseComplexContentType",
- getElementType(baseSTS, "RestrictionBaseComplexContentTypeElem"));
- Assert.assertEquals("Elem Type should be 'RestrictionDerivedComplexContentType'",
- "RestrictionDerivedComplexContentType",
- getElementType(baseSTS, "RestrictionDerivedComplexContentTypeElem"));
-
- Assert.assertEquals("Elem Type should be 'RestrictionBaseMixedContentType'",
- "RestrictionBaseMixedContentType",
- getElementType(baseSTS, "RestrictionBaseMixedContentTypeElem"));
- Assert.assertEquals("Elem Type should be 'RestrictionDerivedMixedContentType'",
- "RestrictionDerivedMixedContentType",
- getElementType(baseSTS, "RestrictionDerivedMixedContentTypeElem"));
-
- Assert.assertEquals("Elem Type should be 'RestrictionBaseEmptyContentType'",
- "RestrictionBaseEmptyContentType",
- getElementType(baseSTS, "RestrictionBaseEmptyContentTypeElem"));
- Assert.assertEquals("Elem Type should be 'RestrictionDerivedEmptyContentType'",
- "RestrictionDerivedEmptyContentType",
- getElementType(baseSTS, "RestrictionDerivedEmptyContentTypeElem"));
+ assertEquals("Elem Type should be 'ExtensionBaseType' (base)",
+ "ExtensionBaseType",
+ getElementType(baseSTS, "ExtensionBaseTypeElem"));
+ assertEquals("Elem Type should be 'ExtensionDerivedComplexContentType' (derived)",
+ "ExtensionDerivedComplexContentType",
+ getElementType(baseSTS, "ExtensionDerivedComplexContentTypeElem"));
+
+ assertEquals("Elem Type should be 'ExtensionBaseMixedContentType' (base)",
+ "ExtensionBaseMixedContentType",
+ getElementType(baseSTS, "ExtensionBaseMixedContentTypElem"));
+ assertEquals("Elem Type should be 'ExtensionDerivedMixedContentType' (derived)",
+ "ExtensionDerivedMixedContentType",
+ getElementType(baseSTS, "ExtensionDerivedMixedContentTypeElem"));
+
+ assertEquals("Elem Type should be 'RestrictionSimpleContentBaseType'",
+ "RestrictionSimpleContentBaseType",
+ getElementType(baseSTS, "RestrictionSimpleContentBaseTypeElem"));
+ assertEquals("Elem Type should be 'RestrictionSimpleContentDerivedType'",
+ "RestrictionSimpleContentDerivedType",
+ getElementType(baseSTS, "RestrictionSimpleContentDerivedTypeElem"));
+
+ assertEquals("Elem Type should be 'RestrictionBaseComplexContentType'",
+ "RestrictionBaseComplexContentType",
+ getElementType(baseSTS, "RestrictionBaseComplexContentTypeElem"));
+ assertEquals("Elem Type should be 'RestrictionDerivedComplexContentType'",
+ "RestrictionDerivedComplexContentType",
+ getElementType(baseSTS, "RestrictionDerivedComplexContentTypeElem"));
+
+ assertEquals("Elem Type should be 'RestrictionBaseMixedContentType'",
+ "RestrictionBaseMixedContentType",
+ getElementType(baseSTS, "RestrictionBaseMixedContentTypeElem"));
+ assertEquals("Elem Type should be 'RestrictionDerivedMixedContentType'",
+ "RestrictionDerivedMixedContentType",
+ getElementType(baseSTS, "RestrictionDerivedMixedContentTypeElem"));
+
+ assertEquals("Elem Type should be 'RestrictionBaseEmptyContentType'",
+ "RestrictionBaseEmptyContentType",
+ getElementType(baseSTS, "RestrictionBaseEmptyContentTypeElem"));
+ assertEquals("Elem Type should be 'RestrictionDerivedEmptyContentType'",
+ "RestrictionDerivedEmptyContentType",
+ getElementType(baseSTS, "RestrictionDerivedEmptyContentTypeElem"));
// step 2 : change the base types now : derived_types_modified.xsd
SchemaTypeSystem modifiedSTS = createNewSTS("derived_types_modifed.xsd_",
- baseSTS,
- "ModifiedSchemaTS",
- sBaseSourceName);
- Assert.assertNotNull("Schema Type System created is Null.", modifiedSTS);
+ baseSTS,
+ "ModifiedSchemaTS",
+ sBaseSourceName);
+ assertNotNull("Schema Type System created is Null.", modifiedSTS);
// no recovearble errors just added another type
- Assert.assertFalse("valid PSOM",
- printRecoveredErrors());
+ assertFalse("valid PSOM",
+ printRecoveredErrors());
// the tests - Walk thro the valid SOM
//inspectSOM(modifiedSTS, 13, 0, 14, 0);
inspectSOM(modifiedSTS, 13, 0, 17, 0);
// instance validation - should fail
- Assert.assertFalse("Validation against instance success - should fail",
- validateInstance(getTestCaseFile("instance_derived_types_valid.xml"), modifiedSTS));
+ assertFalse("Validation against instance success - should fail",
+ validateInstance(getTestCaseFile("instance_derived_types_valid.xml"), modifiedSTS));
// now validate instance with new base type - this should go thro
// TODO resolve this validation
@@ -534,8 +528,8 @@ public class PartialSOMDetailedTest exte
}
- public void testNameSpacesImportFile() throws Exception
- {
+ @Test
+ public void testNameSpacesImportFile() {
System.out.println("Inside test case testNameSpacesImportFile()");
// Step 1: read in an xsd that imports from another xsd file providing file name only
@@ -544,37 +538,37 @@ public class PartialSOMDetailedTest exte
//String sBaseSourceName = "file:/D:/SVNNEW/xmlbeans/trunk/test/cases/xbean/compile/som/";
SchemaTypeSystem baseSTS = createNewSTS("namespaces_import_fileonly.xsd_",
- null,
- "BaseSchemaTS",
- null);
+ null,
+ "BaseSchemaTS",
+ null);
- Assert.assertNotNull("Schema Type System created is Null.", baseSTS);
+ assertNotNull("Schema Type System created is Null.", baseSTS);
// there should be NO recovearble errors this should not be a partial Schema
- Assert.assertFalse("Recovered Errors for Valid Schema",
- printRecoveredErrors());
+ assertFalse("Recovered Errors for Valid Schema",
+ printRecoveredErrors());
}
- public void testNameSpacesWithInclude() throws Exception
- {
+ @Test
+ public void testNameSpacesWithInclude() {
System.out.println("Inside test case testNameSpacesWithInclude()");
// Step 1: read in an xsd that includes another namespace in xsd file namespaces2.xsd
//String sBaseSourceName = "testsourcename";
SchemaTypeSystem baseSTS = createNewSTS("namespaces_include.xsd_",
- null,
- "BaseSchemaTS",
- null);
+ null,
+ "BaseSchemaTS",
+ null);
- Assert.assertNotNull("Schema Type System created is Null.", baseSTS);
+ assertNotNull("Schema Type System created is Null.", baseSTS);
// there should be NO recovearble errors - this should not be a partial Schema
- Assert.assertFalse("Recovered Errors for Valid Schema",
- printRecoveredErrors());
+ assertFalse("Recovered Errors for Valid Schema",
+ printRecoveredErrors());
// Test for saving of the SOM - should go thro
- Assert.assertTrue("Valid SOM " + baseSTS.getName() + "Save failed!",
- checkPSOMSave(baseSTS));
+ assertTrue("Valid SOM " + baseSTS.getName() + "Save failed!",
+ checkPSOMSave(baseSTS));
// the tests - Walk thro the valid SOM
inspectSOM(baseSTS, 2, 0, 1, 0);
@@ -582,49 +576,46 @@ public class PartialSOMDetailedTest exte
}
- /*
- public void testNameSpacesImportFileWithPath() throws Exception
- {
+ @Test
+ @Ignore
+ public void testNameSpacesImportFileWithPath() {
System.out.println("Inside test case testNameSpacesImportFileWithPath()");
//Step 1: read in an xsd that does not have any imports
String sBaseSourceName = "testsourcename";
- SchemaTypeSystem baseSTS = createNewSTS("namespaces_noimports.xsd",
- null,
- "BaseSchemaTS",
- sBaseSourceName);
+ SchemaTypeSystem baseSTS = createNewSTS("namespaces_noimports.xsd_",
+ null,
+ "BaseSchemaTS",
+ sBaseSourceName);
- Assert.assertNotNull("Schema Type System created is Null.", baseSTS);
+ assertNotNull("Schema Type System created is Null.", baseSTS);
// there should be NO recovearble errors - this should not be a partial Schema
- Assert.assertFalse("Recovered Errors for Valid Schema",
- printRecoveredErrors());
+ assertFalse("Recovered Errors for Valid Schema",
+ printRecoveredErrors());
// Test for saving of the SOM - should go thro
- Assert.assertTrue("Valid SOM " + baseSTS.getName() + "Save failed!",
- checkPSOMSave(baseSTS));
+ assertTrue("Valid SOM " + baseSTS.getName() + "Save failed!",
+ checkPSOMSave(baseSTS));
// the tests - Walk thro the valid SOM
inspectSOM(baseSTS, 1, 0, 0, 0);
// step 2 : read in an xsd that imports a namespace from another xsd file providing the complete file path for the imported xsd
SchemaTypeSystem modifiedSTS = createNewSTS("namespaces_import_filepath.xsd",
- baseSTS,
- "ModifiedSchemaTS",
- sBaseSourceName);
- Assert.assertNotNull("Schema Type System created is Null.", modifiedSTS);
+ baseSTS,
+ "ModifiedSchemaTS",
+ sBaseSourceName);
+ assertNotNull("Schema Type System created is Null.", modifiedSTS);
// no recovearble errors just added another type
- Assert.assertFalse("valid PSOM",
- printRecoveredErrors());
+ assertFalse("valid PSOM",
+ printRecoveredErrors());
// the tests - Walk thro the valid SOM
inspectSOM(modifiedSTS, 2, 0, 1, 0);
}
- */
-
-
}
Modified: xmlbeans/trunk/test/src/dom/checkin/AttributeSyncTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/dom/checkin/AttributeSyncTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/dom/checkin/AttributeSyncTest.java (original)
+++ xmlbeans/trunk/test/src/dom/checkin/AttributeSyncTest.java Fri Jan 18 23:08:44 2019
@@ -17,24 +17,10 @@
package dom.checkin;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-/**
- *
- *
- */
+import org.junit.Before;
public class AttributeSyncTest extends AttributeTest {
- public AttributeSyncTest(String s) {
- super(s);
- }
-
- public static Test suite() {
- return new TestSuite(AttributeSyncTest.class);
- }
-
+ @Before
public void setUp() throws Exception {
super.loadSync();
super.moveToNode();
Modified: xmlbeans/trunk/test/src/dom/checkin/AttributeTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/dom/checkin/AttributeTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/dom/checkin/AttributeTest.java (original)
+++ xmlbeans/trunk/test/src/dom/checkin/AttributeTest.java Fri Jan 18 23:08:44 2019
@@ -19,97 +19,93 @@ package dom.checkin;
import dom.common.DomUtils;
import dom.common.NodeWithChildrenTest;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.Before;
+import org.junit.Test;
import org.w3c.dom.*;
+import static org.junit.Assert.*;
-/**
- *
- *
- */
public class AttributeTest extends NodeWithChildrenTest {
- public AttributeTest(String s) {
- super(s);
+ public AttributeTest() {
String sDTD = "<?xml version=\"1.0\"?>" +
"<!DOCTYPE foodoc [" +
"<!ELEMENT foo>" +
"<!ATTLIST foo at_spec CDATA \"0\">" +
"]>";
- sXml =
- "<foo xmlns:extra=\"bea.org\" xmlns:myns=\"uri:foo\" at0=\"val0\" myns:at0=\"val01\" at2=\"val2\" at3=\"val3\" at4=\"val4\">some text</foo>";
+ sXml = "<foo xmlns:extra=\"bea.org\" xmlns:myns=\"uri:foo\" at0=\"val0\" myns:at0=\"val01\" at2=\"val2\" at3=\"val3\" at4=\"val4\">some text</foo>";
if (bDTD)
sXml = sDTD + sXml;
sXmlNS =
"<foo xmlns:myns=\"uri:foo\" at0=\"val0\" myns:at0=\"val01\" at2=\"val2\" at3=\"val3\" at4=\"val4\"/>";
}
- public static Test suite() {
- return new TestSuite(AttributeTest.class);
- }
-
-
+ @Test
public void testNodeName() {
String sExpected = "myns:at0";
assertEquals(sExpected, m_node.getNodeName());
}
+ @Test
public void testGetName() {
String sExpected = "myns:at0";
assertEquals(sExpected, ((Attr) m_node).getName());
}
+ @Test
public void testNodeType() {
assertEquals(Node.ATTRIBUTE_NODE, m_node.getNodeType());
}
-
+ @Test
public void testNodeValue() {
assertEquals("val01", m_node.getNodeValue());
}
//following are null here
-
+ @Test
public void testNextSibling() {
assertEquals(null, m_node.getNextSibling());
}
+ @Test
public void testPreviousSibling() {
assertEquals(null, m_node.getPreviousSibling());
}
+ @Test
public void testParent() {
assertEquals(null, m_node.getParentNode());
}
-
+ @Test
public void testPrefix() {
assertEquals("myns", m_node.getPrefix());
}
+ @Test
public void testNamespaceUri() {
assertEquals("uri:foo", m_node.getNamespaceURI());
}
+ @Test
public void testLocalName() {
assertEquals("at0", m_node.getLocalName());
}
-
+ @Test
public void testAppendChild() {
//elt
Node newChild = m_doc.createElement("foo");
try {
m_node.appendChild(newChild);
- fail(
- "Cannot append an element children to attributes " +
- m_node.getChildNodes().getLength());
+ fail("Cannot append an element children to attributes " +
+ m_node.getChildNodes().getLength());
}
catch (DOMException de) {
assertEquals(DOMException.HIERARCHY_REQUEST_ERR, de.code);
@@ -123,9 +119,9 @@ public class AttributeTest extends NodeW
m_node.normalize();
assertEquals(1, m_node.getChildNodes().getLength());
assertEquals("val01foobar", ((Text) m_node.getFirstChild()).getData());
-
}
+ @Test
public void testCloneNode() {
Attr cloned,
cloned1;
@@ -170,19 +166,22 @@ public class AttributeTest extends NodeW
* <p/>
* }
*/
-
+ @Test
public void testGetChildNodes() {
assertEquals(1, m_node.getChildNodes().getLength());
}
+ @Test
public void testFirstChild() {
assertEquals("val01", ((Text) m_node.getFirstChild()).getData());
}
+ @Test
public void testLastChild() {
assertEquals("val01", ((Text) m_node.getLastChild()).getData());
}
+ @Test
public void testInsertBefore() {
Node newChild = m_doc.createElement("foo");
assertEquals(1, m_node.getChildNodes().getLength());
@@ -202,7 +201,7 @@ public class AttributeTest extends NodeW
assertEquals("val01", m_node.getLastChild().getNodeValue());
}
-
+ @Test
public void testRemoveChild() {
//attr w/o a value
Element owner = (Element) ((Attr) m_node).getOwnerElement();
@@ -211,6 +210,7 @@ public class AttributeTest extends NodeW
// assertEquals(false,owner.hasAttributeNS("uri:foo","at0"));
}
+ @Test
public void testReplaceChild() {
//assertFalse(m_node.hasChildNodes());
@@ -231,7 +231,7 @@ public class AttributeTest extends NodeW
}
-
+ @Test
public void testGetOwnerElement() {
assertEquals("foo", ((Attr) m_node).getOwnerElement().getLocalName());
Node newNode = m_doc.createAttributeNS("foo1:org", "name");
@@ -250,12 +250,14 @@ public class AttributeTest extends NodeW
assertEquals(true,((Attr)m_node).getSpecified());
}
*/
+ @Test
public void testSetValue() {
String newVal = "new<spec\u042Fchar";
((Attr) m_node).setValue(newVal);
assertEquals(newVal, ((Attr) m_node).getValue());
}
+ @Test
public void testSetValueNull() {
((Attr) m_node).setValue("foo");
String newVal = "";
@@ -267,12 +269,12 @@ public class AttributeTest extends NodeW
assertEquals(true, ((Attr) m_node).hasChildNodes());
}
-
+ @Test
public void testGetValue() {
assertEquals("val01", ((Attr) m_node).getValue());
}
-
+ @Test
public void testInsertBeforeDocFrag() {
DocumentFragment child = m_doc.createDocumentFragment();
child.appendChild(m_doc.createTextNode("foo1"));
@@ -280,6 +282,7 @@ public class AttributeTest extends NodeW
super.testInsertBefore(child, target);
}
+ @Test
public void testAppendChildDocFrag() {
DocumentFragment child = m_doc.createDocumentFragment();
child.appendChild(m_doc.createTextNode("foo"));
@@ -287,6 +290,7 @@ public class AttributeTest extends NodeW
}
+ @Test
public void testReplaceChildDocFrag() {
DocumentFragment child = m_doc.createDocumentFragment();
@@ -303,6 +307,7 @@ public class AttributeTest extends NodeW
}
+ @Test
public void testInsertBeforeNullTarget() {
Node child = m_doc.createElementNS("org.foo.www", "foonode");
try {
@@ -316,6 +321,7 @@ public class AttributeTest extends NodeW
super.testInsertBefore(child, null);
}
+ @Test
public void testInsertExistingNode() {
Node toInsert=m_doc.getFirstChild();
//elt under attr
@@ -333,6 +339,7 @@ public class AttributeTest extends NodeW
assertEquals(2, m_node.getChildNodes().getLength());
}
+ @Test
public void testSetNodeValue() {
m_node.appendChild(m_doc.createTextNode("bar"));//attr w/ two values
int nCount = m_node.getChildNodes().getLength();
@@ -341,6 +348,7 @@ public class AttributeTest extends NodeW
assertEquals("blah", m_node.getFirstChild().getNodeValue());
}
+ @Test
public void testAppendChildExisting() {
Node child = m_doc.getFirstChild().getFirstChild();//some text
if (child == m_node)
@@ -349,7 +357,7 @@ public class AttributeTest extends NodeW
super.testAppendChild(child);
}
-
+ @Test
public void testSetPrefix() {
String newPrefix = "yana"; //should clear it
m_node.setPrefix(newPrefix);
@@ -364,7 +372,7 @@ public class AttributeTest extends NodeW
}
-
+ @Test
public void testInsertBeforeInvalidRefNode() {
Node child = m_doc.createTextNode("foonode");
Node target = m_doc.createElement("foo");
@@ -378,6 +386,7 @@ public class AttributeTest extends NodeW
}
}
+ @Test
public void testDomLevel1() {
Attr at = m_doc.createAttribute("foobar");
assertNull("L1 prefix null", at.getPrefix());
@@ -394,20 +403,19 @@ public class AttributeTest extends NodeW
}
}
+ @Test
public void moveToNode() {
m_node = m_doc.getFirstChild();
m_node = ((Element) m_node).getAttributeNodeNS("uri:foo", "at0");
assertEquals("val01", m_node.getNodeValue());
assertTrue(m_node instanceof Attr);
-
-
}
+ @Before
public void setUp() throws Exception {
super.setUp();
moveToNode();
}
-
}
Modified: xmlbeans/trunk/test/src/dom/checkin/CDataSectionSyncTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/dom/checkin/CDataSectionSyncTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/dom/checkin/CDataSectionSyncTest.java (original)
+++ xmlbeans/trunk/test/src/dom/checkin/CDataSectionSyncTest.java Fri Jan 18 23:08:44 2019
@@ -16,24 +16,10 @@
package dom.checkin;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-/**
- *
- *
- */
+import org.junit.Before;
public class CDataSectionSyncTest extends CDataSectionTest {
- public CDataSectionSyncTest(String s) {
- super(s);
- }
-
- public static Test suite() {
- return new TestSuite(CDataSectionSyncTest.class);
- }
-
+ @Before
public void setUp() throws Exception {
super.loadSync();
super.moveToNode();
Modified: xmlbeans/trunk/test/src/dom/checkin/CDataSectionTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/dom/checkin/CDataSectionTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/dom/checkin/CDataSectionTest.java (original)
+++ xmlbeans/trunk/test/src/dom/checkin/CDataSectionTest.java Fri Jan 18 23:08:44 2019
@@ -16,21 +16,17 @@
package dom.checkin;
import dom.common.CharacterDataTest;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.Before;
+import org.junit.Test;
import org.w3c.dom.CDATASection;
import org.w3c.dom.Node;
+import static org.junit.Assert.assertEquals;
-/**
- *
- *
- */
public class CDataSectionTest extends CharacterDataTest {
- public CDataSectionTest(String s) {
- super(s);
+ public CDataSectionTest() {
sXml = "<script/>";
/*
TODO:
@@ -44,43 +40,43 @@ sXml="<script>"+
*/
}
- public static Test suite() {
- return new TestSuite(CDataSectionTest.class);
- }
-
-
+ @Test
public void testNodeName() {
assertEquals("#cdata-section", m_node.getNodeName());
}
+ @Test
public void testNodeType() {
assertEquals(Node.CDATA_SECTION_NODE, m_node.getNodeType());
}
-
+ @Test
public void testNodeValue() {
assertEquals("function matchwo(a,b){\"+\n\t \"return 0 }",
m_node.getNodeValue());
}
-
+ @Test
public void testNextSibling() {
Node nxtSibling = m_node.getNextSibling();
assertEquals("foobar", nxtSibling.getNodeValue());
}
+ @Test
public void testPreviousSibling() {
Node prSibling = m_node.getPreviousSibling();
assertEquals(null, prSibling);
}
+ @Test
public void testParent() {
Node parent = m_node.getParentNode();
assertEquals(m_doc.getFirstChild(), parent);
assertEquals("script", parent.getLocalName());
}
+ @Test
public void testSetNodeValue() {
m_node.setNodeValue("new CDATA");
assertEquals("new CDATA", m_node.getNodeValue());
@@ -97,6 +93,7 @@ sXml="<script>"+
}
+ @Before
public void setUp() throws Exception {
super.setUp();
moveToNode();
Modified: xmlbeans/trunk/test/src/dom/checkin/CommentSyncTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/dom/checkin/CommentSyncTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/dom/checkin/CommentSyncTest.java (original)
+++ xmlbeans/trunk/test/src/dom/checkin/CommentSyncTest.java Fri Jan 18 23:08:44 2019
@@ -17,24 +17,11 @@
package dom.checkin;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.Before;
-/**
- *
- *
- */
-
public class CommentSyncTest extends CommentTest {
- public CommentSyncTest(String s) {
- super(s);
- }
-
- public static Test suite() {
- return new TestSuite(CommentSyncTest.class);
- }
-
+ @Before
public void setUp() throws Exception {
super.loadSync();
super.moveToNode();
Modified: xmlbeans/trunk/test/src/dom/checkin/CommentTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/dom/checkin/CommentTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/dom/checkin/CommentTest.java (original)
+++ xmlbeans/trunk/test/src/dom/checkin/CommentTest.java Fri Jan 18 23:08:44 2019
@@ -17,46 +17,41 @@
package dom.checkin;
import dom.common.CharacterDataTest;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.Before;
+import org.junit.Test;
import org.w3c.dom.Node;
import org.w3c.dom.Text;
import xmlcursor.common.Common;
+import static org.junit.Assert.assertEquals;
-/**
- *
- *
- */
public class CommentTest extends CharacterDataTest {
- public CommentTest(String s) {
- super(s);
+ public CommentTest() {
sXml = Common.XML_FOO_COMMENT;
sXmlNS = sXml;
}
- public static Test suite() {
- return new TestSuite(CommentTest.class);
- }
-
-
+ @Test
public void testNodeName() {
assertEquals("#comment", m_node.getNodeName());
}
+ @Test
public void testNodeValue() {
System.out.println("Comment testNodeValue");
assertEquals(" comment text ", m_node.getNodeValue());
System.out.println("Comment testNodeValue DONE");
}
+ @Test
public void testNodeType() {
assertEquals(Node.COMMENT_NODE, m_node.getNodeType());
}
+ @Test
public void testNextSibling() {
Node nxtSibling = m_node.getNextSibling();
assertEquals("foo", nxtSibling.getLocalName());
@@ -65,16 +60,19 @@ public class CommentTest extends Charact
assertEquals("text", ((Text) nxtSibling.getFirstChild()).getData());
}
+ @Test
public void testPreviousSibling() {
Node prSibling = m_node.getPreviousSibling();
assertEquals(null, prSibling);
}
+ @Test
public void testParent() {
Node parent = m_node.getParentNode();
assertEquals(m_doc, parent);
}
+ @Test
public void testSetNodeValue() {
m_node.setNodeValue("new comment");
assertEquals("new comment", m_doc.getFirstChild().getNodeValue());
@@ -86,6 +84,7 @@ public class CommentTest extends Charact
}
+ @Before
public void setUp() throws Exception {
super.setUp();
moveToNode();
Modified: xmlbeans/trunk/test/src/dom/checkin/DirtyCacheTests.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/dom/checkin/DirtyCacheTests.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/dom/checkin/DirtyCacheTests.java (original)
+++ xmlbeans/trunk/test/src/dom/checkin/DirtyCacheTests.java Fri Jan 18 23:08:44 2019
@@ -15,10 +15,9 @@
package dom.checkin;
-import junit.framework.TestCase;
import org.apache.xmlbeans.XmlCursor;
+import org.junit.Test;
import org.w3c.dom.Node;
-
import xbean.dom.complexTypeTest.ElementT;
import xbean.dom.complexTypeTest.EltTypeDocument;
import xbean.dom.complexTypeTest.MixedT;
@@ -27,10 +26,11 @@ import xbean.dom.dumbNS.RootDocument;
import java.math.BigInteger;
-public class DirtyCacheTests extends TestCase
-{
+import static org.junit.Assert.assertNull;
- public void testDirtyValue()throws Exception{
+public class DirtyCacheTests {
+ @Test
+ public void testDirtyValue() throws Exception {
EltTypeDocument o = EltTypeDocument.Factory.newInstance();
ElementT t = o.addNewEltType();
t.setChild1(new BigInteger("30"));
@@ -39,17 +39,18 @@ public class DirtyCacheTests extends Tes
n = n.getFirstChild();
n = n.getFirstChild();//text
String s = n.getNodeValue();
- System.out.println(n.getNodeName()+" "+ s);
+ System.out.println(n.getNodeName() + " " + s);
t.setChild1(new BigInteger("5"));
s = n.getNodeValue();
- System.out.println(n.getNodeName()+" "+ s);
+ System.out.println(n.getNodeName() + " " + s);
}
- public void testDirtyValue1()throws Exception{
+ @Test
+ public void testDirtyValue1() throws Exception {
MixedTypeDocument o = MixedTypeDocument.Factory.newInstance();
MixedT testElt = o.addNewMixedType();
- assertEquals(null, testElt.getChild1());
- assertEquals(null, testElt.xgetChild1());
+ assertNull(testElt.getChild1());
+ assertNull(testElt.xgetChild1());
testElt.setChild2(new BigInteger("5"));
testElt.setChild3(new BigInteger("1"));
testElt.setChild1(new BigInteger("0"));
@@ -62,15 +63,16 @@ public class DirtyCacheTests extends Tes
n = n.getFirstChild();
String s = n.getNodeValue();
- System.out.println(n.getNodeName()+" "+ s);
- n=n.getNextSibling();
+ System.out.println(n.getNodeName() + " " + s);
+ n = n.getNextSibling();
n = n.getFirstChild();
s = n.getNodeValue();
- System.out.println(n.getNodeName()+" "+ s);
+ System.out.println(n.getNodeName() + " " + s);
}
- public void testDirtyValue2()throws Exception{
+ @Test
+ public void testDirtyValue2() throws Exception {
RootDocument o = RootDocument.Factory.newInstance();
RootDocument.Root testElt = o.addNewRoot();
testElt.setB(new BigInteger("5"));
@@ -78,6 +80,6 @@ public class DirtyCacheTests extends Tes
n = n.getFirstChild();
n = n.getAttributes().getNamedItem("b");
- System.out.println(n.getNodeName()+" "+ n.getNodeValue());
+ System.out.println(n.getNodeName() + " " + n.getNodeValue());
}
}
Modified: xmlbeans/trunk/test/src/dom/checkin/DocumentFragmentSyncTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/dom/checkin/DocumentFragmentSyncTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/dom/checkin/DocumentFragmentSyncTest.java (original)
+++ xmlbeans/trunk/test/src/dom/checkin/DocumentFragmentSyncTest.java Fri Jan 18 23:08:44 2019
@@ -17,27 +17,12 @@
package dom.checkin;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-/**
- *
- *
- */
+import org.junit.Before;
public class DocumentFragmentSyncTest extends DocumentFragmentTest {
- public DocumentFragmentSyncTest(String s) {
- super(s);
- }
-
- public static Test suite() {
- return new TestSuite(DocumentFragmentSyncTest.class);
- }
-
+ @Before
public void setUp() throws Exception {
super.loadSync();
super.moveToNode();
}
-
}
Modified: xmlbeans/trunk/test/src/dom/checkin/DocumentFragmentTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/dom/checkin/DocumentFragmentTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/dom/checkin/DocumentFragmentTest.java (original)
+++ xmlbeans/trunk/test/src/dom/checkin/DocumentFragmentTest.java Fri Jan 18 23:08:44 2019
@@ -17,73 +17,72 @@
package dom.checkin;
import dom.common.NodeWithChildrenTest;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.Before;
+import org.junit.Test;
import org.w3c.dom.Node;
+import static org.junit.Assert.*;
-/**
- *
- * */
public class DocumentFragmentTest extends NodeWithChildrenTest {
- public DocumentFragmentTest(String s) {
- super(s);
+ public DocumentFragmentTest() {
sXml =
- "<foo at0=\"val0\" a" +
+ "<foo at0=\"val0\" a" +
"t1=\"val1\" at2=\"val2\" at3=\"val3\" at4=\"val4\"><bar bat0=\"val0\"/></foo>";
sXmlNS =
- "<foo xmlns:myns=\"uri:foo\" at0=\"val0\" myns:at0=\"val01\" at2=\"val2\" at3=\"val3\" at4=\"val4\"/>";
+ "<foo xmlns:myns=\"uri:foo\" at0=\"val0\" myns:at0=\"val01\" at2=\"val2\" at3=\"val3\" at4=\"val4\"/>";
}
- public static Test suite() {
- return new TestSuite(DocumentFragmentTest.class);
- }
-
-
+ @Test
public void testNodeName() {
assertEquals("#document-fragment", m_node.getNodeName());
}
+ @Test
public void testNodeType() {
assertEquals(Node.DOCUMENT_FRAGMENT_NODE, m_node.getNodeType());
}
-
+ @Test
public void testNodeValue() {
- assertEquals(null, m_node.getNodeValue());
+ assertNull(m_node.getNodeValue());
}
-
+ @Test
public void testNextSibling() {
- assertEquals(null, m_node.getNextSibling());
+ assertNull(m_node.getNextSibling());
}
+ @Test
public void testPreviousSibling() {
- assertFalse(m_node == null);
- assertEquals(null, m_node.getPreviousSibling());
+ assertNotNull(m_node);
+ assertNull(m_node.getPreviousSibling());
}
+ @Test
public void testParent() {
- assertEquals(null, m_node.getParentNode());
+ assertNull(m_node.getParentNode());
}
+ @Test
public void testGetChildNodes() {
assertEquals(1, m_node.getChildNodes().getLength());
}
+ @Test
public void testFirstChild() {
assertEquals("foo", m_node.getFirstChild().getNodeName());
}
-
+ @Test
public void testLastChild() {
assertEquals("foo", m_node.getLastChild().getNodeName());
}
+ @Test
public void testInsertExisitingNode() {
Node child = m_doc.getFirstChild().getFirstChild();//some text
if (child == m_node)
@@ -91,6 +90,7 @@ public class DocumentFragmentTest extend
super.testInsertExistingNode(child);
}
+ @Test
public void testAppendChildExisting() {
Node child = m_doc.getFirstChild().getFirstChild();//some text
if (child == m_node)
@@ -105,10 +105,9 @@ public class DocumentFragmentTest extend
}
+ @Before
public void setUp() throws Exception {
super.setUp();
moveToNode();
}
-
-
}
Modified: xmlbeans/trunk/test/src/dom/checkin/DocumentSyncTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/dom/checkin/DocumentSyncTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/dom/checkin/DocumentSyncTest.java (original)
+++ xmlbeans/trunk/test/src/dom/checkin/DocumentSyncTest.java Fri Jan 18 23:08:44 2019
@@ -16,27 +16,13 @@
package dom.checkin;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.Before;
-/**
- *
- *
- */
-
public class DocumentSyncTest extends DocumentTest {
- public DocumentSyncTest(String s) {
- super(s);
- }
-
- public static Test suite() {
- return new TestSuite(DocumentSyncTest.class);
- }
-
+ @Before
public void setUp() throws Exception {
super.loadSync();
super.moveToNode();
}
-
}
Modified: xmlbeans/trunk/test/src/dom/checkin/DocumentTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/dom/checkin/DocumentTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/dom/checkin/DocumentTest.java (original)
+++ xmlbeans/trunk/test/src/dom/checkin/DocumentTest.java Fri Jan 18 23:08:44 2019
@@ -17,28 +17,22 @@
package dom.checkin;
import dom.common.NodeWithChildrenTest;
-import junit.framework.AssertionFailedError;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.Before;
+import org.junit.Test;
import org.w3c.dom.*;
import org.xml.sax.InputSource;
import java.io.IOException;
import java.io.StringReader;
+import static org.junit.Assert.*;
-/**
- *
- *
- */
public class DocumentTest extends NodeWithChildrenTest {
- public DocumentTest(String s) {
- super(s);
- sXml =
- "<foo at0=\"val0\" at1=\"val1\" at2=\"val2\" at3=\"val3\" at4=\"val4\"><bar bat0=\"val0\"/></foo>";
+ public DocumentTest() {
+ sXml = "<foo at0=\"val0\" at1=\"val1\" at2=\"val2\" at3=\"val3\" at4=\"val4\"><bar bat0=\"val0\"/></foo>";
sXmlNS = "<bar xmlns:other=\"uri:other\" xmlns:myns=\"uri:foo\">" +
"<foo at0=\"val0\" myns:at0=\"val01\" at2=\"val2\" myns:at3=\"val3\" at4=\"val4\">" +
@@ -48,54 +42,57 @@ public class DocumentTest extends NodeWi
"</bar>";
}
- public static Test suite() {
- return new TestSuite(DocumentTest.class);
- }
-
-
+ @Test
public void testNodeName() {
assertEquals("#document", m_node.getNodeName());
}
+ @Test
public void testNodeType() {
assertEquals(Node.DOCUMENT_NODE, m_node.getNodeType());
}
-
+ @Test
public void testNodeValue() {
- assertEquals(null, m_node.getNodeValue());
+ assertNull(m_node.getNodeValue());
}
-
+ @Test
public void testNextSibling() {
- assertEquals(null, m_node.getNextSibling());
+ assertNull(m_node.getNextSibling());
}
+ @Test
public void testPreviousSibling() {
- assertEquals(null, m_node.getPreviousSibling());
+ assertNull(m_node.getPreviousSibling());
}
+ @Test
public void testParent() {
- assertEquals(null, m_node.getParentNode());
+ assertNull(m_node.getParentNode());
}
+ @Test
public void testOwnerDocument() {
- assertEquals(null, m_node.getOwnerDocument());//API spec
+ assertNull(m_node.getOwnerDocument());//API spec
}
+ @Test
public void testChildNodes() {
assertEquals(1, m_node.getChildNodes().getLength());
}
+ @Test
public void testFirstChild() {
assertEquals("foo", m_node.getFirstChild().getLocalName());
}
+ @Test
public void testLastChild() {
assertEquals("foo", m_node.getLastChild().getLocalName());
}
-
+ @Test
public void testAppendChild() {
try {
super.testAppendChild();
@@ -103,9 +100,9 @@ public class DocumentTest extends NodeWi
catch (DOMException de) {
assertEquals(DOMException.HIERARCHY_REQUEST_ERR, de.code);
}
-
}
+ @Test
public void testInsertBefore() {
try {
super.testInsertBefore();
@@ -115,6 +112,7 @@ public class DocumentTest extends NodeWi
}
}
+ @Test
public void testInsertBeforeNullTarget() {
try {
super.testInsertBeforeNullTarget();
@@ -124,6 +122,7 @@ public class DocumentTest extends NodeWi
}
}
+ @Test
public void testInsertExistingNode() {
try {
super.testInsertExistingNode(m_node.getFirstChild());
@@ -133,6 +132,7 @@ public class DocumentTest extends NodeWi
}
}
+ @Test
public void testInsertBeforeInvalidRefNode() {
try {
super.testInsertBeforeInvalidRefNode();
@@ -140,12 +140,13 @@ public class DocumentTest extends NodeWi
catch (DOMException de) {
assertEquals(DOMException.HIERARCHY_REQUEST_ERR, de.code);
}
- catch (AssertionFailedError af) {
+ catch (AssertionError af) {
assertEquals(((DOMException) af.getCause()).code,
DOMException.HIERARCHY_REQUEST_ERR);
}
}
+ @Test
public void testAppendChildIllegal0() {
try {
super.testAppendChildIllegal0();
@@ -153,12 +154,13 @@ public class DocumentTest extends NodeWi
catch (DOMException de) {
assertEquals(DOMException.HIERARCHY_REQUEST_ERR, de.code);
}
- catch (AssertionFailedError af) {
+ catch (AssertionError af) {
assertEquals(((DOMException) af.getCause()).code,
DOMException.HIERARCHY_REQUEST_ERR);
}
}
+ @Test
public void testAppendChildIllegal1() {
try {
super.testAppendChildIllegal1();
@@ -166,20 +168,23 @@ public class DocumentTest extends NodeWi
catch (DOMException de) {
assertEquals(DOMException.HIERARCHY_REQUEST_ERR, de.code);
}
- catch (AssertionFailedError af) {
+ catch (AssertionError af) {
assertEquals(((DOMException) af.getCause()).code,
DOMException.HIERARCHY_REQUEST_ERR);
}
}
+ @Test
public void testGetChildNodes() {
assertEquals(1, m_node.getChildNodes().getLength());
}
+ @Test
public void testSetPrefix() {
super.testSetPrefix(); //see charData--is the exception correct
}
+ @Test
public void testInsertExisitingNode() {
Node child = m_doc.getFirstChild().getFirstChild();//some text
if (child == m_node)
@@ -193,6 +198,7 @@ public class DocumentTest extends NodeWi
}
}
+ @Test
public void testAppendChildExisting() {
Node child = m_node.getFirstChild().getFirstChild();
try {
@@ -207,6 +213,7 @@ public class DocumentTest extends NodeWi
//unque doc child--normalize in elt. or text or comment, etc
}
+ @Test
public void testInsertBeforeDocFrag() {
try {
super.testInsertBeforeDocFrag();
@@ -216,6 +223,7 @@ public class DocumentTest extends NodeWi
}
}
+ @Test
public void testAppendChildDocFrag() {
try {
super.testAppendChildDocFrag();
@@ -225,6 +233,7 @@ public class DocumentTest extends NodeWi
}
}
+ @Test
public void testReplaceChildFront() {
Node node = m_doc.getDocumentElement();
assertEquals(node, m_node.getFirstChild());
@@ -233,6 +242,7 @@ public class DocumentTest extends NodeWi
assertEquals(m_doc.getDocumentElement(), newNode);
}
+ @Test
public void testReplaceChildEnd() {
Node node = m_doc.getDocumentElement();
assertEquals(node, m_node.getFirstChild());
@@ -240,6 +250,7 @@ public class DocumentTest extends NodeWi
super.testReplaceChild(newNode, node);
}
+ @Test
public void testReplaceChildDocFrag() {
try {
super.testReplaceChildDocFrag();
@@ -249,73 +260,76 @@ public class DocumentTest extends NodeWi
}
}
+ @Test
public void testCreateAttribute() {
Attr att = m_doc.createAttribute("at0");
- assertEquals(null, att.getOwnerElement());
+ assertNull(att.getOwnerElement());
assertEquals(m_doc, att.getOwnerDocument());
assertFalse(att.hasChildNodes());
assertEquals("", att.getValue());
}
+ @Test
public void testCreateAttributeNS() {
Attr att = m_doc.createAttributeNS("foo:uri", "at0");
assertEquals("foo:uri", att.getNamespaceURI());
- assertEquals(null, att.getOwnerElement());
+ assertNull(att.getOwnerElement());
assertEquals(m_doc, att.getOwnerDocument());
}
- //not implem
+ @Test
public void testCreateCDATASection() {
CDATASection cdata = m_doc.createCDATASection("<CDATA Section>");
- assertEquals(null, cdata.getParentNode());
+ assertNull(cdata.getParentNode());
assertEquals(m_doc, cdata.getOwnerDocument());
cdata = m_doc.createCDATASection(null);
- assertEquals(null, cdata.getParentNode());
+ assertNull(cdata.getParentNode());
assertEquals(m_doc, cdata.getOwnerDocument());
assertEquals("", cdata.getData());
}
+ @Test
public void testCreateComment() {
Comment comment = m_doc.createComment("A comment");
- assertEquals(null, comment.getParentNode());
+ assertNull(comment.getParentNode());
assertEquals(m_doc, comment.getOwnerDocument());
comment = m_doc.createComment(null);
assertEquals("", comment.getData());
}
+ @Test
public void testCreateDocumentFragment() {
DocumentFragment doc_frag = m_doc.createDocumentFragment();
- assertEquals(null, doc_frag.getParentNode());
+ assertNull(doc_frag.getParentNode());
assertEquals(m_doc, doc_frag.getOwnerDocument());
}
+ @Test
public void testCreateElement() {
Element elt1 = m_doc.createElement("elt1");
- assertEquals(null, elt1.getParentNode());
+ assertNull(elt1.getParentNode());
assertEquals(m_doc, elt1.getOwnerDocument());
}
+ @Test
public void testCreateElementNS() {
Element elt1 = m_doc.createElementNS("uri:foo", "ns:elt1");
assertEquals("uri:foo", elt1.getNamespaceURI());
- assertEquals(null, elt1.getParentNode());
+ assertNull(elt1.getParentNode());
assertEquals(m_doc, elt1.getOwnerDocument());
}
- public void testCreateEntityReference() {
- //not implemented
- }
-
+ @Test
public void testCreateProcessingInstruction() {
ProcessingInstruction pi = null;
try {
pi = m_doc.createProcessingInstruction("xml", "version 1.0");
- assertEquals(null, pi.getParentNode());
+ assertNull(pi.getParentNode());
assertEquals(m_doc, pi.getOwnerDocument());
fail(" this is a no-go");
}
@@ -346,29 +360,22 @@ public class DocumentTest extends NodeWi
}
+ @Test
public void testCreateTextNode() {
Text txt0 = m_doc.createTextNode("foo");
- assertEquals(null, txt0.getParentNode());
+ assertNull(txt0.getParentNode());
assertEquals(m_doc, txt0.getOwnerDocument());
txt0 = m_doc.createTextNode(null);
assertEquals("", txt0.getData());
}
- public void testGetDoctype() {
- //TODO throws not impl exception assertEquals(null,m_doc.getDoctype());
- }
-
+ @Test
public void testGetDocumentElement() {
assertEquals(m_doc.getDocumentElement(), m_node.getFirstChild());
}
-/* public void testGetElementById()
- {
- // TODO
- fail("Test Not implemented");
- }
-*/
+ @Test
public void testGetElementsByTagName() {
//move node @ foo
m_node = m_docNS;
@@ -382,6 +389,7 @@ public class DocumentTest extends NodeWi
}
//elts need to come out in preorder order
+ @Test
public void testGetElementsByTagNamePreorder() {
m_node = m_docNS;
NodeList result = ((Document) m_node).getElementsByTagName("foo");
@@ -391,13 +399,14 @@ public class DocumentTest extends NodeWi
result.item(1).getFirstChild().getNodeValue());
}
-
+ @Test
public void testGetElementsByTagNameDNE() {
m_node = m_docNS;
NodeList result = ((Document) m_node).getElementsByTagName("foobar");
assertEquals(0, result.getLength());
}
+ @Test
public void testGetElementsByTagNameNS() {
m_node = m_docNS;
NodeList result = ((Document) m_node).getElementsByTagNameNS("*", "*");
@@ -423,7 +432,7 @@ public class DocumentTest extends NodeWi
result.item(1).getFirstChild().getNodeValue());
NodeList result1 = ((Document) m_node).getElementsByTagNameNS("",
"foo");
- assertEquals(true, compareNodeList(result, result1));
+ assertTrue(compareNodeList(result, result1));
result = ((Document) m_node).getElementsByTagNameNS(null, "*");
@@ -431,6 +440,7 @@ public class DocumentTest extends NodeWi
assertEquals("ZeD", ((Element) result.item(3)).getTagName());
}
+ @Test
public void testGetElementsByTagNameNS_DNE() {
m_node = m_docNS;
NodeList result = ((Document) m_node).getElementsByTagNameNS("uri:foo",
@@ -444,12 +454,14 @@ public class DocumentTest extends NodeWi
}
+ @Test
public void testGetImplementation() {
assertTrue(
m_doc.getImplementation().toString().startsWith(
"org.apache.xmlbeans.impl.store"));
}
+ @Test
public void testImportNode() {
Node toImport = m_docNS.getFirstChild();
@@ -471,7 +483,7 @@ public class DocumentTest extends NodeWi
}
Document xercesDocument = parser.getDocument();
- assertFalse(xercesDocument == null);
+ assertNotNull(xercesDocument);
toImport = xercesDocument.getFirstChild();
((Document) m_node).importNode(toImport, true);
@@ -482,7 +494,6 @@ public class DocumentTest extends NodeWi
((Document) m_node).importNode(toImport, false);
((Document) m_node).importNode(toImport, true);
-
}
/**
@@ -494,17 +505,16 @@ public class DocumentTest extends NodeWi
* Note that the deep parameter has no effect on Attr nodes;
* they always carry their children with them when imported
*/
-
+ @Test
public void testImportAttrNode() {
Node toImport = m_doc.getFirstChild().getAttributes().item(0);
toImport.appendChild(m_doc.createTextNode("more text"));
Node imported = m_docNS.importNode(toImport, false);
- assertEquals(null, imported.getParentNode());
+ assertNull(imported.getParentNode());
assertEquals(Node.ATTRIBUTE_NODE, imported.getNodeType());
assertEquals(2, imported.getChildNodes().getLength());
assertEquals(imported.getOwnerDocument(), m_docNS);
-
}
/**
@@ -515,19 +525,20 @@ public class DocumentTest extends NodeWi
* corresponding subtree.
* Otherwise, this simply generates an empty DocumentFragment.
*/
+ @Test
public void testImportDocFrag() {
Node toImport = m_doc.createDocumentFragment();
toImport.appendChild(m_doc.getFirstChild());
toImport.appendChild(m_doc.createTextNode("some text"));
Node imported = m_docNS.importNode(toImport, false);
- assertEquals(null, imported.getParentNode());
+ assertNull(imported.getParentNode());
assertEquals(Node.DOCUMENT_FRAGMENT_NODE, imported.getNodeType());
- assertEquals(false, imported.hasChildNodes());
+ assertFalse(imported.hasChildNodes());
assertEquals(imported.getOwnerDocument(), m_docNS);
imported = m_docNS.importNode(toImport, true);
- assertEquals(null, imported.getParentNode());
+ assertNull(imported.getParentNode());
assertEquals(Node.DOCUMENT_FRAGMENT_NODE, imported.getNodeType());
assertEquals(2, imported.getChildNodes().getLength());
assertEquals(imported.getOwnerDocument(), m_docNS);
@@ -537,9 +548,8 @@ public class DocumentTest extends NodeWi
* DOCUMENT_NODE
* Document nodes cannot be imported.
*/
-
+ @Test
public void testImportDocument() {
-
DOMException e1 = null;
try {
m_docNS.importNode(m_doc, false);
@@ -572,11 +582,12 @@ public class DocumentTest extends NodeWi
* reassembled to form the corresponding subtree.
*/
//TODO: specified and default attributes
+ @Test
public void testImportElement() {
Node toImport = m_doc.getFirstChild();
Node imported = m_docNS.importNode(toImport, false);
- assertEquals(null, imported.getParentNode());
+ assertNull(imported.getParentNode());
assertEquals(Node.ELEMENT_NODE, imported.getNodeType());
assertEquals(0, imported.getChildNodes().getLength());
assertEquals(5, imported.getAttributes().getLength());
@@ -584,12 +595,11 @@ public class DocumentTest extends NodeWi
imported = m_docNS.importNode(toImport, true);
- assertEquals(null, imported.getParentNode());
+ assertNull(imported.getParentNode());
assertEquals(Node.ELEMENT_NODE, imported.getNodeType());
assertEquals(1, imported.getChildNodes().getLength());
assertEquals(5, imported.getAttributes().getLength());
assertEquals(imported.getOwnerDocument(), m_docNS);
-
}
/**
@@ -614,21 +624,20 @@ public class DocumentTest extends NodeWi
* The imported node copies its target and data
* values from those of the source node.
*/
+ @Test
public void testImportPI() {
Node pi = m_doc.createProcessingInstruction("xml-stylesheet",
"do something");
m_doc.getFirstChild().appendChild(pi);
Node imported = m_docNS.importNode(pi, false);
- assertEquals(null, imported.getParentNode());
+ assertNull(imported.getParentNode());
assertEquals(Node.PROCESSING_INSTRUCTION_NODE, imported.getNodeType());
assertEquals("do something",
((ProcessingInstruction) imported).getData());
assertEquals("xml-stylesheet",
((ProcessingInstruction) imported).getTarget());
assertEquals(imported.getOwnerDocument(), m_docNS);
-
-
}
/**
@@ -636,6 +645,7 @@ public class DocumentTest extends NodeWi
* These three types of nodes inheriting from CharacterData copy their
* data and length attributes from those of the source node.
*/
+ @Test
public void testImportChars() {
//import CDATA--nothing to do--it's always text
@@ -646,7 +656,7 @@ public class DocumentTest extends NodeWi
Node imported = m_docNS.importNode(
m_doc.getFirstChild().getLastChild(), false);
- assertEquals(null, imported.getParentNode());
+ assertNull(imported.getParentNode());
assertEquals(Node.TEXT_NODE, imported.getNodeType());
assertEquals("some text", ((Text) imported).getData());
assertEquals(9, ((Text) imported).getLength());
@@ -657,7 +667,7 @@ public class DocumentTest extends NodeWi
//import Comment
txt = m_doc.createComment("some text");
m_doc.getFirstChild().appendChild(txt);
- assertEquals(null, imported.getParentNode());
+ assertNull(imported.getParentNode());
imported =
m_docNS.importNode(m_doc.getFirstChild().getLastChild(), false);
@@ -669,6 +679,7 @@ public class DocumentTest extends NodeWi
}
+ @Test
public void testImportNodeNull() {
Node _Null = null;
((Document) m_node).importNode(_Null, true);
@@ -678,11 +689,10 @@ public class DocumentTest extends NodeWi
public void moveToNode() {
m_node = m_doc;
-
}
+ @Before
public void setUp() throws Exception {
-
super.setUp();
moveToNode();
}
Modified: xmlbeans/trunk/test/src/dom/checkin/DomImplementationSyncTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/dom/checkin/DomImplementationSyncTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/dom/checkin/DomImplementationSyncTest.java (original)
+++ xmlbeans/trunk/test/src/dom/checkin/DomImplementationSyncTest.java Fri Jan 18 23:08:44 2019
@@ -17,24 +17,10 @@
package dom.checkin;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-/**
- *
- *
- */
+import org.junit.Before;
public class DomImplementationSyncTest extends DomImplementationTest {
- public DomImplementationSyncTest(String s) {
- super(s);
- }
-
- public static Test suite() {
- return new TestSuite(DomImplementationSyncTest.class);
- }
-
+ @Before
public void setUp() throws Exception {
super.loadSync();
super.moveToNode();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org