Modified: xmlbeans/trunk/src/test/java/xmlcursor/detailed/PrefixForNamespaceTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/detailed/PrefixForNamespaceTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/xmlcursor/detailed/PrefixForNamespaceTest.java (original) +++ xmlbeans/trunk/src/test/java/xmlcursor/detailed/PrefixForNamespaceTest.java Sun Feb 6 01:51:55 2022 @@ -16,108 +16,104 @@ package xmlcursor.detailed; +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.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.*; -public class PrefixForNamespaceTest extends BasicCursorTestCase { +public class PrefixForNamespaceTest { @Test - public void testprefixForNamespaceFromSTARTDOC() throws Exception { - m_xo = XmlObject.Factory.parse("<foo xmlns=\"nsa\">text</foo>"); - m_xc = m_xo.newCursor(); - m_xc.toFirstChild(); - m_xc.insertNamespace("pre1", "uri1"); - m_xc.insertNamespace("pre2", "uri2"); - m_xc.insertNamespace("pre3", "uri3"); - m_xc.insertNamespace(null, "uridefault"); - m_xc.toStartDoc(); - assertEquals("pre1", m_xc.prefixForNamespace("uri1")); - assertEquals("pre2", m_xc.prefixForNamespace("uri2")); - assertEquals("pre3", m_xc.prefixForNamespace("uri3")); - } - - @Test - public void testprefixForNamespaceFromSTARTDOCInvalid() throws Exception { - m_xo = XmlObject.Factory.parse("<foo xmlns=\"nsa\">text</foo>"); - m_xc = m_xo.newCursor(); - m_xc.toFirstChild(); - m_xc.insertNamespace("ns1", "uri1"); - m_xc.insertNamespace("ns2", "uri2"); - m_xc.insertNamespace("ns3", "uri3"); - m_xc.insertNamespace(null, "uridefault"); - m_xc.toStartDoc(); - assertEquals("uri4", m_xc.prefixForNamespace("uri4")); - } - - @Test(expected = IllegalArgumentException.class) - public void testprefixForNamespaceFromSTARTDOCNull() throws Exception { - m_xo = XmlObject.Factory.parse("<foo xmlns=\"nsa\">text</foo>"); - m_xc = m_xo.newCursor(); - m_xc.prefixForNamespace(null); - } - - @Test(expected = IllegalArgumentException.class) - public void testprefixForNamespaceFromSTARTDOCEmptyString() throws Exception { - m_xo = XmlObject.Factory.parse("<foo xmlns=\"nsa\">text</foo>"); - m_xc = m_xo.newCursor(); - m_xc.prefixForNamespace(""); - } - - @Test - public void testprefixForNamespaceFromSTART() throws Exception { - m_xo = XmlObject.Factory.parse( - JarUtil.getResourceFromJar(Common.TRANXML_FILE_CLM)); - m_xc = m_xo.newCursor(); - m_xc.toFirstChild(); - assertEquals("xsi", - m_xc.prefixForNamespace("http://www.w3.org/2000/10/XMLSchema-instance";)); - } - - @Test - public void testprefixForNamespaceFromSTARTdefaultNamespace() throws Exception { - m_xo = XmlObject.Factory.parse( - JarUtil.getResourceFromJar(Common.TRANXML_FILE_CLM)); - m_xc = m_xo.newCursor(); - m_xc.toFirstChild(); - assertEquals("", - m_xc.prefixForNamespace("http://www.tranxml.org/TranXML/Version4.0";)); - } - - @Test - public void testprefixForNamespaceFromATTR() throws Exception { - m_xo = XmlObject.Factory.parse("<foo xmlns=\"nsa\"><bar attr0=\"val0\">text</bar></foo>"); - m_xc = m_xo.newCursor(); - m_xc.toFirstChild(); - m_xc.insertNamespace("pre1", "uri1"); - m_xc.insertNamespace("pre2", "uri2"); - m_xc.insertNamespace("pre3", "uri3"); - m_xc.insertNamespace(null, "uridefault"); - m_xc.toStartDoc(); - m_xc.selectPath("declare default element namespace \"nsa\";" + "$this//bar"); - m_xc.toFirstAttribute(); - assertEquals("nsa", m_xc.prefixForNamespace("nsa")); - assertEquals("pre1", m_xc.prefixForNamespace("uri1")); - } - - @Test - public void testprefixForNamespaceFromEND() throws Exception { - m_xo = XmlObject.Factory.parse("<foo xmlns=\"nsa\"><bar attr0=\"val0\">text</bar></foo>"); - m_xc = m_xo.newCursor(); - m_xc.toFirstChild(); - m_xc.insertNamespace("pre1", "uri1"); - m_xc.insertNamespace("pre2", "uri2"); - m_xc.insertNamespace("pre3", "uri3"); - m_xc.insertNamespace(null, "uridefault"); - toNextTokenOfType(m_xc, TokenType.END); - //the default prefix - assertEquals("", m_xc.prefixForNamespace("nsa")); - // assertEquals("pre1", m_xc.prefixForNamespace("uri1")); + void testprefixForNamespaceFromSTARTDOC() throws Exception { + try (XmlCursor m_xc = cur("<foo xmlns=\"nsa\">text</foo>")) { + m_xc.toFirstChild(); + m_xc.insertNamespace("pre1", "uri1"); + m_xc.insertNamespace("pre2", "uri2"); + m_xc.insertNamespace("pre3", "uri3"); + m_xc.insertNamespace(null, "uridefault"); + m_xc.toStartDoc(); + assertEquals("pre1", m_xc.prefixForNamespace("uri1")); + assertEquals("pre2", m_xc.prefixForNamespace("uri2")); + assertEquals("pre3", m_xc.prefixForNamespace("uri3")); + } + } + + @Test + void testprefixForNamespaceFromSTARTDOCInvalid() throws Exception { + try (XmlCursor m_xc = cur("<foo xmlns=\"nsa\">text</foo>")) { + m_xc.toFirstChild(); + m_xc.insertNamespace("ns1", "uri1"); + m_xc.insertNamespace("ns2", "uri2"); + m_xc.insertNamespace("ns3", "uri3"); + m_xc.insertNamespace(null, "uridefault"); + m_xc.toStartDoc(); + assertEquals("uri4", m_xc.prefixForNamespace("uri4")); + } + } + + @Test + void testprefixForNamespaceFromSTARTDOCNull() throws Exception { + try (XmlCursor m_xc = cur("<foo xmlns=\"nsa\">text</foo>")) { + assertThrows(IllegalArgumentException.class, () -> m_xc.prefixForNamespace(null)); + } + } + + @Test + void testprefixForNamespaceFromSTARTDOCEmptyString() throws Exception { + try (XmlCursor m_xc = cur("<foo xmlns=\"nsa\">text</foo>")) { + assertThrows(IllegalArgumentException.class, () -> m_xc.prefixForNamespace("")); + } + } + + @Test + void testprefixForNamespaceFromSTART() throws Exception { + try (XmlCursor m_xc = jcur(Common.TRANXML_FILE_CLM)) { + m_xc.toFirstChild(); + assertEquals("xsi", m_xc.prefixForNamespace("http://www.w3.org/2000/10/XMLSchema-instance";)); + } + } + + @Test + void testprefixForNamespaceFromSTARTdefaultNamespace() throws Exception { + try (XmlCursor m_xc = jcur(Common.TRANXML_FILE_CLM)) { + m_xc.toFirstChild(); + assertEquals("", m_xc.prefixForNamespace("http://www.tranxml.org/TranXML/Version4.0";)); + } + } + + @Test + void testprefixForNamespaceFromATTR() throws Exception { + try (XmlCursor m_xc = cur("<foo xmlns=\"nsa\"><bar attr0=\"val0\">text</bar></foo>")) { + m_xc.toFirstChild(); + m_xc.insertNamespace("pre1", "uri1"); + m_xc.insertNamespace("pre2", "uri2"); + m_xc.insertNamespace("pre3", "uri3"); + m_xc.insertNamespace(null, "uridefault"); + m_xc.toStartDoc(); + m_xc.selectPath("declare default element namespace \"nsa\";" + "$this//bar"); + m_xc.toFirstAttribute(); + assertEquals("nsa", m_xc.prefixForNamespace("nsa")); + assertEquals("pre1", m_xc.prefixForNamespace("uri1")); + } + } + + @Test + void testprefixForNamespaceFromEND() throws Exception { + try (XmlCursor m_xc = cur("<foo xmlns=\"nsa\"><bar attr0=\"val0\">text</bar></foo>")) { + m_xc.toFirstChild(); + m_xc.insertNamespace("pre1", "uri1"); + m_xc.insertNamespace("pre2", "uri2"); + m_xc.insertNamespace("pre3", "uri3"); + m_xc.insertNamespace(null, "uridefault"); + toNextTokenOfType(m_xc, TokenType.END); + //the default prefix + assertEquals("", m_xc.prefixForNamespace("nsa")); + // assertEquals("pre1", m_xc.prefixForNamespace("uri1")); + } } }
Modified: xmlbeans/trunk/src/test/java/xmlcursor/detailed/PushPopTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/detailed/PushPopTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/xmlcursor/detailed/PushPopTest.java (original) +++ xmlbeans/trunk/src/test/java/xmlcursor/detailed/PushPopTest.java Sun Feb 6 01:51:55 2022 @@ -17,37 +17,40 @@ package xmlcursor.detailed; -import org.apache.xmlbeans.XmlObject; -import org.junit.Before; -import org.junit.Test; -import xmlcursor.common.BasicCursorTestCase; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -public class PushPopTest extends BasicCursorTestCase { - - private String sDoc = "<foo xmlns:edi='http://ecommerce.org/schema'><?xml-stylesheet type=\"text/xsl\" xmlns=\"http://openuri.org/shipping/\";?><!-- the 'price' element's namespace is http://ecommerce.org/schema --> <edi:price units='Euro' date='12-12-03'>32.18</edi:price> </foo>"; +import org.apache.xmlbeans.XmlCursor; +import org.apache.xmlbeans.XmlException; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static xmlcursor.common.BasicCursorTestCase.cur; + +public class PushPopTest { + + private static final String XML = + "<foo xmlns:edi='http://ecommerce.org/schema'>" + + "<?xml-stylesheet type=\"text/xsl\" xmlns=\"http://openuri.org/shipping/\";?>" + + "<!-- the 'price' element's namespace is http://ecommerce.org/schema --> " + + "<edi:price units='Euro' date='12-12-03'>32.18</edi:price> </foo>"; @Test - public void testPopEmpty() { - assertFalse(m_xc.pop()); + void testPopEmpty() throws XmlException { + try (XmlCursor m_xc = cur(XML)) { + assertFalse(m_xc.pop()); + } } @Test - public void testPushNTimes() { - int nCount = 100; - for (int i = 0; i < nCount; i++) - m_xc.push(); - boolean result = true; - for (int i = 0; i < nCount; i++) - result &= m_xc.pop(); - assertTrue(result); - assertFalse(m_xc.pop()); - } - - @Before - public void setUp() throws Exception { - m_xc = XmlObject.Factory.parse(sDoc).newCursor(); + void testPushNTimes() throws XmlException { + final int nCount = 100; + try (XmlCursor m_xc = cur(XML)) { + for (int i = 0; i < nCount; i++) { + m_xc.push(); + } + for (int i = 0; i < nCount; i++) { + assertTrue(m_xc.pop()); + } + assertFalse(m_xc.pop()); + } } } Modified: xmlbeans/trunk/src/test/java/xmlcursor/detailed/SelectionsTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/detailed/SelectionsTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/xmlcursor/detailed/SelectionsTest.java (original) +++ xmlbeans/trunk/src/test/java/xmlcursor/detailed/SelectionsTest.java Sun Feb 6 01:51:55 2022 @@ -17,26 +17,28 @@ package xmlcursor.detailed; import org.apache.xmlbeans.XmlCursor; +import org.apache.xmlbeans.XmlException; import org.apache.xmlbeans.XmlObject; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Test; import test.xbean.xmlcursor.cr196679.TestDocument; import test.xbean.xmlcursor.cr196679.TestType; -import xmlcursor.common.BasicCursorTestCase; -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.cur; +import static xmlcursor.common.BasicCursorTestCase.obj; -public class SelectionsTest extends BasicCursorTestCase { +public class SelectionsTest { - private static final 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>"; - //average case test + //average case test @Test - public void testNormalCase() throws Exception { - try (XmlCursor m_xc1 = m_xo.newCursor()) { - int nSelectionsCount = 7; + void testNormalCase() throws Exception { + XmlObject m_xo = obj(XML); + try (XmlCursor m_xc = m_xo.newCursor(); XmlCursor m_xc1 = m_xo.newCursor()) { + final int nSelectionsCount = 7; m_xc.selectPath("$this//a"); assertFalse(m_xc.hasNextSelection()); assertFalse(m_xc.toNextSelection()); @@ -49,65 +51,59 @@ public class SelectionsTest extends Basi m_xc1.addToSelection(); } while (m_xc1.toNextSibling()); assertEquals(nSelectionsCount, m_xc.getSelectionCount()); - int i = 0; - while (m_xc.hasNextSelection()) { - m_xc.toNextSelection(); - assertEquals("" + i, m_xc.getTextValue()); - i++; - } - int j = 0; - while (m_xc1.hasNextSelection()) { - m_xc1.toSelection(j); - assertEquals("" + j, m_xc1.getTextValue()); - j++; - } - assertEquals(nSelectionsCount, j); - assertEquals(nSelectionsCount, i); + assertEquals(nSelectionsCount, getSelectionCount(m_xc)); + assertEquals(nSelectionsCount, getSelectionCount(m_xc1)); } } + private static int getSelectionCount(XmlCursor m_xc) { + int i = 0; + while (m_xc.hasNextSelection()) { + m_xc.toNextSelection(); + assertEquals("" + i, m_xc.getTextValue()); + i++; + } + return i; + } + + @Test - public void testToSelectionIllegalIndex() { - m_xc.selectPath("$this//b"); - boolean result = m_xc.toSelection(-1); - assertFalse(result); + void testToSelectionIllegalIndex() throws XmlException { + try (XmlCursor m_xc = cur(XML)) { + m_xc.selectPath("$this//b"); + boolean result = m_xc.toSelection(-1); + assertFalse(result); - try { result = m_xc.toSelection(m_xc.getSelectionCount() + 1); - assertFalse("Index > num selections", result); - } catch (IllegalStateException e) { - } + assertFalse(result, "Index > num selections"); - assertFalse("Index < 0 ", result); + assertFalse(result, "Index < 0 "); + } } @Test - public void testClearSelections() { - m_xc.selectPath("$this//b"); - m_xc.toSelection(0); - m_xc.clearSelections(); - assertEquals("<b>0</b>", m_xc.xmlText()); - + void testClearSelections() throws XmlException { + try (XmlCursor m_xc = cur(XML)) { + m_xc.selectPath("$this//b"); + m_xc.toSelection(0); + m_xc.clearSelections(); + assertEquals("<b>0</b>", m_xc.xmlText()); + } } @Test - public void testCR196679() throws Exception { - TestDocument testDoc = null; - String input = "<ns:test xmlns:ns=\"http://xbean.test/xmlcursor/CR196679\";>\n" + + void testCR196679() throws Exception { + final String input = + "<ns:test xmlns:ns=\"http://xbean.test/xmlcursor/CR196679\";>\n" + " <ns:name>myTest</ns:name>" + " <ns:value>5</ns:value>" + " </ns:test>"; - testDoc = TestDocument.Factory.parse(input); + TestDocument testDoc = TestDocument.Factory.parse(input); TestType test = testDoc.getTest(); - String queryName = - "declare namespace ns='http://xbean.test/xmlcursor/CR196679'" + - "$this/ns:name"; - - String queryValue = - "declare namespace ns='http://xbean.test/xmlcursor/CR196679'" + - "$this/ns:value"; + String queryName = "declare namespace ns='http://xbean.test/xmlcursor/CR196679' $this/ns:name"; + String queryValue = "declare namespace ns='http://xbean.test/xmlcursor/CR196679' $this/ns:value"; try (XmlCursor cursor = test.newCursor()) { cursor.push(); @@ -124,9 +120,4 @@ public class SelectionsTest extends Basi } } - @Before - public void setUp() throws Exception { - m_xo = XmlObject.Factory.parse(sXml); - m_xc = m_xo.newCursor(); - } } Modified: xmlbeans/trunk/src/test/java/xmlcursor/detailed/SetTextValueTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/detailed/SetTextValueTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/xmlcursor/detailed/SetTextValueTest.java (original) +++ xmlbeans/trunk/src/test/java/xmlcursor/detailed/SetTextValueTest.java Sun Feb 6 01:51:55 2022 @@ -17,204 +17,197 @@ package xmlcursor.detailed; import org.apache.xmlbeans.XmlCursor; import org.apache.xmlbeans.XmlCursor.TokenType; -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 xmlcursor.common.Common; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; +import static xmlcursor.common.BasicCursorTestCase.*; -/** - * - * - */ -public class SetTextValueTest extends BasicCursorTestCase { +public class SetTextValueTest { /** * Depth first concatenation of all text leaves */ @Test - public void testSTARTDOC() { - String sExpected = Common.XMLFRAG_BEGINTAG + "<newdoc/>" + - Common.XMLFRAG_ENDTAG; - char[] buffer = new String("<newdoc/>").toCharArray(); - m_xc.setTextValue(buffer, 0, buffer.length); - //toPrevTokenOfType(m_xc,TokenType.STARTDOC); - assertEquals(sExpected, m_xc.xmlText()); + void testSTARTDOC() throws XmlException { + String sExpected = Common.XMLFRAG_BEGINTAG + "<newdoc/>" + Common.XMLFRAG_ENDTAG; + char[] buffer = "<newdoc/>".toCharArray(); + try (XmlCursor m_xc = cur(Common.XML_FOO_NS_PREFIX)) { + m_xc.setTextValue(buffer, 0, buffer.length); + //toPrevTokenOfType(m_xc,TokenType.STARTDOC); + assertEquals(sExpected, m_xc.xmlText()); + } } @Test - public void testSTART() { + void testSTART() throws XmlException { String sNewVal = "new test value "; - String sExpected = "<foo xmlns:edi=\"http://ecommerce.org/schema\";>" + - sNewVal + - "</foo>"; - toNextTokenOfType(m_xc, TokenType.START); - char[] buffer = sNewVal.toCharArray(); - m_xc.setTextValue(buffer, 0, buffer.length); - toPrevTokenOfType(m_xc, TokenType.STARTDOC); - assertEquals(sExpected, m_xc.xmlText()); + String sExpected = "<foo xmlns:edi=\"http://ecommerce.org/schema\";>" + sNewVal + "</foo>"; + try (XmlCursor m_xc = cur(Common.XML_FOO_NS_PREFIX)) { + toNextTokenOfType(m_xc, TokenType.START); + char[] buffer = sNewVal.toCharArray(); + m_xc.setTextValue(buffer, 0, buffer.length); + toPrevTokenOfType(m_xc, TokenType.STARTDOC); + assertEquals(sExpected, m_xc.xmlText()); + } } @Test - public void testAttr() { + void testAttr() throws XmlException { String sNewVal = "US\u0024 "; String sExpected = "<foo xmlns:edi=\"http://ecommerce.org/schema\";><!-- the 'price' element's namespace is http://ecommerce.org/schema --> <edi:price units=\"" + sNewVal + "\">32.18</edi:price></foo>"; - toNextTokenOfType(m_xc, TokenType.ATTR); - char[] buffer = sNewVal.toCharArray(); - m_xc.setTextValue(buffer, 0, buffer.length); - toPrevTokenOfType(m_xc, TokenType.STARTDOC); - assertEquals(sExpected, m_xc.xmlText()); + try (XmlCursor m_xc = cur(Common.XML_FOO_NS_PREFIX)) { + toNextTokenOfType(m_xc, TokenType.ATTR); + char[] buffer = sNewVal.toCharArray(); + m_xc.setTextValue(buffer, 0, buffer.length); + toPrevTokenOfType(m_xc, TokenType.STARTDOC); + assertEquals(sExpected, m_xc.xmlText()); + } } @Test - public void testComment() { + void testComment() throws XmlException { String sNewVal = "My new comment "; String sExpected = "<foo xmlns:edi=\"http://ecommerce.org/schema\";><!--" + sNewVal + "--> <edi:price units=\"Euro\">32.18</edi:price></foo>"; - toNextTokenOfType(m_xc, TokenType.COMMENT); - char[] buffer = sNewVal.toCharArray(); - m_xc.setTextValue(buffer, 0, buffer.length); - toPrevTokenOfType(m_xc, TokenType.STARTDOC); - assertEquals(sExpected, m_xc.xmlText()); + try (XmlCursor m_xc = cur(Common.XML_FOO_NS_PREFIX)) { + toNextTokenOfType(m_xc, TokenType.COMMENT); + char[] buffer = sNewVal.toCharArray(); + m_xc.setTextValue(buffer, 0, buffer.length); + toPrevTokenOfType(m_xc, TokenType.STARTDOC); + assertEquals(sExpected, m_xc.xmlText()); + } } @Test - public void testPI() throws Exception { + void testPI() throws Exception { String sTestXml = "<?xml-stylesheet type=\"text/xsl\" xmlns=\"http://openuri.org/shipping/\";?><foo at0=\"value0\">text</foo>"; - m_xc = XmlObject.Factory.parse(sTestXml).newCursor(); - String sNewVal = "type=\"text/html\" xmlns=\"http://newUri.org\"; "; - String sExpected = "<?xml-stylesheet " + sNewVal + - "?><foo at0=\"value0\">text</foo>"; - toNextTokenOfType(m_xc, TokenType.PROCINST); - char[] buffer = sNewVal.toCharArray(); - m_xc.setTextValue(buffer, 0, buffer.length); - toPrevTokenOfType(m_xc, TokenType.STARTDOC); - assertEquals(sExpected, m_xc.xmlText()); + try (XmlCursor m_xc = cur(sTestXml)) { + String sNewVal = "type=\"text/html\" xmlns=\"http://newUri.org\"; "; + String sExpected = "<?xml-stylesheet " + sNewVal + "?><foo at0=\"value0\">text</foo>"; + toNextTokenOfType(m_xc, TokenType.PROCINST); + char[] buffer = sNewVal.toCharArray(); + m_xc.setTextValue(buffer, 0, buffer.length); + toPrevTokenOfType(m_xc, TokenType.STARTDOC); + assertEquals(sExpected, m_xc.xmlText()); + } } @Test - public void testSetNull() { - toNextTokenOfType(m_xc, TokenType.START); - try { - m_xc.setTextValue(null, 0, 10); - fail("Buffer was Null"); - } - catch (IllegalArgumentException ie) { + void testSetNull() throws XmlException { + try (XmlCursor m_xc = cur(Common.XML_FOO_NS_PREFIX)) { + toNextTokenOfType(m_xc, TokenType.START); + assertThrows(IllegalArgumentException.class, () -> m_xc.setTextValue(null, 0, 10)); } } - @Test(expected = IndexOutOfBoundsException.class) - public void testNegativeOffset() { + @Test + void testNegativeOffset() throws XmlException { char[] buffer = new char[100]; - toNextTokenOfType(m_xc, TokenType.START); - m_xc.setTextValue(buffer, -1, 98); + try (XmlCursor m_xc = cur(Common.XML_FOO_NS_PREFIX)) { + toNextTokenOfType(m_xc, TokenType.START); + assertThrows(IndexOutOfBoundsException.class, () -> m_xc.setTextValue(buffer, -1, 98)); + } } @Test - public void testNonZeroOffset() { + void testNonZeroOffset() throws XmlException { char[] buffer = "Test".toCharArray(); - toNextTokenOfType(m_xc, TokenType.START); - String sExpected = "st"; - m_xc.setTextValue(buffer, 2, buffer.length - 2); - toNextTokenOfType(m_xc, TokenType.TEXT); - assertEquals(sExpected, m_xc.getChars()); + try (XmlCursor m_xc = cur(Common.XML_FOO_NS_PREFIX)) { + toNextTokenOfType(m_xc, TokenType.START); + String sExpected = "st"; + m_xc.setTextValue(buffer, 2, buffer.length - 2); + toNextTokenOfType(m_xc, TokenType.TEXT); + assertEquals(sExpected, m_xc.getChars()); + } } - @Test(expected = IndexOutOfBoundsException.class) - public void testLargeOffset() { + @Test + void testLargeOffset() throws XmlException { String sNewVal = " 20"; - toNextTokenOfType(m_xc, TokenType.START); - m_xc.setTextValue(sNewVal.toCharArray(), 5, 3); + try (XmlCursor m_xc = cur(Common.XML_FOO_NS_PREFIX)) { + toNextTokenOfType(m_xc, TokenType.START); + assertThrows(IndexOutOfBoundsException.class, () -> m_xc.setTextValue(sNewVal.toCharArray(), 5, 3)); + } } //charCount<=0: should be a noop - @Test(expected = IndexOutOfBoundsException.class) - public void testNegativeCharCount() { + @Test + void testNegativeCharCount() throws XmlException { char[] buffer = new char[100]; - toNextTokenOfType(m_xc, TokenType.START); - String sExpected = m_xc.xmlText(); - m_xc.setTextValue(buffer, 10, -1); - if (!m_xc.equals(sExpected)) fail("Negative Char Cnt"); + try (XmlCursor m_xc = cur(Common.XML_FOO_NS_PREFIX)) { + toNextTokenOfType(m_xc, TokenType.START); + String sExpected = m_xc.xmlText(); + assertThrows(IndexOutOfBoundsException.class, () -> m_xc.setTextValue(buffer, 10, -1)); + } } @Test - public void testZeroCharCount() { + void testZeroCharCount() throws XmlException { char[] buffer = new char[100]; String sExpected = "<foo xmlns:edi=\"http://ecommerce.org/schema\"/>"; - assertEquals(XmlCursor.TokenType.STARTDOC,m_xc.currentTokenType()); - toNextTokenOfType(m_xc, TokenType.START); - //since the operation is delete+replace - //0,0 is equivalent to a delete - m_xc.setTextValue(buffer, 0, 0); - toPrevTokenOfType(m_xc, TokenType.STARTDOC); - assertEquals(sExpected, m_xc.xmlText()); + try (XmlCursor m_xc = cur(Common.XML_FOO_NS_PREFIX)) { + assertEquals(TokenType.STARTDOC, m_xc.currentTokenType()); + toNextTokenOfType(m_xc, TokenType.START); + //since the operation is delete+replace + //0,0 is equivalent to a delete + m_xc.setTextValue(buffer, 0, 0); + toPrevTokenOfType(m_xc, TokenType.STARTDOC); + assertEquals(sExpected, m_xc.xmlText()); + } } @Test - public void testLargeCharCount() { + void testLargeCharCount() throws XmlException { String sNewVal = " 20"; int nCharCount = 10; assertTrue(sNewVal.length() < nCharCount); - toNextTokenOfType(m_xc, TokenType.START); - m_xc.setTextValue(sNewVal.toCharArray(), 0, nCharCount); + try (XmlCursor m_xc = cur(Common.XML_FOO_NS_PREFIX)) { + toNextTokenOfType(m_xc, TokenType.START); + m_xc.setTextValue(sNewVal.toCharArray(), 0, nCharCount); // toPrevTokenOfType(m_xc, TokenType.START); - assertEquals(sNewVal, m_xc.getTextValue()); + assertEquals(sNewVal, m_xc.getTextValue()); + } } //offset+selection>buffer @Test - public void testSelectionPastEnd() { + void testSelectionPastEnd() throws XmlException { String sNewVal = " 20"; - toNextTokenOfType(m_xc, TokenType.START); - m_xc.setTextValue(sNewVal.toCharArray(), 2, 4); + try (XmlCursor m_xc = cur(Common.XML_FOO_NS_PREFIX)) { + toNextTokenOfType(m_xc, TokenType.START); + m_xc.setTextValue(sNewVal.toCharArray(), 2, 4); // toPrevTokenOfType(m_xc, TokenType.START); - assertEquals("0", m_xc.getTextValue()); + assertEquals("0", m_xc.getTextValue()); + } } //spec doesn't say anything about text??? - @Test(expected = IllegalStateException.class) - public void testText() { - String sNewVal = "5000 "; - char[] buff = sNewVal.toCharArray(); - toNextTokenOfType(m_xc, TokenType.TEXT); - m_xc.setTextValue(buff, 0, buff.length); + @Test + void testText() throws XmlException { + char[] buff = "5000 ".toCharArray(); + try (XmlCursor m_xc = cur(Common.XML_FOO_NS_PREFIX)) { + toNextTokenOfType(m_xc, TokenType.TEXT); + assertThrows(IllegalStateException.class, () -> m_xc.setTextValue(buff, 0, buff.length)); + } } //$NOTE:did I forget a type @Test - public void testSetIllegalCursorPos() { - + void testSetIllegalCursorPos() throws XmlException { char[] buffer = new char[100]; - int i = 0; - toNextTokenOfType(m_xc, TokenType.END); - try { - m_xc.setTextValue(buffer, 0, 100); - i++; - } - catch (IllegalStateException e) { - } + try (XmlCursor m_xc = cur(Common.XML_FOO_NS_PREFIX)) { + toNextTokenOfType(m_xc, TokenType.END); + assertThrows(IllegalStateException.class, () -> m_xc.setTextValue(buffer, 0, 100)); - toNextTokenOfType(m_xc, TokenType.ENDDOC); - try { - m_xc.setTextValue(buffer, 0, 100); - fail("SetText in ENDDOC token"); + toNextTokenOfType(m_xc, TokenType.ENDDOC); + assertThrows(IllegalStateException.class, () -> m_xc.setTextValue(buffer, 0, 100), "SetText in ENDDOC token"); } - catch (IllegalStateException e) { - } - if (i > 0) - fail("SetText in END token"); - } - - @Before - public void setUp() throws Exception { - String sDoc = Common.XML_FOO_NS_PREFIX; - m_xc = XmlObject.Factory.parse(sDoc).newCursor(); } } Modified: xmlbeans/trunk/src/test/java/xmlcursor/detailed/ToBookmarkTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/detailed/ToBookmarkTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/xmlcursor/detailed/ToBookmarkTest.java (original) +++ xmlbeans/trunk/src/test/java/xmlcursor/detailed/ToBookmarkTest.java Sun Feb 6 01:51:55 2022 @@ -19,116 +19,110 @@ package xmlcursor.detailed; 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.junit.jupiter.api.Test; import xmlcursor.common.Common; import javax.xml.namespace.QName; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; +import static xmlcursor.common.BasicCursorTestCase.*; -public class ToBookmarkTest extends BasicCursorTestCase { - private SimpleBookmark _theBookmark = new SimpleBookmark("value"); - private SimpleBookmark _theBookmark1 = new SimpleBookmark("value1"); - - @Test - public void testToBookmarkPrior() 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 xc1 = m_xc.newCursor()) { - xc1.toEndDoc(); - assertTrue(xc1.toBookmark(_theBookmark)); +public class ToBookmarkTest { + private static final SimpleBookmark _theBookmark = new SimpleBookmark("value"); + private static final SimpleBookmark _theBookmark1 = new SimpleBookmark("value1"); - assertTrue(m_xc.isAtSamePositionAs(xc1)); - SimpleBookmark sa = (SimpleBookmark) xc1.getBookmark(_theBookmark.getClass()); - assertEquals("value", sa.text); + @Test + void testToBookmarkPrior() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_TEXT)) { + toNextTokenOfType(m_xc, TokenType.START); + m_xc.setBookmark(_theBookmark); + try (XmlCursor xc1 = m_xc.newCursor()) { + xc1.toEndDoc(); + assertTrue(xc1.toBookmark(_theBookmark)); + + assertTrue(m_xc.isAtSamePositionAs(xc1)); + SimpleBookmark sa = (SimpleBookmark) xc1.getBookmark(_theBookmark.getClass()); + assertEquals("value", sa.text); + } } } @Test - public void testToBookmarkPost() 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 xc1 = m_xc.newCursor()) { - xc1.toStartDoc(); - assertTrue(xc1.toBookmark(_theBookmark)); - - assertTrue(m_xc.isAtSamePositionAs(xc1)); - SimpleBookmark sa = (SimpleBookmark) xc1.getBookmark(_theBookmark.getClass()); - assertEquals("value", sa.text); + void testToBookmarkPost() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_TEXT)) { + toNextTokenOfType(m_xc, TokenType.START); + m_xc.setBookmark(_theBookmark); + try (XmlCursor xc1 = m_xc.newCursor()) { + xc1.toStartDoc(); + assertTrue(xc1.toBookmark(_theBookmark)); + + assertTrue(m_xc.isAtSamePositionAs(xc1)); + SimpleBookmark sa = (SimpleBookmark) xc1.getBookmark(_theBookmark.getClass()); + assertEquals("value", sa.text); + } } } @Test - public void testToBookmarkNULL() 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 xc1 = m_xc.newCursor()) { - xc1.toEndDoc(); - assertFalse(xc1.toBookmark(null)); + void testToBookmarkNULL() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_TEXT)) { + toNextTokenOfType(m_xc, TokenType.START); + m_xc.setBookmark(_theBookmark); + try (XmlCursor xc1 = m_xc.newCursor()) { + xc1.toEndDoc(); + assertFalse(xc1.toBookmark(null)); - assertFalse(m_xc.isAtSamePositionAs(xc1)); - assertEquals(TokenType.ENDDOC, xc1.currentTokenType()); + assertFalse(m_xc.isAtSamePositionAs(xc1)); + assertEquals(TokenType.ENDDOC, xc1.currentTokenType()); + } } } @Test - public void testToBookmarkDifferentDoc() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_TEXT); - m_xc = m_xo.newCursor(); - XmlObject xo = XmlObject.Factory.parse(Common.XML_FOO); - try (XmlCursor xc1 = xo.newCursor()) { - assertFalse(m_xc.isInSameDocument(xc1)); - toNextTokenOfType(m_xc, TokenType.START); - m_xc.setBookmark(_theBookmark); + void testToBookmarkDifferentDoc() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_TEXT)) { + XmlObject xo = XmlObject.Factory.parse(Common.XML_FOO); + try (XmlCursor xc1 = xo.newCursor()) { + assertFalse(m_xc.isInSameDocument(xc1)); + toNextTokenOfType(m_xc, TokenType.START); + m_xc.setBookmark(_theBookmark); - assertFalse(xc1.toBookmark(_theBookmark)); - assertFalse(m_xc.isInSameDocument(xc1)); + assertFalse(xc1.toBookmark(_theBookmark)); + assertFalse(m_xc.isInSameDocument(xc1)); + } } } @Test - public void testPostMoveBookmarkInsideMove() throws Exception { - m_xo = XmlObject.Factory.parse(JarUtil.getResourceFromJar(Common.TRANXML_FILE_XMLCURSOR_PO)); + void testPostMoveBookmarkInsideMove() throws Exception { String ns = "declare namespace po=\"http://xbean.test/xmlcursor/PurchaseOrder\"";; String exp_ns = "xmlns: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 + " $this//po:shipTo/po:city"); while (m_xc.toNextSelection()) { m_xc.setBookmark(_theBookmark); xc1.selectPath(ns + " $this//po:billTo/po:city"); while (xc1.toNextSelection()) { m_xc.moveXml(xc1); - try { - assertTrue(xc1.toBookmark(_theBookmark)); - assertEquals("<po:city " + exp_ns + ">Mill Valley</po:city>", xc1.xmlText()); - xc1.toNextSibling(); - assertEquals("<po:city " + exp_ns + ">Old Town</po:city>", xc1.xmlText()); - } catch (Exception e) { - } + assertTrue(xc1.toBookmark(_theBookmark)); + assertEquals("<po:city " + exp_ns + ">Mill Valley</po:city>", xc1.xmlText()); + xc1.toNextSibling(); + assertEquals("<po:city " + exp_ns + ">Old Town</po:city>", xc1.xmlText()); } } } } @Test - public void testPostMoveBookmarkToRightOfMove() throws Exception { - m_xo = XmlObject.Factory.parse(JarUtil.getResourceFromJar(Common.TRANXML_FILE_XMLCURSOR_PO)); + void testPostMoveBookmarkToRightOfMove() throws Exception { String ns = "declare namespace po=\"http://xbean.test/xmlcursor/PurchaseOrder\"";; String exp_ns = "xmlns: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 + " $this//po:shipTo/po:city"); while (m_xc.toNextSelection()) { m_xc.setBookmark(_theBookmark); @@ -142,24 +136,21 @@ public class ToBookmarkTest extends Basi while (xc1.toNextSelection()) { m_xc.moveXml(xc1); m_xc.toStartDoc(); - try { - assertTrue(xc1.toBookmark(_theBookmark1)); - xc1.toPrevSibling(); - assertEquals("<po:street " + exp_ns + ">123 Maple Street</po:street>", xc1.xmlText()); - } catch (Exception e) { - } + assertTrue(xc1.toBookmark(_theBookmark1)); + xc1.toPrevSibling(); + assertEquals("<po:street " + exp_ns + ">123 Maple Street</po:street>", xc1.xmlText()); } } } } @Test - public void testToBookmarkPostCopy() throws Exception { - m_xo = XmlObject.Factory.parse(JarUtil.getResourceFromJar(Common.TRANXML_FILE_XMLCURSOR_PO)); - m_xc = m_xo.newCursor(); - try (XmlCursor xc1 = m_xo.newCursor()) { - String ns = "declare namespace po=\"http://xbean.test/xmlcursor/PurchaseOrder\"";; - String exp_ns = "xmlns:po=\"http://xbean.test/xmlcursor/PurchaseOrder\"";; + void testToBookmarkPostCopy() throws Exception { + String ns = "declare namespace po=\"http://xbean.test/xmlcursor/PurchaseOrder\"";; + String exp_ns = "xmlns:po=\"http://xbean.test/xmlcursor/PurchaseOrder\"";; + + 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 + " $this//po:shipTo/po:city"); while (m_xc.toNextSelection()) { @@ -167,23 +158,19 @@ public class ToBookmarkTest extends Basi xc1.selectPath(ns + "$this//po:billTo/po:city"); while (xc1.toNextSelection()) { m_xc.copyXml(xc1); - try { - assertTrue(xc1.toBookmark(_theBookmark)); - assertEquals("<po:city " + exp_ns + ">Mill Valley</po:city>", xc1.xmlText()); - xc1.toNextSibling(); - assertEquals("<po:state " + exp_ns + ">CA</po:state>", xc1.xmlText()); - } catch (Exception e) { - } + assertTrue(xc1.toBookmark(_theBookmark)); + assertEquals("<po:city " + exp_ns + ">Mill Valley</po:city>", xc1.xmlText()); + xc1.toNextSibling(); + assertEquals("<po:state " + exp_ns + ">CA</po:state>", xc1.xmlText()); } } } } @Test - public void testToBookmarkPostMoveChars() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_DIGITS); - m_xc = m_xo.newCursor(); - try (XmlCursor xc1 = m_xo.newCursor()) { + void testToBookmarkPostMoveChars() 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); xc1.toCursor(m_xc); xc1.toNextChar(1); @@ -205,44 +192,41 @@ public class ToBookmarkTest extends Basi * result should be 0123*01*4 where * shows the new insert */ @Test - public void testToBookmarkPostCopyChars() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_DIGITS); - m_xc = m_xo.newCursor(); - // XmlCursor xc1 = m_xo.newCursor(); - toNextTokenOfType(m_xc, TokenType.TEXT); - try (XmlCursor xc1 = m_xc.newCursor()) { - //xc1.toCursor(m_xc); - xc1.toNextChar(1); - // set a Bookmark at the '1', text is 1234 - xc1.setBookmark(_theBookmark); - // move xc1 to the '3' , text post cursor is 34 - xc1.toNextChar(2); - - assertEquals("34", xc1.getTextValue()); - //text at m_xc is 01234, should get 0123*01*4 - assertEquals(2, m_xc.copyChars(2, xc1)); - assertEquals("0120134", m_xc.getTextValue()); - assertEquals("34", xc1.getTextValue()); - xc1.toBookmark(_theBookmark); - assertEquals("120134", xc1.getTextValue()); + void testToBookmarkPostCopyChars() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_DIGITS)) { + toNextTokenOfType(m_xc, TokenType.TEXT); + try (XmlCursor xc1 = m_xc.newCursor()) { + //xc1.toCursor(m_xc); + xc1.toNextChar(1); + // set a Bookmark at the '1', text is 1234 + xc1.setBookmark(_theBookmark); + // move xc1 to the '3' , text post cursor is 34 + xc1.toNextChar(2); + + assertEquals("34", xc1.getTextValue()); + //text at m_xc is 01234, should get 0123*01*4 + assertEquals(2, m_xc.copyChars(2, xc1)); + assertEquals("0120134", m_xc.getTextValue()); + assertEquals("34", xc1.getTextValue()); + xc1.toBookmark(_theBookmark); + assertEquals("120134", xc1.getTextValue()); + } } } @Test - public void testDumb() throws Exception { - m_xo = XmlObject.Factory.parse("<foo>01234</foo>"); - m_xc = m_xo.newCursor(); - try (XmlCursor xc1 = toNextTokenOfTypeCursor(m_xc, TokenType.TEXT)) { + void testDumb() throws Exception { + try (XmlCursor m_xc = cur("<foo>01234</foo>"); + XmlCursor xc1 = toNextTokenOfTypeCursor(m_xc, TokenType.TEXT)) { xc1.toNextChar(2); assertEquals(2, m_xc.copyChars(2, xc1)); } } - @Test(expected = IllegalArgumentException.class) - public void testDumbDelete() throws Exception { - m_xo = XmlObject.Factory.parse("<foo>01234</foo>"); - m_xc = m_xo.newCursor(); - try (XmlCursor xc1 = toNextTokenOfTypeCursor(m_xc, TokenType.TEXT)) { + @Test + void testDumbDelete() throws Exception { + try (XmlCursor m_xc = cur("<foo>01234</foo>"); + XmlCursor xc1 = toNextTokenOfTypeCursor(m_xc, TokenType.TEXT)) { m_xc.toNextChar(2); m_xc.setBookmark(_theBookmark); m_xc.toStartDoc(); @@ -250,119 +234,118 @@ public class ToBookmarkTest extends Basi xc1.removeXml(); xc1.toCursor(m_xc); //both at start of original doc - assertEquals(m_xc.currentTokenType(), - XmlCursor.TokenType.STARTDOC); + assertEquals(TokenType.STARTDOC, m_xc.currentTokenType()); assertTrue(m_xc.isAtSamePositionAs(xc1)); //move xc1 to outer space xc1.toBookmark(_theBookmark); - assertTrue(!m_xc.isInSameDocument(xc1)); - assertTrue(!m_xc.isLeftOf(xc1)); + assertFalse(m_xc.isInSameDocument(xc1)); + assertThrows(IllegalArgumentException.class, () -> m_xc.isLeftOf(xc1)); } } @Test - public void testToBookmarkPostRemove() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_BAR_TEXT); - m_xc = m_xo.newCursor(); - m_xc.selectPath(".//bar"); - while (m_xc.toNextSelection()) - assertEquals("<bar>text</bar>", m_xc.xmlText()); - m_xc.toNextToken(); - m_xc.setBookmark(_theBookmark); // set annot. at 'text' + void testToBookmarkPostRemove() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_BAR_TEXT)) { + m_xc.selectPath(".//bar"); + while (m_xc.toNextSelection()) { + assertEquals("<bar>text</bar>", m_xc.xmlText()); + } + m_xc.toNextToken(); + m_xc.setBookmark(_theBookmark); // set annot. at 'text' - try (XmlCursor xc1 = m_xc.newCursor()) { - xc1.toBookmark(_theBookmark); - SimpleBookmark sa = (SimpleBookmark) xc1.getBookmark(SimpleBookmark.class); - assertEquals("value", sa.text); - m_xc.toStartDoc(); - xc1.toPrevToken(); - xc1.removeXml(); - xc1.toStartDoc(); - assertTrue(m_xc.isAtSamePositionAs(xc1)); - assertEquals("<foo/>", m_xc.xmlText()); - //test modified, the two cursors are not in the same - //tree anymore - assertTrue(xc1.toBookmark(_theBookmark)); - assertTrue(!xc1.isInSameDocument(m_xc)); -// assertTrue(!xc1.isLeftOf(m_xc)); - - sa = (SimpleBookmark) xc1.getBookmark(SimpleBookmark.class); - assertNotNull(sa); - assertEquals(TokenType.TEXT, xc1.currentTokenType()); + try (XmlCursor xc1 = m_xc.newCursor()) { + xc1.toBookmark(_theBookmark); + SimpleBookmark sa = (SimpleBookmark) xc1.getBookmark(SimpleBookmark.class); + assertEquals("value", sa.text); + m_xc.toStartDoc(); + xc1.toPrevToken(); + xc1.removeXml(); + xc1.toStartDoc(); + assertTrue(m_xc.isAtSamePositionAs(xc1)); + assertEquals("<foo/>", m_xc.xmlText()); + //test modified, the two cursors are not in the same + //tree anymore + assertTrue(xc1.toBookmark(_theBookmark)); + assertFalse(xc1.isInSameDocument(m_xc)); + + sa = (SimpleBookmark) xc1.getBookmark(SimpleBookmark.class); + assertNotNull(sa); + assertEquals(TokenType.TEXT, xc1.currentTokenType()); + } } } @Test - public void testToBookmarkPostRemoveAttribute() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT); - m_xc = m_xo.newCursor(); - toNextTokenOfType(m_xc, TokenType.ATTR); - m_xc.setBookmark(_theBookmark); // set annot. at attribute - m_xc.toStartDoc(); - try (XmlCursor xc1 = m_xc.newCursor()) { - xc1.toBookmark(_theBookmark); - SimpleBookmark sa = (SimpleBookmark) xc1.getBookmark(SimpleBookmark.class); - assertEquals("value", sa.text); - xc1.toEndDoc(); - - toNextTokenOfType(m_xc, TokenType.START); - m_xc.removeAttribute(new QName("attr0")); + void testToBookmarkPostRemoveAttribute() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_1ATTR_TEXT)) { + toNextTokenOfType(m_xc, TokenType.ATTR); + m_xc.setBookmark(_theBookmark); // set annot. at attribute m_xc.toStartDoc(); - - assertEquals("<foo>text</foo>", m_xc.xmlText()); - assertTrue(xc1.toBookmark(_theBookmark)); - assertTrue(!xc1.isInSameDocument(m_xc)); + try (XmlCursor xc1 = m_xc.newCursor()) { + xc1.toBookmark(_theBookmark); + SimpleBookmark sa = (SimpleBookmark) xc1.getBookmark(SimpleBookmark.class); + assertEquals("value", sa.text); + xc1.toEndDoc(); + + toNextTokenOfType(m_xc, TokenType.START); + m_xc.removeAttribute(new QName("attr0")); + m_xc.toStartDoc(); + + assertEquals("<foo>text</foo>", m_xc.xmlText()); + assertTrue(xc1.toBookmark(_theBookmark)); + assertFalse(xc1.isInSameDocument(m_xc)); + } } } @Test - public void testToBookmarkPostRemoveChars() throws Exception { - m_xo = XmlObject.Factory.parse(Common.XML_FOO_DIGITS); - m_xc = m_xo.newCursor(); - toNextTokenOfType(m_xc, TokenType.TEXT); - m_xc.toNextChar(2); - assertEquals("234", m_xc.getTextValue()); - m_xc.setBookmark(_theBookmark); // set annot. at '2' - m_xc.toPrevChar(2); - assertEquals(3, m_xc.removeChars(3)); // '2' should be deleted - assertEquals("34", m_xc.getTextValue()); - try (XmlCursor xc1 = m_xc.newCursor()) { - xc1.toEndDoc(); - - assertTrue(xc1.toBookmark(_theBookmark)); - assertTrue(!xc1.isInSameDocument(m_xc)); - SimpleBookmark sa = - (SimpleBookmark) xc1.getBookmark(SimpleBookmark.class); - assertEquals("value", sa.text); - assertEquals(TokenType.TEXT, xc1.currentTokenType()); + void testToBookmarkPostRemoveChars() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_DIGITS)) { + toNextTokenOfType(m_xc, TokenType.TEXT); + m_xc.toNextChar(2); + assertEquals("234", m_xc.getTextValue()); + m_xc.setBookmark(_theBookmark); // set annot. at '2' + m_xc.toPrevChar(2); + // '2' should be deleted + assertEquals(3, m_xc.removeChars(3)); + assertEquals("34", m_xc.getTextValue()); + try (XmlCursor xc1 = m_xc.newCursor()) { + xc1.toEndDoc(); + + assertTrue(xc1.toBookmark(_theBookmark)); + assertFalse(xc1.isInSameDocument(m_xc)); + SimpleBookmark sa = (SimpleBookmark) xc1.getBookmark(SimpleBookmark.class); + assertEquals("value", sa.text); + assertEquals(TokenType.TEXT, xc1.currentTokenType()); + } } } @Test - public void testToBookmarkPostSetTextValue() 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.getTextValue()); - m_xc.setBookmark(_theBookmark); // set annot. in middle of TEXT - try (XmlCursor xc1 = m_xc.newCursor()) { - xc1.toEndDoc(); - m_xc.toPrevToken(); - m_xc.setTextValue("changed"); - m_xc.toStartDoc(); - assertEquals("<foo>changed</foo>", m_xc.xmlText()); - - assertTrue(xc1.toBookmark(_theBookmark)); - assertTrue(!xc1.isInSameDocument(m_xc)); - SimpleBookmark sa = (SimpleBookmark) xc1.getBookmark(SimpleBookmark.class); - assertEquals("value", sa.text); - assertEquals(TokenType.TEXT, xc1.currentTokenType()); + void testToBookmarkPostSetTextValue() throws Exception { + try (XmlCursor m_xc = cur(Common.XML_FOO_TEXT)) { + toNextTokenOfType(m_xc, TokenType.TEXT); + m_xc.toNextChar(2); + assertEquals("xt", m_xc.getTextValue()); + // set annot. in middle of TEXT + m_xc.setBookmark(_theBookmark); + try (XmlCursor xc1 = m_xc.newCursor()) { + xc1.toEndDoc(); + m_xc.toPrevToken(); + m_xc.setTextValue("changed"); + m_xc.toStartDoc(); + assertEquals("<foo>changed</foo>", m_xc.xmlText()); + + assertTrue(xc1.toBookmark(_theBookmark)); + assertFalse(xc1.isInSameDocument(m_xc)); + SimpleBookmark sa = (SimpleBookmark) xc1.getBookmark(SimpleBookmark.class); + assertEquals("value", sa.text); + assertEquals(TokenType.TEXT, xc1.currentTokenType()); + } } - } - public class SimpleBookmark extends XmlCursor.XmlBookmark { + private static class SimpleBookmark extends XmlCursor.XmlBookmark { public String text; SimpleBookmark(String text) { Modified: xmlbeans/trunk/src/test/java/xmlcursor/detailed/ToChildTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/detailed/ToChildTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/xmlcursor/detailed/ToChildTest.java (original) +++ xmlbeans/trunk/src/test/java/xmlcursor/detailed/ToChildTest.java Sun Feb 6 01:51:55 2022 @@ -16,297 +16,264 @@ 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 javax.xml.namespace.QName; -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 ToChildTest extends BasicCursorTestCase { +public class ToChildTest { - private String sDoc="<foo>early<bar>text</bar><char>zap<dar>wap</dar><ear>yap</ear></char></foo>"; - - private int nChildCount=2; //num children if TEXT is a child - /** - * Testing toChild(String) - * Cases: - * non-existing name - * 2 children with same name - * nested child with same name - * Child of TEXT - */ + private static final String XML ="<foo>early<bar>text</bar><char>zap<dar>wap</dar><ear>yap</ear></char></foo>"; @Test - public void testToChildNonExisting() throws Exception { - m_xc = XmlObject.Factory.parse(sDoc).newCursor(); - assertFalse(m_xc.toChild("yana")); + void testToChildNonExisting() throws Exception { + try (XmlCursor m_xc = cur(XML)) { + assertFalse(m_xc.toChild("yana")); + } } - @Test(expected = IllegalArgumentException.class) - public void testToChildInvalidName() throws Exception { - m_xc = XmlObject.Factory.parse(sDoc).newCursor(); - m_xc.toChild(""); + @Test + void testToChildInvalidName() throws Exception { + try (XmlCursor m_xc = cur(XML)) { + assertThrows(IllegalArgumentException.class, () -> m_xc.toChild("")); + } } - @Test(expected = IllegalArgumentException.class) - public void testToChildNull() throws Exception { - m_xc = XmlObject.Factory.parse(sDoc).newCursor(); - m_xc.toChild((String)null); + @Test + void testToChildNull() throws Exception { + try (XmlCursor m_xc = cur(XML)) { + assertThrows(IllegalArgumentException.class, () -> m_xc.toChild((String)null)); + } } @Test - public void testNameCollision() throws Exception { - sDoc = "<foo><bar>txt0</bar><bar>txt1</bar></foo>"; + void testNameCollision() throws Exception { String sExpectedValue = "<bar>txt0</bar>"; - m_xc = XmlObject.Factory.parse(sDoc).newCursor(); - m_xc.toFirstChild(); - assertTrue(m_xc.toChild("bar")); - assertEquals(sExpectedValue, m_xc.xmlText()); + try (XmlCursor m_xc = cur("<foo><bar>txt0</bar><bar>txt1</bar></foo>")) { + m_xc.toFirstChild(); + assertTrue(m_xc.toChild("bar")); + assertEquals(sExpectedValue, m_xc.xmlText()); + } } @Test - public void testSameNameDescendant() throws Exception { - sDoc = "<foo><bar><bar>txt0<bar/></bar></bar><bar>txt1</bar></foo>"; + void testSameNameDescendant() throws Exception { String sExpectedValue = "<bar><bar>txt0<bar/></bar></bar>"; - m_xc = XmlObject.Factory.parse(sDoc).newCursor(); - m_xc.toFirstChild(); - assertTrue(m_xc.toChild("bar")); - assertEquals(sExpectedValue, m_xc.xmlText()); + try (XmlCursor m_xc = cur("<foo><bar><bar>txt0<bar/></bar></bar><bar>txt1</bar></foo>")) { + m_xc.toFirstChild(); + assertTrue(m_xc.toChild("bar")); + assertEquals(sExpectedValue, m_xc.xmlText()); + } } @Test - public void testTextChild() throws Exception { - m_xc = XmlObject.Factory.parse(sDoc).newCursor(); - m_xc.toFirstChild(); - toNextTokenOfType(m_xc, TokenType.TEXT); - assertFalse(m_xc.toChild("bar")); + void testTextChild() throws Exception { + try (XmlCursor m_xc = cur(XML)) { + m_xc.toFirstChild(); + toNextTokenOfType(m_xc, TokenType.TEXT); + assertFalse(m_xc.toChild("bar")); + } } - /** - * toChild(String,String) - * Cases: - * non-existing ns, existing name - * non-existing name, existing ns - * 2 children with same name - * 2 children with same name, diff ns - * 2 children with diff name, same ns - * nested child with same name & ns - */ - - @Test - public void testNullNS() throws Exception { - m_xc = XmlObject.Factory.parse(sDoc).newCursor(); - m_xc.toFirstChild(); - String sExpectedResult = "<bar>text</bar>"; - assertTrue(m_xc.toChild(null, "bar")); - assertEquals(sExpectedResult, m_xc.xmlText()); + void testNullNS() throws Exception { + try (XmlCursor m_xc = cur(XML)) { + m_xc.toFirstChild(); + String sExpectedResult = "<bar>text</bar>"; + assertTrue(m_xc.toChild(null, "bar")); + assertEquals(sExpectedResult, m_xc.xmlText()); + } } - @Test(expected = IllegalArgumentException.class) - public void testNullName() throws Exception { - m_xc = XmlObject.Factory.parse(sDoc).newCursor(); - m_xc.toFirstChild(); - m_xc.toChild("uri:foo.org", null); + @Test + void testNullName() throws Exception { + try (XmlCursor m_xc = cur(XML)) { + m_xc.toFirstChild(); + assertThrows(IllegalArgumentException.class, () -> m_xc.toChild("uri:foo.org", null)); + } } @Test - public void testNamespaceOKNameInvalid() throws Exception { - sDoc = "<foo xmlns:fo=\"uri:foo.org\"><fo:bar>txt0</fo:bar><bar>txt1</bar></foo>"; - m_xc = XmlObject.Factory.parse(sDoc).newCursor(); - m_xc.toFirstChild(); - assertFalse(m_xc.toChild("fo", "test")); + void testNamespaceOKNameInvalid() throws Exception { + try (XmlCursor m_xc = cur("<foo xmlns:fo=\"uri:foo.org\"><fo:bar>txt0</fo:bar><bar>txt1</bar></foo>")) { + m_xc.toFirstChild(); + assertFalse(m_xc.toChild("fo", "test")); + } } @Test - public void testNamespaceInvalidNameOK() throws Exception { - sDoc = "<foo xmlns:fo=\"uri:foo.org\"><fo:bar>txt0</fo:bar><bar>txt1</bar></foo>"; - m_xc = XmlObject.Factory.parse(sDoc).newCursor(); - m_xc.toFirstChild(); - assertFalse(m_xc.toChild("bar", "bar")); + void testNamespaceInvalidNameOK() throws Exception { + try (XmlCursor m_xc = cur("<foo xmlns:fo=\"uri:foo.org\"><fo:bar>txt0</fo:bar><bar>txt1</bar></foo>")) { + m_xc.toFirstChild(); + assertFalse(m_xc.toChild("bar", "bar")); + } } @Test - public void testNormalCase() throws Exception { - sDoc = "<foo xmlns:fo=\"uri:foo.org\"><fo:bar>txt0</fo:bar><bar>txt1</bar></foo>"; + void testNormalCase() throws Exception { String sExpectedResult = "<fo:bar xmlns:fo=\"uri:foo.org\">txt0</fo:bar>"; - m_xc = XmlObject.Factory.parse(sDoc).newCursor(); - m_xc.toFirstChild(); - assertTrue(m_xc.toChild("uri:foo.org", "bar")); - assertEquals(sExpectedResult, m_xc.xmlText()); + try (XmlCursor m_xc = cur("<foo xmlns:fo=\"uri:foo.org\"><fo:bar>txt0</fo:bar><bar>txt1</bar></foo>")) { + m_xc.toFirstChild(); + assertTrue(m_xc.toChild("uri:foo.org", "bar")); + assertEquals(sExpectedResult, m_xc.xmlText()); + } } @Test - public void testUriNameCollision() throws Exception { - sDoc = "<foo xmlns:fo=\"uri:foo.org\"><fo:bar>txt0</fo:bar><fo:bar>txt1</fo:bar></foo>"; + void testUriNameCollision() throws Exception { String sExpectedValue = "<fo:bar xmlns:fo=\"uri:foo.org\">txt0</fo:bar>"; - m_xc = XmlObject.Factory.parse(sDoc).newCursor(); - m_xc.toFirstChild(); - assertTrue(m_xc.toChild("uri:foo.org", "bar")); - assertEquals(sExpectedValue, m_xc.xmlText()); + try (XmlCursor m_xc = cur("<foo xmlns:fo=\"uri:foo.org\"><fo:bar>txt0</fo:bar><fo:bar>txt1</fo:bar></foo>")) { + m_xc.toFirstChild(); + assertTrue(m_xc.toChild("uri:foo.org", "bar")); + assertEquals(sExpectedValue, m_xc.xmlText()); + } } //same URI diff names @Test - public void testFakeNameCollision() throws Exception { - sDoc = "<foo xmlns:fo=\"uri:foo.org\"><fo:bars>txt0</fo:bars><fo:bar>txt1</fo:bar></foo>"; + void testFakeNameCollision() throws Exception { String sExpectedValue = "<fo:bar xmlns:fo=\"uri:foo.org\">txt1</fo:bar>"; - m_xc = XmlObject.Factory.parse(sDoc).newCursor(); - m_xc.toFirstChild(); - assertTrue(m_xc.toChild("uri:foo.org", "bar")); - assertEquals(sExpectedValue, m_xc.xmlText()); + try (XmlCursor m_xc = cur("<foo xmlns:fo=\"uri:foo.org\"><fo:bars>txt0</fo:bars><fo:bar>txt1</fo:bar></foo>")) { + m_xc.toFirstChild(); + assertTrue(m_xc.toChild("uri:foo.org", "bar")); + assertEquals(sExpectedValue, m_xc.xmlText()); + } } //diff URI same names @Test - public void testFakeNameCollision3() throws Exception { - sDoc = "<foo xmlns:fo=\"uri:foo.org\"><fo:bar>txt0</fo:bar><bar>txt1</bar></foo>"; + void testFakeNameCollision3() throws Exception { String sExpectedValue = "<fo:bar xmlns:fo=\"uri:foo.org\">txt0</fo:bar>"; - m_xc = XmlObject.Factory.parse(sDoc).newCursor(); - m_xc.toFirstChild(); - assertTrue(m_xc.toChild("uri:foo.org", "bar")); - assertEquals(sExpectedValue, m_xc.xmlText()); + try (XmlCursor m_xc = cur("<foo xmlns:fo=\"uri:foo.org\"><fo:bar>txt0</fo:bar><bar>txt1</bar></foo>")) { + m_xc.toFirstChild(); + assertTrue(m_xc.toChild("uri:foo.org", "bar")); + assertEquals(sExpectedValue, m_xc.xmlText()); + } } @Test - public void testSameNameDescendant1() throws Exception { - sDoc = "<foo xmlns:fo=\"uri:foo.org\"><bar><fo:bar>txt0<bar/></fo:bar></bar><bar>txt1</bar></foo>"; - - m_xc = XmlObject.Factory.parse(sDoc).newCursor(); - m_xc.toFirstChild(); - assertFalse(m_xc.toChild("uri:foo.org", "bar")); + void testSameNameDescendant1() throws Exception { + try (XmlCursor m_xc = cur("<foo xmlns:fo=\"uri:foo.org\"><bar><fo:bar>txt0<bar/></fo:bar></bar><bar>txt1</bar></foo>")) { + m_xc.toFirstChild(); + assertFalse(m_xc.toChild("uri:foo.org", "bar")); + } } @Test - public void testSameNameDescendant2() throws Exception { - sDoc = "<foo xmlns:fo=\"uri:foo.org\"><bar><fo:bar>txt0<bar/></fo:bar></bar><bar>txt1</bar><fo:bar>txt1</fo:bar></foo>"; + void testSameNameDescendant2() throws Exception { String sExpectedValue = "<fo:bar xmlns:fo=\"uri:foo.org\">txt1</fo:bar>"; - m_xc = XmlObject.Factory.parse(sDoc).newCursor(); - m_xc.toFirstChild(); - assertTrue(m_xc.toChild("uri:foo.org", "bar")); - assertEquals(sExpectedValue, m_xc.xmlText()); + try (XmlCursor m_xc = cur("<foo xmlns:fo=\"uri:foo.org\"><bar><fo:bar>txt0<bar/></fo:bar></bar><bar>txt1</bar><fo:bar>txt1</fo:bar></foo>")) { + m_xc.toFirstChild(); + assertTrue(m_xc.toChild("uri:foo.org", "bar")); + assertEquals(sExpectedValue, m_xc.xmlText()); + } } - - /** - * toChild(int) - * Cases: - * i<0 - * i>numChildren - * i=0, numChildren=0 - */ - @Test - public void testNegativeIndex() throws Exception { - m_xc = XmlObject.Factory.parse(sDoc).newCursor(); - assertFalse(m_xc.toChild(-1)); + void testNegativeIndex() throws Exception { + try (XmlCursor m_xc = cur(XML)) { + assertFalse(m_xc.toChild(-1)); + } } @Test - public void testIndexOKFirst() throws Exception { + void testIndexOKFirst() throws Exception { String sExpectedValue = "<bar>text</bar>"; - m_xc = XmlObject.Factory.parse(sDoc).newCursor(); - m_xc.toFirstChild(); - assertTrue(m_xc.toChild(0));//text is not children - assertEquals(sExpectedValue, m_xc.xmlText()); + try (XmlCursor m_xc = cur(XML)) { + m_xc.toFirstChild(); + assertTrue(m_xc.toChild(0));//text is not children + assertEquals(sExpectedValue, m_xc.xmlText()); + } } @Test - public void testIndexOKLast() throws Exception { + void testIndexOKLast() throws Exception { String sExpectedValue = "<char>zap<dar>wap</dar><ear>yap</ear></char>"; - m_xc = XmlObject.Factory.parse(sDoc).newCursor(); - m_xc.toFirstChild(); - assertTrue(m_xc.toChild(nChildCount - 1)); - assertEquals(sExpectedValue, m_xc.xmlText()); - m_xc.toParent(); - m_xc.toLastChild(); - assertEquals(sExpectedValue, m_xc.xmlText()); + int nChildCount = 2; + try (XmlCursor m_xc = cur(XML)) { + m_xc.toFirstChild(); + assertTrue(m_xc.toChild(nChildCount - 1)); + assertEquals(sExpectedValue, m_xc.xmlText()); + m_xc.toParent(); + m_xc.toLastChild(); + assertEquals(sExpectedValue, m_xc.xmlText()); + } } @Test - public void testLargeIndex() throws Exception { - m_xc = XmlObject.Factory.parse(sDoc).newCursor(); - m_xc.toFirstChild(); - assertFalse(m_xc.toChild(20)); - + void testLargeIndex() throws Exception { + try (XmlCursor m_xc = cur(XML)) { + m_xc.toFirstChild(); + assertFalse(m_xc.toChild(20)); + } } @Test - public void testInd0Count0() throws Exception { - sDoc = "<foo/>"; - m_xc = XmlObject.Factory.parse(sDoc).newCursor(); - m_xc.toFirstChild(); - assertFalse(m_xc.toChild(0)); + void testInd0Count0() throws Exception { + try (XmlCursor m_xc = cur("<foo/>")) { + m_xc.toFirstChild(); + assertFalse(m_xc.toChild(0)); + } } - - /** - * toChild(QName,int) - * Cases: - * QName dne, - * QName OK, i OK;i >numChildren;i<0 - * Name collision, i=1;i>numChildren - * Siblings and a child with same qname, ask for 2nd sibling - */ - @Test - public void testToChildQNameDNE0() throws Exception { + void testToChildQNameDNE0() throws Exception { QName searchVal = new QName("fake:uri", "bar"); - m_xc = XmlObject.Factory.parse(sDoc).newCursor(); - m_xc.toFirstChild(); - assertFalse(m_xc.toChild(searchVal, 1)); + try (XmlCursor m_xc = cur(XML)) { + m_xc.toFirstChild(); + assertFalse(m_xc.toChild(searchVal, 1)); + } } @Test - public void testToChildQNameDNE1() throws Exception { - sDoc = "<foo xmlns:fo=\"uri:foo.org\"><fo:bars>txt0</fo:bars><fo:bar>txt1</fo:bar></foo>"; + void testToChildQNameDNE1() throws Exception { QName searchVal = new QName("uri:foo.org", "bar", "pre"); - m_xc = XmlObject.Factory.parse(sDoc).newCursor(); - m_xc.toFirstChild(); - assertFalse(m_xc.toChild(searchVal, 1)); + try (XmlCursor m_xc = cur("<foo xmlns:fo=\"uri:foo.org\"><fo:bars>txt0</fo:bars><fo:bar>txt1</fo:bar></foo>")) { + m_xc.toFirstChild(); + assertFalse(m_xc.toChild(searchVal, 1)); + } } @Test - public void testToChildQNameOKIndexOK() throws Exception { - sDoc = "<foo xmlns:fo=\"uri:foo.org\"><fo:bars>txt0</fo:bars><fo:bar>txt1</fo:bar></foo>"; + void testToChildQNameOKIndexOK() throws Exception { QName searchVal = new QName("uri:foo.org", "bar", "fo"); String sExpectedValue = "<fo:bar xmlns:fo=\"uri:foo.org\">txt1</fo:bar>"; - m_xc = XmlObject.Factory.parse(sDoc).newCursor(); - m_xc.toFirstChild(); - assertTrue(m_xc.toChild(searchVal, 0)); - assertEquals(sExpectedValue, m_xc.xmlText()); - assertFalse(m_xc.toChild(searchVal, 1)); - assertFalse(m_xc.toChild(searchVal, -1)); + try (XmlCursor m_xc = cur("<foo xmlns:fo=\"uri:foo.org\"><fo:bars>txt0</fo:bars><fo:bar>txt1</fo:bar></foo>")) { + m_xc.toFirstChild(); + assertTrue(m_xc.toChild(searchVal, 0)); + assertEquals(sExpectedValue, m_xc.xmlText()); + assertFalse(m_xc.toChild(searchVal, 1)); + assertFalse(m_xc.toChild(searchVal, -1)); + } } @Test - public void testQNameNameCollision() throws Exception { - sDoc = "<foo xmlns:fo=\"uri:foo.org\"><fo:bars>txt0</fo:bars><fo:bar>txt1</fo:bar></foo>"; - nChildCount = 2; + void testQNameNameCollision() throws Exception { + int nInvalidCount = 2; QName searchVal = new QName("uri:foo.org", "bar", "fo"); String sExpectedValue = "<fo:bar xmlns:fo=\"uri:foo.org\">txt1</fo:bar>"; - m_xc = XmlObject.Factory.parse(sDoc).newCursor(); - m_xc.toFirstChild(); - assertTrue(m_xc.toChild(searchVal, 0)); - assertEquals(sExpectedValue, m_xc.xmlText()); - int nInvalidCount = 2; - if (nInvalidCount >= nChildCount) + try (XmlCursor m_xc = cur("<foo xmlns:fo=\"uri:foo.org\"><fo:bars>txt0</fo:bars><fo:bar>txt1</fo:bar></foo>")) { + m_xc.toFirstChild(); + assertTrue(m_xc.toChild(searchVal, 0)); + assertEquals(sExpectedValue, m_xc.xmlText()); assertFalse(m_xc.toChild(searchVal, nInvalidCount)); - else fail("Broken Test"); + } } @Test - public void testFakeQNameCollision() throws Exception { - sDoc = "<foo xmlns:fo=\"uri:foo.org\" xmlns:fo2=\"uri:foo.org\"><fo2:bar>txt0</fo2:bar><fo:bar>txt1</fo:bar></foo>"; + void testFakeQNameCollision() throws Exception { String sExpectedValue = "<fo2:bar xmlns:fo=\"uri:foo.org\" xmlns:fo2=\"uri:foo.org\">txt0</fo2:bar>"; - m_xc = XmlObject.Factory.parse(sDoc).newCursor(); - m_xc.toFirstChild(); - QName searchVal = new QName("uri:foo.org", "bar", "fo"); - assertTrue(m_xc.toChild(searchVal, 0)); - assertEquals(sExpectedValue, m_xc.xmlText()); + try (XmlCursor m_xc = cur("<foo xmlns:fo=\"uri:foo.org\" xmlns:fo2=\"uri:foo.org\"><fo2:bar>txt0</fo2:bar><fo:bar>txt1</fo:bar></foo>")) { + m_xc.toFirstChild(); + QName searchVal = new QName("uri:foo.org", "bar", "fo"); + assertTrue(m_xc.toChild(searchVal, 0)); + assertEquals(sExpectedValue, m_xc.xmlText()); + } } } Modified: xmlbeans/trunk/src/test/java/xmlcursor/detailed/XmlLineNumberTest.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/detailed/XmlLineNumberTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff ============================================================================== --- xmlbeans/trunk/src/test/java/xmlcursor/detailed/XmlLineNumberTest.java (original) +++ xmlbeans/trunk/src/test/java/xmlcursor/detailed/XmlLineNumberTest.java Sun Feb 6 01:51:55 2022 @@ -18,16 +18,16 @@ import org.apache.xmlbeans.XmlCursor; import org.apache.xmlbeans.XmlLineNumber; import org.apache.xmlbeans.XmlObject; import org.apache.xmlbeans.XmlOptions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import static common.Common.P; import static common.Common.XBEAN_CASE_ROOT; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class XmlLineNumberTest { - public static final String xml = + private static final String XML = "<people><person born=\"1912\" died=\"1954\" id=\"p342\">\n" + " <name>\n" + "\t\t<first_name>Alan</first_name>\n" + @@ -35,14 +35,14 @@ public class XmlLineNumberTest { "</name>\n" + "</person></people>"; - public static final String xmlFile = XBEAN_CASE_ROOT + P + "xmlcursor" + P + "Employees.xml"; + private static final String xmlFile = XBEAN_CASE_ROOT + P + "xmlcursor" + P + "Employees.xml"; /** * test obtaining XmlLineNumber bookmark with option * XmlOptions.setLoadLineNumbers() */ @Test - public void testGetBookmark1() throws Exception { + void testGetBookmark1() throws Exception { File f = new File(xmlFile); XmlOptions opt = new XmlOptions(); opt.setLoadLineNumbers(); @@ -70,7 +70,7 @@ public class XmlLineNumberTest { * XmlOptions.setLoadLineNumbers(XmlOptions.LOAD_LINE_NUMBERS_END_ELEMENT) */ @Test - public void testGetBookmark2() throws Exception { + void testGetBookmark2() throws Exception { File f = new File(xmlFile); XmlOptions opt = new XmlOptions(); opt.setLoadLineNumbersEndElement(); @@ -99,9 +99,9 @@ public class XmlLineNumberTest { * - parsing xml from string */ @Test - public void testLineNumber1() throws Exception { + void testLineNumber1() throws Exception { XmlOptions opt = new XmlOptions().setLoadLineNumbers(); - XmlObject xo = XmlObject.Factory.parse(xml, opt); + XmlObject xo = XmlObject.Factory.parse(XML, opt); try (XmlCursor c = xo.newCursor()) { c.toFirstContentToken(); @@ -128,7 +128,7 @@ public class XmlLineNumberTest { * - parsing xml from file */ @Test - public void testLineNumber2() throws Exception { + void testLineNumber2() throws Exception { File f = new File(xmlFile); XmlOptions opt = new XmlOptions(); opt.setLoadLineNumbersEndElement(); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
