Modified: xmlbeans/trunk/test/src/xmlobject/checkin/CDataTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/xmlobject/checkin/CDataTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff ============================================================================== --- xmlbeans/trunk/test/src/xmlobject/checkin/CDataTest.java (original) +++ xmlbeans/trunk/test/src/xmlobject/checkin/CDataTest.java Fri Jan 18 23:08:44 2019 @@ -15,114 +15,99 @@ package xmlobject.checkin; -import java.io.File; -import java.io.IOException; - -import junit.framework.TestCase; - -import org.apache.xmlbeans.XmlObject; -import org.apache.xmlbeans.XmlOptions; import org.apache.xmlbeans.SystemProperties; import org.apache.xmlbeans.XmlException; +import org.apache.xmlbeans.XmlObject; +import org.apache.xmlbeans.XmlOptions; +import org.junit.Ignore; +import org.junit.Test; -import dumbNS.RootDocument.Root; -import dumbNS.RootDocument; - -import tools.util.Util; -import tools.util.ResourceUtil; -import tools.util.JarUtil; -import xmlcursor.common.Common; +import static org.junit.Assert.assertEquals; /** * Test for finner CData control feature. */ -public class CDataTest - extends TestCase -{ - static final String NL = SystemProperties.getProperty("line.separator")!=null ? +public class CDataTest { + private static final String NL = SystemProperties.getProperty("line.separator") != null ? SystemProperties.getProperty("line.separator") : (System.getProperty("line.separator") != null ? System.getProperty("line.separator") : "\n"); - public CDataTest(String name) - { - super(name); - } - - public void testCData1() - throws Exception - { + @Test + public void testCData1() throws Exception { String xmlText = "<a><![CDATA[cdata text]]></a>"; - String resultText = "<a>cdata text</a>"; - checkCData(xmlText, resultText, resultText); + checkCData(xmlText, xmlText, xmlText); } - public void testCData2() - throws Exception - { - String xmlText = "<a>" + NL + - "<b><![CDATA[cdata text]]> regular text</b>" + NL + - "</a>"; - String expected1 = "<a>\n" + - "<b>cdata text regular text</b>\n" + - "</a>"; - String expected2 = "<a>" + NL + - " <b>cdata text regular text</b>" + NL + - "</a>"; + @Test + @Ignore("Bookmark doesn't seem to keep the length of the CDATA") + public void testCData2() throws Exception { + String xmlText = + "<a>" + NL + + "<b><![CDATA[cdata text]]> regular text</b>" + NL + + "</a>"; + String expected1 = + "<a>\n" + + "<b>cdata text regular text</b>\n" + + "</a>"; + String expected2 = + "<a>" + NL + + " <b>cdata text regular text</b>" + NL + + "</a>"; checkCData(xmlText, expected1, expected2); } - public void testCData3() - throws Exception - { - String xmlText = "<a>\n" + - "<c>text <![CDATA[cdata text]]></c>\n" + - "</a>"; - String expected1 = "<a>\n" + - "<c>text cdata text</c>\n" + - "</a>"; - String expected2 = "<a>" + NL + - " <c>text cdata text</c>" + NL + - "</a>"; + @Test + public void testCData3() throws Exception { + String xmlText = + "<a>\n" + + "<c>text <![CDATA[cdata text]]></c>\n" + + "</a>"; + String expected1 = + "<a>\n" + + "<c>text cdata text</c>\n" + + "</a>"; + String expected2 = + "<a>" + NL + + " <c>text cdata text</c>" + NL + + "</a>"; checkCData(xmlText, expected1, expected2); } // https://issues.apache.org/jira/browse/XMLBEANS-404 + @Test public void testXmlBeans404() - throws Exception - { - String xmlText = "<a>\n" + - "<c>text <![CDATA[cdata text]]]]></c>\n" + - "</a>"; - String expected1 = "<a>\n" + - "<c>text cdata text]]</c>\n" + - "</a>"; - String expected2 = "<a>" + NL + - " <c>text cdata text]]</c>" + NL + - "</a>"; + throws Exception { + String xmlText = + "<a>\n" + + "<c>text <![CDATA[cdata text]]]]></c>\n" + + "</a>"; + String expected1 = + "<a>\n" + + "<c>text cdata text]]</c>\n" + + "</a>"; + String expected2 = + "<a>" + NL + + " <c>text cdata text]]</c>" + NL + + "</a>"; checkCData(xmlText, expected1, expected2); } private void checkCData(String xmlText, String expected1, String expected2) - throws XmlException - { - System.out.println("\ninput:\n" + xmlText); - + throws XmlException { XmlOptions opts = new XmlOptions(); opts.setUseCDataBookmarks(); - XmlObject xo = XmlObject.Factory.parse( xmlText , opts); + XmlObject xo = XmlObject.Factory.parse(xmlText, opts); String result1 = xo.xmlText(opts); - System.out.println("result xmlText:\n" + result1); assertEquals("xmlText", expected1, result1); opts.setSavePrettyPrint(); String result2 = xo.xmlText(opts); - System.out.println("result prettyPrint:\n" + result2); assertEquals("prettyPrint", expected2, result2); } }
Modified: xmlbeans/trunk/test/src/xmlobject/checkin/CreationTests.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/xmlobject/checkin/CreationTests.java?rev=1851656&r1=1851655&r2=1851656&view=diff ============================================================================== --- xmlbeans/trunk/test/src/xmlobject/checkin/CreationTests.java (original) +++ xmlbeans/trunk/test/src/xmlobject/checkin/CreationTests.java Fri Jan 18 23:08:44 2019 @@ -15,28 +15,24 @@ package xmlobject.checkin; -import junit.framework.Test; -import junit.framework.TestSuite; -import junit.framework.TestCase; -import junit.framework.Assert; +import com.easypo.XmlLineItemBean; import com.easypo.XmlPurchaseOrderDocumentBean; import com.easypo.XmlPurchaseOrderDocumentBean.PurchaseOrder; -import com.easypo.XmlLineItemBean; import com.easypo.XmlShipperBean; +import org.junit.Test; import java.math.BigDecimal; import java.math.BigInteger; -public class CreationTests extends TestCase -{ - public CreationTests(String name) { super(name); } - public static Test suite() { return new TestSuite(CreationTests.class); } +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; - public void testCreatePo() throws Exception - { +public class CreationTests { + @Test + public void testCreatePo() { XmlPurchaseOrderDocumentBean doc = XmlPurchaseOrderDocumentBean.Factory.newInstance(); - + PurchaseOrder order = doc.addNewPurchaseOrder(); order.addNewCustomer().setName("David Bau"); order.getCustomer().setAddress("Gladwyne, PA"); @@ -60,29 +56,27 @@ public class CreationTests extends TestC sh.setName("UPS"); sh.setPerOunceRate(new BigDecimal("0.74")); -// System.out.println(doc.xmlText()); - - Assert.assertEquals("David Bau", order.getCustomer().getName()); - Assert.assertEquals("Gladwyne, PA", order.getCustomer().getAddress()); - Assert.assertEquals(3, order.sizeOfLineItemArray()); - - Assert.assertEquals("Burnham's Celestial Handbook, Vol 1", order.getLineItemArray(0).getDescription()); - Assert.assertEquals(new BigDecimal("21.79"), order.getLineItemArray(0).getPrice()); - Assert.assertEquals(new BigInteger("2"), order.getLineItemArray(0).getQuantity()); - Assert.assertEquals(new BigDecimal("5"), order.getLineItemArray(0).getPerUnitOunces()); - - Assert.assertEquals("Burnham's Celestial Handbook, Vol 2", order.getLineItemArray(1).getDescription()); - Assert.assertEquals(new BigDecimal("19.89"), order.getLineItemArray(1).getPrice()); - Assert.assertEquals(new BigInteger("2"), order.getLineItemArray(1).getQuantity()); - Assert.assertEquals(new BigDecimal("5"), order.getLineItemArray(1).getPerUnitOunces()); - - Assert.assertEquals("Burnham's Celestial Handbook, Vol 3", order.getLineItemArray(2).getDescription()); - Assert.assertEquals(new BigDecimal("19.89"), order.getLineItemArray(2).getPrice()); - Assert.assertEquals(new BigInteger("1"), order.getLineItemArray(2).getQuantity()); - Assert.assertEquals(new BigDecimal("5"), order.getLineItemArray(2).getPerUnitOunces()); - - Assert.assertEquals(true, order.isSetShipper()); - Assert.assertEquals("UPS", order.getShipper().getName()); - Assert.assertEquals(new BigDecimal("0.74"), order.getShipper().getPerOunceRate()); + assertEquals("David Bau", order.getCustomer().getName()); + assertEquals("Gladwyne, PA", order.getCustomer().getAddress()); + assertEquals(3, order.sizeOfLineItemArray()); + + assertEquals("Burnham's Celestial Handbook, Vol 1", order.getLineItemArray(0).getDescription()); + assertEquals(new BigDecimal("21.79"), order.getLineItemArray(0).getPrice()); + assertEquals(new BigInteger("2"), order.getLineItemArray(0).getQuantity()); + assertEquals(new BigDecimal("5"), order.getLineItemArray(0).getPerUnitOunces()); + + assertEquals("Burnham's Celestial Handbook, Vol 2", order.getLineItemArray(1).getDescription()); + assertEquals(new BigDecimal("19.89"), order.getLineItemArray(1).getPrice()); + assertEquals(new BigInteger("2"), order.getLineItemArray(1).getQuantity()); + assertEquals(new BigDecimal("5"), order.getLineItemArray(1).getPerUnitOunces()); + + assertEquals("Burnham's Celestial Handbook, Vol 3", order.getLineItemArray(2).getDescription()); + assertEquals(new BigDecimal("19.89"), order.getLineItemArray(2).getPrice()); + assertEquals(new BigInteger("1"), order.getLineItemArray(2).getQuantity()); + assertEquals(new BigDecimal("5"), order.getLineItemArray(2).getPerUnitOunces()); + + assertTrue(order.isSetShipper()); + assertEquals("UPS", order.getShipper().getName()); + assertEquals(new BigDecimal("0.74"), order.getShipper().getPerOunceRate()); } } Modified: xmlbeans/trunk/test/src/xmlobject/checkin/DumbTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/xmlobject/checkin/DumbTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff ============================================================================== --- xmlbeans/trunk/test/src/xmlobject/checkin/DumbTest.java (original) +++ xmlbeans/trunk/test/src/xmlobject/checkin/DumbTest.java Fri Jan 18 23:08:44 2019 @@ -15,52 +15,35 @@ package xmlobject.checkin; -import java.io.File; -import java.io.IOException; - -import junit.framework.TestCase; - -import org.apache.xmlbeans.XmlObject; - -import dumbNS.RootDocument.Root; import dumbNS.RootDocument; - -import tools.util.Util; -import tools.util.ResourceUtil; +import dumbNS.RootDocument.Root; +import org.apache.xmlbeans.XmlObject; +import org.junit.Before; +import org.junit.Test; import tools.util.JarUtil; -import xmlcursor.common.Common; +import java.io.IOException; -/** - * - * - */ -public class DumbTest extends TestCase { - String instance; +import static org.junit.Assert.assertEquals; - public DumbTest(String name) { - super(name); - } - public void setUp() { +public class DumbTest { + private String instance; - try { - instance = JarUtil.getResourceFromJar("xbean/simple/dumb/dumb.xml"); - } catch (IOException e) { - System.err.println("Could not load xbean/simple/dumb/dumb.xml from " + Common.XMLCASES_JAR - + e.getMessage()); - e.printStackTrace(); - } + @Before + public void setUp() throws IOException { + instance = JarUtil.getResourceFromJar("xbean/simple/dumb/dumb.xml"); } + @Test public void testGetB2() - throws Exception { + throws Exception { RootDocument rootDoc = (RootDocument) XmlObject.Factory - .parse(instance); + .parse(instance); Root root = rootDoc.getRoot(); System.out.println("root.xmlText() = " + root.xmlText()); - assertTrue("bar:b attribute != 4", root.getB2().intValue() == 4); + assertEquals("bar:b attribute != 4", 4, root.getB2().intValue()); } } Modified: xmlbeans/trunk/test/src/xmlobject/checkin/EasyPoTests.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/xmlobject/checkin/EasyPoTests.java?rev=1851656&r1=1851655&r2=1851656&view=diff ============================================================================== --- xmlbeans/trunk/test/src/xmlobject/checkin/EasyPoTests.java (original) +++ xmlbeans/trunk/test/src/xmlobject/checkin/EasyPoTests.java Fri Jan 18 23:08:44 2019 @@ -15,120 +15,90 @@ package xmlobject.checkin; -import junit.framework.TestCase; -import junit.framework.Test; -import junit.framework.TestSuite; -import junit.framework.Assert; - -import java.math.BigDecimal; -import java.math.BigInteger; - -import org.apache.xmlbeans.XmlObject; -import org.apache.xmlbeans.XmlException; import com.easypo.XmlPurchaseOrderDocumentBean; import com.easypo.XmlPurchaseOrderDocumentBean.PurchaseOrder; +import org.apache.xmlbeans.XmlException; +import org.apache.xmlbeans.XmlObject; +import org.junit.Test; +import tools.util.JarUtil; +import java.math.BigDecimal; +import java.math.BigInteger; +import static org.junit.Assert.*; -import tools.util.*; - -public class EasyPoTests extends TestCase -{ - public EasyPoTests(String name) { super(name); } - public static Test suite() { return new TestSuite(EasyPoTests.class); } - - public void testEasyPo() throws Exception - { +public class EasyPoTests { + @Test + public void testEasyPo() throws Exception { XmlPurchaseOrderDocumentBean doc = (XmlPurchaseOrderDocumentBean) XmlObject.Factory.parse(JarUtil.getResourceFromJarasFile( - "xbean/xmlobject/easypo1.xml")); - Assert.assertEquals(false, doc.isNil()); + "xbean/xmlobject/easypo1.xml")); + assertFalse(doc.isNil()); PurchaseOrder order = doc.getPurchaseOrder(); - Assert.assertEquals("David Bau", order.getCustomer().getName()); - Assert.assertEquals("Gladwyne, PA", order.getCustomer().getAddress()); - Assert.assertEquals(3, order.sizeOfLineItemArray()); - - Assert.assertEquals("Burnham's Celestial Handbook, Vol 1", order.getLineItemArray(0).getDescription()); - Assert.assertEquals(new BigDecimal("21.79"), order.getLineItemArray(0).getPrice()); - Assert.assertEquals(new BigInteger("2"), order.getLineItemArray(0).getQuantity()); - Assert.assertEquals(new BigDecimal("5"), order.getLineItemArray(0).getPerUnitOunces()); - - Assert.assertEquals("Burnham's Celestial Handbook, Vol 2", order.getLineItemArray(1).getDescription()); - Assert.assertEquals(new BigDecimal("19.89"), order.getLineItemArray(1).getPrice()); - Assert.assertEquals(new BigInteger("2"), order.getLineItemArray(1).getQuantity()); - Assert.assertEquals(new BigDecimal("5"), order.getLineItemArray(1).getPerUnitOunces()); - - Assert.assertEquals("Burnham's Celestial Handbook, Vol 3", order.getLineItemArray(2).getDescription()); - Assert.assertEquals(new BigDecimal("19.89"), order.getLineItemArray(2).getPrice()); - Assert.assertEquals(new BigInteger("1"), order.getLineItemArray(2).getQuantity()); - Assert.assertEquals(new BigDecimal("5"), order.getLineItemArray(2).getPerUnitOunces()); - - Assert.assertEquals(true, order.isSetShipper()); - Assert.assertEquals("UPS", order.getShipper().getName()); - Assert.assertEquals(new BigDecimal("0.74"), order.getShipper().getPerOunceRate()); + assertEquals("David Bau", order.getCustomer().getName()); + assertEquals("Gladwyne, PA", order.getCustomer().getAddress()); + assertEquals(3, order.sizeOfLineItemArray()); + + assertEquals("Burnham's Celestial Handbook, Vol 1", order.getLineItemArray(0).getDescription()); + assertEquals(new BigDecimal("21.79"), order.getLineItemArray(0).getPrice()); + assertEquals(new BigInteger("2"), order.getLineItemArray(0).getQuantity()); + assertEquals(new BigDecimal("5"), order.getLineItemArray(0).getPerUnitOunces()); + + assertEquals("Burnham's Celestial Handbook, Vol 2", order.getLineItemArray(1).getDescription()); + assertEquals(new BigDecimal("19.89"), order.getLineItemArray(1).getPrice()); + assertEquals(new BigInteger("2"), order.getLineItemArray(1).getQuantity()); + assertEquals(new BigDecimal("5"), order.getLineItemArray(1).getPerUnitOunces()); + + assertEquals("Burnham's Celestial Handbook, Vol 3", order.getLineItemArray(2).getDescription()); + assertEquals(new BigDecimal("19.89"), order.getLineItemArray(2).getPrice()); + assertEquals(new BigInteger("1"), order.getLineItemArray(2).getQuantity()); + assertEquals(new BigDecimal("5"), order.getLineItemArray(2).getPerUnitOunces()); + + assertTrue(order.isSetShipper()); + assertEquals("UPS", order.getShipper().getName()); + assertEquals(new BigDecimal("0.74"), order.getShipper().getPerOunceRate()); - Assert.assertEquals(3, order.sizeOfLineItemArray()); + assertEquals(3, order.sizeOfLineItemArray()); } - - - public void testSimpleAutoValidaiton() throws Exception - { + + @Test + public void testSimpleAutoValidaiton() throws Exception { XmlPurchaseOrderDocumentBean.Factory.parse( - "<purchase-order xmlns='http://openuri.org/easypo'/>" ); + "<purchase-order xmlns='http://openuri.org/easypo'/>"); - try - { + try { XmlPurchaseOrderDocumentBean.Factory.parse( - "<purchase-orde xmlns='http://openuri.org/easypo'/>" ); - - Assert.assertTrue( false ); - } - catch ( XmlException e ) - { + "<purchase-orde xmlns='http://openuri.org/easypo'/>"); + fail(); + } catch (XmlException e) { } - try - { + try { XmlPurchaseOrderDocumentBean.Factory.parse( - "<purchase-order xmlns='http://openuri.org/easyp'/>" ); - - Assert.assertTrue( false ); - } - catch ( XmlException e ) - { + "<purchase-order xmlns='http://openuri.org/easyp'/>"); + fail(); + } catch (XmlException e) { } - - try - { - XmlPurchaseOrderDocumentBean.Factory.parse( - "<f:fragment xmlns:f='http://www.openuri.org/fragment'/>" ); - Assert.assertTrue( false ); - } - catch ( XmlException e ) - { - } - - try - { + try { XmlPurchaseOrderDocumentBean.Factory.parse( - "<f:fragment xmlns:f='http://www.openuri.org/fragment'><a/></f:fragment>" ); - - Assert.assertTrue( false ); - } - catch ( XmlException e ) - { + "<f:fragment xmlns:f='http://www.openuri.org/fragment'/>"); + fail(); + } catch (XmlException e) { } - - try - { - XmlPurchaseOrderDocumentBean.Factory.parse( - "<f:fragment xmlns:f='http://www.openuri.org/fragment'><a/><a/></f:fragment>" ); - Assert.assertTrue( false ); + try { + XmlPurchaseOrderDocumentBean.Factory.parse( + "<f:fragment xmlns:f='http://www.openuri.org/fragment'><a/></f:fragment>"); + fail(); + } catch (XmlException e) { } - catch ( XmlException e ) - { + + try { + XmlPurchaseOrderDocumentBean.Factory.parse( + "<f:fragment xmlns:f='http://www.openuri.org/fragment'><a/><a/></f:fragment>"); + fail(); + } catch (XmlException e) { } } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
