Modified: xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToNextSelectionTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToNextSelectionTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToNextSelectionTest.java (original) +++ xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToNextSelectionTest.java Sun Feb 6 01:51:55 2022 @@ -17,72 +17,74 @@ 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 static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; +import static xmlcursor.common.BasicCursorTestCase.cur; -public class ToNextSelectionTest extends BasicCursorTestCase { +public class ToNextSelectionTest { @Test - public void testToNextSelectionMultipleReturns() throws Exception { + void testToNextSelectionMultipleReturns() throws Exception { String sXml = "<foo><b>0</b><b>1</b><b>2</b><b>3</b><b>4</b><b>5</b><b>6</b></foo>"; - m_xc = XmlObject.Factory.parse(sXml).newCursor(); - m_xc.selectPath("$this//b"); - m_xc.toNextSelection(); - for (int i = 0; i < 6; i++) { - assertEquals("" + i, m_xc.getTextValue()); - assertTrue(m_xc.toNextSelection()); + try (XmlCursor m_xc = cur(sXml)) { + m_xc.selectPath("$this//b"); + m_xc.toNextSelection(); + for (int i = 0; i < 6; i++) { + assertEquals("" + i, m_xc.getTextValue()); + assertTrue(m_xc.toNextSelection()); + } + assertEquals("6", m_xc.getTextValue()); + assertFalse(m_xc.toNextSelection()); } - assertEquals("6", m_xc.getTextValue()); - assertFalse(m_xc.toNextSelection()); } @Test - public void testToNextSelectionAfterClear() throws Exception { + void testToNextSelectionAfterClear() throws Exception { String sXml = "<foo><b>0</b><b>1</b><b>2</b><b>3</b><b>4</b><b>5</b><b>6</b></foo>"; - m_xc = XmlObject.Factory.parse(sXml).newCursor(); - m_xc.selectPath("$this//b"); - m_xc.toNextSelection(); - for (int i = 0; i < 3; i++) { - assertEquals("" + i, m_xc.getTextValue()); - assertTrue(m_xc.toNextSelection()); + try (XmlCursor m_xc = cur(sXml)) { + m_xc.selectPath("$this//b"); + m_xc.toNextSelection(); + for (int i = 0; i < 3; i++) { + assertEquals("" + i, m_xc.getTextValue()); + assertTrue(m_xc.toNextSelection()); + } + m_xc.clearSelections(); + assertEquals("3", m_xc.getTextValue()); + assertFalse(m_xc.toNextSelection()); } - m_xc.clearSelections(); - assertEquals("3", m_xc.getTextValue()); - assertFalse(m_xc.toNextSelection()); } @Test - public void testToNextSelectionBeforeSelect() throws Exception { + void testToNextSelectionBeforeSelect() throws Exception { String sXml = "<foo><b>0</b><b>1</b><b>2</b><b>3</b><b>4</b><b>5</b><b>6</b></foo>"; - m_xc = XmlObject.Factory.parse(sXml).newCursor(); - assertFalse(m_xc.toNextSelection()); - m_xc.selectPath("$this//b"); - m_xc.toNextSelection(); - for (int i = 0; i < 6; i++) { - assertEquals("" + i, m_xc.getTextValue()); - assertTrue(m_xc.toNextSelection()); + try (XmlCursor m_xc = cur(sXml)) { + assertFalse(m_xc.toNextSelection()); + m_xc.selectPath("$this//b"); + m_xc.toNextSelection(); + for (int i = 0; i < 6; i++) { + assertEquals("" + i, m_xc.getTextValue()); + assertTrue(m_xc.toNextSelection()); + } + assertEquals("6", m_xc.getTextValue()); + assertFalse(m_xc.toNextSelection()); } - assertEquals("6", m_xc.getTextValue()); - assertFalse(m_xc.toNextSelection()); } @Test - public void testToNextSelectionOtherCursor() throws Exception { + void testToNextSelectionOtherCursor() throws Exception { String sXml = "<foo><b>0</b><b>1</b><b>2</b><b>3</b><b>4</b><b>5</b><b>6</b></foo>"; - m_xc = XmlObject.Factory.parse(sXml).newCursor(); - try (XmlCursor xc0 = m_xc.newCursor()) { + try (XmlCursor m_xc = cur(sXml); + XmlCursor xc0 = m_xc.newCursor()) { m_xc.selectPath("$this//b"); assertFalse(xc0.toNextSelection()); } } @Test - public void testToNextSelectionTwoCursorsDifferentSelections() throws Exception { + void testToNextSelectionTwoCursorsDifferentSelections() throws Exception { String sXml = "<foo><a>X</a><b>0</b><a>Y</a><b>1</b><a>Z</a><b>2</b></foo>"; - m_xc = XmlObject.Factory.parse(sXml).newCursor(); - try (XmlCursor xc0 = m_xc.newCursor()) { + try (XmlCursor m_xc = cur(sXml); + XmlCursor xc0 = m_xc.newCursor()) { xc0.selectPath("$this//a"); xc0.toNextSelection(); assertEquals(3, xc0.getSelectionCount()); @@ -97,10 +99,10 @@ public class ToNextSelectionTest extends } @Test - public void testToNextSelectionTwoCursorsSameSelections() throws Exception { + void testToNextSelectionTwoCursorsSameSelections() throws Exception { String sXml = "<foo><a>X</a><b>0</b><a>Y</a><b>1</b><a>Z</a><b>2</b></foo>"; - m_xc = XmlObject.Factory.parse(sXml).newCursor(); - try (XmlCursor xc0 = m_xc.newCursor()) { + try (XmlCursor m_xc = cur(sXml); + XmlCursor xc0 = m_xc.newCursor()) { xc0.selectPath("$this//b"); xc0.toNextSelection(); assertEquals(3, xc0.getSelectionCount());
Modified: xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToNextSiblingTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToNextSiblingTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToNextSiblingTest.java (original) +++ xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToNextSiblingTest.java Sun Feb 6 01:51:55 2022 @@ -15,126 +15,131 @@ 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.Test; import javax.xml.namespace.QName; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; +import static xmlcursor.common.BasicCursorTestCase.cur; /** * checkin tests for XmlCursor toNextSibling methods * */ -public class ToNextSiblingTest extends BasicCursorTestCase { - private static String xml0 = "<root><a/><b/><c/></root>"; - private static String xml1 = "<root xmlns=\"somenamespace\"><a/><b/><c/></root>"; +public class ToNextSiblingTest { + private static final String xml0 = "<root><a/><b/><c/></root>"; + private static final String xml1 = "<root xmlns=\"somenamespace\"><a/><b/><c/></root>"; /** test toNextSibling(String name) where there is no namespace */ @Test - public void testName() throws Exception { - m_xc = XmlObject.Factory.parse(xml0).newCursor(); - m_xc.toNextToken(); - m_xc.toChild(0); - assertEquals("", m_xc.getName().getNamespaceURI()); - assertEquals("a", m_xc.getName().getLocalPart()); - m_xc.push(); - - // name exists - assertTrue(m_xc.toNextSibling("c")); - assertEquals("", m_xc.getName().getNamespaceURI()); - assertEquals("c", m_xc.getName().getLocalPart()); - m_xc.pop(); - - // name does not exist - assertFalse(m_xc.toNextSibling("d")); - // cursor hasn't moved - assertEquals("", m_xc.getName().getNamespaceURI()); - assertEquals("a", m_xc.getName().getLocalPart()); + void testName() throws Exception { + try (XmlCursor m_xc = cur(xml0)) { + m_xc.toNextToken(); + m_xc.toChild(0); + assertEquals("", m_xc.getName().getNamespaceURI()); + assertEquals("a", m_xc.getName().getLocalPart()); + m_xc.push(); + + // name exists + assertTrue(m_xc.toNextSibling("c")); + assertEquals("", m_xc.getName().getNamespaceURI()); + assertEquals("c", m_xc.getName().getLocalPart()); + m_xc.pop(); + + // name does not exist + assertFalse(m_xc.toNextSibling("d")); + // cursor hasn't moved + assertEquals("", m_xc.getName().getNamespaceURI()); + assertEquals("a", m_xc.getName().getLocalPart()); + } } /** test toNextSibling(String name) where there is a namespace */ @Test - public void testIncompleteName() throws Exception { - m_xc = XmlObject.Factory.parse(xml1).newCursor(); - m_xc.toNextToken(); - m_xc.toChild(0); - assertEquals("somenamespace", m_xc.getName().getNamespaceURI()); - assertEquals("a", m_xc.getName().getLocalPart()); - - // name exists, but is incomplete by itself without the namespace - assertFalse(m_xc.toNextSibling("c")); - assertEquals("somenamespace", m_xc.getName().getNamespaceURI()); - assertEquals("a", m_xc.getName().getLocalPart()); + void testIncompleteName() throws Exception { + try (XmlCursor m_xc = cur(xml1)) { + m_xc.toNextToken(); + m_xc.toChild(0); + assertEquals("somenamespace", m_xc.getName().getNamespaceURI()); + assertEquals("a", m_xc.getName().getLocalPart()); + + // name exists, but is incomplete by itself without the namespace + assertFalse(m_xc.toNextSibling("c")); + assertEquals("somenamespace", m_xc.getName().getNamespaceURI()); + assertEquals("a", m_xc.getName().getLocalPart()); + } } /** test toNextSibling(String namespace, String localname) */ @Test - public void testNamespaceAndLocalName0() throws Exception { - m_xc = XmlObject.Factory.parse(xml0).newCursor(); - m_xc.toNextToken(); - m_xc.toChild(0); - assertEquals("", m_xc.getName().getNamespaceURI()); - assertEquals("a", m_xc.getName().getLocalPart()); - m_xc.push(); - - // name exists - assertTrue(m_xc.toNextSibling("", "c")); - assertEquals("", m_xc.getName().getNamespaceURI()); - assertEquals("c", m_xc.getName().getLocalPart()); - m_xc.pop(); - - // name does not exist - assertFalse(m_xc.toNextSibling("", "d")); - // cursor hasn't moved - assertEquals("", m_xc.getName().getNamespaceURI()); - assertEquals("a", m_xc.getName().getLocalPart()); + void testNamespaceAndLocalName0() throws Exception { + try (XmlCursor m_xc = cur(xml0)) { + m_xc.toNextToken(); + m_xc.toChild(0); + assertEquals("", m_xc.getName().getNamespaceURI()); + assertEquals("a", m_xc.getName().getLocalPart()); + m_xc.push(); + + // name exists + assertTrue(m_xc.toNextSibling("", "c")); + assertEquals("", m_xc.getName().getNamespaceURI()); + assertEquals("c", m_xc.getName().getLocalPart()); + m_xc.pop(); + + // name does not exist + assertFalse(m_xc.toNextSibling("", "d")); + // cursor hasn't moved + assertEquals("", m_xc.getName().getNamespaceURI()); + assertEquals("a", m_xc.getName().getLocalPart()); + } } /** test toNextSibling(String namespace, String localname) */ @Test - public void testNamespaceAndLocalName1() throws Exception { - m_xc = XmlObject.Factory.parse(xml1).newCursor(); - m_xc.toNextToken(); - m_xc.toChild(0); - assertEquals("somenamespace", m_xc.getName().getNamespaceURI()); - assertEquals("a", m_xc.getName().getLocalPart()); - m_xc.push(); - - // name exists - assertTrue(m_xc.toNextSibling("somenamespace", "c")); - assertEquals("somenamespace", m_xc.getName().getNamespaceURI()); - assertEquals("c", m_xc.getName().getLocalPart()); - m_xc.pop(); - - // name does not exist - assertFalse(m_xc.toNextSibling("somenamespace", "d")); - // cursor hasn't moved - assertEquals("somenamespace", m_xc.getName().getNamespaceURI()); - assertEquals("a", m_xc.getName().getLocalPart()); + void testNamespaceAndLocalName1() throws Exception { + try (XmlCursor m_xc = cur(xml1)) { + m_xc.toNextToken(); + m_xc.toChild(0); + assertEquals("somenamespace", m_xc.getName().getNamespaceURI()); + assertEquals("a", m_xc.getName().getLocalPart()); + m_xc.push(); + + // name exists + assertTrue(m_xc.toNextSibling("somenamespace", "c")); + assertEquals("somenamespace", m_xc.getName().getNamespaceURI()); + assertEquals("c", m_xc.getName().getLocalPart()); + m_xc.pop(); + + // name does not exist + assertFalse(m_xc.toNextSibling("somenamespace", "d")); + // cursor hasn't moved + assertEquals("somenamespace", m_xc.getName().getNamespaceURI()); + assertEquals("a", m_xc.getName().getLocalPart()); + } } /** test toNextSibling(QName qName) */ @Test - public void testQName() throws Exception { - m_xc = XmlObject.Factory.parse(xml1).newCursor(); - m_xc.toNextToken(); - m_xc.toChild(0); - assertEquals("somenamespace", m_xc.getName().getNamespaceURI()); - assertEquals("a", m_xc.getName().getLocalPart()); - m_xc.push(); - - // name exists - assertTrue(m_xc.toNextSibling(new QName("somenamespace", "c"))); - assertEquals("somenamespace", m_xc.getName().getNamespaceURI()); - assertEquals("c", m_xc.getName().getLocalPart()); - m_xc.pop(); - - // name does not exist - assertFalse(m_xc.toNextSibling(new QName("somenamespace", "d"))); - // cursor hasn't moved - assertEquals("somenamespace", m_xc.getName().getNamespaceURI()); - assertEquals("a", m_xc.getName().getLocalPart()); + void testQName() throws Exception { + try (XmlCursor m_xc = cur(xml1)) { + m_xc.toNextToken(); + m_xc.toChild(0); + assertEquals("somenamespace", m_xc.getName().getNamespaceURI()); + assertEquals("a", m_xc.getName().getLocalPart()); + m_xc.push(); + + // name exists + assertTrue(m_xc.toNextSibling(new QName("somenamespace", "c"))); + assertEquals("somenamespace", m_xc.getName().getNamespaceURI()); + assertEquals("c", m_xc.getName().getLocalPart()); + m_xc.pop(); + + // name does not exist + assertFalse(m_xc.toNextSibling(new QName("somenamespace", "d"))); + // cursor hasn't moved + assertEquals("somenamespace", m_xc.getName().getNamespaceURI()); + assertEquals("a", m_xc.getName().getLocalPart()); + } } } Modified: xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToParentElementTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToParentElementTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToParentElementTest.java (original) +++ xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToParentElementTest.java Sun Feb 6 01:51:55 2022 @@ -16,75 +16,82 @@ 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 static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; +import static xmlcursor.common.BasicCursorTestCase.cur; +import static xmlcursor.common.BasicCursorTestCase.toNextTokenOfType; -public class ToParentElementTest extends BasicCursorTestCase { +public class ToParentElementTest { @Test - public void testToParentElementFromSTARTDOC() throws Exception { - m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar></foo>").newCursor(); - assertFalse(m_xc.toParent()); - assertEquals(TokenType.STARTDOC, m_xc.currentTokenType()); + void testToParentElementFromSTARTDOC() throws Exception { + try (XmlCursor m_xc = cur("<foo>early<bar>text</bar></foo>")) { + assertFalse(m_xc.toParent()); + assertEquals(TokenType.STARTDOC, m_xc.currentTokenType()); + } } @Test - public void testToParentElementFromFirstChildOfSTARTDOC() throws Exception { - m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar></foo>").newCursor(); - m_xc.toFirstChild(); - assertTrue(m_xc.toParent()); - assertEquals(TokenType.STARTDOC, m_xc.currentTokenType()); + void testToParentElementFromFirstChildOfSTARTDOC() throws Exception { + try (XmlCursor m_xc = cur("<foo>early<bar>text</bar></foo>")) { + m_xc.toFirstChild(); + assertTrue(m_xc.toParent()); + assertEquals(TokenType.STARTDOC, m_xc.currentTokenType()); + } } @Test - public void testToParentElementFromPrevTokenOfENDDOC() throws Exception { - m_xc = XmlObject.Factory.parse("<foo>text</foo>").newCursor(); - m_xc.toEndDoc(); - m_xc.toPrevToken(); - assertEquals(TokenType.END, m_xc.currentTokenType()); + void testToParentElementFromPrevTokenOfENDDOC() throws Exception { + try (XmlCursor m_xc = cur("<foo>text</foo>")) { + m_xc.toEndDoc(); + m_xc.toPrevToken(); + assertEquals(TokenType.END, m_xc.currentTokenType()); - assertTrue(m_xc.toParent()); - assertEquals(TokenType.START, m_xc.currentTokenType()); + assertTrue(m_xc.toParent()); + assertEquals(TokenType.START, m_xc.currentTokenType()); + } } @Test - public void testToParentElementNested() throws Exception { - m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar><char>zap<dar>wap</dar><ear>yap</ear></char></foo>").newCursor(); - m_xc.selectPath("$this//ear"); - m_xc.toNextSelection(); - assertEquals("yap", m_xc.getTextValue()); - assertTrue(m_xc.toParent()); - assertEquals("zapwapyap", m_xc.getTextValue()); + void testToParentElementNested() throws Exception { + try (XmlCursor m_xc = cur("<foo>early<bar>text</bar><char>zap<dar>wap</dar><ear>yap</ear></char></foo>")) { + m_xc.selectPath("$this//ear"); + m_xc.toNextSelection(); + assertEquals("yap", m_xc.getTextValue()); + assertTrue(m_xc.toParent()); + assertEquals("zapwapyap", m_xc.getTextValue()); + } } @Test - public void testToParentElementFromATTR() throws Exception { - m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar><char>zap<dar>wap</dar><ear attr0=\"val0\">yap</ear></char></foo>").newCursor(); - toNextTokenOfType(m_xc, TokenType.ATTR); - assertEquals("val0", m_xc.getTextValue()); - assertTrue(m_xc.toParent()); - assertEquals("yap", m_xc.getTextValue()); - assertTrue(m_xc.toParent()); - assertEquals("zapwapyap", m_xc.getTextValue()); + void testToParentElementFromATTR() throws Exception { + try (XmlCursor m_xc = cur("<foo>early<bar>text</bar><char>zap<dar>wap</dar><ear attr0=\"val0\">yap</ear></char></foo>")) { + toNextTokenOfType(m_xc, TokenType.ATTR); + assertEquals("val0", m_xc.getTextValue()); + assertTrue(m_xc.toParent()); + assertEquals("yap", m_xc.getTextValue()); + assertTrue(m_xc.toParent()); + assertEquals("zapwapyap", m_xc.getTextValue()); + } } @Test - public void testToParentElementFromTEXT() throws Exception { - m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar><char>zap<dar>wap</dar><ear>yap</ear></char></foo>").newCursor(); - m_xc.selectPath("$this//ear"); - m_xc.toNextSelection(); - m_xc.toNextToken(); - assertEquals(TokenType.TEXT, m_xc.currentTokenType()); - assertEquals("yap", m_xc.getChars()); - assertTrue(m_xc.toParent()); - assertEquals("yap", m_xc.getTextValue()); - assertTrue(m_xc.toParent()); - assertEquals("zapwapyap", m_xc.getTextValue()); + void testToParentElementFromTEXT() throws Exception { + try (XmlCursor m_xc = cur("<foo>early<bar>text</bar><char>zap<dar>wap</dar><ear>yap</ear></char></foo>")) { + m_xc.selectPath("$this//ear"); + m_xc.toNextSelection(); + m_xc.toNextToken(); + assertEquals(TokenType.TEXT, m_xc.currentTokenType()); + assertEquals("yap", m_xc.getChars()); + assertTrue(m_xc.toParent()); + assertEquals("yap", m_xc.getTextValue()); + assertTrue(m_xc.toParent()); + assertEquals("zapwapyap", m_xc.getTextValue()); + } } } Modified: xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToPrevAttributeTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToPrevAttributeTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToPrevAttributeTest.java (original) +++ xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToPrevAttributeTest.java Sun Feb 6 01:51:55 2022 @@ -16,63 +16,70 @@ 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.*; +import static org.junit.jupiter.api.Assertions.*; +import static xmlcursor.common.BasicCursorTestCase.cur; +import static xmlcursor.common.BasicCursorTestCase.toNextTokenOfType; -public class ToPrevAttributeTest extends BasicCursorTestCase { +public class ToPrevAttributeTest { @Test - public void testtoPrevAttrFromSTART() throws Exception { - m_xc = XmlObject.Factory.parse(Common.XML_FOO_2ATTR_TEXT).newCursor(); - toNextTokenOfType(m_xc, TokenType.START); - assertFalse(m_xc.toPrevAttribute()); + void testtoPrevAttrFromSTART() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_2ATTR_TEXT)) { + toNextTokenOfType(m_xc, TokenType.START); + assertFalse(m_xc.toPrevAttribute()); + } } @Test - public void testtoPrevAttrFromSingleATTR() throws Exception { - m_xc = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT).newCursor(); - toNextTokenOfType(m_xc, TokenType.ATTR); - assertFalse(m_xc.toPrevAttribute()); - assertEquals("val0", m_xc.getTextValue()); + void testtoPrevAttrFromSingleATTR() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_1ATTR_TEXT)) { + toNextTokenOfType(m_xc, TokenType.ATTR); + assertFalse(m_xc.toPrevAttribute()); + assertEquals("val0", m_xc.getTextValue()); + } } @Test - public void testtoPrevAttrWithSiblings() throws Exception { - m_xc = XmlObject.Factory.parse(Common.XML_FOO_2ATTR_TEXT).newCursor(); - toNextTokenOfType(m_xc, TokenType.ATTR); - toNextTokenOfType(m_xc, TokenType.ATTR); - assertEquals("val1", m_xc.getTextValue()); - assertTrue(m_xc.toPrevAttribute()); - assertEquals("val0", m_xc.getTextValue()); + void testtoPrevAttrWithSiblings() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_2ATTR_TEXT)) { + toNextTokenOfType(m_xc, TokenType.ATTR); + toNextTokenOfType(m_xc, TokenType.ATTR); + assertEquals("val1", m_xc.getTextValue()); + assertTrue(m_xc.toPrevAttribute()); + assertEquals("val0", m_xc.getTextValue()); + } } @Test - public void testtoPrevAttrFromFirstSibling() throws Exception { - m_xc = XmlObject.Factory.parse(Common.XML_FOO_2ATTR_TEXT).newCursor(); - toNextTokenOfType(m_xc, TokenType.ATTR); - assertFalse(m_xc.toPrevAttribute()); - assertEquals("val0", m_xc.getTextValue()); + void testtoPrevAttrFromFirstSibling() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_2ATTR_TEXT)) { + toNextTokenOfType(m_xc, TokenType.ATTR); + assertFalse(m_xc.toPrevAttribute()); + assertEquals("val0", m_xc.getTextValue()); + } } @Test - public void testtoPrevAttrWithXMLNS() throws Exception { - m_xc = XmlObject.Factory.parse("<foo attr0=\"val0\" xmlns=\"uri\" attr1=\"val1\">text</foo>").newCursor(); - toNextTokenOfType(m_xc, TokenType.ATTR); - toNextTokenOfType(m_xc, TokenType.ATTR); - assertEquals("val1", m_xc.getTextValue()); - assertTrue(m_xc.toPrevAttribute()); - assertEquals("val0", m_xc.getTextValue()); - assertFalse(m_xc.toPrevAttribute()); + void testtoPrevAttrWithXMLNS() throws Exception { + try (XmlCursor m_xc = cur("<foo attr0=\"val0\" xmlns=\"uri\" attr1=\"val1\">text</foo>")) { + toNextTokenOfType(m_xc, TokenType.ATTR); + toNextTokenOfType(m_xc, TokenType.ATTR); + assertEquals("val1", m_xc.getTextValue()); + assertTrue(m_xc.toPrevAttribute()); + assertEquals("val0", m_xc.getTextValue()); + assertFalse(m_xc.toPrevAttribute()); + } } @Test - public void testtoPrevAttrFromTEXT() throws Exception { - m_xc = XmlObject.Factory.parse(Common.XML_FOO_2ATTR_TEXT).newCursor(); - toNextTokenOfType(m_xc, TokenType.TEXT); - assertFalse(m_xc.toPrevAttribute()); + void testtoPrevAttrFromTEXT() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_2ATTR_TEXT)) { + toNextTokenOfType(m_xc, TokenType.TEXT); + assertFalse(m_xc.toPrevAttribute()); + } } } Modified: xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToPrevBookmarkTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToPrevBookmarkTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToPrevBookmarkTest.java (original) +++ xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToPrevBookmarkTest.java Sun Feb 6 01:51:55 2022 @@ -18,94 +18,94 @@ 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.*; +import static org.junit.jupiter.api.Assertions.*; +import static xmlcursor.common.BasicCursorTestCase.cur; +import static xmlcursor.common.BasicCursorTestCase.toNextTokenOfType; -public class ToPrevBookmarkTest extends BasicCursorTestCase { - private SimpleBookmark _theBookmark = new SimpleBookmark("value"); - private SimpleBookmark _theBookmark1 = new SimpleBookmark("value1"); - private DifferentBookmark _difBookmark = new DifferentBookmark("diff"); +public class ToPrevBookmarkTest { + private static final SimpleBookmark _theBookmark = new SimpleBookmark("value"); + private static final SimpleBookmark _theBookmark1 = new SimpleBookmark("value1"); + private static final DifferentBookmark _difBookmark = new DifferentBookmark("diff"); @Test - public void testToPrevBookmarkSameKey() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_TEXT); - m_xc = m_xo.newCursor(); - toNextTokenOfType(m_xc, TokenType.START); - m_xc.setBookmark(_theBookmark); - try (XmlCursor xc0 = m_xc.newCursor()) { - toNextTokenOfType(m_xc, TokenType.END); - m_xc.setBookmark(_theBookmark1); - try (XmlCursor xc1 = m_xc.newCursor()) { - m_xc.toEndDoc(); - - assertEquals(_theBookmark1, m_xc.toPrevBookmark(SimpleBookmark.class)); - assertTrue(m_xc.isAtSamePositionAs(xc1)); - assertEquals(_theBookmark, m_xc.toPrevBookmark(SimpleBookmark.class)); - assertTrue(m_xc.isAtSamePositionAs(xc0)); - assertNull(m_xc.toPrevBookmark(SimpleBookmark.class)); + void testToPrevBookmarkSameKey() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_TEXT)) { + toNextTokenOfType(m_xc, TokenType.START); + m_xc.setBookmark(_theBookmark); + try (XmlCursor xc0 = m_xc.newCursor()) { + toNextTokenOfType(m_xc, TokenType.END); + m_xc.setBookmark(_theBookmark1); + try (XmlCursor xc1 = m_xc.newCursor()) { + m_xc.toEndDoc(); + + assertEquals(_theBookmark1, m_xc.toPrevBookmark(SimpleBookmark.class)); + assertTrue(m_xc.isAtSamePositionAs(xc1)); + assertEquals(_theBookmark, m_xc.toPrevBookmark(SimpleBookmark.class)); + assertTrue(m_xc.isAtSamePositionAs(xc0)); + assertNull(m_xc.toPrevBookmark(SimpleBookmark.class)); + } } } } @Test - public void testToPrevBookmarkInvalidKey() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_TEXT); - m_xc = m_xo.newCursor(); - toNextTokenOfType(m_xc, TokenType.START); - m_xc.setBookmark(_theBookmark); - toNextTokenOfType(m_xc, TokenType.END); - m_xc.setBookmark(_theBookmark1); - m_xc.toEndDoc(); - assertNull(m_xc.toPrevBookmark(Object.class)); + void testToPrevBookmarkInvalidKey() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_TEXT)) { + toNextTokenOfType(m_xc, TokenType.START); + m_xc.setBookmark(_theBookmark); + toNextTokenOfType(m_xc, TokenType.END); + m_xc.setBookmark(_theBookmark1); + m_xc.toEndDoc(); + assertNull(m_xc.toPrevBookmark(Object.class)); + } } @Test - public void testToPrevBookmarkDifferentKeys() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_TEXT); - m_xc = m_xo.newCursor(); - toNextTokenOfType(m_xc, TokenType.START); - m_xc.setBookmark(_theBookmark); - try (XmlCursor xc0 = m_xc.newCursor()) { - toNextTokenOfType(m_xc, TokenType.END); - m_xc.setBookmark(_difBookmark); - - try (XmlCursor xc1 = m_xc.newCursor()) { - m_xc.toEndDoc(); - - assertEquals(_difBookmark, m_xc.toPrevBookmark(DifferentBookmark.class)); - assertTrue(m_xc.isAtSamePositionAs(xc1)); - assertNull(m_xc.toPrevBookmark(DifferentBookmark.class)); - assertEquals(_theBookmark, m_xc.toPrevBookmark(SimpleBookmark.class)); - assertTrue(m_xc.isAtSamePositionAs(xc0)); + void testToPrevBookmarkDifferentKeys() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_TEXT)) { + toNextTokenOfType(m_xc, TokenType.START); + m_xc.setBookmark(_theBookmark); + try (XmlCursor xc0 = m_xc.newCursor()) { + toNextTokenOfType(m_xc, TokenType.END); + m_xc.setBookmark(_difBookmark); + + try (XmlCursor xc1 = m_xc.newCursor()) { + m_xc.toEndDoc(); + + assertEquals(_difBookmark, m_xc.toPrevBookmark(DifferentBookmark.class)); + assertTrue(m_xc.isAtSamePositionAs(xc1)); + assertNull(m_xc.toPrevBookmark(DifferentBookmark.class)); + assertEquals(_theBookmark, m_xc.toPrevBookmark(SimpleBookmark.class)); + assertTrue(m_xc.isAtSamePositionAs(xc0)); + } } } } @Test - public void testToPrevBookmarkPostSetTextValue() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_TEXT); - m_xc = m_xo.newCursor(); - toNextTokenOfType(m_xc, TokenType.TEXT); - m_xc.toNextChar(2); - assertEquals("xt", m_xc.getChars()); - m_xc.setBookmark(_theBookmark); // set bm in middle of TEXT - try (XmlCursor xc1 = m_xc.newCursor()) { - xc1.toEndDoc(); - m_xc.toPrevToken(); - m_xc.setTextValue("changed"); // changes text, should destroy bm - m_xc.toEndDoc(); + void testToPrevBookmarkPostSetTextValue() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_TEXT)) { + toNextTokenOfType(m_xc, TokenType.TEXT); + m_xc.toNextChar(2); + assertEquals("xt", m_xc.getChars()); + m_xc.setBookmark(_theBookmark); // set bm in middle of TEXT + try (XmlCursor xc1 = m_xc.newCursor()) { + xc1.toEndDoc(); + m_xc.toPrevToken(); + m_xc.setTextValue("changed"); // changes text, should destroy bm + m_xc.toEndDoc(); - assertNull(xc1.toPrevBookmark(SimpleBookmark.class)); - assertEquals(TokenType.ENDDOC, xc1.currentTokenType()); + assertNull(xc1.toPrevBookmark(SimpleBookmark.class)); + assertEquals(TokenType.ENDDOC, xc1.currentTokenType()); + } } } - public class SimpleBookmark extends XmlCursor.XmlBookmark { + private static class SimpleBookmark extends XmlCursor.XmlBookmark { public String text; SimpleBookmark(String text) { @@ -113,7 +113,7 @@ public class ToPrevBookmarkTest extends } } - public class DifferentBookmark extends XmlCursor.XmlBookmark { + private static class DifferentBookmark extends XmlCursor.XmlBookmark { public String text; DifferentBookmark(String text) { Modified: xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToPrevCharTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToPrevCharTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToPrevCharTest.java (original) +++ xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToPrevCharTest.java Sun Feb 6 01:51:55 2022 @@ -16,67 +16,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.junit.jupiter.api.Test; -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 ToPrevCharTest extends BasicCursorTestCase { +public class ToPrevCharTest { @Test - public void testToPrevCharNegative() throws Exception { - m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar></foo>").newCursor(); - toNextTokenOfType(m_xc, TokenType.TEXT); - m_xc.toNextToken(); - assertEquals("text", m_xc.getTextValue()); - assertEquals(5, m_xc.toPrevChar(-1)); - assertEquals(TokenType.TEXT, m_xc.currentTokenType()); - assertEquals("early", m_xc.getChars()); + void testToPrevCharNegative() throws Exception { + try (XmlCursor m_xc = cur("<foo>early<bar>text</bar></foo>")) { + toNextTokenOfType(m_xc, TokenType.TEXT); + m_xc.toNextToken(); + assertEquals("text", m_xc.getTextValue()); + assertEquals(5, m_xc.toPrevChar(-1)); + assertEquals(TokenType.TEXT, m_xc.currentTokenType()); + assertEquals("early", m_xc.getChars()); + } } @Test - public void testToPrevCharGTLength() throws Exception { - m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar></foo>").newCursor(); - toNextTokenOfType(m_xc, TokenType.TEXT); - m_xc.toNextToken(); - assertEquals("text", m_xc.getTextValue()); - assertEquals(5, m_xc.toPrevChar(999)); - assertEquals(TokenType.TEXT, m_xc.currentTokenType()); - assertEquals("early", m_xc.getChars()); + void testToPrevCharGTLength() throws Exception { + try (XmlCursor m_xc = cur("<foo>early<bar>text</bar></foo>")) { + toNextTokenOfType(m_xc, TokenType.TEXT); + m_xc.toNextToken(); + assertEquals("text", m_xc.getTextValue()); + assertEquals(5, m_xc.toPrevChar(999)); + assertEquals(TokenType.TEXT, m_xc.currentTokenType()); + assertEquals("early", m_xc.getChars()); + } } @Test - public void testToPrevCharLTLength() throws Exception { - m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar></foo>").newCursor(); - toNextTokenOfType(m_xc, TokenType.TEXT); - m_xc.toNextToken(); - assertEquals("text", m_xc.getTextValue()); - assertEquals(3, m_xc.toPrevChar(3)); - assertEquals(TokenType.TEXT, m_xc.currentTokenType()); - assertEquals("rly", m_xc.getChars()); + void testToPrevCharLTLength() throws Exception { + try (XmlCursor m_xc = cur("<foo>early<bar>text</bar></foo>")) { + toNextTokenOfType(m_xc, TokenType.TEXT); + m_xc.toNextToken(); + assertEquals("text", m_xc.getTextValue()); + assertEquals(3, m_xc.toPrevChar(3)); + assertEquals(TokenType.TEXT, m_xc.currentTokenType()); + assertEquals("rly", m_xc.getChars()); + } } @Test - public void testToPrevCharZero() throws Exception { - m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar></foo>").newCursor(); - toNextTokenOfType(m_xc, TokenType.TEXT); - m_xc.toNextToken(); - assertEquals("text", m_xc.getTextValue()); - assertEquals(0, m_xc.toPrevChar(0)); - assertEquals(TokenType.START, m_xc.currentTokenType()); - assertEquals("text", m_xc.getTextValue()); + void testToPrevCharZero() throws Exception { + try (XmlCursor m_xc = cur("<foo>early<bar>text</bar></foo>")) { + toNextTokenOfType(m_xc, TokenType.TEXT); + m_xc.toNextToken(); + assertEquals("text", m_xc.getTextValue()); + assertEquals(0, m_xc.toPrevChar(0)); + assertEquals(TokenType.START, m_xc.currentTokenType()); + assertEquals("text", m_xc.getTextValue()); + } } @Test - public void testToPrevCharFromATTR() throws Exception { - m_xc = XmlObject.Factory.parse("<foo attr0=\"val0\">early<bar>text</bar></foo>").newCursor(); - toNextTokenOfType(m_xc, TokenType.ATTR); - assertEquals("val0", m_xc.getTextValue()); - assertEquals(0, m_xc.toPrevChar(2)); - assertEquals(TokenType.ATTR, m_xc.currentTokenType()); - assertEquals("val0", m_xc.getTextValue()); + void testToPrevCharFromATTR() throws Exception { + try (XmlCursor m_xc = cur("<foo attr0=\"val0\">early<bar>text</bar></foo>")) { + toNextTokenOfType(m_xc, TokenType.ATTR); + assertEquals("val0", m_xc.getTextValue()); + assertEquals(0, m_xc.toPrevChar(2)); + assertEquals(TokenType.ATTR, m_xc.currentTokenType()); + assertEquals("val0", m_xc.getTextValue()); + } } } Modified: xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToPrevElementTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToPrevElementTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToPrevElementTest.java (original) +++ xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToPrevElementTest.java Sun Feb 6 01:51:55 2022 @@ -18,25 +18,26 @@ 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 static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; +import static xmlcursor.common.BasicCursorTestCase.cur; +import static xmlcursor.common.BasicCursorTestCase.toNextTokenOfType; -public class ToPrevElementTest extends BasicCursorTestCase { +public class ToPrevElementTest { @Test - public void testToPrevElementFromSTARTDOC() throws Exception { - m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar></foo>").newCursor(); - assertFalse(m_xc.toPrevSibling()); - assertEquals(TokenType.STARTDOC, m_xc.currentTokenType()); + void testToPrevElementFromSTARTDOC() throws Exception { + try (XmlCursor m_xc = cur("<foo>early<bar>text</bar></foo>")) { + assertFalse(m_xc.toPrevSibling()); + assertEquals(TokenType.STARTDOC, m_xc.currentTokenType()); + } } @Test - public void testToPrevElementFromENDDOC() throws Exception { - m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar></foo>").newCursor(); - try (XmlCursor xc0 = m_xc.newCursor()) { + void testToPrevElementFromENDDOC() throws Exception { + try (XmlCursor m_xc = cur("<foo>early<bar>text</bar></foo>"); + XmlCursor xc0 = m_xc.newCursor()) { xc0.toFirstChild(); m_xc.toEndDoc(); m_xc.toPrevSibling(); @@ -46,33 +47,36 @@ public class ToPrevElementTest extends B } @Test - public void testToPrevElementSiblings() throws Exception { - m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar><char>zap<dar>wap</dar><ear>yap</ear></char></foo>").newCursor(); - m_xc.selectPath("$this//ear"); - m_xc.toNextSelection(); - assertEquals("yap", m_xc.getTextValue()); - assertTrue(m_xc.toPrevSibling()); - assertEquals("wap", m_xc.getTextValue()); - assertFalse(m_xc.toPrevSibling()); + void testToPrevElementSiblings() throws Exception { + try (XmlCursor m_xc = cur("<foo>early<bar>text</bar><char>zap<dar>wap</dar><ear>yap</ear></char></foo>")) { + m_xc.selectPath("$this//ear"); + m_xc.toNextSelection(); + assertEquals("yap", m_xc.getTextValue()); + assertTrue(m_xc.toPrevSibling()); + assertEquals("wap", m_xc.getTextValue()); + assertFalse(m_xc.toPrevSibling()); + } } @Test - public void testToPrevElementFromATTR() throws Exception { - m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar><char>zap<dar>wap</dar><ear attr0=\"val0\">yap</ear></char></foo>").newCursor(); - toNextTokenOfType(m_xc, TokenType.ATTR); - assertEquals("val0", m_xc.getTextValue()); - assertFalse(m_xc.toPrevSibling()); + void testToPrevElementFromATTR() throws Exception { + try (XmlCursor m_xc = cur("<foo>early<bar>text</bar><char>zap<dar>wap</dar><ear attr0=\"val0\">yap</ear></char></foo>")) { + toNextTokenOfType(m_xc, TokenType.ATTR); + assertEquals("val0", m_xc.getTextValue()); + assertFalse(m_xc.toPrevSibling()); + } } @Test - public void testToPrevElementFromTEXT() throws Exception { - m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar><char>zap<dar>wap</dar><ear><a/>yap</ear></char></foo>").newCursor(); - m_xc.selectPath("$this//ear"); - m_xc.toNextSelection(); - toNextTokenOfType(m_xc, TokenType.TEXT); - assertEquals("yap", m_xc.getChars()); - assertTrue(m_xc.toPrevSibling()); - assertEquals("", m_xc.getTextValue()); + void testToPrevElementFromTEXT() throws Exception { + try (XmlCursor m_xc = cur("<foo>early<bar>text</bar><char>zap<dar>wap</dar><ear><a/>yap</ear></char></foo>")) { + m_xc.selectPath("$this//ear"); + m_xc.toNextSelection(); + toNextTokenOfType(m_xc, TokenType.TEXT); + assertEquals("yap", m_xc.getChars()); + assertTrue(m_xc.toPrevSibling()); + assertEquals("", m_xc.getTextValue()); + } } } Modified: xmlbeans/trunk/src/test/java/xmlcursor/checkin/TokensTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/checkin/TokensTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/xmlcursor/checkin/TokensTest.java (original) +++ xmlbeans/trunk/src/test/java/xmlcursor/checkin/TokensTest.java Sun Feb 6 01:51:55 2022 @@ -16,135 +16,136 @@ 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.*; +import static org.junit.jupiter.api.Assertions.*; +import static xmlcursor.common.BasicCursorTestCase.cur; +import static xmlcursor.common.BasicCursorTestCase.toNextTokenOfType; -public class TokensTest extends BasicCursorTestCase { +public class TokensTest { @Test - public void testHasNextToken() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT); - m_xc = m_xo.newCursor(); - toNextTokenOfType(m_xc, TokenType.TEXT); - assertTrue(m_xc.hasNextToken()); + void testHasNextToken() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_1ATTR_TEXT)) { + toNextTokenOfType(m_xc, TokenType.TEXT); + assertTrue(m_xc.hasNextToken()); + } } @Test - public void testHasNextTokenENDDOC() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT); - m_xc = m_xo.newCursor(); - m_xc.toEndDoc(); - assertFalse(m_xc.hasNextToken()); + void testHasNextTokenENDDOC() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_1ATTR_TEXT)) { + m_xc.toEndDoc(); + assertFalse(m_xc.hasNextToken()); + } } @Test - public void testHasPrevToken() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT); - m_xc = m_xo.newCursor(); - toNextTokenOfType(m_xc, TokenType.TEXT); - assertTrue(m_xc.hasPrevToken()); + void testHasPrevToken() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_1ATTR_TEXT)) { + toNextTokenOfType(m_xc, TokenType.TEXT); + assertTrue(m_xc.hasPrevToken()); + } } @Test - public void testHasPrevTokenSTARTDOC() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT); - m_xc = m_xo.newCursor(); - assertFalse(m_xc.hasPrevToken()); + void testHasPrevTokenSTARTDOC() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_1ATTR_TEXT)) { + assertFalse(m_xc.hasPrevToken()); + } } @Test - public void testToEndTokenFromSTARTDOC() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT); - m_xc = m_xo.newCursor(); - assertEquals(TokenType.ENDDOC, m_xc.toEndToken()); + void testToEndTokenFromSTARTDOC() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_1ATTR_TEXT)) { + assertEquals(TokenType.ENDDOC, m_xc.toEndToken()); + } } @Test - public void testToEndTokenFromSTART() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT); - m_xc = m_xo.newCursor(); - toNextTokenOfType(m_xc, TokenType.START); - assertEquals(TokenType.END, m_xc.toEndToken()); + void testToEndTokenFromSTART() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_1ATTR_TEXT)) { + toNextTokenOfType(m_xc, TokenType.START); + assertEquals(TokenType.END, m_xc.toEndToken()); + } } @Test - public void testToEndTokenFromTEXTmiddle() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT); - m_xc = m_xo.newCursor(); - toNextTokenOfType(m_xc, TokenType.TEXT); - m_xc.toNextChar(1); - assertEquals(TokenType.NONE, m_xc.toEndToken()); + void testToEndTokenFromTEXTmiddle() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_1ATTR_TEXT)) { + toNextTokenOfType(m_xc, TokenType.TEXT); + m_xc.toNextChar(1); + assertEquals(TokenType.NONE, m_xc.toEndToken()); + } } @Test - public void testToFirstContentTokenFromSTARTDOC() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT); - m_xc = m_xo.newCursor(); - m_xc.toFirstContentToken(); - assertEquals(TokenType.START, m_xc.currentTokenType()); + void testToFirstContentTokenFromSTARTDOC() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_1ATTR_TEXT)) { + m_xc.toFirstContentToken(); + assertEquals(TokenType.START, m_xc.currentTokenType()); + } } @Test - public void testToFirstContentTokenFromATTR() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT); - m_xc = m_xo.newCursor(); - toNextTokenOfType(m_xc, TokenType.ATTR); - assertEquals(TokenType.NONE, m_xc.toFirstContentToken()); - assertEquals(TokenType.ATTR, m_xc.currentTokenType()); + void testToFirstContentTokenFromATTR() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_1ATTR_TEXT)) { + toNextTokenOfType(m_xc, TokenType.ATTR); + assertEquals(TokenType.NONE, m_xc.toFirstContentToken()); + assertEquals(TokenType.ATTR, m_xc.currentTokenType()); + } } @Test - public void testToFirstContentTokenFromSTARTwithContent() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT); - m_xc = m_xo.newCursor(); - toNextTokenOfType(m_xc, TokenType.START); - assertEquals(TokenType.TEXT, m_xc.toFirstContentToken()); + void testToFirstContentTokenFromSTARTwithContent() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_1ATTR_TEXT)) { + toNextTokenOfType(m_xc, TokenType.START); + assertEquals(TokenType.TEXT, m_xc.toFirstContentToken()); + } } @Test - public void testToFirstContentTokenFromSTARTwithoutContent() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_1ATTR); - m_xc = m_xo.newCursor(); - toNextTokenOfType(m_xc, TokenType.START); - assertEquals(TokenType.END, m_xc.toFirstContentToken()); + void testToFirstContentTokenFromSTARTwithoutContent() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_1ATTR)) { + toNextTokenOfType(m_xc, TokenType.START); + assertEquals(TokenType.END, m_xc.toFirstContentToken()); + } } @Test - public void testToNextTokenFromENDDOC() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT); - m_xc = m_xo.newCursor(); - m_xc.toEndDoc(); - assertEquals(TokenType.NONE, m_xc.toNextToken()); + void testToNextTokenFromENDDOC() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_1ATTR_TEXT)) { + m_xc.toEndDoc(); + assertEquals(TokenType.NONE, m_xc.toNextToken()); + } } @Test - public void testToNextTokenNAMESPACE() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_NS); - m_xc = m_xo.newCursor(); - toNextTokenOfType(m_xc, TokenType.START); - assertEquals(TokenType.NAMESPACE, m_xc.toNextToken()); + void testToNextTokenNAMESPACE() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_NS)) { + toNextTokenOfType(m_xc, TokenType.START); + assertEquals(TokenType.NAMESPACE, m_xc.toNextToken()); + } } @Test - public void testToPrevTokenSTARTDOC() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT); - m_xc = m_xo.newCursor(); - assertEquals(TokenType.NONE, m_xc.toPrevToken()); - assertEquals(TokenType.STARTDOC, m_xc.currentTokenType()); + void testToPrevTokenSTARTDOC() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_1ATTR_TEXT)) { + assertEquals(TokenType.NONE, m_xc.toPrevToken()); + assertEquals(TokenType.STARTDOC, m_xc.currentTokenType()); + } } @Test - public void testToPrevTokenENDDOC() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT); - m_xc = m_xo.newCursor(); - m_xc.toEndDoc(); - assertEquals(TokenType.END, m_xc.toPrevToken()); + void testToPrevTokenENDDOC() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_1ATTR_TEXT)) { + m_xc.toEndDoc(); + assertEquals(TokenType.END, m_xc.toPrevToken()); + } } } Modified: xmlbeans/trunk/src/test/java/xmlcursor/common/BasicCursorTestCase.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/common/BasicCursorTestCase.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/xmlcursor/common/BasicCursorTestCase.java (original) +++ xmlbeans/trunk/src/test/java/xmlcursor/common/BasicCursorTestCase.java Sun Feb 6 01:51:55 2022 @@ -19,26 +19,19 @@ package xmlcursor.common; import org.apache.xmlbeans.XmlCursor; import org.apache.xmlbeans.XmlCursor.TokenType; +import org.apache.xmlbeans.XmlException; import org.apache.xmlbeans.XmlObject; -import org.junit.After; +import org.apache.xmlbeans.XmlOptions; +import tools.util.JarUtil; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import java.io.IOException; -public class BasicCursorTestCase { - protected XmlObject m_xo; - protected XmlCursor m_xc; - - @After - public void tearDown() throws Exception { - m_xo = null; - if (m_xc != null) { - m_xc.close(); - m_xc = null; - } - } +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; + +public final class BasicCursorTestCase { - public void toNextTokenOfType(XmlCursor xc, TokenType tt) throws IllegalArgumentException { + public static void toNextTokenOfType(XmlCursor xc, TokenType tt) throws IllegalArgumentException { if (xc == null) { throw new IllegalArgumentException("Invalid argument: null XmlCursor"); } else if (tt == null) { @@ -52,12 +45,12 @@ public class BasicCursorTestCase { assertEquals(tt, xc.currentTokenType()); } - public XmlCursor toNextTokenOfTypeCursor(XmlCursor xc, TokenType tt) throws IllegalArgumentException { + public static XmlCursor toNextTokenOfTypeCursor(XmlCursor xc, TokenType tt) throws IllegalArgumentException { toNextTokenOfType(xc, tt); return xc.newCursor(); } - public void toPrevTokenOfType(XmlCursor xc, TokenType tt) + public static void toPrevTokenOfType(XmlCursor xc, TokenType tt) throws IllegalArgumentException { if (xc == null) { throw new IllegalArgumentException("Invalid argument: null XmlCursor"); @@ -82,7 +75,7 @@ public class BasicCursorTestCase { * * */ - public void compareDocTokens(XmlCursor a, XmlCursor b) { + public static void compareDocTokens(XmlCursor a, XmlCursor b) { while (a.hasNextToken() && b.hasNextToken()) { TokenType ttOrig = a.currentTokenType(); TokenType ttRoundTrip = b.currentTokenType(); @@ -97,5 +90,24 @@ public class BasicCursorTestCase { } } + public static XmlCursor jcur(String xml) throws XmlException, IOException { + return jobj(xml).newCursor(); + } + + public static XmlObject jobj(String xml) throws XmlException, IOException { + return obj(JarUtil.getResourceFromJar(xml)); + } + + public static XmlObject jobj(String xml, XmlOptions map) throws XmlException, IOException { + return XmlObject.Factory.parse(JarUtil.getResourceFromJar(xml), map); + } + + public static XmlCursor cur(String xml) throws XmlException { + return obj(xml).newCursor(); + } + + public static XmlObject obj(String xml) throws XmlException { + return XmlObject.Factory.parse(xml); + } } Modified: xmlbeans/trunk/src/test/java/xmlcursor/common/Common.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/common/Common.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/xmlcursor/common/Common.java (original) +++ xmlbeans/trunk/src/test/java/xmlcursor/common/Common.java Sun Feb 6 01:51:55 2022 @@ -19,46 +19,46 @@ package xmlcursor.common; -public class Common { - public final static String XMLFRAG_BEGINTAG = "<xml-fragment>"; - public final static String XMLFRAG_ENDTAG = "</xml-fragment>"; - - public final static String XML_FOO = "<foo></foo>"; - public final static String XML_FOO_1ATTR = "<foo attr0=\"val0\"></foo>"; - public final static String XML_FOO_TEXT = "<foo>text</foo>"; - public final static String XML_FOO_1ATTR_TEXT = "<foo attr0=\"val0\">text</foo>"; - public final static String XML_FOO_2ATTR = "<foo attr0=\"val0\" attr1=\"val1\"></foo>"; - public final static String XML_FOO_2ATTR_TEXT = "<foo attr0=\"val0\" attr1=\"val1\">text</foo>"; - public final static String XML_FOO_5ATTR_TEXT = "<foo attr0=\"val0\" attr1=\"val1\" attr2=\"val2\" attr3=\"val3\" attr4=\"val4\">text</foo>"; - public final static String XML_FOO_BAR = "<foo><bar></bar></foo>"; - public final static String XML_FOO_BAR_TEXT = "<foo><bar>text</bar></foo>"; - public final static String XML_FOO_BAR_TEXT_EXT = "<foo><bar>text</bar>extended</foo>"; - public final static String XML_FOO_BAR_WS_TEXT = "<foo><bar> text </bar> ws \\r\\n </foo>"; - public final static String XML_FOO_BAR_WS_ONLY = "<foo> <bar> </bar> </foo>"; - public final static String XML_FOO_NS = "<foo xmlns=\"http://www.foo.org\";></foo>"; - public final static String XML_FOO_NS_PREFIX = "<foo xmlns:edi='http://ecommerce.org/schema'><!-- the 'price' element's namespace is http://ecommerce.org/schema --> <edi:price units='Euro'>32.18</edi:price></foo>"; - public final static String XML_FOO_BAR_NESTED_SIBLINGS = "<foo attr0=\"val0\"><bar>text0<zed>nested0</zed></bar><bar>text1<zed>nested1</zed></bar></foo>"; - public final static String XML_FOO_PROCINST = "<?xml-stylesheet type=\"text/xsl\" xmlns=\"http://openuri.org/shipping/\";?><foo>text</foo>"; - public final static String XML_FOO_COMMENT = "<!-- comment text --><foo>text</foo>"; - public final static String XML_FOO_DIGITS = "<foo xmlns=\"http://www.foo.org\"; attr0=\"val0\">01234</foo>"; - public final static String XML_TEXT_MIDDLE = "<foo><bar>text</bar>extended<goo>text1</goo></foo>"; - - public final static String XML_ATTR_TEXT = "<foo x=\"y\">ab</foo> "; +public interface Common { + String XMLFRAG_BEGINTAG = "<xml-fragment>"; + String XMLFRAG_ENDTAG = "</xml-fragment>"; + + String XML_FOO = "<foo></foo>"; + String XML_FOO_1ATTR = "<foo attr0=\"val0\"></foo>"; + String XML_FOO_TEXT = "<foo>text</foo>"; + String XML_FOO_1ATTR_TEXT = "<foo attr0=\"val0\">text</foo>"; + String XML_FOO_2ATTR = "<foo attr0=\"val0\" attr1=\"val1\"></foo>"; + String XML_FOO_2ATTR_TEXT = "<foo attr0=\"val0\" attr1=\"val1\">text</foo>"; + String XML_FOO_5ATTR_TEXT = "<foo attr0=\"val0\" attr1=\"val1\" attr2=\"val2\" attr3=\"val3\" attr4=\"val4\">text</foo>"; + String XML_FOO_BAR = "<foo><bar></bar></foo>"; + String XML_FOO_BAR_TEXT = "<foo><bar>text</bar></foo>"; + String XML_FOO_BAR_TEXT_EXT = "<foo><bar>text</bar>extended</foo>"; + String XML_FOO_BAR_WS_TEXT = "<foo><bar> text </bar> ws \\r\\n </foo>"; + String XML_FOO_BAR_WS_ONLY = "<foo> <bar> </bar> </foo>"; + String XML_FOO_NS = "<foo xmlns=\"http://www.foo.org\";></foo>"; + String XML_FOO_NS_PREFIX = "<foo xmlns:edi='http://ecommerce.org/schema'><!-- the 'price' element's namespace is http://ecommerce.org/schema --> <edi:price units='Euro'>32.18</edi:price></foo>"; + String XML_FOO_BAR_NESTED_SIBLINGS = "<foo attr0=\"val0\"><bar>text0<zed>nested0</zed></bar><bar>text1<zed>nested1</zed></bar></foo>"; + String XML_FOO_PROCINST = "<?xml-stylesheet type=\"text/xsl\" xmlns=\"http://openuri.org/shipping/\";?><foo>text</foo>"; + String XML_FOO_COMMENT = "<!-- comment text --><foo>text</foo>"; + String XML_FOO_DIGITS = "<foo xmlns=\"http://www.foo.org\"; attr0=\"val0\">01234</foo>"; + String XML_TEXT_MIDDLE = "<foo><bar>text</bar>extended<goo>text1</goo></foo>"; + + String XML_ATTR_TEXT = "<foo x=\"y\">ab</foo> "; - public final static String CLM_NS = "http://www.tranxml.org/TranXML/Version4.0";; - public final static String CLM_XSI_NS = "xmlns:xsi=\"http://www.w3.org/2000/10/XMLSchema-instance\"";; - public final static String CLM_NS_XQUERY_DEFAULT = "declare default element namespace \"" + CLM_NS + "\"; "; + String CLM_NS = "http://www.tranxml.org/TranXML/Version4.0";; + String CLM_XSI_NS = "xmlns:xsi=\"http://www.w3.org/2000/10/XMLSchema-instance\"";; + String CLM_NS_XQUERY_DEFAULT = "declare default element namespace \"" + CLM_NS + "\"; "; - public final static String TRANXML_FILE_CLM = "xbean/xmlcursor/CarLocationMessage.xml"; - public final static String TRANXML_FILE_XMLCURSOR_PO = "xbean/xmlcursor/po.xml"; + String TRANXML_FILE_CLM = "xbean/xmlcursor/CarLocationMessage.xml"; + String TRANXML_FILE_XMLCURSOR_PO = "xbean/xmlcursor/po.xml"; - public final static String XML_SCHEMA_TYPE_SUFFIX = "http://www.w3.org/2001/XMLSchema";; - public final static String TRANXML_SCHEMA_TYPE_SUFFIX = CLM_NS; + String XML_SCHEMA_TYPE_SUFFIX = "http://www.w3.org/2001/XMLSchema";; + String TRANXML_SCHEMA_TYPE_SUFFIX = CLM_NS; - public static String wrapInXmlFrag(String text) { + static String wrapInXmlFrag(String text) { return XMLFRAG_BEGINTAG + text + XMLFRAG_ENDTAG; } Modified: xmlbeans/trunk/src/test/java/xmlcursor/detailed/CopyCharsTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/detailed/CopyCharsTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/xmlcursor/detailed/CopyCharsTest.java (original) +++ xmlbeans/trunk/src/test/java/xmlcursor/detailed/CopyCharsTest.java Sun Feb 6 01:51:55 2022 @@ -19,27 +19,26 @@ package xmlcursor.detailed; 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.*; +import static org.junit.jupiter.api.Assertions.*; +import static xmlcursor.common.BasicCursorTestCase.*; -public class CopyCharsTest extends BasicCursorTestCase { - @Test(expected = IllegalArgumentException.class) - public void testCopyCharsToNull() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_DIGITS); - m_xc = m_xo.newCursor(); - toNextTokenOfType(m_xc, TokenType.TEXT); - m_xc.copyChars(4, null); +public class CopyCharsTest { + @Test + void testCopyCharsToNull() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_DIGITS)) { + toNextTokenOfType(m_xc, TokenType.TEXT); + assertThrows(IllegalArgumentException.class, () -> m_xc.copyChars(4, null)); + } } @Test - public void testCopyCharsNegative() throws Exception { - m_xo = XmlObject.Factory.parse("<foo><bar>0123</bar><bar>WXYZ</bar></foo>"); - m_xc = m_xo.newCursor(); - try (XmlCursor xc0 = toNextTokenOfTypeCursor(m_xc, TokenType.TEXT); - XmlCursor xc1 = toNextTokenOfTypeCursor(m_xc, TokenType.TEXT)) { + void testCopyCharsNegative() throws Exception { + try (XmlCursor m_xc = cur("<foo><bar>0123</bar><bar>WXYZ</bar></foo>"); + XmlCursor xc0 = toNextTokenOfTypeCursor(m_xc, TokenType.TEXT); + XmlCursor xc1 = toNextTokenOfTypeCursor(m_xc, TokenType.TEXT)) { assertFalse(xc0.isAtSamePositionAs(xc1)); assertEquals(4, xc1.copyChars(-1, xc0)); assertEquals(TokenType.TEXT, xc0.currentTokenType()); @@ -55,11 +54,10 @@ public class CopyCharsTest extends Basic } @Test - public void testCopyCharsZero() throws Exception { - m_xo = XmlObject.Factory.parse("<foo><bar>0123</bar><bar>WXYZ</bar></foo>"); - m_xc = m_xo.newCursor(); - try (XmlCursor xc0 = toNextTokenOfTypeCursor(m_xc, TokenType.TEXT); - XmlCursor xc1 = toNextTokenOfTypeCursor(m_xc, TokenType.TEXT)) { + void testCopyCharsZero() throws Exception { + try (XmlCursor m_xc = cur("<foo><bar>0123</bar><bar>WXYZ</bar></foo>"); + XmlCursor xc0 = toNextTokenOfTypeCursor(m_xc, TokenType.TEXT); + XmlCursor xc1 = toNextTokenOfTypeCursor(m_xc, TokenType.TEXT)) { assertFalse(xc0.isAtSamePositionAs(xc1)); assertEquals(0, xc1.copyChars(0, xc0)); assertEquals("0123", xc0.getTextValue()); @@ -71,11 +69,10 @@ public class CopyCharsTest extends Basic } @Test - public void testCopyCharsThis() throws Exception { - m_xo = XmlObject.Factory.parse("<foo><bar>0123</bar><bar>WXYZ</bar></foo>"); - m_xc = m_xo.newCursor(); - try (XmlCursor xc0 = toNextTokenOfTypeCursor(m_xc, TokenType.TEXT); - XmlCursor xc1 = m_xc.newCursor()) { + void testCopyCharsThis() throws Exception { + try (XmlCursor m_xc = cur("<foo><bar>0123</bar><bar>WXYZ</bar></foo>"); + XmlCursor xc0 = toNextTokenOfTypeCursor(m_xc, TokenType.TEXT); + XmlCursor xc1 = m_xc.newCursor()) { assertTrue(xc0.isAtSamePositionAs(xc1)); assertEquals(4, xc1.copyChars(4, xc0)); assertEquals("0123", xc0.getTextValue()); @@ -86,11 +83,10 @@ public class CopyCharsTest extends Basic } @Test - public void testCopyCharsGTmax() throws Exception { - m_xo = XmlObject.Factory.parse("<foo><bar>0123</bar><bar>WXYZ</bar></foo>"); - m_xc = m_xo.newCursor(); - try (XmlCursor xc0 = toNextTokenOfTypeCursor(m_xc, TokenType.TEXT); - XmlCursor xc1 = toNextTokenOfTypeCursor(m_xc, TokenType.TEXT)) { + void testCopyCharsGTmax() throws Exception { + try (XmlCursor m_xc = cur("<foo><bar>0123</bar><bar>WXYZ</bar></foo>"); + XmlCursor xc0 = toNextTokenOfTypeCursor(m_xc, TokenType.TEXT); + XmlCursor xc1 = toNextTokenOfTypeCursor(m_xc, TokenType.TEXT)) { assertFalse(xc0.isAtSamePositionAs(xc1)); assertEquals(4, xc1.copyChars(1000, xc0)); // verify xc0 @@ -103,30 +99,28 @@ public class CopyCharsTest extends Basic } @Test - public void testCopyCharsToDifferentDocument() 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 testCopyCharsToDifferentDocument() 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.TEXT); assertEquals(5, m_xc.copyChars(5, xc1)); - assertEquals(5,xc1.toPrevChar(5)); + assertEquals(5, xc1.toPrevChar(5)); // verify xc1 assertEquals("01234text", xc1.getTextValue()); + // verify m_xc + assertEquals("01234", m_xc.getTextValue()); } - // verify m_xc - assertEquals("01234", m_xc.getTextValue()); } - @Test(expected = IllegalArgumentException.class) - public void testCopyCharsToEmptyDocumentSTARTDOC() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_DIGITS); - m_xc = m_xo.newCursor(); + @Test + void testCopyCharsToEmptyDocumentSTARTDOC() throws Exception { XmlObject xo = XmlObject.Factory.newInstance(); - try (XmlCursor xc1 = xo.newCursor()) { + try (XmlCursor m_xc = cur(Common.XML_FOO_DIGITS); + XmlCursor xc1 = xo.newCursor()) { toNextTokenOfType(m_xc, TokenType.TEXT); - assertEquals(5, m_xc.copyChars(5, xc1)); + // assertEquals(5, m_xc.copyChars(5, xc1)); + assertThrows(IllegalArgumentException.class, () -> m_xc.copyChars(5, xc1)); } } } Modified: xmlbeans/trunk/src/test/java/xmlcursor/detailed/CopyTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/detailed/CopyTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/xmlcursor/detailed/CopyTest.java (original) +++ xmlbeans/trunk/src/test/java/xmlcursor/detailed/CopyTest.java Sun Feb 6 01:51:55 2022 @@ -16,31 +16,30 @@ package xmlcursor.detailed; import org.apache.xmlbeans.XmlCursor; import org.apache.xmlbeans.XmlException; -import org.apache.xmlbeans.XmlObject; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static xmlcursor.common.BasicCursorTestCase.cur; public class CopyTest { //this is per CR128353 @Test - @Ignore("doesn't work anymore without Piccolo Parser") + @Disabled("doesn't work anymore without Piccolo Parser") public void testCopyNamespaceMigration() throws XmlException { String s1 = "<X xmlns=\"foo\" xmlns:xsi=\"bar\"><zzz>123</zzz></X>"; String s2 = "<Y> ... [some content] ... </Y>"; - try (XmlCursor xc1 = XmlObject.Factory.parse(s1).newCursor(); - XmlCursor xc2 = XmlObject.Factory.parse(s2).newCursor()) { + String exp = "<Y><foo:zzz xmlns:foo=\"foo\" xmlns:xsi=\"bar\">123</foo:zzz> ... [some content] ... </Y>"; + try (XmlCursor xc1 = cur(s1); + XmlCursor xc2 = cur(s2)) { xc1.toFirstContentToken(); xc1.toFirstChild(); assertEquals(XmlCursor.TokenType.START, xc2.toFirstContentToken()); xc2.toNextToken(); xc1.copyXml(xc2); xc2.toStartDoc(); - assertEquals("<Y>" + - "<foo:zzz xmlns:foo=\"foo\" xmlns:xsi=\"bar\">123</foo:zzz>" + - " ... [some content] ... </Y>", xc2.xmlText()); + assertEquals(exp, xc2.xmlText()); } } Modified: xmlbeans/trunk/src/test/java/xmlcursor/detailed/CursorGeneratedTypedObjectTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/detailed/CursorGeneratedTypedObjectTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/xmlcursor/detailed/CursorGeneratedTypedObjectTest.java (original) +++ xmlbeans/trunk/src/test/java/xmlcursor/detailed/CursorGeneratedTypedObjectTest.java Sun Feb 6 01:51:55 2022 @@ -19,7 +19,7 @@ import org.apache.xmlbeans.XmlCursor; import org.apache.xmlbeans.XmlCursor.TokenType; import org.apache.xmlbeans.XmlObject; import org.apache.xmlbeans.XmlOptions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tranxml.tranXML.version40.CarLocationMessageDocument; import org.tranxml.tranXML.version40.CodeList309; import org.tranxml.tranXML.version40.GeographicLocationDocument; @@ -32,12 +32,12 @@ import xmlcursor.common.Common; import javax.xml.namespace.QName; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class CursorGeneratedTypedObjectTest { @Test - public void testGetObjectValidateLocation() throws Exception { + void testGetObjectValidateLocation() throws Exception { String sNamespace = "xmlns:loc=\"http://xbean.test/xmlcursor/Location\"";; String sXml = "<loc:Location " + sNamespace + ">" + @@ -89,14 +89,12 @@ public class CursorGeneratedTypedObjectT } @Test - public void testGetObjectGL() throws Exception { + void testGetObjectGL() throws Exception { String sNamespace = "xmlns=\"http://www.tranxml.org/TranXML/Version4.0\"; xmlns:xsi=\"http://www.w3.org/2000/10/XMLSchema-instance\"";; CarLocationMessageDocument clm = CarLocationMessageDocument.Factory.parse( - JarUtil.getResourceFromJar( - Common.TRANXML_FILE_CLM)); + JarUtil.getResourceFromJar(Common.TRANXML_FILE_CLM)); try (XmlCursor xc = clm.newCursor()) { - xc.selectPath(Common.CLM_NS_XQUERY_DEFAULT + - "$this//GeographicLocation"); + xc.selectPath(Common.CLM_NS_XQUERY_DEFAULT + "$this//GeographicLocation"); xc.toNextSelection(); GeographicLocationDocument.GeographicLocation gl0 = (GeographicLocationDocument.GeographicLocation) xc.getObject(); @@ -151,9 +149,8 @@ public class CursorGeneratedTypedObjectT assertEquals("DALLAS", gl.getCityName().getStringValue()); assertEquals("TX", gl.getStateOrProvinceCode()); LocationIdentifierDocument.LocationIdentifier li = gl.getLocationIdentifier(); - assertNotNull("LocationIdentifier unexpectedly null", li); - assertEquals(CodeList309.FR, - gl.getLocationIdentifier().getQualifier()); + assertNotNull(li, "LocationIdentifier unexpectedly null"); + assertEquals(CodeList309.FR, gl.getLocationIdentifier().getQualifier()); assertEquals("xyz", gl.getCountrySubdivisionCode()); } } @@ -161,7 +158,7 @@ public class CursorGeneratedTypedObjectT @Test - public void testGetObjectPerson() throws Exception { + void testGetObjectPerson() throws Exception { String sFF = "<First>Fred</First><Last>Flintstone</Last>"; String sXml = "<Person xmlns=\"person\"><Name>" + sFF + "</Name></Person>"; Modified: xmlbeans/trunk/src/test/java/xmlcursor/detailed/CursorLocations.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/detailed/CursorLocations.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/xmlcursor/detailed/CursorLocations.java (original) +++ xmlbeans/trunk/src/test/java/xmlcursor/detailed/CursorLocations.java Sun Feb 6 01:51:55 2022 @@ -19,38 +19,32 @@ package xmlcursor.detailed; import org.apache.xmlbeans.XmlCursor; import org.apache.xmlbeans.XmlCursor.TokenType; import org.apache.xmlbeans.XmlObject; -import org.junit.Test; +import org.junit.jupiter.api.Test; import test.xbean.xmlcursor.purchaseOrder.PurchaseOrderDocument; import test.xbean.xmlcursor.purchaseOrder.PurchaseOrderType; import test.xbean.xmlcursor.purchaseOrder.USAddress; import tools.util.JarUtil; -import xmlcursor.common.BasicCursorTestCase; import xmlcursor.common.Common; import java.math.BigDecimal; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; +import static xmlcursor.common.BasicCursorTestCase.*; -public class CursorLocations extends BasicCursorTestCase { +public class CursorLocations { - private Bookmark0 _theBookmark0 = new Bookmark0("value0"); - - @Test(expected = IllegalArgumentException.class) - public void testLocation() throws Exception { - XmlObject m_xo1; - - - m_xo = XmlObject.Factory.parse( - JarUtil.getResourceFromJar(Common.TRANXML_FILE_XMLCURSOR_PO)); - m_xo1 = XmlObject.Factory.parse(Common.XML_FOO_BAR_TEXT); + private static final Bookmark0 _theBookmark0 = new Bookmark0("value0"); + @Test + void testLocation() throws Exception { + XmlObject m_xo = jobj(Common.TRANXML_FILE_XMLCURSOR_PO); try (XmlCursor xc1 = m_xo.newCursor(); XmlCursor xc2 = m_xo.newCursor(); - XmlCursor xc3 = m_xo1.newCursor()) { + XmlCursor xc3 = cur(Common.XML_FOO_BAR_TEXT)) { toNextTokenOfType(xc2, TokenType.END); toNextTokenOfType(xc3, TokenType.START); - + //start w/ xc1 at beg of doc //xc2 at end of first elt (po:name) while (xc1.isLeftOf(xc2)) { @@ -68,14 +62,11 @@ public class CursorLocations extends Bas //xc1 & xc2 @ shipTo toNextTokenOfType(xc1,TokenType.TEXT); toNextTokenOfType(xc2,TokenType.TEXT); - assertEquals("Current Token Type ", - xc1.currentTokenType(), - xc2.currentTokenType()); + assertEquals(xc1.currentTokenType(), xc2.currentTokenType(), "Current Token Type "); //both @ Alice Smith toNextTokenOfType(xc1,TokenType.TEXT); toNextTokenOfType(xc2,TokenType.TEXT); - assertEquals(XmlCursor.TokenType.TEXT, - xc1.currentTokenType()); + assertEquals(TokenType.TEXT, xc1.currentTokenType()); //these are only equivalent if the cursor is on a TEXT token assertEquals(xc1.getChars(), xc1.getTextValue()); assertEquals(xc1.getChars(), xc2.getTextValue()); @@ -121,20 +112,20 @@ public class CursorLocations extends Bas assertTrue(xc4.isInSameDocument(xc3)); assertEquals(-1, xc4.comparePosition(xc3)); // assertEquals(TokenType.TEXT, xc3.toPrevToken()); - assertEquals(4,xc3.toPrevChar(4)); + assertEquals(4, xc3.toPrevChar(4)); assertEquals(0, xc4.comparePosition(xc3)); //comparing in two different documents assertFalse(xc2.isInSameDocument(xc3)); - xc4.isLeftOf(xc2); + assertThrows(IllegalArgumentException.class, () -> xc4.isLeftOf(xc2)); } } } @Test - public void testLocationATTR() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_5ATTR_TEXT); + void testLocationATTR() throws Exception { + XmlObject m_xo = obj(Common.XML_FOO_5ATTR_TEXT); try (XmlCursor xc1 = m_xo.newCursor(); XmlCursor xc2 = m_xo.newCursor()) { @@ -175,8 +166,8 @@ public class CursorLocations extends Bas } @Test - public void testLocationTEXTMiddle() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_TEXT_MIDDLE); + void testLocationTEXTMiddle() throws Exception { + XmlObject m_xo = obj(Common.XML_TEXT_MIDDLE); try (XmlCursor xc1 = m_xo.newCursor(); XmlCursor xc2 = m_xo.newCursor(); @@ -224,7 +215,7 @@ public class CursorLocations extends Bas } @Test - public void testXmlObjectUsingCursor() throws Exception { + void testXmlObjectUsingCursor() throws Exception { PurchaseOrderDocument pod = PurchaseOrderDocument.Factory.parse( JarUtil.getResourceFromJar(Common.TRANXML_FILE_XMLCURSOR_PO)); @@ -251,7 +242,7 @@ public class CursorLocations extends Bas toPrevTokenOfType(xc3, TokenType.TEXT); toPrevTokenOfType(xc3, TokenType.TEXT); //all cursors are now at: 90952 - assertEquals(xc1.getChars(), xc2.getChars(), xc3.getChars()); + assertEquals(xc2.getChars(), xc3.getChars(), xc1.getChars()); //at 52 xc2.toNextChar(3); //after 90952 @@ -266,13 +257,13 @@ public class CursorLocations extends Bas USAddress usa = pt.getShipTo(); usa.setZip(new BigDecimal(500)); - assertEquals(500,usa.getZip().intValue()); + assertEquals(500, usa.getZip().intValue()); //Any cursors in the value of an Element/attr should be positioned // at the end of the elem/attr after the strong setter assertTrue(xc2.isAtSamePositionAs(xc3)); assertTrue(xc3.isAtSamePositionAs(xc1)); - assertEquals(TokenType.END,xc1.currentTokenType()); + assertEquals(TokenType.END, xc1.currentTokenType()); // inserting an element through the cursor under zip and then doing @@ -298,7 +289,7 @@ public class CursorLocations extends Bas } - public class Bookmark0 extends XmlCursor.XmlBookmark { + private static class Bookmark0 extends XmlCursor.XmlBookmark { public String text; Bookmark0(String text) { Modified: xmlbeans/trunk/src/test/java/xmlcursor/detailed/CursorVsObjectAttributeTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/detailed/CursorVsObjectAttributeTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/xmlcursor/detailed/CursorVsObjectAttributeTest.java (original) +++ xmlbeans/trunk/src/test/java/xmlcursor/detailed/CursorVsObjectAttributeTest.java Sun Feb 6 01:51:55 2022 @@ -20,7 +20,7 @@ import org.apache.xmlbeans.XmlCursor; import org.apache.xmlbeans.XmlCursor.TokenType; import org.apache.xmlbeans.XmlObject; import org.apache.xmlbeans.XmlOptions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tranxml.tranXML.version40.CarLocationMessageDocument; import org.tranxml.tranXML.version40.CarLocationMessageDocument.CarLocationMessage; import tools.util.JarUtil; @@ -28,13 +28,14 @@ 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.jobj; public class CursorVsObjectAttributeTest { @Test - public void testAttributeSet() throws Exception { + void testAttributeSet() throws Exception { CarLocationMessageDocument clmDoc = CarLocationMessageDocument.Factory.parse( JarUtil.getResourceFromJar(Common.TRANXML_FILE_CLM)); try (XmlCursor xc = clmDoc.newCursor()) { @@ -50,10 +51,8 @@ public class CursorVsObjectAttributeTest } @Test - public void testAttributeUnsetRemove() throws Exception { - CarLocationMessageDocument clmDoc = - (CarLocationMessageDocument) XmlObject.Factory.parse( - JarUtil.getResourceFromJar(Common.TRANXML_FILE_CLM)); + void testAttributeUnsetRemove() throws Exception { + CarLocationMessageDocument clmDoc = (CarLocationMessageDocument)jobj(Common.TRANXML_FILE_CLM); try (XmlCursor xc = clmDoc.newCursor()) { xc.toFirstChild(); CarLocationMessage clm = (CarLocationMessage) xc.getObject(); @@ -69,7 +68,7 @@ public class CursorVsObjectAttributeTest } @Test - public void testAttributeInsert() throws Exception { + void testAttributeInsert() throws Exception { XmlOptions map = new XmlOptions(); map.setLoadStripWhitespace(); Modified: xmlbeans/trunk/src/test/java/xmlcursor/detailed/CursorVsObjectInsertRemoveTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/detailed/CursorVsObjectInsertRemoveTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/xmlcursor/detailed/CursorVsObjectInsertRemoveTest.java (original) +++ xmlbeans/trunk/src/test/java/xmlcursor/detailed/CursorVsObjectInsertRemoveTest.java Sun Feb 6 01:51:55 2022 @@ -19,18 +19,19 @@ package xmlcursor.detailed; import org.apache.xmlbeans.XmlCursor; import org.apache.xmlbeans.XmlCursor.TokenType; import org.apache.xmlbeans.XmlObject; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tranxml.tranXML.version40.CarLocationMessageDocument; import org.tranxml.tranXML.version40.EventStatusDocument.EventStatus; import org.tranxml.tranXML.version40.GeographicLocationDocument.GeographicLocation; import tools.util.JarUtil; import xmlcursor.common.Common; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class CursorVsObjectInsertRemoveTest { @Test - public void testInsertRemove() throws Exception { + void testInsertRemove() throws Exception { CarLocationMessageDocument clm = (CarLocationMessageDocument) XmlObject.Factory.parse( JarUtil.getResourceFromJar(Common.TRANXML_FILE_CLM)); @@ -43,12 +44,12 @@ public class CursorVsObjectInsertRemoveT assertEquals("EventStatus", xc.getName().getLocalPart()); EventStatus eventStatus; eventStatus = (EventStatus) xc.getObject(); - assertNotNull("Expected non-null EventStatus object", eventStatus); + assertNotNull(eventStatus, "Expected non-null EventStatus object"); String sEventStatusText; sEventStatusText = xc.getTextValue(); GeographicLocation glDest = eventStatus.getDestination().getGeographicLocation(); - assertNotNull("Expected non-null GeographicLocation object", glDest); + assertNotNull(glDest, "Expected non-null GeographicLocation object"); glDest.setPostalCode("90210"); glDest.setCountryCode("US"); try (XmlCursor xcPostalCode = glDest.xgetPostalCode().newCursor(); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
