Modified: xmlbeans/trunk/src/test/java/scomp/substGroup/detailed/OneLevel.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/scomp/substGroup/detailed/OneLevel.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/scomp/substGroup/detailed/OneLevel.java (original) +++ xmlbeans/trunk/src/test/java/scomp/substGroup/detailed/OneLevel.java Sun Feb 6 01:51:55 2022 @@ -15,94 +15,87 @@ package scomp.substGroup.detailed; import org.apache.xmlbeans.XmlErrorCodes; -import org.junit.Test; -import scomp.common.BaseCase; +import org.apache.xmlbeans.XmlOptions; +import org.junit.jupiter.api.Test; import xbean.scomp.substGroup.oneLevel.*; import java.math.BigInteger; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; +import static scomp.common.BaseCase.createOptions; +import static scomp.common.BaseCase.getErrorCodes; -public class OneLevel extends BaseCase { +public class OneLevel { @Test - public void testValidSubstParse() throws Throwable { + void testValidSubstParse() throws Throwable { String input = - "<items xmlns=\"http://xbean/scomp/substGroup/OneLevel\";>" + - "<shirt>" + - " <number>SKU25</number>" + - " <name>Oxford Shirt</name>" + - " <size>12</size>" + - " <color>blue</color>" + - "</shirt>" + - "<product>" + - " <number>SKU45</number>" + - " <name>Accessory</name>" + - "</product>" + - "<hat>" + - " <number>SKU35</number>" + - " <name>Sombrero</name>" + - " <size>4</size>" + - "</hat>" + - "<umbrella>" + - " <number>SKU15</number>" + - " <name>Umbrella</name>" + - "</umbrella>" + - "</items>"; + "<items xmlns=\"http://xbean/scomp/substGroup/OneLevel\";>" + + "<shirt>" + + " <number>SKU25</number>" + + " <name>Oxford Shirt</name>" + + " <size>12</size>" + + " <color>blue</color>" + + "</shirt>" + + "<product>" + + " <number>SKU45</number>" + + " <name>Accessory</name>" + + "</product>" + + "<hat>" + + " <number>SKU35</number>" + + " <name>Sombrero</name>" + + " <size>4</size>" + + "</hat>" + + "<umbrella>" + + " <number>SKU15</number>" + + " <name>Umbrella</name>" + + "</umbrella>" + + "</items>"; ItemsDocument doc = ItemsDocument.Factory.parse(input); - try { - assertTrue(doc.validate(validateOptions)); - } catch (Throwable t) { - showErrors(); - throw t; - } - + assertTrue(doc.validate(createOptions())); } /** * Test error message. 1 product too many */ @Test - public void testValidSubstParseInvalid() throws Throwable { + void testValidSubstParseInvalid() throws Throwable { String input = - "<items xmlns=\"http://xbean/scomp/substGroup/OneLevel\";>" + - "<shirt>" + - " <number>SKU25</number>" + - " <name>Oxford Shirt</name>" + - " <size>12</size>" + - " <color>blue</color>" + - "</shirt>" + - "<product>" + - " <number>SKU45</number>" + - " <name>Accessory</name>" + - "</product>" + - "<hat>" + - " <number>SKU35</number>" + - " <name>Sombrero</name>" + - " <size>4</size>" + - "</hat>" + - "<umbrella>" + - " <number>SKU15</number>" + - " <name>Umbrella</name>" + - "</umbrella>" + - "<hat>" + - " <number>SKU35</number>" + - " <name>Sombrero</name>" + - " <size>4</size>" + - "</hat>" + - "</items>"; + "<items xmlns=\"http://xbean/scomp/substGroup/OneLevel\";>" + + "<shirt>" + + " <number>SKU25</number>" + + " <name>Oxford Shirt</name>" + + " <size>12</size>" + + " <color>blue</color>" + + "</shirt>" + + "<product>" + + " <number>SKU45</number>" + + " <name>Accessory</name>" + + "</product>" + + "<hat>" + + " <number>SKU35</number>" + + " <name>Sombrero</name>" + + " <size>4</size>" + + "</hat>" + + "<umbrella>" + + " <number>SKU15</number>" + + " <name>Umbrella</name>" + + "</umbrella>" + + "<hat>" + + " <number>SKU35</number>" + + " <name>Sombrero</name>" + + " <size>4</size>" + + "</hat>" + + "</items>"; ItemsDocument doc = ItemsDocument.Factory.parse(input); - - assertTrue(!doc.validate(validateOptions)); - String[] errExpected = new String[]{ - XmlErrorCodes.ELEM_COMPLEX_TYPE_LOCALLY_VALID$ELEMENT_NOT_ALLOWED - }; - assertTrue(compareErrorCodes( - errExpected)); + XmlOptions validateOptions = createOptions(); + assertFalse(doc.validate(validateOptions)); + String[] errExpected = {XmlErrorCodes.ELEM_COMPLEX_TYPE_LOCALLY_VALID$ELEMENT_NOT_ALLOWED}; + assertArrayEquals(errExpected, getErrorCodes(validateOptions)); } @Test - public void testValidSubstBuild() throws Throwable { + void testValidSubstBuild() throws Throwable { ItemsDocument doc = ItemsDocument.Factory.newInstance(); ItemType items = doc.addNewItems(); HatType hat = HatType.Factory.newInstance(); @@ -110,11 +103,11 @@ public class OneLevel extends BaseCase { hat.setNumber("SKU84"); hat.setSize(new BigInteger("10")); - /* This doesn't work - ProductType hat = elt.addNewProduct(); - ((HatType)hat).setNumber(3); - ShirtType shirt = (ShirtType) elt.addNewProduct(); - */ + // This doesn't work + // ProductType hat = elt.addNewProduct(); + // ((HatType)hat).setNumber(3); + // ShirtType shirt = (ShirtType) elt.addNewProduct(); + ShirtType shirt = ShirtType.Factory.newInstance(); shirt.setName("Funny Shirt"); shirt.setNumber("SKU54"); @@ -125,13 +118,6 @@ public class OneLevel extends BaseCase { genericProd.setNumber("32"); items.setProductArray(new ProductType[]{hat, shirt, genericProd}); - try { - assertTrue(doc.validate(validateOptions)); - } catch (Throwable t) { - showErrors(); - throw t; - } - - //TODO: what to do with the umbrella here??? + assertTrue(doc.validate(createOptions())); } }
Modified: xmlbeans/trunk/src/test/java/scomp/substGroup/detailed/UserReportedTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/scomp/substGroup/detailed/UserReportedTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/scomp/substGroup/detailed/UserReportedTest.java (original) +++ xmlbeans/trunk/src/test/java/scomp/substGroup/detailed/UserReportedTest.java Sun Feb 6 01:51:55 2022 @@ -16,8 +16,7 @@ package scomp.substGroup.detailed; import org.apache.xmlbeans.XmlCursor; -import org.junit.Test; -import scomp.common.BaseCase; +import org.junit.jupiter.api.Test; import xbean.scomp.substGroup.userReported.ADocument; import xbean.scomp.substGroup.userReported.BDocument; import xbean.scomp.substGroup.userReported.RootDocument; @@ -25,30 +24,28 @@ import xbean.scomp.substGroup.userReport import javax.xml.namespace.QName; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static scomp.common.BaseCase.createOptions; + +public class UserReportedTest { -public class UserReportedTest extends BaseCase{ - String input="<Root xmlns=\"http://xbean/scomp/substGroup/UserReported\";>" + - " <a/>" + - " <a/>" + - " <b/>" + - " <a/>" + - " <b/>" + - "</Root>"; @Test - public void testGoal()throws Throwable{ + void testGoal() throws Throwable { + String input = + "<Root xmlns=\"http://xbean/scomp/substGroup/UserReported\";>" + + " <a/>" + + " <a/>" + + " <b/>" + + " <a/>" + + " <b/>" + + "</Root>"; - RootDocument doc=RootDocument.Factory.parse(input); - try{ - assertTrue( doc.validate(validateOptions )); - } catch(Throwable t){ - showErrors(); - throw t; - } + RootDocument doc = RootDocument.Factory.parse(input); + assertTrue(doc.validate(createOptions())); } @Test - public void testBuild()throws Throwable{ + void testBuild() throws Throwable { T[] arr = new T[5]; arr[0] = ADocument.Factory.newInstance().addNewA(); @@ -62,24 +59,18 @@ public class UserReportedTest extends Ba RootDocument mdoc = RootDocument.Factory.newInstance(); RootDocument.Root m = mdoc.addNewRoot(); m.setAArray(arr); - T[] arr1=m.getAArray(); + T[] arr1 = m.getAArray(); try (XmlCursor c = arr1[2].newCursor()) { - c.setName(new QName("http://xbean/scomp/substGroup/UserReported","b";)); + c.setName(new QName("http://xbean/scomp/substGroup/UserReported";, "b")); } try (XmlCursor c = arr1[4].newCursor()) { - c.setName(new QName("http://xbean/scomp/substGroup/UserReported","b";)); + c.setName(new QName("http://xbean/scomp/substGroup/UserReported";, "b")); } - /* if (! mdoc.toString().equals(input)) - throw new Exception(mdoc.toString()); - */ + // if (! mdoc.toString().equals(input)) + // throw new Exception(mdoc.toString()); //assertEquals(input, mdoc.toString() ); - try{ - assertTrue( mdoc.validate(validateOptions )); - } catch(Throwable t){ - showErrors(); - throw t; - } + assertTrue(mdoc.validate(createOptions())); } } Modified: xmlbeans/trunk/src/test/java/scomp/substGroup/detailed/Wide.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/scomp/substGroup/detailed/Wide.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/scomp/substGroup/detailed/Wide.java (original) +++ xmlbeans/trunk/src/test/java/scomp/substGroup/detailed/Wide.java Sun Feb 6 01:51:55 2022 @@ -16,8 +16,8 @@ package scomp.substGroup.detailed; import org.apache.xmlbeans.XmlErrorCodes; -import org.junit.Test; -import scomp.common.BaseCase; +import org.apache.xmlbeans.XmlOptions; +import org.junit.jupiter.api.Test; import xbean.scomp.substGroup.deep.ItemType; import xbean.scomp.substGroup.deep.ItemsDocument; import xbean.scomp.substGroup.deep.ProductType; @@ -26,78 +26,71 @@ import xbean.scomp.substGroup.wide.Busin import java.math.BigInteger; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; +import static scomp.common.BaseCase.createOptions; +import static scomp.common.BaseCase.getErrorCodes; -public class Wide extends BaseCase { +public class Wide { @Test - public void testValidSubstParse() throws Throwable { + void testValidSubstParse() throws Throwable { String input = - "<base:items xmlns:pre=\"http://xbean/scomp/substGroup/Wide\""; + - " xmlns:base=\"http://xbean/scomp/substGroup/Deep\";>" + - "<pre:businessshirt>" + - " <number>SKU25</number>" + - " <name>Oxford Shirt</name>" + - " <size>12</size>" + - " <color>white</color>" + - "</pre:businessshirt>" + - "<base:product>" + - " <number>SKU45</number>" + - " <name>Accessory</name>" + - "</base:product>" + - "<pre:beachumbrella diameter=\"1.43\">" + - " <number>SKU15</number>" + - " <name>Umbrella</name>" + - "</pre:beachumbrella>" + - "</base:items>"; + "<base:items xmlns:pre=\"http://xbean/scomp/substGroup/Wide\""; + + " xmlns:base=\"http://xbean/scomp/substGroup/Deep\";>" + + "<pre:businessshirt>" + + " <number>SKU25</number>" + + " <name>Oxford Shirt</name>" + + " <size>12</size>" + + " <color>white</color>" + + "</pre:businessshirt>" + + "<base:product>" + + " <number>SKU45</number>" + + " <name>Accessory</name>" + + "</base:product>" + + "<pre:beachumbrella diameter=\"1.43\">" + + " <number>SKU15</number>" + + " <name>Umbrella</name>" + + "</pre:beachumbrella>" + + "</base:items>"; ItemsDocument doc = ItemsDocument.Factory.parse(input); - try { - assertTrue(doc.validate(validateOptions)); - } catch (Throwable t) { - showErrors(); - throw t; - } - + assertTrue(doc.validate(createOptions())); } /** * Test error message. 1 product too many - * - * @throws Throwable */ - public void testValidSubstParseInvalid() throws Throwable { + @Test + void testValidSubstParseInvalid() throws Throwable { String input = - "<base:items xmlns:pre=\"http://xbean/scomp/substGroup/Wide\""; + - " xmlns:base=\"http://xbean/scomp/substGroup/Deep\";>" + - "<pre:businessshirt>" + - " <number>SKU25</number>" + - " <name>Oxford Shirt</name>" + - " <size>12</size>" + - " <color>white</color>" + - "</pre:businessshirt>" + - "<base:product>" + - " <number>SKU45</number>" + - " <name>Accessory</name>" + - "</base:product>" + - "<pre:beachumbrella diameter=\"1.43\">" + - " <number>SKU15</number>" + - " <name>Umbrella</name>" + - "</pre:beachumbrella>" + - "<pre:baseballhat TeamName=\"Mariners\">" + - " <number>SKU15</number>" + - " <name>Umbrella</name>" + - "</pre:baseballhat>" + - "</base:items>"; + "<base:items xmlns:pre=\"http://xbean/scomp/substGroup/Wide\""; + + " xmlns:base=\"http://xbean/scomp/substGroup/Deep\";>" + + "<pre:businessshirt>" + + " <number>SKU25</number>" + + " <name>Oxford Shirt</name>" + + " <size>12</size>" + + " <color>white</color>" + + "</pre:businessshirt>" + + "<base:product>" + + " <number>SKU45</number>" + + " <name>Accessory</name>" + + "</base:product>" + + "<pre:beachumbrella diameter=\"1.43\">" + + " <number>SKU15</number>" + + " <name>Umbrella</name>" + + "</pre:beachumbrella>" + + "<pre:baseballhat TeamName=\"Mariners\">" + + " <number>SKU15</number>" + + " <name>Umbrella</name>" + + "</pre:baseballhat>" + + "</base:items>"; ItemsDocument doc = ItemsDocument.Factory.parse(input); - - assertTrue(!doc.validate(validateOptions)); - String[] errExpected = new String[]{ - XmlErrorCodes.ELEM_COMPLEX_TYPE_LOCALLY_VALID$ELEMENT_NOT_ALLOWED - }; - assertTrue(compareErrorCodes(errExpected)); - + XmlOptions validateOptions = createOptions(); + assertFalse(doc.validate(validateOptions)); + String[] errExpected = {XmlErrorCodes.ELEM_COMPLEX_TYPE_LOCALLY_VALID$ELEMENT_NOT_ALLOWED}; + assertArrayEquals(errExpected, getErrorCodes(validateOptions)); } - public void testValidSubstBuild() throws Throwable { + @Test + void testValidSubstBuild() throws Throwable { ItemsDocument doc = ItemsDocument.Factory.newInstance(); ItemType items = doc.addNewItems(); BusinessShirtType bShirt = BusinessShirtType.Factory.newInstance(); @@ -116,23 +109,16 @@ public class Wide extends BaseCase { genericProd.setNumber("32"); items.setProductArray(new ProductType[]{bShirt, bu, genericProd}); //shirt must be white - assertTrue(!doc.validate(validateOptions)); - String[] errExpected = new String[]{ - XmlErrorCodes.DATATYPE_VALID$PATTERN_VALID - }; - assertTrue(compareErrorCodes(errExpected)); - + XmlOptions validateOptions = createOptions(); + assertFalse(doc.validate(validateOptions)); + String[] errExpected = {XmlErrorCodes.DATATYPE_VALID$PATTERN_VALID}; + assertArrayEquals(errExpected, getErrorCodes(validateOptions)); //TODO: is the object being copied? Should this change the color? bShirt.setColor("white"); - items.setProductArray(0,bShirt); + items.setProductArray(0, bShirt); - try { - assertTrue(doc.validate(validateOptions)); - } catch (Throwable t) { - showErrors(); - throw t; - } + assertTrue(doc.validate(validateOptions)); } Modified: xmlbeans/trunk/src/test/java/scomp/substGroup/restriction/detailed/Abstract.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/scomp/substGroup/restriction/detailed/Abstract.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/scomp/substGroup/restriction/detailed/Abstract.java (original) +++ xmlbeans/trunk/src/test/java/scomp/substGroup/restriction/detailed/Abstract.java Sun Feb 6 01:51:55 2022 @@ -16,9 +16,9 @@ package scomp.substGroup.restriction.detailed; import org.apache.xmlbeans.XmlErrorCodes; +import org.apache.xmlbeans.XmlOptions; import org.apache.xmlbeans.XmlString; -import org.junit.Test; -import scomp.common.BaseCase; +import org.junit.jupiter.api.Test; import xbean.scomp.substGroup.deep.BusinessShirtType; import xbean.scomp.substGroup.deep.ItemType; import xbean.scomp.substGroup.deep.ItemsDocument; @@ -31,119 +31,101 @@ import xbean.scomp.substGroup.xabstract. import java.math.BigInteger; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; +import static scomp.common.BaseCase.createOptions; +import static scomp.common.BaseCase.getErrorCodes; /** + * */ -public class Abstract extends BaseCase { +public class Abstract { @Test - public void testAbstractInvalid() throws Throwable { + void testAbstractInvalid() throws Throwable { //umbrella not OK here String input = - "<base:items xmlns:pre=\"http://xbean/scomp/substGroup/Abstract\""; + - " xmlns:base=\"http://xbean/scomp/substGroup/Deep\";>" + - "<base:product>" + - " <number>SKU45</number>" + - " <name>Accessory</name>" + - "</base:product>" + - "<pre:umbrella>" + - " <number>SKU15</number>" + - " <name>Umbrella</name>" + - "</pre:umbrella>" + - "<base:casualBShirt>" + - " <number>SKU25</number>" + - " <name>Oxford Shirt</name>" + - " <size>12</size>" + - " <color>blue</color>" + - "<pokadotColor>yellow</pokadotColor>" + - "</base:casualBShirt>" + - "</base:items>"; + "<base:items xmlns:pre=\"http://xbean/scomp/substGroup/Abstract\""; + + " xmlns:base=\"http://xbean/scomp/substGroup/Deep\";>" + + "<base:product>" + + " <number>SKU45</number>" + + " <name>Accessory</name>" + + "</base:product>" + + "<pre:umbrella>" + + " <number>SKU15</number>" + + " <name>Umbrella</name>" + + "</pre:umbrella>" + + "<base:casualBShirt>" + + " <number>SKU25</number>" + + " <name>Oxford Shirt</name>" + + " <size>12</size>" + + " <color>blue</color>" + + "<pokadotColor>yellow</pokadotColor>" + + "</base:casualBShirt>" + + "</base:items>"; ItemsDocument doc = ItemsDocument.Factory.parse(input); - assertTrue(!doc.validate(validateOptions)); - showErrors(); - + assertFalse(doc.validate(createOptions())); } @Test - public void testParseValid() throws Throwable { + void testParseValid() throws Throwable { String input = - "<base:items xmlns:pre=\"http://xbean/scomp/substGroup/Abstract\""; + - " xmlns:base=\"http://xbean/scomp/substGroup/Deep\";>" + - "<base:product>" + - " <number>SKU45</number>" + - " <name>Accessory</name>" + - "</base:product>" + - "<pre:beachumbrella diameter=\"19.5\">" + - " <number>SKU15</number>" + - " <name>Umbrella</name>" + - "</pre:beachumbrella>" + - "<base:casualBShirt>" + - " <number>SKU25</number>" + - " <name>Oxford Shirt</name>" + - " <size>12</size>" + - " <color>blue</color>" + - "<pokadotColor>yellow</pokadotColor>" + - "</base:casualBShirt>" + - "</base:items>"; + "<base:items xmlns:pre=\"http://xbean/scomp/substGroup/Abstract\""; + + " xmlns:base=\"http://xbean/scomp/substGroup/Deep\";>" + + "<base:product>" + + " <number>SKU45</number>" + + " <name>Accessory</name>" + + "</base:product>" + + "<pre:beachumbrella diameter=\"19.5\">" + + " <number>SKU15</number>" + + " <name>Umbrella</name>" + + "</pre:beachumbrella>" + + "<base:casualBShirt>" + + " <number>SKU25</number>" + + " <name>Oxford Shirt</name>" + + " <size>12</size>" + + " <color>blue</color>" + + "<pokadotColor>yellow</pokadotColor>" + + "</base:casualBShirt>" + + "</base:items>"; ItemsDocument doc = ItemsDocument.Factory.parse(input); - try { - assertTrue(doc.validate(validateOptions)); - } - catch (Throwable t) { - showErrors(); - throw t; - } - + assertTrue(doc.validate(createOptions())); } @Test - public void testBuildValid() throws Throwable { - ItemsDocument doc = ItemsDocument.Factory.newInstance(); - BusinessShirtType bs = BusinessShirtType.Factory.newInstance(); + void testBuildValid() throws Throwable { + ItemsDocument doc = ItemsDocument.Factory.newInstance(); + BusinessShirtType bs = BusinessShirtType.Factory.newInstance(); bs.setName("Oxford Shirt"); bs.setNumber("SKU35"); bs.setColor("blue"); bs.setSize(new BigInteger("10")); - ItemType it= doc.addNewItems(); - BeachUmbrellaT um=BeachUmbrellaT.Factory.newInstance(); + ItemType it = doc.addNewItems(); + BeachUmbrellaT um = BeachUmbrellaT.Factory.newInstance(); um.setDiameter(1.5f); um.xsetName(null); um.setNumber("SKU_Umbrella"); - it.setProductArray(new ProductType[]{bs,um}); - assertTrue(! doc.validate()); - XmlString name=XmlString.Factory.newInstance(); + it.setProductArray(new ProductType[]{bs, um}); + assertFalse(doc.validate()); + XmlString name = XmlString.Factory.newInstance(); name.setStringValue("foobar"); - um.xsetName(name); - it.setProductArray(new ProductType[]{bs,um}); - try { - assertTrue(doc.validate(validateOptions)); - } - catch (Throwable t) { - System.out.println(doc.xmlText()); - showErrors(); - throw t; - } + um.xsetName(name); + it.setProductArray(new ProductType[]{bs, um}); + assertTrue(doc.validate(createOptions())); } //user described problem @Test - public void testUserAbstract(){ + void testUserAbstract() { - RootDocument doc=RootDocument.Factory - .newInstance(); - Bar barElt=doc.addNewRoot(); + RootDocument doc = RootDocument.Factory.newInstance(); + Bar barElt = doc.addNewRoot(); barElt.insertNewFoo(0); - AbstractFoo elt= barElt.getFooArray()[0]; - assertTrue (! doc.validate(validateOptions)); - String[] errExpected = new String[]{ - XmlErrorCodes.ELEM_LOCALLY_VALID$ABSTRACT - }; - assertTrue(compareErrorCodes(errExpected)); + AbstractFoo elt = barElt.getFooArray()[0]; + XmlOptions validateOptions = createOptions(); + assertFalse(doc.validate(validateOptions)); + String[] errExpected = {XmlErrorCodes.ELEM_LOCALLY_VALID$ABSTRACT}; + assertArrayEquals(errExpected, getErrorCodes(validateOptions)); elt.changeType(GenericFoo.type); - assertTrue ( doc.validate(validateOptions)); - - + assertTrue(doc.validate(validateOptions)); } - } Modified: xmlbeans/trunk/src/test/java/scomp/substGroup/restriction/detailed/Block.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/scomp/substGroup/restriction/detailed/Block.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/scomp/substGroup/restriction/detailed/Block.java (original) +++ xmlbeans/trunk/src/test/java/scomp/substGroup/restriction/detailed/Block.java Sun Feb 6 01:51:55 2022 @@ -17,151 +17,125 @@ package scomp.substGroup.restriction.det import org.apache.xmlbeans.XmlCursor; import org.apache.xmlbeans.XmlErrorCodes; -import org.junit.Test; -import scomp.common.BaseCase; +import org.apache.xmlbeans.XmlOptions; +import org.junit.jupiter.api.Test; import xbean.scomp.substGroup.block.BeachUmbrellaT; import xbean.scomp.substGroup.deep.*; import javax.xml.namespace.QName; import java.math.BigInteger; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; +import static scomp.common.BaseCase.createOptions; +import static scomp.common.BaseCase.getErrorCodes; -public class Block extends BaseCase { +public class Block { /** * TODO: verify that w/ respect to substitution * groups block all * and block substitution are the same thing; - * - * @throws Throwable */ @Test - public void testBlockAllInvalid() throws Throwable { + void testBlockAllInvalid() throws Throwable { //should not be able to use CasualBusinessShirt instead of shirt //but BusinessShirt instead of shirt should be OK String input = - "<base:items xmlns:pre=\"http://xbean/scomp/substGroup/Block\""; + - " xmlns:base=\"http://xbean/scomp/substGroup/Deep\";>" + - "<pre:casualBShirt>" + - " <number>SKU25</number>" + - " <name>Oxford Shirt</name>" + - " <size>12</size>" + - " <color>blue</color>" + - "<pokadotColor>yellow</pokadotColor>" + - "</pre:casualBShirt>" + - "<base:product>" + - " <number>SKU45</number>" + - " <name>Accessory</name>" + - "</base:product>" + - "<pre:umbrella>" + - " <number>SKU15</number>" + - " <name>Umbrella</name>" + - "</pre:umbrella>" + - "<pre:casualBShirt>" + - " <number>SKU25</number>" + - " <name>Oxford Shirt</name>" + - " <size>12</size>" + - " <color>blue</color>" + - "<pokadotColor>yellow</pokadotColor>" + - "</pre:casualBShirt>" + - "</base:items>"; + "<base:items xmlns:pre=\"http://xbean/scomp/substGroup/Block\""; + + " xmlns:base=\"http://xbean/scomp/substGroup/Deep\";>" + + "<pre:casualBShirt>" + + " <number>SKU25</number>" + + " <name>Oxford Shirt</name>" + + " <size>12</size>" + + " <color>blue</color>" + + "<pokadotColor>yellow</pokadotColor>" + + "</pre:casualBShirt>" + + "<base:product>" + + " <number>SKU45</number>" + + " <name>Accessory</name>" + + "</base:product>" + + "<pre:umbrella>" + + " <number>SKU15</number>" + + " <name>Umbrella</name>" + + "</pre:umbrella>" + + "<pre:casualBShirt>" + + " <number>SKU25</number>" + + " <name>Oxford Shirt</name>" + + " <size>12</size>" + + " <color>blue</color>" + + "<pokadotColor>yellow</pokadotColor>" + + "</pre:casualBShirt>" + + "</base:items>"; ItemsDocument doc = ItemsDocument.Factory.parse(input); - assertTrue(!doc.validate(validateOptions)); - showErrors(); - String[] errExpected = new String[]{ - XmlErrorCodes.ELEM_COMPLEX_TYPE_LOCALLY_VALID$ELEMENT_NOT_ALLOWED - }; - assertTrue(compareErrorCodes(errExpected)); + XmlOptions validateOptions = createOptions(); + assertFalse(doc.validate(validateOptions)); + String[] errExpected = {XmlErrorCodes.ELEM_COMPLEX_TYPE_LOCALLY_VALID$ELEMENT_NOT_ALLOWED}; + assertArrayEquals(errExpected, getErrorCodes(validateOptions)); - ShirtType bs=BusinessShirtType.Factory.newInstance(); + ShirtType bs = BusinessShirtType.Factory.newInstance(); bs.setName("Bus Shirt"); bs.setNumber("SKU35"); bs.setColor("blue"); bs.setSize(new BigInteger("10")); - doc.getItems().setProductArray(new ProductType[]{ - bs - }); + doc.getItems().setProductArray(new ProductType[]{bs}); try (XmlCursor cur = doc.newCursor()) { cur.toFirstContentToken(); cur.toNextToken(); cur.toNextToken(); cur.toNextToken(); - assertEquals(XmlCursor.TokenType.START,cur.currentTokenType()); - cur.setName(new QName("http://xbean/scomp/substGroup/Block","businessShirt","pre";)); - } - System.out.println("*************** "+doc.xmlText()); - - try { - assertTrue(doc.validate(validateOptions)); - } - catch (Throwable t) { - showErrors(); - throw t; + assertEquals(XmlCursor.TokenType.START, cur.currentTokenType()); + cur.setName(new QName("http://xbean/scomp/substGroup/Block";, "businessShirt", "pre")); } + assertTrue(doc.validate(validateOptions)); } @Test - public void testBlockAllValidParse() throws Throwable { + void testBlockAllValidParse() throws Throwable { String input = - "<base:items xmlns:pre=\"http://xbean/scomp/substGroup/Block\""; + - " xmlns:base=\"http://xbean/scomp/substGroup/Deep\";>" + - "<pre:businessShirt>" + - " <number>SKU25</number>" + - " <name>Oxford Shirt</name>" + - " <size>12</size>" + - " <color>blue</color>" + - "</pre:businessShirt>" + - "<base:product>" + - " <number>SKU45</number>" + - " <name>Accessory</name>" + - "</base:product>" + - "<pre:umbrella>" + - " <number>SKU15</number>" + - " <name>Umbrella</name>" + - "</pre:umbrella>" + - "</base:items>"; + "<base:items xmlns:pre=\"http://xbean/scomp/substGroup/Block\""; + + " xmlns:base=\"http://xbean/scomp/substGroup/Deep\";>" + + "<pre:businessShirt>" + + " <number>SKU25</number>" + + " <name>Oxford Shirt</name>" + + " <size>12</size>" + + " <color>blue</color>" + + "</pre:businessShirt>" + + "<base:product>" + + " <number>SKU45</number>" + + " <name>Accessory</name>" + + "</base:product>" + + "<pre:umbrella>" + + " <number>SKU15</number>" + + " <name>Umbrella</name>" + + "</pre:umbrella>" + + "</base:items>"; ItemsDocument doc = ItemsDocument.Factory.parse(input); - try { - assertTrue(doc.validate(validateOptions)); - } - catch (Throwable t) { - showErrors(); - throw t; - } - + assertTrue(doc.validate(createOptions())); } @Test - public void testBlockAllValidBuild() throws Throwable { - ItemsDocument doc = ItemsDocument.Factory.newInstance(); - BusinessShirtType bs = BusinessShirtType.Factory.newInstance(); + void testBlockAllValidBuild() throws Throwable { + ItemsDocument doc = ItemsDocument.Factory.newInstance(); + BusinessShirtType bs = BusinessShirtType.Factory.newInstance(); bs.setName("Oxford Shirt"); bs.setNumber("SKU35"); bs.setColor("blue"); bs.setSize(new BigInteger("10")); - ItemType it= doc.addNewItems(); - it.setProductArray(new ProductType[]{bs}); + ItemType it = doc.addNewItems(); + it.setProductArray(new ProductType[]{bs}); - try { - assertTrue(doc.validate(validateOptions)); - } - catch (Throwable t) { - showErrors(); - throw t; - } + assertTrue(doc.validate(createOptions())); } /* - * even though umbrella has subst. blocked, beachumbrella - * is a valid product substitution - */ + * even though umbrella has subst. blocked, beachumbrella + * is a valid product substitution + */ @Test - public void testBlockSubst() throws Throwable { + void testBlockSubst() throws Throwable { ItemsDocument doc = ItemsDocument.Factory.newInstance(); ItemType items = doc.addNewItems(); BeachUmbrellaT bu = BeachUmbrellaT.Factory.newInstance(); @@ -169,31 +143,16 @@ public class Block extends BaseCase { bu.setNumber("324"); bu.setName("Beach umbrella"); items.setProductArray(new ProductType[]{bu}); - try { - clearErrors(); - assertTrue(doc.validate(validateOptions)); - } - catch (Throwable t) { - showErrors(); - throw t; - } - - - doc = ItemsDocument.Factory.parse("<base:items xmlns:pre=\"http://xbean/scomp/substGroup/Block\""; + - " xmlns:base=\"http://xbean/scomp/substGroup/Deep\";>" + - "<pre:beachumbrella>" + - " <number>SKU15</number>" + - " <name>Umbrella</name>" + - "</pre:beachumbrella>" + - "</base:items>"); - try { - clearErrors(); - assertTrue(doc.validate(validateOptions)); - } - catch (Throwable t) { - showErrors(); - throw t; - } + assertTrue(doc.validate(createOptions())); + doc = ItemsDocument.Factory.parse( + "<base:items xmlns:pre=\"http://xbean/scomp/substGroup/Block\""; + + " xmlns:base=\"http://xbean/scomp/substGroup/Deep\";>" + + "<pre:beachumbrella>" + + " <number>SKU15</number>" + + " <name>Umbrella</name>" + + "</pre:beachumbrella>" + + "</base:items>"); + assertTrue(doc.validate(createOptions())); } } Modified: xmlbeans/trunk/src/test/java/scomp/substGroup/restriction/detailed/Final.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/scomp/substGroup/restriction/detailed/Final.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/scomp/substGroup/restriction/detailed/Final.java (original) +++ xmlbeans/trunk/src/test/java/scomp/substGroup/restriction/detailed/Final.java Sun Feb 6 01:51:55 2022 @@ -15,100 +15,72 @@ package scomp.substGroup.restriction.detailed; import org.apache.xmlbeans.*; -import org.junit.Test; -import scomp.common.BaseCase; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; -import java.util.Iterator; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - - -public class Final extends BaseCase { +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static scomp.common.BaseCase.createOptions; + + +public class Final { + + private static final String XSD = + " <xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\";>\n" + + "\n" + + " <xsd:element name=\"Product\" type=\"BaseProductType\" final=\"sFinalAttributeValue\"/>\n" + + "\n" + + " <xsd:complexType name=\"BaseProductType\">\n" + + " <xsd:sequence>\n" + + " <xsd:element name=\"number\" type=\"xsd:integer\" />\n" + + " <xsd:element name=\"name\" type=\"xsd:string\" minOccurs=\"0\" />\n" + + " <xsd:element name=\"size\" type=\"xsd:integer\" minOccurs=\"0\" />\n" + + " </xsd:sequence>\n" + + " </xsd:complexType>\n" + + "\n" + + " <xsd:element name=\"Shirt\" type=\"ShirtType\" substitutionGroup=\"Product\" />\n" + + "\n" + + " <xsd:complexType name=\"ShirtType\">\n" + + " <xsd:complexContent>\n" + + " <xsd:extension base=\"BaseProductType\">\n" + + " <xsd:sequence>\n" + + " <xsd:element name=\"color\" type=\"xsd:string\"/>\n" + + " </xsd:sequence>\n" + + " </xsd:extension>\n" + + " </xsd:complexContent>\n" + + " </xsd:complexType>\n" + + "\n" + + " <xsd:element name=\"Hat\" type=\"HatType\" substitutionGroup=\"Product\" />\n" + + "\n" + + " <xsd:complexType name=\"HatType\">\n" + + " <xsd:complexContent>\n" + + " <xsd:restriction base=\"BaseProductType\">\n" + + " <xsd:sequence>\n" + + " <xsd:element name=\"number\" type=\"xsd:integer\"/>\n" + + " </xsd:sequence>\n" + + " </xsd:restriction>\n" + + " </xsd:complexContent>\n" + + " </xsd:complexType>\n" + + "\n" + + " </xsd:schema>"; /** * The follwing are test for the 'final' attribute used in a base in substitution groups * They are negative tests and test for #all, restriction, extenstion and 'extenstion restriction' values */ - @Test - public void testFinalAll() { - parseXsdDoc(constructInputXsdString("#all")); - } - - @Test - public void testFinalExtRestr() { - parseXsdDoc(constructInputXsdString("extension restriction")); - } - - @Test - public void testFinalRestriction() { - parseXsdDoc(constructInputXsdString("restriction")); - } - - @Test - public void testFinalExtension() { - parseXsdDoc(constructInputXsdString("extension")); - } - - // helper function for this class - private String constructInputXsdString(String sFinalAttributeValue) { - return (" <xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\";>\n" + - "\n" + - " <xsd:element name=\"Product\" type=\"BaseProductType\" final=\"" + sFinalAttributeValue + "\"/>\n" + - "\n" + - " <xsd:complexType name=\"BaseProductType\">\n" + - " <xsd:sequence>\n" + - " <xsd:element name=\"number\" type=\"xsd:integer\" />\n" + - " <xsd:element name=\"name\" type=\"xsd:string\" minOccurs=\"0\" />\n" + - " <xsd:element name=\"size\" type=\"xsd:integer\" minOccurs=\"0\" />\n" + - " </xsd:sequence>\n" + - " </xsd:complexType>\n" + - "\n" + - " <xsd:element name=\"Shirt\" type=\"ShirtType\" substitutionGroup=\"Product\" />\n" + - "\n" + - " <xsd:complexType name=\"ShirtType\">\n" + - " <xsd:complexContent>\n" + - " <xsd:extension base=\"BaseProductType\">\n" + - " <xsd:sequence>\n" + - " <xsd:element name=\"color\" type=\"xsd:string\"/>\n" + - " </xsd:sequence>\n" + - " </xsd:extension>\n" + - " </xsd:complexContent>\n" + - " </xsd:complexType>\n" + - "\n" + - " <xsd:element name=\"Hat\" type=\"HatType\" substitutionGroup=\"Product\" />\n" + - "\n" + - " <xsd:complexType name=\"HatType\">\n" + - " <xsd:complexContent>\n" + - " <xsd:restriction base=\"BaseProductType\">\n" + - " <xsd:sequence>\n" + - " <xsd:element name=\"number\" type=\"xsd:integer\"/>\n" + - " </xsd:sequence>\n" + - " </xsd:restriction>\n" + - " </xsd:complexContent>\n" + - " </xsd:complexType>\n" + - "\n" + - " </xsd:schema>"); - } - - private void parseXsdDoc(String inputXsd) - { - try { - XmlObject xobj = XmlObject.Factory.parse(inputXsd); - XmlObject[] compInput = new XmlObject[]{xobj}; - XmlBeans.compileXmlBeans(null, null, compInput, null, XmlBeans.getBuiltinTypeSystem(), null, null); - } - catch (XmlException xme) { - assertEquals(1,xme.getErrors().size()); - - Iterator itr = xme.getErrors().iterator(); - XmlError eacherr = (XmlError) itr.next(); - System.out.println("Err:" + eacherr.getMessage()); - assertNotNull(eacherr.getErrorCode()); - assertEquals(XmlErrorCodes.ELEM_PROPERTIES$SUBSTITUTION_FINAL, eacherr.getErrorCode()); - - - } + @ParameterizedTest + @ValueSource(strings = {"#all", "extension restriction", "restriction", "extension"}) + void parseXsdDoc(String inputXsd) throws XmlException { + XmlObject xobj = XmlObject.Factory.parse(XSD.replace("sFinalAttributeValue",inputXsd)); + XmlObject[] compInput = new XmlObject[]{xobj}; + XmlOptions validateOptions = createOptions(); + + assertThrows(XmlException.class, () -> + XmlBeans.compileXmlBeans(null, null, compInput, null, XmlBeans.getBuiltinTypeSystem(), null, validateOptions)); + + boolean errMatch = validateOptions.getErrorListener().stream().map(XmlError::getErrorCode) + .allMatch(XmlErrorCodes.ELEM_PROPERTIES$SUBSTITUTION_FINAL::equals); + assertTrue(errMatch); } } Modified: xmlbeans/trunk/src/test/java/scomp/xmlbeans583/detailed/Xmlbeans583Test.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/scomp/xmlbeans583/detailed/Xmlbeans583Test.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/scomp/xmlbeans583/detailed/Xmlbeans583Test.java (original) +++ xmlbeans/trunk/src/test/java/scomp/xmlbeans583/detailed/Xmlbeans583Test.java Sun Feb 6 01:51:55 2022 @@ -14,17 +14,16 @@ */ package scomp.xmlbeans583.detailed; -import org.junit.Test; -import scomp.common.BaseCase; +import org.junit.jupiter.api.Test; import xsd.xmlToStringTest1Xsd.Ns1T1; import xsd.xmlToStringTest2Xsd.Ns2E1Document; import xsd.xmlToStringTest3Xsd.Ns3E1Document; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; -public class Xmlbeans583Test extends BaseCase { +public class Xmlbeans583Test { @Test - public void testXmlToString() throws Throwable { + void testXmlToString() throws Throwable { final Ns2E1Document ns2e1Doc = Ns2E1Document.Factory.newInstance(); ns2e1Doc.addNewNs2E1().addNewNs2T1E1().setNs1T1E1("Ns1T1E1"); Modified: xmlbeans/trunk/src/test/java/tools/inst2xsd/checkin/Inst2XsdAttrTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/tools/inst2xsd/checkin/Inst2XsdAttrTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/tools/inst2xsd/checkin/Inst2XsdAttrTest.java (original) +++ xmlbeans/trunk/src/test/java/tools/inst2xsd/checkin/Inst2XsdAttrTest.java Sun Feb 6 01:51:55 2022 @@ -14,10 +14,13 @@ */ package tools.inst2xsd.checkin; -import org.junit.Test; -import tools.inst2xsd.common.Inst2XsdTestBase; -public class Inst2XsdAttrTest extends Inst2XsdTestBase { +import org.junit.jupiter.api.Test; + +import static tools.inst2xsd.common.Inst2XsdTestBase.getAttrTypeXml; +import static tools.inst2xsd.common.Inst2XsdTestBase.runAttrTypeChecking; + +public class Inst2XsdAttrTest { // List of precedence for smart simple primitive type determination // byte, short, int, long, integer, float, double, decimal, @@ -28,14 +31,14 @@ public class Inst2XsdAttrTest extends In // list types ? // string @Test - public void test_attrstring() throws Exception { + void test_attrstring() throws Exception { runAttrTypeChecking(getAttrTypeXml("a"), "string"); runAttrTypeChecking(getAttrTypeXml("a2a"), "string"); runAttrTypeChecking(getAttrTypeXml("a b c\n hello\t from\n\txmlbeans"), "string"); } @Test - public void test_attrshort() throws Exception { + void test_attrshort() throws Exception { runAttrTypeChecking(getAttrTypeXml("-129"), "short"); runAttrTypeChecking(getAttrTypeXml("128"), "short"); runAttrTypeChecking(getAttrTypeXml("3000"), "short"); @@ -45,7 +48,7 @@ public class Inst2XsdAttrTest extends In } @Test - public void test_attrint() throws Exception { + void test_attrint() throws Exception { runAttrTypeChecking(getAttrTypeXml("39000"), "int"); runAttrTypeChecking(getAttrTypeXml("32768"), "int"); runAttrTypeChecking(getAttrTypeXml("-32769"), "int"); @@ -56,7 +59,7 @@ public class Inst2XsdAttrTest extends In } @Test - public void test_attrlong() throws Exception { + void test_attrlong() throws Exception { runAttrTypeChecking(getAttrTypeXml("2147483648"), "long"); runAttrTypeChecking(getAttrTypeXml("-2147483649"), "long"); runAttrTypeChecking(getAttrTypeXml("-2150000000"), "long"); @@ -66,7 +69,7 @@ public class Inst2XsdAttrTest extends In } @Test - public void test_attrinteger() throws Exception { + void test_attrinteger() throws Exception { runAttrTypeChecking(getAttrTypeXml("9300000000000000000"), "integer"); runAttrTypeChecking(getAttrTypeXml("-9300000000000000000"), "integer"); runAttrTypeChecking(getAttrTypeXml("-9223372036854775809"), "integer"); @@ -74,7 +77,7 @@ public class Inst2XsdAttrTest extends In } @Test - public void test_attrfloat() throws Exception { + void test_attrfloat() throws Exception { runAttrTypeChecking(getAttrTypeXml("12.78e-2"), "float"); runAttrTypeChecking(getAttrTypeXml("1267.43233E12"), "float"); runAttrTypeChecking(getAttrTypeXml("-1E4"), "float"); @@ -87,26 +90,26 @@ public class Inst2XsdAttrTest extends In } @Test - public void test_attrdate() throws Exception { + void test_attrdate() throws Exception { runAttrTypeChecking(getAttrTypeXml("1999-05-31"), "date"); } @Test - public void test_attrdateTime() throws Exception { + void test_attrdateTime() throws Exception { runAttrTypeChecking(getAttrTypeXml("1999-05-31T13:20:00-05:00"), "dateTime"); runAttrTypeChecking(getAttrTypeXml("2000-03-04T20:00:00Z"), "dateTime"); runAttrTypeChecking(getAttrTypeXml("2000-03-04T23:00:00+03:00"), "dateTime"); } @Test - public void test_attrtime() throws Exception { + void test_attrtime() throws Exception { runAttrTypeChecking(getAttrTypeXml("13:20:00-05:00"), "time"); runAttrTypeChecking(getAttrTypeXml("00:00:00"), "time"); runAttrTypeChecking(getAttrTypeXml("13:20:00Z"), "time"); } @Test - public void test_attrbyte() throws Exception { + void test_attrbyte() throws Exception { runAttrTypeChecking(getAttrTypeXml("123"), "byte"); runAttrTypeChecking(getAttrTypeXml("+100"), "byte"); runAttrTypeChecking(getAttrTypeXml("-1"), "byte"); @@ -116,7 +119,7 @@ public class Inst2XsdAttrTest extends In } @Test - public void test_attrduration() throws Exception { + void test_attrduration() throws Exception { runAttrTypeChecking(getAttrTypeXml("P1347Y"), "duration"); runAttrTypeChecking(getAttrTypeXml("P1347M"), "duration"); runAttrTypeChecking(getAttrTypeXml("P1Y2MT2H"), "duration"); Modified: xmlbeans/trunk/src/test/java/tools/inst2xsd/checkin/Inst2XsdCheckinTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/tools/inst2xsd/checkin/Inst2XsdCheckinTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/tools/inst2xsd/checkin/Inst2XsdCheckinTest.java (original) +++ xmlbeans/trunk/src/test/java/tools/inst2xsd/checkin/Inst2XsdCheckinTest.java Sun Feb 6 01:51:55 2022 @@ -16,42 +16,46 @@ package tools.inst2xsd.checkin; import org.apache.xmlbeans.XmlObject; import org.apache.xmlbeans.impl.inst2xsd.Inst2XsdOptions; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runners.MethodSorters; -import tools.inst2xsd.common.Inst2XsdTestBase; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; import java.io.File; +import static common.Common.P; +import static tools.inst2xsd.common.Inst2XsdCommon.*; +import static tools.inst2xsd.common.Inst2XsdTestBase.SCHEMA_CASES_DIR; +import static tools.inst2xsd.common.Inst2XsdTestBase.runSchemaBuild; + // need to order tests, as "atest_examples_component" didn't work anymore in combination with the other // tests since XMLBEANS-82 -@FixMethodOrder(MethodSorters.NAME_ASCENDING) -public class Inst2XsdCheckinTest extends Inst2XsdTestBase { +@TestMethodOrder(MethodOrderer.Alphanumeric.class) +public class Inst2XsdCheckinTest { @Test - public void test_simpleName() throws Exception { + void test_simpleName() throws Exception { XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "simpleName.xml")); - runSchemaBuild(inst, common.getRussianOptions(), + runSchemaBuild(inst, getRussianOptions(), XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "simpleName_rd0.xsd"))); - runSchemaBuild(inst, common.getSalamiOptions(), + runSchemaBuild(inst, getSalamiOptions(), XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "simpleName_ss0.xsd"))); - runSchemaBuild(inst, common.getVenetianOptions(), + runSchemaBuild(inst, getVenetianOptions(), XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "simpleName_vb0.xsd"))); } @Test - public void test_ns_duplicate_russian() throws Exception { + void test_ns_duplicate_russian() throws Exception { XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "namespaces" + P + "duplicatedNS.xml")); - runSchemaBuild(inst, common.getRussianOptions(), + runSchemaBuild(inst, getRussianOptions(), XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "namespaces" + P + "duplicatedNS_rd0.xsd"))); } @Test - public void test_ns_multipleNested_russian() throws Exception { + void test_ns_multipleNested_russian() throws Exception { XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "namespaces" + P + "multipleNestedNS.xml")); - runSchemaBuild(inst, common.getRussianOptions(), new XmlObject[]{ + runSchemaBuild(inst, getRussianOptions(), new XmlObject[]{ XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "namespaces" + P + "multipleNestedNS_rd0.xsd")), XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "namespaces" + P + "multipleNestedNS_rd1.xsd")), XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "namespaces" + P + "multipleNestedNS_rd2.xsd")), @@ -60,10 +64,10 @@ public class Inst2XsdCheckinTest extends } @Test - public void test_ns_multipleNested_salami() throws Exception { + void test_ns_multipleNested_salami() throws Exception { XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "namespaces" + P + "multipleNestedNS.xml")); - runSchemaBuild(inst, common.getSalamiOptions(), new XmlObject[]{ + runSchemaBuild(inst, getSalamiOptions(), new XmlObject[]{ XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "namespaces" + P + "multipleNestedNS_ss0.xsd")), XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "namespaces" + P + "multipleNestedNS_ss1.xsd")), XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "namespaces" + P + "multipleNestedNS_ss2.xsd")), @@ -72,10 +76,10 @@ public class Inst2XsdCheckinTest extends } @Test - public void test_ns_multipleNested_venetian() throws Exception { + void test_ns_multipleNested_venetian() throws Exception { XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "namespaces" + P + "multipleNestedNS.xml")); - runSchemaBuild(inst, common.getVenetianOptions(), new XmlObject[]{ + runSchemaBuild(inst, getVenetianOptions(), new XmlObject[]{ XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "namespaces" + P + "multipleNestedNS_vb0.xsd")), XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "namespaces" + P + "multipleNestedNS_vb1.xsd")), XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "namespaces" + P + "multipleNestedNS_vb2.xsd")), @@ -84,10 +88,10 @@ public class Inst2XsdCheckinTest extends } @Test - public void test_ns_multiple_russian() throws Exception { + void test_ns_multiple_russian() throws Exception { XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "namespaces" + P + "multipleNS.xml")); - runSchemaBuild(inst, common.getRussianOptions(), new XmlObject[]{ + runSchemaBuild(inst, getRussianOptions(), new XmlObject[]{ XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "namespaces" + P + "multipleNS_rd0.xsd")), XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "namespaces" + P + "multipleNS_rd1.xsd")), XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "namespaces" + P + "multipleNS_rd2.xsd")), @@ -96,10 +100,10 @@ public class Inst2XsdCheckinTest extends } @Test - public void test_ns_multiple_salami() throws Exception { + void test_ns_multiple_salami() throws Exception { XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "namespaces" + P + "multipleNS.xml")); - runSchemaBuild(inst, common.getSalamiOptions(), new XmlObject[]{ + runSchemaBuild(inst, getSalamiOptions(), new XmlObject[]{ XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "namespaces" + P + "multipleNS_ss0.xsd")), XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "namespaces" + P + "multipleNS_ss1.xsd")), XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "namespaces" + P + "multipleNS_ss2.xsd")), @@ -108,10 +112,10 @@ public class Inst2XsdCheckinTest extends } @Test - public void test_ns_multiple_venetian() throws Exception { + void test_ns_multiple_venetian() throws Exception { XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "namespaces" + P + "multipleNS.xml")); - runSchemaBuild(inst, common.getVenetianOptions(), new XmlObject[]{ + runSchemaBuild(inst, getVenetianOptions(), new XmlObject[]{ XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "namespaces" + P + "multipleNS_vb0.xsd")), XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "namespaces" + P + "multipleNS_vb1.xsd")), XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "namespaces" + P + "multipleNS_vb2.xsd")), @@ -120,121 +124,104 @@ public class Inst2XsdCheckinTest extends } @Test - public void test_ns_simple_russian() throws Exception { + void test_ns_simple_russian() throws Exception { XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "namespaces" + P + "simple.xml")); - runSchemaBuild(inst, common.getRussianOptions(), + runSchemaBuild(inst, getRussianOptions(), XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "namespaces" + P + "simple_rd0.xsd"))); } @Test - public void test_ns_simple_salami() throws Exception { + void test_ns_simple_salami() throws Exception { XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "namespaces" + P + "simple.xml")); - runSchemaBuild(inst, common.getSalamiOptions(), + runSchemaBuild(inst, getSalamiOptions(), XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "namespaces" + P + "simple_ss0.xsd"))); } @Test - public void test_ns_simple_venetian() throws Exception { + void test_ns_simple_venetian() throws Exception { XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "namespaces" + P + "simple.xml")); - runSchemaBuild(inst, common.getVenetianOptions(), + runSchemaBuild(inst, getVenetianOptions(), XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "namespaces" + P + "simple_vb0.xsd"))); } @Test - public void test_ns_must_venetian() throws Exception { + void test_ns_must_venetian() throws Exception { XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "namespaces" + P + "must.xml")); - runSchemaBuild(inst, common.getVenetianOptions(), new XmlObject[]{ + runSchemaBuild(inst, getVenetianOptions(), new XmlObject[]{ XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "namespaces" + P + "must_vb0.xsd")), XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "namespaces" + P + "must_vb1.xsd"))}); } @Test - public void test_ns_must_russian() throws Exception { + void test_ns_must_russian() throws Exception { XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "namespaces" + P + "must.xml")); - runSchemaBuild(inst, common.getRussianOptions(), new XmlObject[]{ + runSchemaBuild(inst, getRussianOptions(), new XmlObject[]{ XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "namespaces" + P + "must_rd0.xsd")), XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "namespaces" + P + "must_rd1.xsd"))}); } @Test - public void test_ns_must_salami() throws Exception { + void test_ns_must_salami() throws Exception { XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "namespaces" + P + "must.xml")); - runSchemaBuild(inst, common.getSalamiOptions(), new XmlObject[]{ + runSchemaBuild(inst, getSalamiOptions(), new XmlObject[]{ XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "namespaces" + P + "must_ss0.xsd")), XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "namespaces" + P + "must_ss1.xsd"))}); } @Test - public void test_examples_cd_catalog() throws Exception { + void test_examples_cd_catalog() throws Exception { XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "cd_catalog.xml")); - - log("-= Venetian Options =-"); - runSchemaBuild(inst, common.getVenetianOptions(), + runSchemaBuild(inst, getVenetianOptions(), XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "cd_catalog_vb0.xsd"))); - - log("-= Russian Options =-"); - runSchemaBuild(inst, common.getRussianOptions(), + runSchemaBuild(inst, getRussianOptions(), XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "cd_catalog_rd0.xsd"))); - log("-= Salami Options =-"); - runSchemaBuild(inst, common.getSalamiOptions(), + runSchemaBuild(inst, getSalamiOptions(), XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "cd_catalog_ss0.xsd"))); } @Test - public void test_examples_cdcatalog() throws Exception { + void test_examples_cdcatalog() throws Exception { XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "cdcatalog.xml")); - - log("-= Venetian Options =-"); - runSchemaBuild(inst, common.getVenetianOptions(), + runSchemaBuild(inst, getVenetianOptions(), XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "cdcatalog_vb0.xsd"))); - log("-= Russian Options =-"); - runSchemaBuild(inst, common.getRussianOptions(), + runSchemaBuild(inst, getRussianOptions(), XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "cdcatalog_rd0.xsd"))); - log("-= Salami Options =-"); - runSchemaBuild(inst, common.getSalamiOptions(), + runSchemaBuild(inst, getSalamiOptions(), XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "cdcatalog_ss0.xsd"))); } @Test - public void atest_examples_component() throws Exception { + void atest_examples_component() throws Exception { XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "component.xml")); - - log("-= Venetian Options =-"); - runSchemaBuild(inst, common.getVenetianOptions(), + runSchemaBuild(inst, getVenetianOptions(), XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "component_vb0.xsd"))); - log("-= Russian Options =-"); - runSchemaBuild(inst, common.getRussianOptions(), + runSchemaBuild(inst, getRussianOptions(), XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "component_rd0.xsd"))); - log("-= Salami Options =-"); - runSchemaBuild(inst, common.getSalamiOptions(), + runSchemaBuild(inst, getSalamiOptions(), XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "component_ss0.xsd"))); } @Test - public void test_examples_htmlexample() throws Exception { + void test_examples_htmlexample() throws Exception { XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "html_example.xml")); - - log("-= Russian Options =-"); - runSchemaBuild(inst, common.getRussianOptions(), + runSchemaBuild(inst, getRussianOptions(), XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "html_example_rd0.xsd"))); - log("-= Venetian Options =-"); - runSchemaBuild(inst, common.getVenetianOptions(), + runSchemaBuild(inst, getVenetianOptions(), XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "html_example_vb0.xsd"))); - log("-= Salami Options =-"); - runSchemaBuild(inst, common.getSalamiOptions(), + runSchemaBuild(inst, getSalamiOptions(), XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "html_example_ss0.xsd"))); } @Test - public void test_examples_slashdotxml_neverenum() throws Exception { + void test_examples_slashdotxml_neverenum() throws Exception { XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "slashdot.xml")); - Inst2XsdOptions opt = common.getSalamiOptions(); + Inst2XsdOptions opt = getSalamiOptions(); opt.setUseEnumerations(Inst2XsdOptions.ENUMERATION_NEVER); runSchemaBuild(inst, opt, @@ -242,24 +229,20 @@ public class Inst2XsdCheckinTest extends } @Test - public void test_examples_slashdotxml() throws Exception { + void test_examples_slashdotxml() throws Exception { XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "slashdot.xml")); - - log("-= Russian Options =-"); - runSchemaBuild(inst, common.getRussianOptions(), + runSchemaBuild(inst, getRussianOptions(), XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "slashdotxml_rd0.xsd"))); - log("-= Venetian Options =-"); - runSchemaBuild(inst, common.getVenetianOptions(), + runSchemaBuild(inst, getVenetianOptions(), XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "slashdotxml_vb0.xsd"))); - log("-= Salami Options =-"); - runSchemaBuild(inst, common.getSalamiOptions(), + runSchemaBuild(inst, getSalamiOptions(), XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "slashdotxml_ss0.xsd"))); } @Test - public void test_examples_rss2_vb_contentsmart_4enum() throws Exception { + void test_examples_rss2_vb_contentsmart_4enum() throws Exception { XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "rss2sample.xml")); - Inst2XsdOptions opt = common.getVenetianOptions(); + Inst2XsdOptions opt = getVenetianOptions(); opt.setSimpleContentTypes(Inst2XsdOptions.SIMPLE_CONTENT_TYPES_SMART); opt.setUseEnumerations(4); @@ -268,9 +251,9 @@ public class Inst2XsdCheckinTest extends } @Test - public void test_examples_rss2_vb_contentsmart_nevereum() throws Exception { + void test_examples_rss2_vb_contentsmart_nevereum() throws Exception { XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "rss2sample.xml")); - Inst2XsdOptions opt = common.getVenetianOptions(); + Inst2XsdOptions opt = getVenetianOptions(); opt.setSimpleContentTypes(Inst2XsdOptions.SIMPLE_CONTENT_TYPES_SMART); opt.setUseEnumerations(Inst2XsdOptions.ENUMERATION_NEVER); @@ -279,9 +262,9 @@ public class Inst2XsdCheckinTest extends } @Test - public void test_examples_rss2_vb_contentstring_nevereum() throws Exception { + void test_examples_rss2_vb_contentstring_nevereum() throws Exception { XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "rss2sample.xml")); - Inst2XsdOptions opt = common.getVenetianOptions(); + Inst2XsdOptions opt = getVenetianOptions(); opt.setSimpleContentTypes(Inst2XsdOptions.SIMPLE_CONTENT_TYPES_STRING); opt.setUseEnumerations(Inst2XsdOptions.ENUMERATION_NEVER); @@ -290,9 +273,9 @@ public class Inst2XsdCheckinTest extends } @Test - public void test_examples_rss2_vb_contentstring_4enum() throws Exception { + void test_examples_rss2_vb_contentstring_4enum() throws Exception { XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "rss2sample.xml")); - Inst2XsdOptions opt = common.getVenetianOptions(); + Inst2XsdOptions opt = getVenetianOptions(); opt.setSimpleContentTypes(Inst2XsdOptions.SIMPLE_CONTENT_TYPES_STRING); opt.setUseEnumerations(4); @@ -301,9 +284,9 @@ public class Inst2XsdCheckinTest extends } @Test - public void test_examples_rss2_vb_contentstring() throws Exception { + void test_examples_rss2_vb_contentstring() throws Exception { XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "rss2sample.xml")); - Inst2XsdOptions opt = common.getVenetianOptions(); + Inst2XsdOptions opt = getVenetianOptions(); opt.setSimpleContentTypes(Inst2XsdOptions.SIMPLE_CONTENT_TYPES_STRING); runSchemaBuild(inst, opt, @@ -311,9 +294,9 @@ public class Inst2XsdCheckinTest extends } @Test - public void test_examples_rss2_vb_neverenum() throws Exception { + void test_examples_rss2_vb_neverenum() throws Exception { XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "rss2sample.xml")); - Inst2XsdOptions opt = common.getVenetianOptions(); + Inst2XsdOptions opt = getVenetianOptions(); opt.setUseEnumerations(Inst2XsdOptions.ENUMERATION_NEVER); runSchemaBuild(inst, opt, @@ -321,32 +304,24 @@ public class Inst2XsdCheckinTest extends } @Test - public void test_examples_rss2() throws Exception { + void test_examples_rss2() throws Exception { XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "rss2sample.xml")); - - log("-= Russian Options =-"); - runSchemaBuild(inst, common.getRussianOptions(), + runSchemaBuild(inst, getRussianOptions(), XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "rss2sample_rd0.xsd"))); - log("-= Venetian Options =-"); - runSchemaBuild(inst, common.getVenetianOptions(), + runSchemaBuild(inst, getVenetianOptions(), XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "rss2sample_vb0.xsd"))); - log("-= Salami Options =-"); - runSchemaBuild(inst, common.getSalamiOptions(), + runSchemaBuild(inst, getSalamiOptions(), XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "rss2sample_ss0.xsd"))); } @Test - public void test_examples_rss091() throws Exception { + void test_examples_rss091() throws Exception { XmlObject inst = XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "sampleRss091.xml")); - - log("-= Russian Options =-"); - runSchemaBuild(inst, common.getRussianOptions(), + runSchemaBuild(inst, getRussianOptions(), XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "sampleRss091_rd0.xsd"))); - log("-= Venetian Options =-"); - runSchemaBuild(inst, common.getVenetianOptions(), + runSchemaBuild(inst, getVenetianOptions(), XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "sampleRss091_vb0.xsd"))); - log("-= Salami Options =-"); - runSchemaBuild(inst, common.getSalamiOptions(), + runSchemaBuild(inst, getSalamiOptions(), XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "sampleRss091_ss0.xsd"))); } } Modified: xmlbeans/trunk/src/test/java/tools/inst2xsd/checkin/Inst2XsdOptionsTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/tools/inst2xsd/checkin/Inst2XsdOptionsTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/tools/inst2xsd/checkin/Inst2XsdOptionsTest.java (original) +++ xmlbeans/trunk/src/test/java/tools/inst2xsd/checkin/Inst2XsdOptionsTest.java Sun Feb 6 01:51:55 2022 @@ -14,14 +14,14 @@ */ package tools.inst2xsd.checkin; -import org.junit.Test; -import tools.inst2xsd.common.Inst2XsdTestBase; -public class Inst2XsdOptionsTest extends Inst2XsdTestBase { +import org.junit.jupiter.api.Test; + +public class Inst2XsdOptionsTest { /** Move tests from Detailed back once cursor bug gets fixed */ @Test - public void test_move() throws Exception{ + void test_move() throws Exception{ System.out.println("Move tests from Detailed back once cursor bug gets fixed"); } } Modified: xmlbeans/trunk/src/test/java/tools/inst2xsd/checkin/Inst2XsdTypeTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/tools/inst2xsd/checkin/Inst2XsdTypeTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/tools/inst2xsd/checkin/Inst2XsdTypeTest.java (original) +++ xmlbeans/trunk/src/test/java/tools/inst2xsd/checkin/Inst2XsdTypeTest.java Sun Feb 6 01:51:55 2022 @@ -14,10 +14,12 @@ */ package tools.inst2xsd.checkin; -import org.junit.Test; -import tools.inst2xsd.common.Inst2XsdTestBase; +import org.junit.jupiter.api.Test; -public class Inst2XsdTypeTest extends Inst2XsdTestBase { +import static tools.inst2xsd.common.Inst2XsdTestBase.getTypeXml; +import static tools.inst2xsd.common.Inst2XsdTestBase.runTypeChecking; + +public class Inst2XsdTypeTest { // List of precedence for smart simple primitive type determination // byte, short, int, long, integer, float, double, decimal, @@ -28,14 +30,14 @@ public class Inst2XsdTypeTest extends In // list types ? // string @Test - public void test_string() throws Exception { + void test_string() throws Exception { runTypeChecking(getTypeXml("a"), "string"); runTypeChecking(getTypeXml("a2a"), "string"); runTypeChecking(getTypeXml("a b c\n hello\t from\n\txmlbeans"), "string"); } @Test - public void test_byte() throws Exception { + void test_byte() throws Exception { runTypeChecking(getTypeXml("123"), "byte"); runTypeChecking(getTypeXml("+100"), "byte"); runTypeChecking(getTypeXml("-1"), "byte"); @@ -45,7 +47,7 @@ public class Inst2XsdTypeTest extends In } @Test - public void test_short() throws Exception { + void test_short() throws Exception { runTypeChecking(getTypeXml("-129"), "short"); runTypeChecking(getTypeXml("128"), "short"); runTypeChecking(getTypeXml("3000"), "short"); @@ -55,7 +57,7 @@ public class Inst2XsdTypeTest extends In } @Test - public void test_int() throws Exception { + void test_int() throws Exception { runTypeChecking(getTypeXml("39000"), "int"); runTypeChecking(getTypeXml("32768"), "int"); runTypeChecking(getTypeXml("-32769"), "int"); @@ -66,7 +68,7 @@ public class Inst2XsdTypeTest extends In } @Test - public void test_long() throws Exception { + void test_long() throws Exception { runTypeChecking(getTypeXml("2147483648"), "long"); runTypeChecking(getTypeXml("-2147483649"), "long"); runTypeChecking(getTypeXml("-2150000000"), "long"); @@ -76,7 +78,7 @@ public class Inst2XsdTypeTest extends In } @Test - public void test_integer() throws Exception { + void test_integer() throws Exception { runTypeChecking(getTypeXml("9300000000000000000"), "integer"); runTypeChecking(getTypeXml("-9300000000000000000"), "integer"); runTypeChecking(getTypeXml("-9223372036854775809"), "integer"); @@ -84,7 +86,7 @@ public class Inst2XsdTypeTest extends In } @Test - public void test_float() throws Exception { + void test_float() throws Exception { runTypeChecking(getTypeXml("12.78e-2"), "float"); runTypeChecking(getTypeXml("1267.43233E12"), "float"); runTypeChecking(getTypeXml("-1E4"), "float"); @@ -111,26 +113,26 @@ public class Inst2XsdTypeTest extends In //} @Test - public void test_date() throws Exception { + void test_date() throws Exception { runTypeChecking(getTypeXml("1999-05-31"), "date"); } @Test - public void test_dateTime() throws Exception { + void test_dateTime() throws Exception { runTypeChecking(getTypeXml("1999-05-31T13:20:00-05:00"), "dateTime"); runTypeChecking(getTypeXml("2000-03-04T20:00:00Z"), "dateTime"); runTypeChecking(getTypeXml("2000-03-04T23:00:00+03:00"), "dateTime"); } @Test - public void test_time() throws Exception { + void test_time() throws Exception { runTypeChecking(getTypeXml("13:20:00-05:00"), "time"); runTypeChecking(getTypeXml("00:00:00"), "time"); runTypeChecking(getTypeXml("13:20:00Z"), "time"); } @Test - public void test_CDATA() throws Exception { + void test_CDATA() throws Exception { runTypeChecking(getTypeXml("<![CDATA[ " + "function matchwo(a, b) {" + "if (a < b && a < 0) " + Modified: xmlbeans/trunk/src/test/java/tools/inst2xsd/common/Inst2XsdCommon.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/tools/inst2xsd/common/Inst2XsdCommon.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/tools/inst2xsd/common/Inst2XsdCommon.java (original) +++ xmlbeans/trunk/src/test/java/tools/inst2xsd/common/Inst2XsdCommon.java Sun Feb 6 01:51:55 2022 @@ -14,7 +14,7 @@ */ package tools.inst2xsd.common; -import org.apache.xmlbeans.*; +import org.apache.xmlbeans.XmlOptions; import org.apache.xmlbeans.impl.inst2xsd.Inst2XsdOptions; public class Inst2XsdCommon { @@ -68,7 +68,7 @@ public class Inst2XsdCommon { " See the License for the specific language governing permissions and\n" + " limitations under the License. -->\n"; - public static String base = asl_header + "<a xmlns=\"baseNamespace\">" + + public static final String base = asl_header + "<a xmlns=\"baseNamespace\">" + "<b>abc</b>" + "<c>123</c>" + "<d />" + --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
