Modified: xmlbeans/trunk/src/test/java/tools/xsd2inst/checkin/Xsd2InstTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/tools/xsd2inst/checkin/Xsd2InstTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/tools/xsd2inst/checkin/Xsd2InstTest.java (original) +++ xmlbeans/trunk/src/test/java/tools/xsd2inst/checkin/Xsd2InstTest.java Sun Feb 6 01:51:55 2022 @@ -14,49 +14,51 @@ */ package tools.xsd2inst.checkin; -import junit.framework.TestCase; import org.apache.xmlbeans.*; import org.apache.xmlbeans.impl.common.DocumentHelper; import org.apache.xmlbeans.impl.xsd2inst.SampleXmlUtil; import org.apache.xmlbeans.impl.xsd2inst.SchemaInstanceGenerator; +import org.junit.jupiter.api.Test; import java.io.ByteArrayInputStream; import java.io.InputStream; import java.nio.charset.StandardCharsets; -public class Xsd2InstTest extends TestCase { +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; - public void testPriceQuote() throws Exception { +public class Xsd2InstTest { + private static final String PRICEQ = "/xbean/compile/scomp/pricequote/PriceQuote.xsd"; + + @Test + void testPriceQuote() throws Exception { XmlObject xobj; - try (InputStream xsdStream = Xsd2InstTest.class.getResourceAsStream( - "/xbean/compile/scomp/pricequote/PriceQuote.xsd")) { - xobj = XmlObject.Factory.parse(xsdStream, - (new XmlOptions()).setLoadLineNumbers().setLoadMessageDigest()); + try (InputStream xsdStream = Xsd2InstTest.class.getResourceAsStream(PRICEQ)) { + xobj = XmlObject.Factory.parse(xsdStream, (new XmlOptions()).setLoadLineNumbers().setLoadMessageDigest()); } SchemaInstanceGenerator.Xsd2InstOptions options = new SchemaInstanceGenerator.Xsd2InstOptions(); String result = SchemaInstanceGenerator.xsd2inst(new XmlObject[]{xobj}, "price-quote", options); - assertTrue("price-quote element found?", result.contains("<price-quote>")); - assertTrue("stock-symbol element found?", result.contains("<stock-symbol>string</stock-symbol>")); - assertTrue("stock-price element found?", result.contains("<stock-price>string</stock-price>")); + assertTrue(result.contains("<price-quote>"), "price-quote element found?"); + assertTrue(result.contains("<stock-symbol>string</stock-symbol>"), "stock-symbol element found?"); + assertTrue(result.contains("<stock-price>string</stock-price>"), "stock-price element found?"); try (InputStream docStream = new ByteArrayInputStream(result.getBytes(StandardCharsets.UTF_8))) { assertNotNull(DocumentHelper.readDocument(new XmlOptions(), docStream)); } } - public void testSampleXmlUtil() throws Exception { + @Test + void testSampleXmlUtil() throws Exception { XmlObject xobj; - try (InputStream xsdStream = Xsd2InstTest.class.getResourceAsStream( - "/xbean/compile/scomp/pricequote/PriceQuote.xsd")) { - xobj = XmlObject.Factory.parse(xsdStream, - (new XmlOptions()).setLoadLineNumbers().setLoadMessageDigest()); + try (InputStream xsdStream = Xsd2InstTest.class.getResourceAsStream(PRICEQ)) { + xobj = XmlObject.Factory.parse(xsdStream, (new XmlOptions()).setLoadLineNumbers().setLoadMessageDigest()); } SchemaTypeSystem sts = XmlBeans.compileXsd(new XmlObject[]{xobj}, XmlBeans.getBuiltinTypeSystem(), new XmlOptions()); SchemaGlobalElement[] elements = sts.globalElements(); SchemaGlobalElement element = elements[0]; String result = SampleXmlUtil.createSampleForType(element); - assertTrue("price-quote element found?", result.contains("<price-quote>")); - assertTrue("stock-symbol element found?", result.contains("<stock-symbol>string</stock-symbol>")); - assertTrue("stock-price element found?", result.contains("<stock-price>string</stock-price>")); + assertTrue(result.contains("<price-quote>"), "price-quote element found?"); + assertTrue(result.contains("<stock-symbol>string</stock-symbol>"), "stock-symbol element found?"); + assertTrue(result.contains("<stock-price>string</stock-price>"), "stock-price element found?"); try (InputStream docStream = new ByteArrayInputStream(result.getBytes(StandardCharsets.UTF_8))) { assertNotNull(DocumentHelper.readDocument(new XmlOptions(), docStream)); }
Modified: xmlbeans/trunk/src/test/java/xmlcursor/checkin/AddToSelectionTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/checkin/AddToSelectionTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/xmlcursor/checkin/AddToSelectionTest.java (original) +++ xmlbeans/trunk/src/test/java/xmlcursor/checkin/AddToSelectionTest.java Sun Feb 6 01:51:55 2022 @@ -17,95 +17,83 @@ package xmlcursor.checkin; import org.apache.xmlbeans.XmlCursor; -import org.apache.xmlbeans.XmlObject; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import xmlcursor.common.BasicCursorTestCase; +import org.apache.xmlbeans.XmlException; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.*; +import static xmlcursor.common.BasicCursorTestCase.cur; -public class AddToSelectionTest extends BasicCursorTestCase { +public class AddToSelectionTest { - private static String sXml = "<foo><b>0</b><b>1</b><b>2</b><b attr=\"a3\">3</b><b>4</b><b>5</b><b>6</b></foo>"; + private static final String XML = "<foo><b>0</b><b>1</b><b>2</b><b attr=\"a3\">3</b><b>4</b><b>5</b><b>6</b></foo>"; @Test - public void testAddToSelectionEnd() { - m_xc.toEndDoc(); - m_xc.addToSelection(); - assertEquals(1, m_xc.getSelectionCount()); + void testAddToSelectionEnd() throws XmlException { + try (XmlCursor m_xc = cur(XML)) { + m_xc.toEndDoc(); + m_xc.addToSelection(); + assertEquals(1, m_xc.getSelectionCount()); + } } @Test - public void testAddToSelectionStart() { - m_xc.toStartDoc(); - m_xc.addToSelection(); - assertEquals(1, m_xc.getSelectionCount()); + void testAddToSelectionStart() throws XmlException { + try (XmlCursor m_xc = cur(XML)) { + m_xc.toStartDoc(); + m_xc.addToSelection(); + assertEquals(1, m_xc.getSelectionCount()); + } } @Test - public void testAddToSelectionAll() throws Exception { - sXml = "<foo></foo>"; - m_xc = XmlObject.Factory.parse(sXml).newCursor(); - XmlCursor.TokenType tok; - m_xc.addToSelection(); - while ((tok = m_xc.toNextToken()) != XmlCursor.TokenType.NONE) { - System.err.println(tok); + void testAddToSelectionAll() throws Exception { + String xml = "<foo></foo>"; + try (XmlCursor m_xc = cur(xml)) { m_xc.addToSelection(); - } - assertEquals(4, m_xc.getSelectionCount()); + while (m_xc.toNextToken() != XmlCursor.TokenType.NONE) { + m_xc.addToSelection(); + } + assertEquals(4, m_xc.getSelectionCount()); - //check results - try (XmlCursor m_xc1 = XmlObject.Factory.parse(sXml).newCursor()) { - m_xc.toSelection(0); //reset cursor - int i = m_xc.getSelectionCount(); - while ((tok = m_xc1.toNextToken()) != XmlCursor.TokenType.NONE) { - //assertEquals(true,m_xc.hasNextSelection()); - assertEquals(m_xc.toNextToken(), tok); - m_xc.toNextSelection(); + // check results + try (XmlCursor m_xc1 = cur(xml)) { + // reset cursor + m_xc.toSelection(0); + XmlCursor.TokenType tok; + while ((tok = m_xc1.toNextToken()) != XmlCursor.TokenType.NONE) { + // assertEquals(true,m_xc.hasNextSelection()); + assertEquals(m_xc.toNextToken(), tok); + m_xc.toNextSelection(); + } + // second cursor should be at the end of selections too... + assertFalse(m_xc.toNextSelection()); } - //second cursor should be at the end of selections too... - assertFalse(m_xc.toNextSelection()); } } @Test - public void testAddToSelectionSet() { + void testAddToSelectionSet() throws XmlException { //not set but bag semantics int expRes = 100; - m_xc.clearSelections(); - for (int i = 0; i < 100; i++) { - m_xc.toStartDoc(); - m_xc.addToSelection(); + try (XmlCursor m_xc = cur(XML)) { + for (int i = 0; i < 100; i++) { + m_xc.toStartDoc(); + m_xc.addToSelection(); + } + assertEquals(expRes, m_xc.getSelectionCount()); } - assertEquals(expRes, m_xc.getSelectionCount()); } - @Test(expected = Throwable.class) - public void testAddAfterClose() { - m_xc.close(); - m_xc.addToSelection(); - - } - - @Before - public void setUp() throws Exception { - m_xc = XmlObject.Factory.parse(sXml).newCursor(); - } - - @After - public void tearDown() { - if (m_xc == null) return; - try { - m_xc.clearSelections(); - super.tearDown(); - } catch (IllegalStateException e) { //cursor disposed - } catch (Exception e) { - + @Test + void testAddAfterClose() throws XmlException { + try (XmlCursor m_xc = cur(XML)) { + m_xc.close(); + // TODO: refine exception class + assertThrows(Throwable.class, m_xc::addToSelection); } + } } Modified: xmlbeans/trunk/src/test/java/xmlcursor/checkin/AnnotationsTests.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/checkin/AnnotationsTests.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/xmlcursor/checkin/AnnotationsTests.java (original) +++ xmlbeans/trunk/src/test/java/xmlcursor/checkin/AnnotationsTests.java Sun Feb 6 01:51:55 2022 @@ -16,12 +16,13 @@ package xmlcursor.checkin; import org.apache.xmlbeans.XmlCursor; +import org.apache.xmlbeans.XmlException; import org.apache.xmlbeans.XmlObject; -import org.junit.Test; +import org.junit.jupiter.api.Test; import xmlcursor.common.Common; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class AnnotationsTests { private static class TestBookmark extends XmlCursor.XmlBookmark { @@ -31,7 +32,7 @@ public class AnnotationsTests { // Basic load up a file and iterate through it // @Test - public void testBasicXml() throws Exception { + void testBasicXml() throws XmlException { try (XmlCursor c = XmlObject.Factory.parse(Common.XML_ATTR_TEXT, null).newCursor()) { TestBookmark a1 = new TestBookmark(); Modified: xmlbeans/trunk/src/test/java/xmlcursor/checkin/BeginElementTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/checkin/BeginElementTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/xmlcursor/checkin/BeginElementTest.java (original) +++ xmlbeans/trunk/src/test/java/xmlcursor/checkin/BeginElementTest.java Sun Feb 6 01:51:55 2022 @@ -17,72 +17,73 @@ package xmlcursor.checkin; import org.apache.xmlbeans.XmlCursor; import org.apache.xmlbeans.XmlCursor.TokenType; -import org.apache.xmlbeans.XmlObject; -import org.junit.Test; -import xmlcursor.common.BasicCursorTestCase; +import org.apache.xmlbeans.XmlException; +import org.junit.jupiter.api.Test; import xmlcursor.common.Common; import javax.xml.namespace.QName; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static xmlcursor.common.BasicCursorTestCase.*; -public class BeginElementTest extends BasicCursorTestCase { - - private String sLocalName="localName"; - private String sUri="fakeURI"; - private String sDefaultPrefix=sUri.substring(0,3); //$BUGBUG:WHY??? - private String sExpectedStart="<"+sDefaultPrefix+":localName xmlns:"+sDefaultPrefix+"=\"fakeURI\"/>"; - - private String sInputDoc=Common.XML_FOO_DIGITS; +public class BeginElementTest { + private static final String LOCAL_NAME ="localName"; + private static final String URI ="fakeURI"; + private static final String DEFAULT_PREFIX = URI.substring(0,3); //$BUGBUG:WHY??? + private static final String EXPECTED_START = "<" + DEFAULT_PREFIX + ":localName xmlns:" + DEFAULT_PREFIX + "=\"fakeURI\"/>"; @Test - public void testBeginElementStr() throws Exception { + void testBeginElementStr() throws XmlException { //same for string API - m_xc = XmlObject.Factory.parse(sInputDoc).newCursor(); - toNextTokenOfType(m_xc, TokenType.START); - m_xc.beginElement(sLocalName, sUri); - toPrevTokenOfType(m_xc, TokenType.START); - assertEquals(m_xc.xmlText(), sExpectedStart); + try (XmlCursor m_xc = cur(Common.XML_FOO_DIGITS)) { + toNextTokenOfType(m_xc, TokenType.START); + m_xc.beginElement(LOCAL_NAME, URI); + toPrevTokenOfType(m_xc, TokenType.START); + assertEquals(m_xc.xmlText(), EXPECTED_START); + } } @Test - public void testBeginElementQName() throws Exception { + void testBeginElementQName() throws Exception { //Qname call - - m_xc = XmlObject.Factory.parse(sInputDoc).newCursor(); - //insert new under the first element - toNextTokenOfType(m_xc, TokenType.START); - QName qName = new QName(sUri, sLocalName); - m_xc.beginElement(qName); - checkResult(qName); + try (XmlCursor m_xc = cur(Common.XML_FOO_DIGITS)) { + //insert new under the first element + toNextTokenOfType(m_xc, TokenType.START); + QName qName = new QName(URI, LOCAL_NAME); + m_xc.beginElement(qName); + checkResult(m_xc, qName); + } } @Test - public void testBeginElementQNamePrefix() throws Exception { + void testBeginElementQNamePrefix() throws Exception { //Qname with prefix String sPrefix = "pre"; - m_xc = XmlObject.Factory.parse(sInputDoc).newCursor(); - toNextTokenOfType(m_xc, TokenType.START); - QName qName = new QName(sUri, sLocalName, sPrefix); - System.out.println("Java prefix Qname: " + qName); - m_xc.beginElement(qName); - checkResult(qName); + try (XmlCursor m_xc = cur(Common.XML_FOO_DIGITS)) { + toNextTokenOfType(m_xc, TokenType.START); + QName qName = new QName(URI, LOCAL_NAME, sPrefix); + m_xc.beginElement(qName); + checkResult(m_xc, qName); + } + } + + @Test + void testBeginElementStartDoc() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_DIGITS)) { + m_xc.toFirstContentToken(); + m_xc.beginElement(LOCAL_NAME, URI); + m_xc.toPrevToken(); + m_xc.toPrevToken(); + assertTrue(m_xc.isStartdoc()); + } } //pre: cursor is not moved after beginElt call - private void checkResult(QName qName) { + private static void checkResult(XmlCursor m_xc, QName qName) { TokenType tok = m_xc.toPrevToken(); assertEquals(m_xc.getName(), qName); } - - public void testBeginElementStartDoc(String sLocalName, String sUri) throws Exception { - m_xc = XmlObject.Factory.parse(sInputDoc).newCursor(); - m_xc.beginElement(sLocalName, sUri); - m_xc.toPrevToken(); - m_xc.toPrevToken(); - assertTrue(m_xc.isStartdoc()); - } } Modified: xmlbeans/trunk/src/test/java/xmlcursor/checkin/ClearBookmarkTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/checkin/ClearBookmarkTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/xmlcursor/checkin/ClearBookmarkTest.java (original) +++ xmlbeans/trunk/src/test/java/xmlcursor/checkin/ClearBookmarkTest.java Sun Feb 6 01:51:55 2022 @@ -17,73 +17,73 @@ package xmlcursor.checkin; import org.apache.xmlbeans.XmlCursor; import org.apache.xmlbeans.XmlCursor.XmlBookmark; -import org.apache.xmlbeans.XmlObject; -import org.junit.Test; -import xmlcursor.common.BasicCursorTestCase; +import org.apache.xmlbeans.XmlException; +import org.junit.jupiter.api.Test; import xmlcursor.common.Common; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; - -public class ClearBookmarkTest extends BasicCursorTestCase { - private Bookmark0 _theAnnotation0 = new Bookmark0("value0"); - private Bookmark1 _theAnnotation1 = new Bookmark1("value1"); - private Bookmark2 _theAnnotation2 = new Bookmark2("value2"); +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static xmlcursor.common.BasicCursorTestCase.cur; + +public class ClearBookmarkTest { + private static final Bookmark0 _theAnnotation0 = new Bookmark0("value0"); + private static final Bookmark1 _theAnnotation1 = new Bookmark1("value1"); + private static final Bookmark2 _theAnnotation2 = new Bookmark2("value2"); @Test - public void testClearIndependent() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_TEXT); - m_xc = m_xo.newCursor(); - m_xc.setBookmark(_theAnnotation0); - m_xc.setBookmark(_theAnnotation1); - m_xc.setBookmark(_theAnnotation2); - Bookmark0 ann0 = (Bookmark0) m_xc.getBookmark(Bookmark0.class); - assertEquals("value0", ann0.text); - Bookmark1 ann1 = (Bookmark1) m_xc.getBookmark(Bookmark1.class); - assertEquals("value1", ann1.text); - Bookmark2 ann2 = (Bookmark2) m_xc.getBookmark(Bookmark2.class); - assertEquals("value2", ann2.text); - // clear ann1 - m_xc.clearBookmark(Bookmark1.class); - ann0 = (Bookmark0) m_xc.getBookmark(Bookmark0.class); - assertEquals("value0", ann0.text); - ann1 = (Bookmark1) m_xc.getBookmark(Bookmark1.class); - assertNull(ann1); - ann2 = (Bookmark2) m_xc.getBookmark(Bookmark2.class); - assertEquals("value2", ann2.text); + void testClearIndependent() throws XmlException { + try (XmlCursor m_xc = cur(Common.XML_FOO_TEXT)) { + m_xc.setBookmark(_theAnnotation0); + m_xc.setBookmark(_theAnnotation1); + m_xc.setBookmark(_theAnnotation2); + Bookmark0 ann0 = (Bookmark0) m_xc.getBookmark(Bookmark0.class); + assertEquals("value0", ann0.text); + Bookmark1 ann1 = (Bookmark1) m_xc.getBookmark(Bookmark1.class); + assertEquals("value1", ann1.text); + Bookmark2 ann2 = (Bookmark2) m_xc.getBookmark(Bookmark2.class); + assertEquals("value2", ann2.text); + // clear ann1 + m_xc.clearBookmark(Bookmark1.class); + ann0 = (Bookmark0) m_xc.getBookmark(Bookmark0.class); + assertEquals("value0", ann0.text); + ann1 = (Bookmark1) m_xc.getBookmark(Bookmark1.class); + assertNull(ann1); + ann2 = (Bookmark2) m_xc.getBookmark(Bookmark2.class); + assertEquals("value2", ann2.text); + } } @Test - public void testClearNullKey() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_TEXT); - m_xc = m_xo.newCursor(); - m_xc.setBookmark(_theAnnotation0); - m_xc.clearBookmark(null); - Bookmark0 ann0 = (Bookmark0) m_xc.getBookmark(Bookmark0.class); - assertEquals("value0", ann0.text); + void testClearNullKey() throws XmlException { + try (XmlCursor m_xc = cur(Common.XML_FOO_TEXT)) { + m_xc.setBookmark(_theAnnotation0); + m_xc.clearBookmark(null); + Bookmark0 ann0 = (Bookmark0) m_xc.getBookmark(Bookmark0.class); + assertEquals("value0", ann0.text); + } } @Test - public void testClearSuperClass() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_TEXT); - m_xc = m_xo.newCursor(); - m_xc.setBookmark(_theAnnotation0); - m_xc.clearBookmark(XmlBookmark.class); - Bookmark0 ann0 = (Bookmark0) m_xc.getBookmark(Bookmark0.class); - assertEquals("value0", ann0.text); + void testClearSuperClass() throws XmlException { + try (XmlCursor m_xc = cur(Common.XML_FOO_TEXT)) { + m_xc.setBookmark(_theAnnotation0); + m_xc.clearBookmark(XmlBookmark.class); + Bookmark0 ann0 = (Bookmark0) m_xc.getBookmark(Bookmark0.class); + assertEquals("value0", ann0.text); + } } @Test - public void testClearInvalidClass() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_TEXT); - m_xc = m_xo.newCursor(); - m_xc.setBookmark(_theAnnotation0); - m_xc.clearBookmark(this.getClass()); - Bookmark0 ann0 = (Bookmark0) m_xc.getBookmark(Bookmark0.class); - assertEquals("value0", ann0.text); + void testClearInvalidClass() throws XmlException { + try (XmlCursor m_xc = cur(Common.XML_FOO_TEXT)) { + m_xc.setBookmark(_theAnnotation0); + m_xc.clearBookmark(this.getClass()); + Bookmark0 ann0 = (Bookmark0) m_xc.getBookmark(Bookmark0.class); + assertEquals("value0", ann0.text); + } } - public class Bookmark0 extends XmlCursor.XmlBookmark { + public static class Bookmark0 extends XmlCursor.XmlBookmark { public String text; public Bookmark0(String text) { @@ -91,7 +91,7 @@ public class ClearBookmarkTest extends B } } - public class Bookmark1 extends XmlCursor.XmlBookmark { + public static class Bookmark1 extends XmlCursor.XmlBookmark { public String text; public Bookmark1(String text) { @@ -99,7 +99,7 @@ public class ClearBookmarkTest extends B } } - public class Bookmark2 extends XmlCursor.XmlBookmark { + public static class Bookmark2 extends XmlCursor.XmlBookmark { public String text; public Bookmark2(String text) { Modified: xmlbeans/trunk/src/test/java/xmlcursor/checkin/ClearSelectionTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/checkin/ClearSelectionTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/xmlcursor/checkin/ClearSelectionTest.java (original) +++ xmlbeans/trunk/src/test/java/xmlcursor/checkin/ClearSelectionTest.java Sun Feb 6 01:51:55 2022 @@ -15,40 +15,37 @@ package xmlcursor.checkin; -import org.apache.xmlbeans.XmlObject; -import org.junit.Test; -import tools.util.JarUtil; -import xmlcursor.common.BasicCursorTestCase; +import org.apache.xmlbeans.XmlCursor; +import org.junit.jupiter.api.Test; import xmlcursor.common.Common; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static xmlcursor.common.BasicCursorTestCase.jcur; + +public class ClearSelectionTest { -public class ClearSelectionTest extends BasicCursorTestCase { @Test - public void testClearSelection() throws Exception { - //m_xo = XmlObject.Factory.parse(Common.XML_PURCHASEORDER); - m_xo = XmlObject.Factory.parse( - JarUtil.getResourceFromJar(Common.TRANXML_FILE_XMLCURSOR_PO)); - m_xc = m_xo.newCursor(); - String ns="declare namespace po=\"http://xbean.test/xmlcursor/PurchaseOrder\";";; - String exp_ns="xmlns:po=\"http://xbean.test/xmlcursor/PurchaseOrder\"";; - m_xc.selectPath(ns+" $this//po:city"); - m_xc.toNextSelection(); - assertEquals("Mill Valley", m_xc.getTextValue()); - assertEquals("<po:city "+exp_ns+">Mill Valley</po:city>", m_xc.xmlText()); - m_xc.clearSelections(); - assertFalse(m_xc.toNextSelection()); - assertEquals("Mill Valley", m_xc.getTextValue()); - assertEquals("<po:city "+exp_ns+">Mill Valley</po:city>", m_xc.xmlText()); + void testClearSelection() throws Exception { + try (XmlCursor m_xc = jcur(Common.TRANXML_FILE_XMLCURSOR_PO)) { + String ns = "declare namespace po=\"http://xbean.test/xmlcursor/PurchaseOrder\";";; + String exp_ns = "xmlns:po=\"http://xbean.test/xmlcursor/PurchaseOrder\"";; + m_xc.selectPath(ns + " $this//po:city"); + m_xc.toNextSelection(); + assertEquals("Mill Valley", m_xc.getTextValue()); + assertEquals("<po:city " + exp_ns + ">Mill Valley</po:city>", m_xc.xmlText()); + m_xc.clearSelections(); + assertFalse(m_xc.toNextSelection()); + assertEquals("Mill Valley", m_xc.getTextValue()); + assertEquals("<po:city " + exp_ns + ">Mill Valley</po:city>", m_xc.xmlText()); + } } @Test - public void testClearSelectionNoSelection() throws Exception { - m_xo = XmlObject.Factory.parse( - JarUtil.getResourceFromJar(Common.TRANXML_FILE_XMLCURSOR_PO)); - m_xc = m_xo.newCursor(); - m_xc.clearSelections(); + void testClearSelectionNoSelection() throws Exception { + try (XmlCursor m_xc = jcur(Common.TRANXML_FILE_XMLCURSOR_PO)) { + m_xc.clearSelections(); + } } } Modified: xmlbeans/trunk/src/test/java/xmlcursor/checkin/CloseTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/checkin/CloseTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/xmlcursor/checkin/CloseTest.java (original) +++ xmlbeans/trunk/src/test/java/xmlcursor/checkin/CloseTest.java Sun Feb 6 01:51:55 2022 @@ -16,20 +16,22 @@ package xmlcursor.checkin; -import org.apache.xmlbeans.XmlObject; -import org.junit.Test; -import xmlcursor.common.BasicCursorTestCase; +import org.apache.xmlbeans.XmlCursor; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import xmlcursor.common.Common; +import static xmlcursor.common.BasicCursorTestCase.cur; -public class CloseTest extends BasicCursorTestCase { + +public class CloseTest { @Test - public void testMultipleClose() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO); - m_xc = m_xo.newCursor(); - m_xc.close(); - m_xc.close(); + void testMultipleClose() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO)) { + Assertions.assertDoesNotThrow(m_xc::close); + Assertions.assertDoesNotThrow(m_xc::close); + } } } Modified: xmlbeans/trunk/src/test/java/xmlcursor/checkin/ComparePositionTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/checkin/ComparePositionTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/xmlcursor/checkin/ComparePositionTest.java (original) +++ xmlbeans/trunk/src/test/java/xmlcursor/checkin/ComparePositionTest.java Sun Feb 6 01:51:55 2022 @@ -18,44 +18,47 @@ package xmlcursor.checkin; import org.apache.xmlbeans.XmlCursor; import org.apache.xmlbeans.XmlCursor.TokenType; -import org.apache.xmlbeans.XmlObject; -import org.junit.Test; -import xmlcursor.common.BasicCursorTestCase; +import org.junit.jupiter.api.Test; import xmlcursor.common.Common; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static xmlcursor.common.BasicCursorTestCase.cur; +import static xmlcursor.common.BasicCursorTestCase.toNextTokenOfType; -public class ComparePositionTest extends BasicCursorTestCase { +public class ComparePositionTest { + @Test - public void testComparePositionThis() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT); - m_xc = m_xo.newCursor(); - m_xc.toFirstChild(); - assertEquals(0, m_xc.comparePosition(m_xc)); + void testComparePositionThis() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_1ATTR_TEXT)) { + m_xc.toFirstChild(); + assertEquals(0, m_xc.comparePosition(m_xc)); + } } - @Test(expected = IllegalArgumentException.class) - public void testComparePositionDifferentDocs() throws Exception { - m_xc = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT).newCursor(); - try (XmlCursor xc0 = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT).newCursor()) { + @Test + void testComparePositionDifferentDocs() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_1ATTR_TEXT); + XmlCursor xc0 = cur(Common.XML_FOO_1ATTR_TEXT)) { m_xc.toFirstChild(); xc0.toFirstChild(); - m_xc.comparePosition(xc0); + assertThrows(IllegalArgumentException.class, () -> m_xc.comparePosition(xc0)); } } - @Test(expected = IllegalArgumentException.class) - public void testComparePositionNull() throws Exception { - m_xc = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT).newCursor(); - m_xc.toFirstChild(); - m_xc.comparePosition(null); + @Test + void testComparePositionNull() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_1ATTR_TEXT)) { + m_xc.toFirstChild(); + assertThrows(IllegalArgumentException.class, () -> m_xc.comparePosition(null)); + } } @Test - public void testComparePositionRightInTEXT() throws Exception { - m_xc = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT).newCursor(); - try (XmlCursor xc0 = m_xc.newCursor()) { + void testComparePositionRightInTEXT() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_1ATTR_TEXT); + XmlCursor xc0 = m_xc.newCursor()) { toNextTokenOfType(m_xc, TokenType.TEXT); toNextTokenOfType(xc0, TokenType.TEXT); xc0.toNextChar(1); @@ -64,9 +67,9 @@ public class ComparePositionTest extends } @Test - public void testComparePositionLeftInTEXT() throws Exception { - m_xc = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT).newCursor(); - try (XmlCursor xc0 = m_xc.newCursor()) { + void testComparePositionLeftInTEXT() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_1ATTR_TEXT); + XmlCursor xc0 = m_xc.newCursor()) { toNextTokenOfType(m_xc, TokenType.TEXT); toNextTokenOfType(xc0, TokenType.TEXT); m_xc.toNextChar(1); @@ -75,9 +78,9 @@ public class ComparePositionTest extends } @Test - public void testComparePositionENDandENDDOC() throws Exception { - m_xc = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT).newCursor(); - try (XmlCursor xc0 = m_xc.newCursor()) { + void testComparePositionENDandENDDOC() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_1ATTR_TEXT); + XmlCursor xc0 = m_xc.newCursor()) { m_xc.toEndDoc(); xc0.toEndDoc(); xc0.toPrevToken(); Modified: xmlbeans/trunk/src/test/java/xmlcursor/checkin/CopyTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/checkin/CopyTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/xmlcursor/checkin/CopyTest.java (original) +++ xmlbeans/trunk/src/test/java/xmlcursor/checkin/CopyTest.java Sun Feb 6 01:51:55 2022 @@ -19,58 +19,52 @@ package xmlcursor.checkin; import org.apache.xmlbeans.XmlCursor; import org.apache.xmlbeans.XmlCursor.TokenType; +import org.apache.xmlbeans.XmlException; import org.apache.xmlbeans.XmlObject; -import org.junit.Test; -import tools.util.JarUtil; -import xmlcursor.common.BasicCursorTestCase; +import org.junit.jupiter.api.Test; import xmlcursor.common.Common; import javax.xml.namespace.QName; +import java.io.IOException; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static xmlcursor.common.BasicCursorTestCase.*; -public class CopyTest extends BasicCursorTestCase { - @Test(expected = IllegalArgumentException.class) - public void testCopyToNull() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_DIGITS); - m_xc = m_xo.newCursor(); - toNextTokenOfType(m_xc, TokenType.TEXT); - m_xc.copyXml(null); +public class CopyTest { + + @Test + void testCopyToNull() throws XmlException { + try (XmlCursor m_xc = cur(Common.XML_FOO_DIGITS)) { + toNextTokenOfType(m_xc, TokenType.TEXT); + assertThrows(IllegalArgumentException.class, () -> m_xc.copyXml(null)); + } } @Test - public void testCopyDifferentStoresLoadedByParse() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_DIGITS); - m_xc = m_xo.newCursor(); - XmlObject xo = XmlObject.Factory.parse(Common.XML_FOO_2ATTR_TEXT); - try (XmlCursor xc1 = xo.newCursor()) { + void testCopyDifferentStoresLoadedByParse() throws XmlException { + try (XmlCursor m_xc = cur(Common.XML_FOO_DIGITS); + XmlCursor xc1 = cur(Common.XML_FOO_2ATTR_TEXT)) { toNextTokenOfType(m_xc, TokenType.TEXT); toNextTokenOfType(xc1, TokenType.TEXT); m_xc.copyXml(xc1); xc1.toParent(); // verify xc1 assertEquals("01234text", xc1.getTextValue()); + // verify m_xc + assertEquals("01234", m_xc.getChars()); } - // verify m_xc - assertEquals("01234", m_xc.getChars()); } /** * Method testCopyDifferentStoresLoadedFromFile - * * Tests copy from document w/ namespaces to doc w/o */ @Test - public void testCopyDifferentStoresLoadedFromFile() throws Exception { - // load the documents and obtain a cursor - XmlObject xobj0 = XmlObject.Factory.parse( - JarUtil.getResourceFromJar(Common.TRANXML_FILE_CLM)); - XmlObject xobj1 = XmlObject.Factory.parse( - JarUtil.getResourceFromJar("xbean/xmlcursor/po.xml")); - - try (XmlCursor xc0 = xobj0.newCursor(); - XmlCursor xc1 = xobj1.newCursor()) { + void testCopyDifferentStoresLoadedFromFile() throws XmlException, IOException { + try (XmlCursor xc0 = jcur(Common.TRANXML_FILE_CLM); + XmlCursor xc1 = jcur("xbean/xmlcursor/po.xml")) { xc0.selectPath(Common.CLM_NS_XQUERY_DEFAULT + " .//Initial"); xc0.toNextSelection(); String sQuery= @@ -104,15 +98,10 @@ public class CopyTest extends BasicCurso * Tests copy from document w/o namespaces to document with namespaces */ @Test - public void testCopyDifferentStoresLoadedFromFile2() throws Exception { + void testCopyDifferentStoresLoadedFromFile2() throws Exception { // load the documents and obtain a cursor - XmlObject xobj0 = XmlObject.Factory.parse( - JarUtil.getResourceFromJar(Common.TRANXML_FILE_CLM)); - XmlObject xobj1 = XmlObject.Factory.parse( - JarUtil.getResourceFromJar(Common.TRANXML_FILE_XMLCURSOR_PO)); - - try (XmlCursor xc0 = xobj0.newCursor(); - XmlCursor xc1 = xobj1.newCursor()) { + try (XmlCursor xc0 = jcur(Common.TRANXML_FILE_CLM); + XmlCursor xc1 = jcur(Common.TRANXML_FILE_XMLCURSOR_PO)) { xc0.selectPath(Common.CLM_NS_XQUERY_DEFAULT + " .//Initial"); xc0.toNextSelection(); @@ -143,26 +132,25 @@ public class CopyTest extends BasicCurso } @Test - public void testCopySameLocation() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_DIGITS); - m_xc = m_xo.newCursor(); - try (XmlCursor xc1 = m_xo.newCursor()) { + void testCopySameLocation() throws Exception { + XmlObject m_xo = obj(Common.XML_FOO_DIGITS); + try (XmlCursor m_xc = m_xo.newCursor(); + XmlCursor xc1 = m_xo.newCursor()) { toNextTokenOfType(m_xc, TokenType.TEXT); toNextTokenOfType(xc1, TokenType.TEXT); m_xc.copyXml(xc1); + m_xc.toParent(); + assertEquals("0123401234", m_xc.getTextValue()); } - m_xc.toParent(); - assertEquals("0123401234", m_xc.getTextValue()); } @Test - public void testCopyNewLocation() throws Exception { - m_xo = XmlObject.Factory.parse( - JarUtil.getResourceFromJar(Common.TRANXML_FILE_XMLCURSOR_PO)); - + void testCopyNewLocation() throws Exception { String ns="declare namespace po=\"http://xbean.test/xmlcursor/PurchaseOrder\";; "; - m_xc = m_xo.newCursor(); - try (XmlCursor xc1 = m_xo.newCursor()) { + XmlObject m_xo = jobj(Common.TRANXML_FILE_XMLCURSOR_PO); + + try (XmlCursor m_xc = m_xo.newCursor(); + XmlCursor xc1 = m_xo.newCursor()) { m_xc.selectPath(ns+" .//po:shipTo/po:city"); m_xc.toNextSelection(); xc1.selectPath(ns +" .//po:billTo/po:city"); @@ -172,20 +160,19 @@ public class CopyTest extends BasicCurso xc1.toPrevToken(); // verify xc1 assertEquals("Mill Valley", xc1.getChars()); + // verify m_xc + assertEquals("Mill Valley", m_xc.getTextValue()); } - // verify m_xc - assertEquals("Mill Valley", m_xc.getTextValue()); - } @Test - public void testCopyElementToMiddleOfTEXT() throws Exception { + void testCopyElementToMiddleOfTEXT() throws Exception { String ns="declare namespace po=\"http://xbean.test/xmlcursor/PurchaseOrder\";; "; String exp_ns="xmlns:po=\"http://xbean.test/xmlcursor/PurchaseOrder\"";; - m_xo = XmlObject.Factory.parse( - JarUtil.getResourceFromJar(Common.TRANXML_FILE_XMLCURSOR_PO)); - m_xc = m_xo.newCursor(); - try (XmlCursor xc1 = m_xo.newCursor()) { + XmlObject m_xo = jobj(Common.TRANXML_FILE_XMLCURSOR_PO); + + try (XmlCursor m_xc = m_xo.newCursor(); + XmlCursor xc1 = m_xo.newCursor()) { m_xc.selectPath(ns+" .//po:shipTo/po:city"); m_xc.toNextSelection(); xc1.selectPath(ns+" .//po:billTo/po:city"); @@ -200,8 +187,7 @@ public class CopyTest extends BasicCurso assertEquals("Mill Valley", xc1.getChars()); xc1.toPrevToken(); assertEquals(TokenType.START, xc1.currentTokenType()); - assertEquals(new QName("city").getLocalPart(), - xc1.getName().getLocalPart()); + assertEquals(new QName("city").getLocalPart(), xc1.getName().getLocalPart()); xc1.toPrevToken(); assertEquals("Old ", xc1.getChars()); // verify m_xc Modified: xmlbeans/trunk/src/test/java/xmlcursor/checkin/CopyXmlContentsTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/checkin/CopyXmlContentsTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/xmlcursor/checkin/CopyXmlContentsTest.java (original) +++ xmlbeans/trunk/src/test/java/xmlcursor/checkin/CopyXmlContentsTest.java Sun Feb 6 01:51:55 2022 @@ -19,61 +19,56 @@ package xmlcursor.checkin; import org.apache.xmlbeans.XmlCursor; import org.apache.xmlbeans.XmlCursor.TokenType; -import org.apache.xmlbeans.XmlObject; -import org.junit.Ignore; -import org.junit.Test; -import xmlcursor.common.BasicCursorTestCase; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import xmlcursor.common.Common; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; +import static xmlcursor.common.BasicCursorTestCase.*; -public class CopyXmlContentsTest extends BasicCursorTestCase { - @Test(expected = IllegalArgumentException.class) - public void testCopyToNull() throws Exception { - m_xc = XmlObject.Factory.parse(Common.XML_FOO_DIGITS).newCursor(); - toNextTokenOfType(m_xc, TokenType.TEXT); - m_xc.copyXmlContents(null); - } - - @Test(expected = IllegalStateException.class) - public void testCopyDifferentStoresLoadedByParseInvalidDest() throws Exception { - String sDoc1 = Common.XML_FOO_DIGITS; - String sDoc2 = Common.XML_FOO_2ATTR_TEXT; - m_xc = XmlObject.Factory.parse(sDoc1).newCursor(); - XmlCursor xc1 = XmlObject.Factory.parse(sDoc2).newCursor(); - toNextTokenOfType(m_xc, TokenType.START); - toNextTokenOfType(xc1, TokenType.START); - xc1.close(); - m_xc.copyXmlContents(xc1); +public class CopyXmlContentsTest { + @Test + void testCopyToNull() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_DIGITS)) { + toNextTokenOfType(m_xc, TokenType.TEXT); + assertThrows(IllegalArgumentException.class, () -> m_xc.copyXmlContents(null)); + } + } + + @Test + void testCopyDifferentStoresLoadedByParseInvalidDest() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_DIGITS); + XmlCursor xc1 = cur(Common.XML_FOO_2ATTR_TEXT)) { + toNextTokenOfType(m_xc, TokenType.START); + toNextTokenOfType(xc1, TokenType.START); + xc1.close(); + assertThrows(IllegalStateException.class, () -> m_xc.copyXmlContents(xc1)); + } } @Test - public void testCopyDifferentStoresLoadedByParse() throws Exception { - String sDoc1 = Common.XML_FOO_DIGITS; - String sDoc2 = Common.XML_FOO_2ATTR_TEXT; - m_xc = XmlObject.Factory.parse(sDoc1).newCursor(); - try (XmlCursor xc1 = XmlObject.Factory.parse(sDoc2).newCursor()) { - toNextTokenOfType(m_xc, TokenType.START); - toNextTokenOfType(xc1, TokenType.TEXT); - m_xc.copyXmlContents(xc1); - xc1.toParent(); - // verify xc1 - assertEquals("01234text", xc1.getTextValue()); - } - - // verify m_xc - toNextTokenOfType(m_xc, TokenType.TEXT); //get to the text - assertEquals("01234", m_xc.getChars()); + void testCopyDifferentStoresLoadedByParse() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_DIGITS); + XmlCursor xc1 = cur(Common.XML_FOO_2ATTR_TEXT)) { + toNextTokenOfType(m_xc, TokenType.START); + toNextTokenOfType(xc1, TokenType.TEXT); + m_xc.copyXmlContents(xc1); + xc1.toParent(); + // verify xc1 + assertEquals("01234text", xc1.getTextValue()); + + // verify m_xc + toNextTokenOfType(m_xc, TokenType.TEXT); //get to the text + assertEquals("01234", m_xc.getChars()); + } } /* the source is not a container*/ @Test - public void testCopyDifferentStoresLoadedByParseInvalidSrc() throws Exception { - String sDoc1 = Common.XML_FOO_DIGITS; - String sDoc2 = Common.XML_FOO_2ATTR_TEXT; - m_xc = XmlObject.Factory.parse(sDoc1).newCursor(); - try (XmlCursor xc1 = XmlObject.Factory.parse(sDoc2).newCursor()) { + void testCopyDifferentStoresLoadedByParseInvalidSrc() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_DIGITS); + XmlCursor xc1 = cur(Common.XML_FOO_2ATTR_TEXT)) { toNextTokenOfType(m_xc, TokenType.TEXT); toNextTokenOfType(xc1, TokenType.START); boolean result = m_xc.copyXmlContents(xc1); @@ -82,32 +77,29 @@ public class CopyXmlContentsTest extends } @Test - @Ignore + @Disabled public void testCopyOntoItself() throws Exception { - String sDoc1 = Common.XML_FOO_DIGITS; - m_xc = XmlObject.Factory.parse(sDoc1).newCursor(); - toNextTokenOfType(m_xc, TokenType.TEXT); - String sExpectedXml = m_xc.xmlText(); - boolean result = m_xc.copyXmlContents(m_xc); - - //cursor is left immediately before copied material - assertEquals(sExpectedXml, m_xc.getTextValue()); + try (XmlCursor m_xc = cur(Common.XML_FOO_DIGITS)) { + toNextTokenOfType(m_xc, TokenType.TEXT); + String sExpectedXml = m_xc.xmlText(); + m_xc.copyXmlContents(m_xc); + + //cursor is left immediately before copied material + assertEquals(sExpectedXml, m_xc.getTextValue()); + } } @Test - public void testCopySelf() throws Exception { - String sDoc1 = Common.XML_FOO_DIGITS; - m_xo = XmlObject.Factory.parse(sDoc1); - m_xc = m_xo.newCursor(); - - toNextTokenOfType(m_xc, TokenType.START); - String sExpectedXml = "<xml-fragment>01234<foo attr0=\"val0\" xmlns=\"http://www.foo.org\";>01234</foo></xml-fragment>"; - boolean result = m_xc.copyXmlContents(m_xc); - - //cursor is left immediately before copied material - m_xc.toStartDoc(); - //assertEquals(sExpectedXml.length(),m_xc.xmlText().length()); - assertEquals(sExpectedXml, m_xc.xmlText()); + void testCopySelf() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_DIGITS)) { + toNextTokenOfType(m_xc, TokenType.START); + m_xc.copyXmlContents(m_xc); + //cursor is left immediately before copied material + m_xc.toStartDoc(); + //assertEquals(sExpectedXml.length(),m_xc.xmlText().length()); + String sExpectedXml = "<xml-fragment>01234<foo attr0=\"val0\" xmlns=\"http://www.foo.org\";>01234</foo></xml-fragment>"; + assertEquals(sExpectedXml, m_xc.xmlText()); + } } @@ -115,43 +107,35 @@ public class CopyXmlContentsTest extends Can't really copy the whole doc, so copy all the contents into a false root */ @Test - public void testCopyWholeDoc() throws Exception { - String sDoc1 = Common.XML_FOO_BAR_WS_TEXT; - String sDoc2 = "<root></root>"; - - try (XmlCursor xc1 = XmlObject.Factory.parse(sDoc1).newCursor(); - XmlCursor xc2 = XmlObject.Factory.parse(sDoc2).newCursor()) { + void testCopyWholeDoc() throws Exception { + try (XmlCursor xc1 = cur(Common.XML_FOO_BAR_WS_TEXT); + XmlCursor xc2 = cur("<root></root>")) { xc2.toFirstChild(); String sExpectedXml = xc1.xmlText(); - boolean result = xc1.copyXmlContents(xc2); + xc1.copyXmlContents(xc2); toPrevTokenOfType(xc2, TokenType.STARTDOC); toNextTokenOfType(xc2, TokenType.START); assertEquals(sExpectedXml, xc2.xmlText()); } //namespaces are not copied - sDoc1 = Common.XML_FOO_NS_PREFIX; - sDoc2 = "<root></root>"; - try (XmlCursor xc1 = XmlObject.Factory.parse(sDoc1).newCursor(); - XmlCursor xc2 = XmlObject.Factory.parse(sDoc2).newCursor()) { + try (XmlCursor xc1 = cur(Common.XML_FOO_NS_PREFIX); + XmlCursor xc2 = cur("<root></root>")) { String sExpectedXml = xc1.xmlText(); xc2.toFirstChild(); - boolean result = xc1.copyXmlContents(xc2); + xc1.copyXmlContents(xc2); toPrevTokenOfType(xc2, TokenType.STARTDOC); assertNotEquals(sExpectedXml, xc2.xmlText()); - - //attributes are not copied - sDoc1 = Common.XML_FOO_2ATTR; - sDoc2 = "<root></root>"; } - try (XmlCursor xc1 = XmlObject.Factory.parse(sDoc1).newCursor(); - XmlCursor xc2 = XmlObject.Factory.parse(sDoc2).newCursor()) { + //attributes are not copied + try (XmlCursor xc1 = cur(Common.XML_FOO_2ATTR); + XmlCursor xc2 = cur("<root></root>")) { String sExpectedXml = xc1.xmlText(); xc2.toFirstChild(); - boolean result = xc1.copyXmlContents(xc2); + xc1.copyXmlContents(xc2); toPrevTokenOfType(xc2, TokenType.STARTDOC); assertNotEquals(sExpectedXml, xc2.xmlText()); } Modified: xmlbeans/trunk/src/test/java/xmlcursor/checkin/CurrentTokenTypeTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/checkin/CurrentTokenTypeTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/xmlcursor/checkin/CurrentTokenTypeTest.java (original) +++ xmlbeans/trunk/src/test/java/xmlcursor/checkin/CurrentTokenTypeTest.java Sun Feb 6 01:51:55 2022 @@ -17,96 +17,81 @@ package xmlcursor.checkin; import org.apache.xmlbeans.XmlCursor; +import org.apache.xmlbeans.XmlCursor.TokenType; import org.apache.xmlbeans.XmlException; -import org.apache.xmlbeans.XmlObject; -import org.junit.Test; -import xmlcursor.common.BasicCursorTestCase; +import org.junit.jupiter.api.Test; import xmlcursor.common.Common; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static xmlcursor.common.BasicCursorTestCase.cur; -public class CurrentTokenTypeTest extends BasicCursorTestCase { +public class CurrentTokenTypeTest { - String sInputDoc; - - /** - ATTR - COMMENT - END - ENDDOC - NAMESPACE - NONE - PROCINST - START - STARTDOC - TEXT - */ - - @Test - public void testAttrType() throws XmlException{ - sInputDoc = Common.XML_FOO_2ATTR_TEXT; - m_xc = XmlObject.Factory.parse(sInputDoc).newCursor(); - assertEquals(m_xc.currentTokenType(), XmlCursor.TokenType.STARTDOC); - assertEquals(m_xc.toNextToken(), XmlCursor.TokenType.START); - assertEquals(m_xc.toNextToken(), XmlCursor.TokenType.ATTR); - assertEquals(m_xc.toNextToken(), XmlCursor.TokenType.ATTR); - assertEquals(m_xc.toNextToken(), XmlCursor.TokenType.TEXT); - assertEquals(m_xc.toNextToken(), XmlCursor.TokenType.END); - assertEquals(m_xc.toNextToken(), XmlCursor.TokenType.ENDDOC); - assertEquals(m_xc.toNextToken(), XmlCursor.TokenType.NONE); + @Test + void testAttrType() throws XmlException{ + try (XmlCursor m_xc = cur(Common.XML_FOO_2ATTR_TEXT)) { + assertEquals(m_xc.currentTokenType(), TokenType.STARTDOC); + assertEquals(m_xc.toNextToken(), TokenType.START); + assertEquals(m_xc.toNextToken(), TokenType.ATTR); + assertEquals(m_xc.toNextToken(), TokenType.ATTR); + assertEquals(m_xc.toNextToken(), TokenType.TEXT); + assertEquals(m_xc.toNextToken(), TokenType.END); + assertEquals(m_xc.toNextToken(), TokenType.ENDDOC); + assertEquals(m_xc.toNextToken(), TokenType.NONE); + } } @Test - public void testCommentType() throws XmlException { - sInputDoc = Common.XML_FOO_COMMENT; - m_xc = XmlObject.Factory.parse(sInputDoc).newCursor(); - assertEquals(m_xc.currentTokenType(), XmlCursor.TokenType.STARTDOC); - assertEquals(m_xc.toNextToken(), XmlCursor.TokenType.COMMENT); + void testCommentType() throws XmlException { + try (XmlCursor m_xc = cur(Common.XML_FOO_COMMENT)) { + assertEquals(m_xc.currentTokenType(), TokenType.STARTDOC); + assertEquals(m_xc.toNextToken(), TokenType.COMMENT); + } } @Test - public void testNamespaceType()throws XmlException{ - sInputDoc = Common.XML_FOO_NS_PREFIX; - m_xc = XmlObject.Factory.parse(sInputDoc).newCursor(); - - assertEquals(m_xc.currentTokenType(), XmlCursor.TokenType.STARTDOC); - assertEquals(m_xc.toNextToken(), XmlCursor.TokenType.START); - assertEquals(m_xc.toNextToken(), XmlCursor.TokenType.NAMESPACE); - assertEquals(m_xc.toNextToken(), XmlCursor.TokenType.COMMENT); - assertEquals(m_xc.toNextToken(), XmlCursor.TokenType.TEXT); - assertEquals(m_xc.toNextToken(), XmlCursor.TokenType.START); - assertEquals(m_xc.toNextToken(), XmlCursor.TokenType.ATTR); + void testNamespaceType()throws XmlException{ + try (XmlCursor m_xc = cur(Common.XML_FOO_NS_PREFIX)) { + assertEquals(m_xc.currentTokenType(), TokenType.STARTDOC); + assertEquals(m_xc.toNextToken(), TokenType.START); + assertEquals(m_xc.toNextToken(), TokenType.NAMESPACE); + assertEquals(m_xc.toNextToken(), TokenType.COMMENT); + assertEquals(m_xc.toNextToken(), TokenType.TEXT); + assertEquals(m_xc.toNextToken(), TokenType.START); + assertEquals(m_xc.toNextToken(), TokenType.ATTR); + } } @Test - public void testNoneType()throws XmlException{ - sInputDoc = "<a/>"; - m_xc = XmlObject.Factory.parse(sInputDoc).newCursor(); - m_xc.toEndDoc(); - assertEquals(m_xc.toNextToken(), XmlCursor.TokenType.NONE); + void testNoneType()throws XmlException{ + try (XmlCursor m_xc = cur("<a/>")) { + m_xc.toEndDoc(); + assertEquals(m_xc.toNextToken(), TokenType.NONE); + } } @Test - public void testProcinstType()throws XmlException{ - sInputDoc = Common.XML_FOO_PROCINST; - m_xc = XmlObject.Factory.parse(sInputDoc).newCursor(); - assertEquals(m_xc.currentTokenType(), XmlCursor.TokenType.STARTDOC); - assertEquals(m_xc.toNextToken(), XmlCursor.TokenType.PROCINST); + void testProcinstType()throws XmlException{ + try (XmlCursor m_xc = cur(Common.XML_FOO_PROCINST)) { + assertEquals(m_xc.currentTokenType(), TokenType.STARTDOC); + assertEquals(m_xc.toNextToken(), TokenType.PROCINST); + } } @Test - public void testTextType()throws XmlException{ - sInputDoc = "<text>blah<test>test and some more test</test>" + "\u042F\u0436\n\r</text>"; - m_xc = XmlObject.Factory.parse(sInputDoc).newCursor(); - assertEquals(m_xc.currentTokenType(), XmlCursor.TokenType.STARTDOC); - assertEquals(m_xc.toNextToken(), XmlCursor.TokenType.START); - assertEquals(m_xc.toNextToken(), XmlCursor.TokenType.TEXT); - assertEquals(m_xc.toNextToken(), XmlCursor.TokenType.START); - assertEquals(m_xc.toNextToken(), XmlCursor.TokenType.TEXT); - assertEquals(m_xc.toNextToken(), XmlCursor.TokenType.END); - assertEquals(m_xc.toNextToken(), XmlCursor.TokenType.TEXT); - assertEquals(m_xc.toNextToken(), XmlCursor.TokenType.END); - assertEquals(m_xc.toNextToken(), XmlCursor.TokenType.ENDDOC); + void testTextType()throws XmlException{ + String sInputDoc = "<text>blah<test>test and some more test</test>" + "\u042F\u0436\n\r</text>"; + try (XmlCursor m_xc = cur(sInputDoc)) { + assertEquals(m_xc.currentTokenType(), TokenType.STARTDOC); + assertEquals(m_xc.toNextToken(), TokenType.START); + assertEquals(m_xc.toNextToken(), TokenType.TEXT); + assertEquals(m_xc.toNextToken(), TokenType.START); + assertEquals(m_xc.toNextToken(), TokenType.TEXT); + assertEquals(m_xc.toNextToken(), TokenType.END); + assertEquals(m_xc.toNextToken(), TokenType.TEXT); + assertEquals(m_xc.toNextToken(), TokenType.END); + assertEquals(m_xc.toNextToken(), TokenType.ENDDOC); + } } } Modified: xmlbeans/trunk/src/test/java/xmlcursor/checkin/GetAllBookmarkRefsTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/checkin/GetAllBookmarkRefsTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/xmlcursor/checkin/GetAllBookmarkRefsTest.java (original) +++ xmlbeans/trunk/src/test/java/xmlcursor/checkin/GetAllBookmarkRefsTest.java Sun Feb 6 01:51:55 2022 @@ -17,49 +17,49 @@ package xmlcursor.checkin; import org.apache.xmlbeans.XmlCursor; -import org.apache.xmlbeans.XmlObject; -import org.junit.Test; -import xmlcursor.common.BasicCursorTestCase; +import org.junit.jupiter.api.Test; import xmlcursor.common.Common; -import java.util.Vector; +import java.util.ArrayList; +import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -public class GetAllBookmarkRefsTest extends BasicCursorTestCase { - private Bookmark0 _theBookmark0 = new Bookmark0("value0"); - private Bookmark1 _theBookmark1 = new Bookmark1("value1"); - private Bookmark2 _theBookmark2 = new Bookmark2("value2"); +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static xmlcursor.common.BasicCursorTestCase.cur; + +public class GetAllBookmarkRefsTest { + private static final Bookmark0 _theBookmark0 = new Bookmark0("value0"); + private static final Bookmark1 _theBookmark1 = new Bookmark1("value1"); + private static final Bookmark2 _theBookmark2 = new Bookmark2("value2"); @Test - public void testGetAll() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_TEXT); - m_xc = m_xo.newCursor(); - m_xc.setBookmark(_theBookmark0); - m_xc.setBookmark(_theBookmark1); - m_xc.setBookmark(_theBookmark2); - - Vector v = new Vector(); - m_xc.getAllBookmarkRefs(v); - assertEquals(3, v.size()); - assertEquals("value0", ((Bookmark0) v.elementAt(0)).text); - assertEquals("value1", ((Bookmark1) v.elementAt(1)).text); - assertEquals("value2", ((Bookmark2) v.elementAt(2)).text); + void testGetAll() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_TEXT)) { + m_xc.setBookmark(_theBookmark0); + m_xc.setBookmark(_theBookmark1); + m_xc.setBookmark(_theBookmark2); + + List<Object> v = new ArrayList<>(); + m_xc.getAllBookmarkRefs(v); + assertEquals(3, v.size()); + assertEquals("value0", ((Bookmark0) v.get(0)).text); + assertEquals("value1", ((Bookmark1) v.get(1)).text); + assertEquals("value2", ((Bookmark2) v.get(2)).text); + } } @Test - public void testGetAllNullListToFill() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_TEXT); - m_xc = m_xo.newCursor(); - m_xc.setBookmark(_theBookmark0); - m_xc.setBookmark(_theBookmark1); - m_xc.setBookmark(_theBookmark2); - m_xc.getAllBookmarkRefs(null); - assertTrue(true); + void testGetAllNullListToFill() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_TEXT)) { + m_xc.setBookmark(_theBookmark0); + m_xc.setBookmark(_theBookmark1); + m_xc.setBookmark(_theBookmark2); + m_xc.getAllBookmarkRefs(null); + assertTrue(true); + } } - public class Bookmark0 extends XmlCursor.XmlBookmark { + private static class Bookmark0 extends XmlCursor.XmlBookmark { public String text; Bookmark0(String text) { @@ -67,7 +67,7 @@ public class GetAllBookmarkRefsTest exte } } - public class Bookmark1 extends XmlCursor.XmlBookmark { + private static class Bookmark1 extends XmlCursor.XmlBookmark { public String text; Bookmark1(String text) { @@ -75,7 +75,7 @@ public class GetAllBookmarkRefsTest exte } } - public class Bookmark2 extends XmlCursor.XmlBookmark { + private static class Bookmark2 extends XmlCursor.XmlBookmark { public String text; Bookmark2(String text) { Modified: xmlbeans/trunk/src/test/java/xmlcursor/checkin/GetAllNamespacesTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/checkin/GetAllNamespacesTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/xmlcursor/checkin/GetAllNamespacesTest.java (original) +++ xmlbeans/trunk/src/test/java/xmlcursor/checkin/GetAllNamespacesTest.java Sun Feb 6 01:51:55 2022 @@ -17,86 +17,81 @@ package xmlcursor.checkin; import org.apache.xmlbeans.XmlCursor; -import org.apache.xmlbeans.XmlObject; -import org.junit.Before; -import org.junit.Test; -import xmlcursor.common.BasicCursorTestCase; +import org.apache.xmlbeans.XmlException; +import org.junit.jupiter.api.Test; import java.util.HashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.*; +import static xmlcursor.common.BasicCursorTestCase.cur; +import static xmlcursor.common.BasicCursorTestCase.toNextTokenOfType; + +public class GetAllNamespacesTest { + + private static final String XML = + "<bk:book xmlns:bk='urn:loc.gov:books'" + + " xmlns:isbn='urn:ISBN:0-395-36341-6'>" + + "<bk:title>Cheaper by the Dozen</bk:title>" + + "<isbn:number>1568491379</isbn:number>" + + "<nestedInfo xmlns:bk='urn:loc.gov:booksOverridden'>" + + "nestedText</nestedInfo>" + + "</bk:book>"; -public class GetAllNamespacesTest extends BasicCursorTestCase { - - @Test(expected = Exception.class) - public void testCursorNotContainer() { - //lousy message - toNextTokenOfType(m_xc, XmlCursor.TokenType.TEXT); - Map myHash = new HashMap(); - - m_xc.getAllNamespaces(myHash); + @Test + void testCursorNotContainer() throws XmlException { + try (XmlCursor m_xc = cur(XML)) { + //lousy message + toNextTokenOfType(m_xc, XmlCursor.TokenType.TEXT); + assertThrows(Exception.class, () -> m_xc.getAllNamespaces(new HashMap<>())); + } } @Test - public void testGetAllNamespaces() { - //parse in setUp - int nExpectedNamespaces = 2;//2 distinct namespaces but 3 - Map namespaceMap = new HashMap(); - toNextTokenOfType(m_xc, XmlCursor.TokenType.START); - m_xc.getAllNamespaces(namespaceMap); - assertEquals(namespaceMap.entrySet().size(), nExpectedNamespaces); - assertEquals((String) namespaceMap.get("bk"), "urn:loc.gov:books"); - //assertEquals((String)namespaceMap.get("bk"),"urn:loc.gov:booksOverridden"); - assertEquals((String) namespaceMap.get("isbn"), - "urn:ISBN:0-395-36341-6"); + void testGetAllNamespaces() throws XmlException { + try (XmlCursor m_xc = cur(XML)) { + toNextTokenOfType(m_xc, XmlCursor.TokenType.START); + Map<String, String> namespaceMap = new HashMap<>(); + m_xc.getAllNamespaces(namespaceMap); + //2 distinct namespaces but 3 + assertEquals(2, namespaceMap.entrySet().size()); + assertEquals("urn:loc.gov:books", namespaceMap.get("bk")); + assertEquals("urn:ISBN:0-395-36341-6", namespaceMap.get("isbn")); + } } @Test - public void testGetAllNamespacesIllegalCursorPos() { - int nExpectedNamespaces = 0; - Map namespaceMap = new HashMap(); - m_xc.getAllNamespaces(namespaceMap); - assertEquals(namespaceMap.entrySet().size(), nExpectedNamespaces); + void testGetAllNamespacesIllegalCursorPos() throws XmlException { + try (XmlCursor m_xc = cur(XML)) { + Map<String, String> namespaceMap = new HashMap<>(); + m_xc.getAllNamespaces(namespaceMap); + assertTrue(namespaceMap.isEmpty()); + } } @Test - public void testGetAllNamespacesNull() { - - toNextTokenOfType(m_xc, XmlCursor.TokenType.START); - - m_xc.getAllNamespaces(null); + void testGetAllNamespacesNull() throws XmlException { + try (XmlCursor m_xc = cur(XML)) { + toNextTokenOfType(m_xc, XmlCursor.TokenType.START); + assertDoesNotThrow(() -> m_xc.getAllNamespaces(null)); + } } /** * cursor is positioned below the namespace declaration but in its scope */ @Test - public void testGetAllNamespacesInternal() { - int nExpectedNamespaces = 2; - Map namespaceMap = new HashMap(); - m_xc.toFirstChild(); - m_xc.toChild(2);//nestedInfo - m_xc.getAllNamespaces(namespaceMap); - assertEquals(namespaceMap.entrySet().size(), nExpectedNamespaces); - - assertEquals((String) namespaceMap.get("bk"), - "urn:loc.gov:booksOverridden"); - assertEquals((String) namespaceMap.get("isbn"), - "urn:ISBN:0-395-36341-6"); - - } - - @Before - public void setUp() throws Exception { - String sTestXml = "<bk:book xmlns:bk='urn:loc.gov:books'" + - " xmlns:isbn='urn:ISBN:0-395-36341-6'>" + - "<bk:title>Cheaper by the Dozen</bk:title>" + - "<isbn:number>1568491379</isbn:number>" + - "<nestedInfo xmlns:bk='urn:loc.gov:booksOverridden'>" + - "nestedText</nestedInfo>" + - "</bk:book>"; - m_xc = XmlObject.Factory.parse(sTestXml).newCursor(); + void testGetAllNamespacesInternal() throws XmlException { + try (XmlCursor m_xc = cur(XML)) { + Map<String,String> namespaceMap = new HashMap<>(); + m_xc.toFirstChild(); + m_xc.toChild(2);//nestedInfo + m_xc.getAllNamespaces(namespaceMap); + assertEquals(2, namespaceMap.entrySet().size()); + + assertEquals("urn:loc.gov:booksOverridden", namespaceMap.get("bk")); + assertEquals("urn:ISBN:0-395-36341-6", namespaceMap.get("isbn")); + } } } Modified: xmlbeans/trunk/src/test/java/xmlcursor/checkin/GetAttributeTextTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/checkin/GetAttributeTextTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/xmlcursor/checkin/GetAttributeTextTest.java (original) +++ xmlbeans/trunk/src/test/java/xmlcursor/checkin/GetAttributeTextTest.java Sun Feb 6 01:51:55 2022 @@ -16,59 +16,58 @@ package xmlcursor.checkin; +import org.apache.xmlbeans.XmlCursor; import org.apache.xmlbeans.XmlCursor.TokenType; -import org.apache.xmlbeans.XmlObject; -import org.junit.Test; -import tools.util.JarUtil; -import xmlcursor.common.BasicCursorTestCase; +import org.apache.xmlbeans.XmlException; +import org.junit.jupiter.api.Test; import xmlcursor.common.Common; import javax.xml.namespace.QName; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static xmlcursor.common.BasicCursorTestCase.*; -public class GetAttributeTextTest extends BasicCursorTestCase { +public class GetAttributeTextTest { + @Test - public void testGetAttributeTextFromSTARTwith2ATTR() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_2ATTR_TEXT); - m_xc = m_xo.newCursor(); - m_xc.toFirstChild(); - assertEquals("val1", m_xc.getAttributeText(new QName("attr1"))); + void testGetAttributeTextFromSTARTwith2ATTR() throws XmlException { + try (XmlCursor m_xc = cur(Common.XML_FOO_2ATTR_TEXT)) { + m_xc.toFirstChild(); + assertEquals("val1", m_xc.getAttributeText(new QName("attr1"))); + } } @Test - public void testGetAttributeTextFromSTARTwithInvalid() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_2ATTR_TEXT); - m_xc = m_xo.newCursor(); - m_xc.toFirstChild(); - assertNull(m_xc.getAttributeText(new QName("invalid"))); + void testGetAttributeTextFromSTARTwithInvalid() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_2ATTR_TEXT)) { + m_xc.toFirstChild(); + assertNull(m_xc.getAttributeText(new QName("invalid"))); + } } @Test - public void testGetAttributeTextFromSTARTChildHasAttr() throws Exception { - m_xo = XmlObject.Factory.parse( - JarUtil.getResourceFromJar(Common.TRANXML_FILE_XMLCURSOR_PO)); - m_xc = m_xo.newCursor(); - m_xc.selectPath("$this//items"); - assertNull(m_xc.getAttributeText(new QName("partNum"))); + void testGetAttributeTextFromSTARTChildHasAttr() throws Exception { + try (XmlCursor m_xc = jcur(Common.TRANXML_FILE_XMLCURSOR_PO)) { + m_xc.selectPath("$this//items"); + assertNull(m_xc.getAttributeText(new QName("partNum"))); + } } @Test - public void testGetAttributeTextFromSTARTDOCChildHasAttr() throws Exception { - m_xo = XmlObject.Factory.parse( - JarUtil.getResourceFromJar(Common.TRANXML_FILE_XMLCURSOR_PO)); - m_xc = m_xo.newCursor(); - assertNull(m_xc.getAttributeText(new QName("partNum"))); + void testGetAttributeTextFromSTARTDOCChildHasAttr() throws Exception { + try (XmlCursor m_xc = jcur(Common.TRANXML_FILE_XMLCURSOR_PO)) { + assertNull(m_xc.getAttributeText(new QName("partNum"))); + } } @Test - public void testGetAttributeTextFromATTR() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_2ATTR_TEXT); - m_xc = m_xo.newCursor(); - toNextTokenOfType(m_xc, TokenType.ATTR); - assertNull(m_xc.getAttributeText(new QName("attr1"))); + void testGetAttributeTextFromATTR() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_2ATTR_TEXT)) { + toNextTokenOfType(m_xc, TokenType.ATTR); + assertNull(m_xc.getAttributeText(new QName("attr1"))); + } } } Modified: xmlbeans/trunk/src/test/java/xmlcursor/checkin/GetBookmarkTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/checkin/GetBookmarkTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/xmlcursor/checkin/GetBookmarkTest.java (original) +++ xmlbeans/trunk/src/test/java/xmlcursor/checkin/GetBookmarkTest.java Sun Feb 6 01:51:55 2022 @@ -18,65 +18,64 @@ package xmlcursor.checkin; import org.apache.xmlbeans.XmlCursor; import org.apache.xmlbeans.XmlCursor.XmlBookmark; -import org.apache.xmlbeans.XmlObject; -import org.junit.Test; -import xmlcursor.common.BasicCursorTestCase; +import org.apache.xmlbeans.XmlException; +import org.junit.jupiter.api.Test; import xmlcursor.common.Common; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static xmlcursor.common.BasicCursorTestCase.cur; -public class GetBookmarkTest extends BasicCursorTestCase { - private Bookmark0 _theBookmark0 = new Bookmark0("value0"); - private Bookmark1 _theBookmark1 = new Bookmark1("value1"); - private Bookmark2 _theBookmark2 = new Bookmark2("value2"); - +public class GetBookmarkTest { + private static final Bookmark0 _theBookmark0 = new Bookmark0("value0"); + private static final Bookmark1 _theBookmark1 = new Bookmark1("value1"); + private static final Bookmark2 _theBookmark2 = new Bookmark2("value2"); @Test - public void testGetBookmarkIndependentKey() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_TEXT); - m_xc = m_xo.newCursor(); - m_xc.setBookmark(_theBookmark0); - m_xc.setBookmark(_theBookmark1); - m_xc.setBookmark(_theBookmark2); - Bookmark0 ann0 = (Bookmark0) m_xc.getBookmark(Bookmark0.class); - assertEquals("value0", ann0.text); - Bookmark1 ann1 = (Bookmark1) m_xc.getBookmark(Bookmark1.class); - assertEquals("value1", ann1.text); - Bookmark2 ann2 = (Bookmark2) m_xc.getBookmark(Bookmark2.class); - assertEquals("value2", ann2.text); + void testGetBookmarkIndependentKey() throws XmlException { + try (XmlCursor m_xc = cur(Common.XML_FOO_TEXT)) { + m_xc.setBookmark(_theBookmark0); + m_xc.setBookmark(_theBookmark1); + m_xc.setBookmark(_theBookmark2); + Bookmark0 ann0 = (Bookmark0) m_xc.getBookmark(Bookmark0.class); + assertEquals("value0", ann0.text); + Bookmark1 ann1 = (Bookmark1) m_xc.getBookmark(Bookmark1.class); + assertEquals("value1", ann1.text); + Bookmark2 ann2 = (Bookmark2) m_xc.getBookmark(Bookmark2.class); + assertEquals("value2", ann2.text); + } } @Test - public void testGetBookmarkNullKey() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_TEXT); - m_xc = m_xo.newCursor(); - m_xc.setBookmark(_theBookmark0); - XmlBookmark xa = m_xc.getBookmark(null); - assertNull(xa); + void testGetBookmarkNullKey() throws XmlException { + try (XmlCursor m_xc = cur(Common.XML_FOO_TEXT)) { + m_xc.setBookmark(_theBookmark0); + XmlBookmark xa = m_xc.getBookmark(null); + assertNull(xa); + } } @Test - public void testGetBookmarkInvalidKey() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_TEXT); - m_xc = m_xo.newCursor(); - m_xc.setBookmark(_theBookmark0); - XmlBookmark xa = m_xc.getBookmark(Bookmark1.class); - assertNull(xa); + void testGetBookmarkInvalidKey() throws XmlException { + try (XmlCursor m_xc = cur(Common.XML_FOO_TEXT)) { + m_xc.setBookmark(_theBookmark0); + XmlBookmark xa = m_xc.getBookmark(Bookmark1.class); + assertNull(xa); + } } @Test - public void testGetBookmarkNotAtCursor() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_TEXT); - m_xc = m_xo.newCursor(); - m_xc.setBookmark(_theBookmark0); - m_xc.toNextToken(); - XmlBookmark xa = m_xc.getBookmark(Bookmark0.class); - assertNull(xa); + void testGetBookmarkNotAtCursor() throws XmlException { + try (XmlCursor m_xc = cur(Common.XML_FOO_TEXT)) { + m_xc.setBookmark(_theBookmark0); + m_xc.toNextToken(); + XmlBookmark xa = m_xc.getBookmark(Bookmark0.class); + assertNull(xa); + } } - public class Bookmark0 extends XmlCursor.XmlBookmark { + public static class Bookmark0 extends XmlCursor.XmlBookmark { public String text; public Bookmark0(String text) { @@ -84,7 +83,7 @@ public class GetBookmarkTest extends Bas } } - public class Bookmark1 extends XmlCursor.XmlBookmark { + public static class Bookmark1 extends XmlCursor.XmlBookmark { public String text; public Bookmark1(String text) { @@ -92,7 +91,7 @@ public class GetBookmarkTest extends Bas } } - public class Bookmark2 extends XmlCursor.XmlBookmark { + public static class Bookmark2 extends XmlCursor.XmlBookmark { public String text; public Bookmark2(String text) { Modified: xmlbeans/trunk/src/test/java/xmlcursor/checkin/GetCharsTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/checkin/GetCharsTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/xmlcursor/checkin/GetCharsTest.java (original) +++ xmlbeans/trunk/src/test/java/xmlcursor/checkin/GetCharsTest.java Sun Feb 6 01:51:55 2022 @@ -16,39 +16,42 @@ package xmlcursor.checkin; +import org.apache.xmlbeans.XmlCursor; import org.apache.xmlbeans.XmlCursor.TokenType; -import org.apache.xmlbeans.XmlObject; -import org.junit.Test; -import xmlcursor.common.BasicCursorTestCase; +import org.apache.xmlbeans.XmlException; +import org.junit.jupiter.api.Test; import xmlcursor.common.Common; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static xmlcursor.common.BasicCursorTestCase.cur; +import static xmlcursor.common.BasicCursorTestCase.toNextTokenOfType; -public class GetCharsTest extends BasicCursorTestCase { +public class GetCharsTest { + @Test - public void testGetCharFromTEXTOffset() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_DIGITS); - m_xc = m_xo.newCursor(); - toNextTokenOfType(m_xc, TokenType.TEXT); - m_xc.toNextChar(1); - assertEquals("1234", m_xc.getChars()); + void testGetCharFromTEXTOffset() throws XmlException { + try (XmlCursor m_xc = cur(Common.XML_FOO_DIGITS)) { + toNextTokenOfType(m_xc, TokenType.TEXT); + m_xc.toNextChar(1); + assertEquals("1234", m_xc.getChars()); + } } @Test - public void testGetCharFromATTR() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_DIGITS); - m_xc = m_xo.newCursor(); - toNextTokenOfType(m_xc, TokenType.ATTR); - assertEquals("", m_xc.getChars()); + void testGetCharFromATTR() throws XmlException { + try (XmlCursor m_xc = cur(Common.XML_FOO_DIGITS)) { + toNextTokenOfType(m_xc, TokenType.ATTR); + assertEquals("", m_xc.getChars()); + } } @Test - public void testGetCharFromCOMMENT() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_COMMENT); - m_xc = m_xo.newCursor(); - toNextTokenOfType(m_xc, TokenType.COMMENT); - assertEquals("", m_xc.getChars()); + void testGetCharFromCOMMENT() throws XmlException { + try (XmlCursor m_xc = cur(Common.XML_FOO_COMMENT)) { + toNextTokenOfType(m_xc, TokenType.COMMENT); + assertEquals("", m_xc.getChars()); + } } } Modified: xmlbeans/trunk/src/test/java/xmlcursor/checkin/GetCharsType2Test.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/checkin/GetCharsType2Test.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/xmlcursor/checkin/GetCharsType2Test.java (original) +++ xmlbeans/trunk/src/test/java/xmlcursor/checkin/GetCharsType2Test.java Sun Feb 6 01:51:55 2022 @@ -16,110 +16,112 @@ package xmlcursor.checkin; +import org.apache.xmlbeans.XmlCursor; import org.apache.xmlbeans.XmlCursor.TokenType; -import org.apache.xmlbeans.XmlObject; -import org.junit.Test; -import xmlcursor.common.BasicCursorTestCase; +import org.junit.jupiter.api.Test; import xmlcursor.common.Common; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static xmlcursor.common.BasicCursorTestCase.cur; +import static xmlcursor.common.BasicCursorTestCase.toNextTokenOfType; -public class GetCharsType2Test extends BasicCursorTestCase { +public class GetCharsType2Test { + @Test - public void testGetCharsType2LessThanBufLength() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_DIGITS); - m_xc = m_xo.newCursor(); - toNextTokenOfType(m_xc, TokenType.TEXT); - char[] buf = new char[5]; - assertEquals(3, m_xc.getChars(buf, 0, 3)); - String s = new String(buf); - assertEquals("012\0\0", s); + void testGetCharsType2LessThanBufLength() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_DIGITS)) { + toNextTokenOfType(m_xc, TokenType.TEXT); + char[] buf = new char[5]; + assertEquals(3, m_xc.getChars(buf, 0, 3)); + String s = new String(buf); + assertEquals("012\0\0", s); + } } @Test - public void testGetCharsType2GTBufLengthMinusOffset() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_DIGITS); - m_xc = m_xo.newCursor(); - toNextTokenOfType(m_xc, TokenType.TEXT); - char[] buf = new char[5]; - assertEquals(2, m_xc.getChars(buf, 3, 3)); - assertEquals('\0', buf[0]); - assertEquals('\0', buf[1]); - assertEquals('\0', buf[2]); - assertEquals('0', buf[3]); - assertEquals('1', buf[4]); + void testGetCharsType2GTBufLengthMinusOffset() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_DIGITS)) { + toNextTokenOfType(m_xc, TokenType.TEXT); + char[] buf = new char[5]; + assertEquals(2, m_xc.getChars(buf, 3, 3)); + assertEquals('\0', buf[0]); + assertEquals('\0', buf[1]); + assertEquals('\0', buf[2]); + assertEquals('0', buf[3]); + assertEquals('1', buf[4]); + } } @Test - public void testGetCharsType2FromATTR() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_DIGITS); - m_xc = m_xo.newCursor(); - toNextTokenOfType(m_xc, TokenType.ATTR); - char[] buf = new char[5]; - assertEquals(0, m_xc.getChars(buf, 3, 4)); + void testGetCharsType2FromATTR() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_DIGITS)) { + toNextTokenOfType(m_xc, TokenType.ATTR); + char[] buf = new char[5]; + assertEquals(0, m_xc.getChars(buf, 3, 4)); + } } @Test - public void testGetCharsType2FromSTART() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_DIGITS); - m_xc = m_xo.newCursor(); - toNextTokenOfType(m_xc, TokenType.START); - char[] buf = new char[5]; - assertEquals(0, m_xc.getChars(buf, 3, 4)); + void testGetCharsType2FromSTART() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_DIGITS)) { + toNextTokenOfType(m_xc, TokenType.START); + char[] buf = new char[5]; + assertEquals(0, m_xc.getChars(buf, 3, 4)); + } } @Test - public void testGetCharsType2FromSTARTDOC() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_DIGITS); - m_xc = m_xo.newCursor(); - char[] buf = new char[5]; - assertEquals(0, m_xc.getChars(buf, 3, 4)); + void testGetCharsType2FromSTARTDOC() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_DIGITS)) { + char[] buf = new char[5]; + assertEquals(0, m_xc.getChars(buf, 3, 4)); + } } @Test - public void testGetCharsType2FromNAMESPACE() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_DIGITS); - m_xc = m_xo.newCursor(); - toNextTokenOfType(m_xc, TokenType.NAMESPACE); - char[] buf = new char[5]; - assertEquals(0, m_xc.getChars(buf, 3, 4)); + void testGetCharsType2FromNAMESPACE() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_DIGITS)) { + toNextTokenOfType(m_xc, TokenType.NAMESPACE); + char[] buf = new char[5]; + assertEquals(0, m_xc.getChars(buf, 3, 4)); + } } @Test - public void testGetCharsType2FromPROCINST() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_PROCINST); - m_xc = m_xo.newCursor(); - toNextTokenOfType(m_xc, TokenType.PROCINST); - char[] buf = new char[5]; - assertEquals(0, m_xc.getChars(buf, 3, 4)); + void testGetCharsType2FromPROCINST() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_PROCINST)) { + toNextTokenOfType(m_xc, TokenType.PROCINST); + char[] buf = new char[5]; + assertEquals(0, m_xc.getChars(buf, 3, 4)); + } } @Test - public void testGetCharsType2FromEND() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_DIGITS); - m_xc = m_xo.newCursor(); - toNextTokenOfType(m_xc, TokenType.END); - char[] buf = new char[5]; - assertEquals(0, m_xc.getChars(buf, 3, 4)); + void testGetCharsType2FromEND() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_DIGITS)) { + toNextTokenOfType(m_xc, TokenType.END); + char[] buf = new char[5]; + assertEquals(0, m_xc.getChars(buf, 3, 4)); + } } @Test - public void testGetCharsType2FromENDDOC() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_DIGITS); - m_xc = m_xo.newCursor(); - m_xc.toEndDoc(); - char[] buf = new char[5]; - assertEquals(0, m_xc.getChars(buf, 3, 4)); + void testGetCharsType2FromENDDOC() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_DIGITS)) { + m_xc.toEndDoc(); + char[] buf = new char[5]; + assertEquals(0, m_xc.getChars(buf, 3, 4)); + } } @Test - public void testGetCharsType2FromCOMMENT() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_COMMENT); - m_xc = m_xo.newCursor(); - m_xc.toEndDoc(); - char[] buf = new char[5]; - assertEquals(0, m_xc.getChars(buf, 3, 4)); + void testGetCharsType2FromCOMMENT() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_COMMENT)) { + m_xc.toEndDoc(); + char[] buf = new char[5]; + assertEquals(0, m_xc.getChars(buf, 3, 4)); + } } } Modified: xmlbeans/trunk/src/test/java/xmlcursor/checkin/GetDocChangeStampTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/checkin/GetDocChangeStampTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/xmlcursor/checkin/GetDocChangeStampTest.java (original) +++ xmlbeans/trunk/src/test/java/xmlcursor/checkin/GetDocChangeStampTest.java Sun Feb 6 01:51:55 2022 @@ -17,44 +17,38 @@ package xmlcursor.checkin; import org.apache.xmlbeans.XmlCursor; -import org.apache.xmlbeans.XmlObject; -import org.junit.Test; -import tools.util.JarUtil; -import xmlcursor.common.BasicCursorTestCase; +import org.junit.jupiter.api.Test; import xmlcursor.common.Common; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.*; +import static xmlcursor.common.BasicCursorTestCase.jcur; -public class GetDocChangeStampTest extends BasicCursorTestCase { +public class GetDocChangeStampTest { @Test - public void testGetDocChangeStampHasChanged() throws Exception { - m_xo = XmlObject.Factory.parse( - JarUtil.getResourceFromJar(Common.TRANXML_FILE_XMLCURSOR_PO)); - m_xc = m_xo.newCursor(); - String ns="declare namespace po=\"http://xbean.test/xmlcursor/PurchaseOrder\";";; - - m_xc.selectPath(ns+" $this//po:city"); - m_xc.toNextSelection(); - assertEquals("Mill Valley", m_xc.getTextValue()); - XmlCursor.ChangeStamp cs0 = m_xc.getDocChangeStamp(); - m_xc.setTextValue("Mowed Valley"); - assertEquals("Mowed Valley", m_xc.getTextValue()); - assertEquals(true, cs0.hasChanged()); + void testGetDocChangeStampHasChanged() throws Exception { + try (XmlCursor m_xc = jcur(Common.TRANXML_FILE_XMLCURSOR_PO)) { + String ns = "declare namespace po=\"http://xbean.test/xmlcursor/PurchaseOrder\";";; + + m_xc.selectPath(ns + " $this//po:city"); + m_xc.toNextSelection(); + assertEquals("Mill Valley", m_xc.getTextValue()); + XmlCursor.ChangeStamp cs0 = m_xc.getDocChangeStamp(); + m_xc.setTextValue("Mowed Valley"); + assertEquals("Mowed Valley", m_xc.getTextValue()); + assertTrue(cs0.hasChanged()); + } } @Test - public void testGetDocChangeStampNotChanged() throws Exception { - m_xo = XmlObject.Factory.parse( - JarUtil.getResourceFromJar(Common.TRANXML_FILE_XMLCURSOR_PO)); - String ns="declare namespace po=\"http://xbean.test/xmlcursor/PurchaseOrder\";";; - - m_xc = m_xo.newCursor(); - m_xc.selectPath(ns+" $this//po:city"); - XmlCursor.ChangeStamp cs0 = m_xc.getDocChangeStamp(); - m_xc.toEndDoc(); - assertEquals(false, cs0.hasChanged()); - System.out.println(cs0); + void testGetDocChangeStampNotChanged() throws Exception { + try (XmlCursor m_xc = jcur(Common.TRANXML_FILE_XMLCURSOR_PO)) { + String ns = "declare namespace po=\"http://xbean.test/xmlcursor/PurchaseOrder\";";; + m_xc.selectPath(ns + " $this//po:city"); + XmlCursor.ChangeStamp cs0 = m_xc.getDocChangeStamp(); + m_xc.toEndDoc(); + assertFalse(cs0.hasChanged()); + } } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
