You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ki...@apache.org on 2022/02/06 01:52:00 UTC
svn commit: r1897795 [29/39] - in /xmlbeans: site/src/documentation/content/xdocs/ trunk/ trunk/src/main/java/org/apache/xmlbeans/impl/store/ trunk/src/test/java/ValidatingXSRTests/checkin/ trunk/src/test/java/ValidatingXSRTests/detailed/ trunk/src/tes...
Modified: xmlbeans/trunk/src/test/java/xmlcursor/checkin/StoreTests.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/checkin/StoreTests.java?rev=1897795&r1=1897794&r2=1897795&view=diff
==============================================================================
--- xmlbeans/trunk/src/test/java/xmlcursor/checkin/StoreTests.java (original)
+++ xmlbeans/trunk/src/test/java/xmlcursor/checkin/StoreTests.java Sun Feb 6 01:51:55 2022
@@ -19,8 +19,11 @@ import org.apache.xmlbeans.*;
import org.apache.xmlbeans.XmlCursor.TokenType;
import org.apache.xmlbeans.XmlCursor.XmlBookmark;
import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
import org.xml.sax.*;
import org.xml.sax.ext.LexicalHandler;
import xmlcursor.common.Common;
@@ -31,16 +34,35 @@ import javax.xml.parsers.SAXParserFactor
import java.io.StringReader;
import java.util.*;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import static xmlcursor.common.BasicCursorTestCase.cur;
+import static xmlcursor.common.BasicCursorTestCase.obj;
public class StoreTests {
static String[] _args;
static String _test;
-
- private void streamTest(String xml)
- throws Exception {
+ @ParameterizedTest
+ @ValueSource(strings = {
+ "<a/>",
+ "<a x='y'/>",
+ "<a><b>foo</b></a>",
+ "<a><b>fo<!--moo-->o<?goof ball?>dsfdf</b></a>",
+ "<a xmlns='nnn'></a>",
+ "<a x='y'><!---->x<b/><c p='q'>z</c></a>",
+ "<a x='y'><!----><b>moo</b><c p='q'></c></a>",
+ "<a>asa<b/>sdsd<c>aaz</c>adsasd</a>",
+ "<a><?target value?></a>",
+ "<n:a xmlns:n='nnn'></n:a>",
+ "<j:a x='y' p='q' xmlns:j='k'></j:a>",
+ "<foo xmlns=\"foo.com\"><bar>1</bar></foo>",
+ "<foo><!--comment--><?target foo?></foo>",
+ "<foo>a<bar>b</bar>c<bar>d</bar>e</foo>",
+ "<foo xmlns:x=\"y\"><bar xmlns:x=\"z\"/></foo>",
+ "<foo x=\"y\" p=\"r\"/>"
+ })
+ void testXMLStreamReader(String xml) throws Exception {
XmlObject x1 = XmlObject.Factory.parse(xml);
XmlObject x2;
try (XmlCursor c = x1.newCursor()) {
@@ -54,27 +76,7 @@ public class StoreTests {
}
@Test
- public void testXMLStreamReader() throws Exception {
- streamTest("<a/>");
- streamTest("<a x='y'/>");
- streamTest("<a><b>foo</b></a>");
- streamTest("<a><b>fo<!--moo-->o<?goof ball?>dsfdf</b></a>");
- streamTest("<a xmlns='nnn'></a>");
- streamTest("<a x='y'><!---->x<b/><c p='q'>z</c></a>");
- streamTest("<a x='y'><!----><b>moo</b><c p='q'></c></a>");
- streamTest("<a>asa<b/>sdsd<c>aaz</c>adsasd</a>");
- streamTest("<a><?target value?></a>");
- streamTest("<n:a xmlns:n='nnn'></n:a>");
- streamTest("<j:a x='y' p='q' xmlns:j='k'></j:a>");
- streamTest("<foo xmlns=\"foo.com\"><bar>1</bar></foo>");
- streamTest("<foo><!--comment--><?target foo?></foo>");
- streamTest("<foo>a<bar>b</bar>c<bar>d</bar>e</foo>");
- streamTest("<foo xmlns:x=\"y\"><bar xmlns:x=\"z\"/></foo>");
- streamTest("<foo x=\"y\" p=\"r\"/>");
- }
-
- @Test
- public void testReplaceContents() throws Exception {
+ void testReplaceContents() throws Exception {
XmlObject xDst = XmlObject.Factory.newInstance();
XmlObject xSrc = XmlObject.Factory.parse("<foo/>");
XmlObject newDst = xDst.set(xSrc);
@@ -104,37 +106,35 @@ public class StoreTests {
assertEquals("<bar x=\"moo\"/>", xDst.xmlText());
}
- @Test(expected = Exception.class)
- public void testSniffing() throws Exception {
+ @Test
+ void testSniffing() throws Exception {
XmlObject x;
- x = XmlObject.Factory.parse("<xoo/>");
- assertSame(x.schemaType(), XmlBeans.NO_TYPE);
+ x = obj("<xoo/>");
+ Assertions.assertSame(x.schemaType(), XmlBeans.NO_TYPE);
- x = XmlObject.Factory.parse(
- "<schema xmlns='http://www.w3.org/2001/XMLSchema'/>");
- assertSame(x.schemaType(), SchemaDocument.type);
+ x = obj("<schema xmlns='http://www.w3.org/2001/XMLSchema'/>");
+ Assertions.assertSame(x.schemaType(), SchemaDocument.type);
- x = XmlObject.Factory.parse(
- "<schema xmlns='http://www.w3.org/2001/XMLSchema/moo'/>");
- assertSame(x.schemaType(), XmlBeans.NO_TYPE);
+ x = obj("<schema xmlns='http://www.w3.org/2001/XMLSchema/moo'/>");
+ Assertions.assertSame(x.schemaType(), XmlBeans.NO_TYPE);
- x = XmlObject.Factory.parse(
- "<schema xmlns='http://www.w3.org/2001/XMLSchema'/>");
- assertSame(x.schemaType(), SchemaDocument.type);
+ x = obj("<schema xmlns='http://www.w3.org/2001/XMLSchema'/>");
+ Assertions.assertSame(x.schemaType(), SchemaDocument.type);
x = org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument.Factory.parse(
"<schema xmlns='http://www.w3.org/2001/XMLSchema'/>");
- assertSame(x.schemaType(), SchemaDocument.type);
+ Assertions.assertSame(x.schemaType(), SchemaDocument.type);
- org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument.Factory.parse(
- "<schema xmlns='http://www.w3.org/2001/XMLSchema/moo'/>");
+ assertThrows(Exception.class, () ->
+ org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument.Factory.parse(
+ "<schema xmlns='http://www.w3.org/2001/XMLSchema/moo'/>")
+ );
}
@Test
- public void testCursorStack() throws Exception {
- XmlObject x = XmlObject.Factory.parse("<foo x='y'/>");
- try (XmlCursor c = x.newCursor()) {
+ void testCursorStack() throws Exception {
+ try (XmlCursor c = cur("<foo x='y'/>")) {
c.push();
c.toNextToken();
c.push();
@@ -148,7 +148,7 @@ public class StoreTests {
}
@Test
- public void testImplicitNamespaces() {
+ void testImplicitNamespaces() {
Map<String, String> namespaces = new HashMap<>();
namespaces.put("foo", "foo.com");
namespaces.put("bar", "bar.com");
@@ -328,8 +328,17 @@ public class StoreTests {
private final StringBuilder _sb = new StringBuilder();
}
- private void doTestSaxSaver(String xml)
- throws Exception {
+ @ParameterizedTest
+ @ValueSource(strings = {
+ "<a xmlns='nnn'></a>",
+ "<a x='y'><!---->x<b/><c p='q'>z</c></a>",
+ "<a x='y'><!----><b>moo</b><c p='q'></c></a>",
+ "<a>asa<b/>sdsd<c>aaz</c>adsasd</a>",
+ "<a><?target value?></a>",
+ "<n:a xmlns:n='nnn'></n:a>",
+ "<j:a x='y' p='q' xmlns:j='k'></j:a>"
+ })
+ void testSaxSaver(String xml) throws Exception {
// ME
Content content2 = new Content();
@@ -362,19 +371,7 @@ public class StoreTests {
}
@Test
- public void testSaxSaver()
- throws Exception {
- doTestSaxSaver("<a xmlns='nnn'></a>");
- doTestSaxSaver("<a x='y'><!---->x<b/><c p='q'>z</c></a>");
- doTestSaxSaver("<a x='y'><!----><b>moo</b><c p='q'></c></a>");
- doTestSaxSaver("<a>asa<b/>sdsd<c>aaz</c>adsasd</a>");
- doTestSaxSaver("<a><?target value?></a>");
- doTestSaxSaver("<n:a xmlns:n='nnn'></n:a>");
- doTestSaxSaver("<j:a x='y' p='q' xmlns:j='k'></j:a>");
- }
-
- @Test
- @Ignore
+ @Disabled
public void testParsing() throws Exception {
Random r = new Random(1);
@@ -391,7 +388,7 @@ public class StoreTests {
try (XmlCursor c = XmlObject.Factory.parse(
xml, new XmlOptions().setLoadLineNumbers()).
- newCursor()) {
+ newCursor()) {
for (int i = 0; i < xml.length(); i++) {
char ch = xml.charAt(i);
@@ -427,7 +424,7 @@ public class StoreTests {
}
@Test
- @Ignore
+ @Disabled
public void testLineNumbers() throws Exception {
Random r = new Random(1);
@@ -635,7 +632,7 @@ public class StoreTests {
whitespaces();
}
- HashMap<String,Object> attrs = new HashMap<>();
+ HashMap<String, Object> attrs = new HashMap<>();
for (int i = r.nextInt(3); i > 0; i--) {
append(' ');
@@ -644,7 +641,6 @@ public class StoreTests {
do {
aname = makeNcName();
-
} while (attrs.containsKey(aname));
attrs.put(aname, null);
@@ -716,7 +712,7 @@ public class StoreTests {
}
@Test
- public void testBookmarks()
+ void testBookmarks()
throws Exception {
XmlObject x = XmlObject.Factory.parse("<foo x='y'>abcdefg<!---->xy</foo>");
@@ -756,33 +752,32 @@ public class StoreTests {
c.toStartDoc();
- assertSame(c.getBookmark(MyMark.class), m1);
- assertSame(c.toNextBookmark(MyMark.class), m2);
- assertSame(c.toNextBookmark(MyMark.class), m3);
- assertSame(c.toNextBookmark(MyMark.class), m4);
- assertSame(c.toNextBookmark(MyMark.class), m5);
- assertSame(c.toNextBookmark(MyMark.class), m6);
- assertSame(c.toNextBookmark(MyMark.class), m7);
- assertSame(c.toNextBookmark(MyMark.class), m8);
+ Assertions.assertSame(c.getBookmark(MyMark.class), m1);
+ Assertions.assertSame(c.toNextBookmark(MyMark.class), m2);
+ Assertions.assertSame(c.toNextBookmark(MyMark.class), m3);
+ Assertions.assertSame(c.toNextBookmark(MyMark.class), m4);
+ Assertions.assertSame(c.toNextBookmark(MyMark.class), m5);
+ Assertions.assertSame(c.toNextBookmark(MyMark.class), m6);
+ Assertions.assertSame(c.toNextBookmark(MyMark.class), m7);
+ Assertions.assertSame(c.toNextBookmark(MyMark.class), m8);
assertNull(c.toNextBookmark(MyMark.class));
c.toEndDoc();
- assertSame(c.getBookmark(MyMark.class), m8);
- assertSame(c.toPrevBookmark(MyMark.class), m7);
- assertSame(c.toPrevBookmark(MyMark.class), m6);
- assertSame(c.toPrevBookmark(MyMark.class), m5);
- assertSame(c.toPrevBookmark(MyMark.class), m4);
- assertSame(c.toPrevBookmark(MyMark.class), m3);
- assertSame(c.toPrevBookmark(MyMark.class), m2);
- assertSame(c.toPrevBookmark(MyMark.class), m1);
+ Assertions.assertSame(c.getBookmark(MyMark.class), m8);
+ Assertions.assertSame(c.toPrevBookmark(MyMark.class), m7);
+ Assertions.assertSame(c.toPrevBookmark(MyMark.class), m6);
+ Assertions.assertSame(c.toPrevBookmark(MyMark.class), m5);
+ Assertions.assertSame(c.toPrevBookmark(MyMark.class), m4);
+ Assertions.assertSame(c.toPrevBookmark(MyMark.class), m3);
+ Assertions.assertSame(c.toPrevBookmark(MyMark.class), m2);
+ Assertions.assertSame(c.toPrevBookmark(MyMark.class), m1);
assertNull(c.toPrevBookmark(MyMark.class));
}
}
@Test
- public void testSetName()
- throws Exception {
+ void testSetName() throws Exception {
XmlObject x = XmlObject.Factory.parse("<foo x='a'/>");
try (XmlCursor c = x.newCursor()) {
c.toNextToken();
@@ -798,8 +793,7 @@ public class StoreTests {
// Basic load up a file and iterate through it
//
@Test
- public void testBasicXml()
- throws Exception {
+ void testBasicXml() throws Exception {
try (XmlCursor c = XmlObject.Factory.parse(Common.XML_ATTR_TEXT, null).newCursor()) {
int n = 0;
@@ -822,8 +816,7 @@ public class StoreTests {
// going backward
//
@Test
- public void testConsistentTokenOrder()
- throws Exception {
+ void testConsistentTokenOrder() throws Exception {
ArrayList<TokenType> l = new ArrayList<>();
try (XmlCursor c = XmlObject.Factory.parse(Common.XML_ATTR_TEXT, null).newCursor()) {
@@ -847,20 +840,17 @@ public class StoreTests {
}
}
- // Make sure you can't insert text before the doc begin
- // going backward
- @Test(expected = IllegalStateException.class)
- public void testIllegalTextInsert()
- throws Exception {
+ // Make sure you can't insert text before the doc begin going backward
+ @Test
+ void testIllegalTextInsert() throws Exception {
try (XmlCursor c = XmlObject.Factory.parse(Common.XML_ATTR_TEXT, null).newCursor()) {
- c.insertChars("Ho ho ho");
+ assertThrows(IllegalStateException.class, () -> c.insertChars("Ho ho ho"));
}
}
// Make sure getText works in a basic way
@Test
- public void testgetText()
- throws Exception {
+ void testgetText() throws Exception {
try (XmlCursor c = XmlObject.Factory.parse(Common.XML_ATTR_TEXT, null).newCursor()) {
assertEquals("ab", c.getTextValue()); // Doc node
@@ -899,7 +889,7 @@ public class StoreTests {
}
@Test
- public void testCDATA() throws Exception {
+ void testCDATA() throws Exception {
// https://issues.apache.org/jira/browse/XMLBEANS-404
String xml = "<foo>Unable to render embedded object: <![CDATA[>>>>>>>><<<<<<<<<<<]]></foo>";
String expected = "<foo><![CDATA[Unable to render embedded object: >>>>>>>><<<<<<<<<<<]]></foo>";
@@ -910,7 +900,7 @@ public class StoreTests {
}
@Test
- public void testSaving() throws Exception {
+ void testSaving() throws Exception {
doSaveTest("<foo xmlns=\"foo.com\"><bar>1</bar></foo>");
doSaveTest("<foo><!--comment--><?target foo?></foo>");
doSaveTest("<foo>a<bar>b</bar>c<bar>d</bar>e</foo>");
@@ -1032,7 +1022,7 @@ public class StoreTests {
assertTrue(c.toFirstChild());
}
} else {
- fail();
+ Assertions.fail();
}
n = 0;
@@ -1043,8 +1033,7 @@ public class StoreTests {
}
@Test
- public void testOps()
- throws Exception {
+ void testOps() throws Exception {
XmlObject x, x2, y;
XmlBookmark anno;
@@ -1052,7 +1041,7 @@ public class StoreTests {
x = XmlObject.Factory.parse("<foo>abcdef</foo>");
try (XmlCursor cFrom = navDoc(x, "d");
- XmlCursor cTo = navNewCursor(cFrom, "")) {
+ XmlCursor cTo = navNewCursor(cFrom, "")) {
assertTrue(cFrom.moveXml(cTo));
cFrom.insertChars("[FROM]");
cTo.insertChars("[TO]");
@@ -1062,31 +1051,29 @@ public class StoreTests {
options.setSaveSyntheticDocumentElement(new QName(null, "bar"));
- assertTrue(
- x.xmlText(options).equals("<bar>[TO]<foo>abcdef</foo>[FROM]</bar>") ||
- x.xmlText(options).equals("<bar>[FROM]<foo>abcdef</foo>[TO]</bar>"));
+ assertTrue(x.xmlText(options).equals("<bar>[TO]<foo>abcdef</foo>[FROM]</bar>") ||
+ x.xmlText(options).equals("<bar>[FROM]<foo>abcdef</foo>[TO]</bar>"));
//
x = XmlObject.Factory.parse("<foo>abcdef</foo>");
try (XmlCursor cFrom = navDoc(x, "d");
- XmlCursor cTo = navNewCursor(cFrom, "ttt")) {
+ XmlCursor cTo = navNewCursor(cFrom, "ttt")) {
assertTrue(cFrom.moveXml(cTo));
cFrom.insertChars("[FROM]");
cTo.insertChars("[TO]");
}
- assertTrue(
- x.xmlText(options).equals("<bar><foo>abcdef</foo>[FROM][TO]</bar>") ||
- x.xmlText(options).equals("<bar><foo>abcdef</foo>[TO][FROM]</bar>"));
+ assertTrue(x.xmlText(options).equals("<bar><foo>abcdef</foo>[FROM][TO]</bar>") ||
+ x.xmlText(options).equals("<bar><foo>abcdef</foo>[TO][FROM]</bar>"));
//
x = XmlObject.Factory.parse("<foo>abcdef</foo>");
try (XmlCursor cFrom = navDoc(x, "d");
- XmlCursor cTo = navNewCursor(cFrom, "t3c")) {
+ XmlCursor cTo = navNewCursor(cFrom, "t3c")) {
assertFalse(cFrom.moveXml(cTo));
cFrom.insertChars("[FROM]");
cTo.insertChars("[TO]");
@@ -1099,7 +1086,7 @@ public class StoreTests {
x = XmlObject.Factory.parse("<r><a>xyz</a><b>pqr</b></r>");
try (XmlCursor cFrom = navDoc(x, "dd");
- XmlCursor cTo = navNewCursor(cFrom, "r-1t")) {
+ XmlCursor cTo = navNewCursor(cFrom, "r-1t")) {
assertTrue(cFrom.moveXml(cTo));
cFrom.insertChars("[FROM]");
cTo.insertChars("[TO]");
@@ -1112,7 +1099,7 @@ public class StoreTests {
x = XmlObject.Factory.parse("<r><a>xyz</a><b>pqr</b>AB</r>");
try (XmlCursor cFrom = navDoc(x, "dd");
- XmlCursor cTo = navNewCursor(cFrom, "r-1t-1c")) {
+ XmlCursor cTo = navNewCursor(cFrom, "r-1t-1c")) {
assertTrue(cFrom.moveXml(cTo));
cFrom.insertChars("[FROM]");
cTo.insertChars("[TO]");
@@ -1125,7 +1112,7 @@ public class StoreTests {
x = XmlObject.Factory.parse("<r><a>xyz</a><b>pqr</b>AB</r>");
try (XmlCursor cFrom = navDoc(x, "dd");
- XmlCursor cTo = navNewCursor(cFrom, "stc")) {
+ XmlCursor cTo = navNewCursor(cFrom, "stc")) {
assertTrue(cFrom.moveXml(cTo));
cFrom.insertChars("[FROM]");
cTo.insertChars("[TO]");
@@ -1138,7 +1125,7 @@ public class StoreTests {
x = XmlObject.Factory.parse("<r><a>xyz</a><b>pqr</b>AB</r>");
try (XmlCursor cFrom = navDoc(x, "dd");
- XmlCursor cTo = navDoc(x, "d")) {
+ XmlCursor cTo = navDoc(x, "d")) {
assertTrue(cFrom.moveXml(cTo));
cFrom.insertChars("[FROM]");
cTo.insertChars("[TO]");
@@ -1151,7 +1138,7 @@ public class StoreTests {
x = XmlObject.Factory.parse("<r><a>xyz</a><b>pqr</b>AB</r>");
try (XmlCursor cFrom = navDoc(x, "dd");
- XmlCursor cTo = navDoc(x, "r")) {
+ XmlCursor cTo = navDoc(x, "r")) {
assertTrue(cFrom.moveXml(cTo));
cFrom.insertChars("[FROM]");
cTo.insertChars("[TO]");
@@ -1165,7 +1152,7 @@ public class StoreTests {
x2 = XmlObject.Factory.parse("<s></s>");
try (XmlCursor cFrom = navDoc(x, "dd");
- XmlCursor cTo = navDoc(x2, "dt")) {
+ XmlCursor cTo = navDoc(x2, "dt")) {
assertTrue(cFrom.moveXml(cTo));
cFrom.insertChars("[FROM]");
cTo.insertChars("[TO]");
@@ -1179,8 +1166,8 @@ public class StoreTests {
x = XmlObject.Factory.parse("<r><a>pq</a><b></b></r>");
try (XmlCursor cFrom = navDoc(x, "dd");
- XmlCursor cTo = navDoc(x, "ddst");
- XmlCursor cTemp = navDoc(x, "ddt1c")) {
+ XmlCursor cTo = navDoc(x, "ddst");
+ XmlCursor cTemp = navDoc(x, "ddt1c")) {
assertTrue(cFrom.moveXml(cTo));
cFrom.insertChars("[FROM]");
cTo.insertChars("[TO]");
@@ -1194,7 +1181,7 @@ public class StoreTests {
x = XmlObject.Factory.parse("<foo>abcdef</foo>");
try (XmlCursor cFrom = navDoc(x, "2t2c");
- XmlCursor cTo = navNewCursor(cFrom, "-1c")) {
+ XmlCursor cTo = navNewCursor(cFrom, "-1c")) {
cFrom.moveChars(2, cTo);
cFrom.insertChars("[FROM]");
cTo.insertChars("[TO]");
@@ -1207,7 +1194,7 @@ public class StoreTests {
x = XmlObject.Factory.parse("<foo>abcdef</foo>");
try (XmlCursor cFrom = navDoc(x, "2t2c");
- XmlCursor cTo = navNewCursor(cFrom, "3c")) {
+ XmlCursor cTo = navNewCursor(cFrom, "3c")) {
cFrom.moveChars(2, cTo);
cFrom.insertChars("[FROM]");
cTo.insertChars("[TO]");
@@ -1220,7 +1207,7 @@ public class StoreTests {
x = XmlObject.Factory.parse("<bar><foo>abcdef</foo><foo>123456</foo></bar>");
try (XmlCursor cFrom = navDoc(x, "3t2c");
- XmlCursor cTo = navNewCursor(cFrom, "3t3c")) {
+ XmlCursor cTo = navNewCursor(cFrom, "3t3c")) {
cFrom.moveChars(2, cTo);
cFrom.insertChars("[FROM]");
cTo.insertChars("[TO]");
@@ -1233,15 +1220,14 @@ public class StoreTests {
x = XmlObject.Factory.parse("<bar><foo>abcdef</foo><foo>123456</foo></bar>");
try (XmlCursor cFrom = navDoc(x, "2d");
- XmlCursor cTo = navDoc(x, "2dst2c")) {
+ XmlCursor cTo = navDoc(x, "2dst2c")) {
assertTrue(cFrom.copyXml(cTo));
cFrom.insertChars("[FROM]");
cTo.insertChars("[TO]");
}
- assertEquals(x.xmlText(),
- "<bar>[FROM]<foo>abcdef</foo><foo>12" +
- "<foo>abcdef</foo>[TO]3456</foo></bar>");
+ assertEquals(x.xmlText(), "<bar>[FROM]<foo>abcdef</foo><foo>12" +
+ "<foo>abcdef</foo>[TO]3456</foo></bar>");
//
@@ -1249,7 +1235,7 @@ public class StoreTests {
x2 = XmlObject.Factory.parse("<s></s>");
try (XmlCursor cFrom = navDoc(x, "dd");
- XmlCursor cTo = navDoc(x2, "dt")) {
+ XmlCursor cTo = navDoc(x2, "dt")) {
assertTrue(cFrom.copyXml(cTo));
cFrom.insertChars("[FROM]");
cTo.insertChars("[TO]");
@@ -1264,14 +1250,14 @@ public class StoreTests {
"<bar><foo>abcdef</foo>blah<foo>123456</foo></bar>");
try (XmlCursor cFrom = navDoc(x, "2d");
- XmlCursor cTo = navDoc(x, "2dst2c")) {
+ XmlCursor cTo = navDoc(x, "2dst2c")) {
assertTrue(cFrom.copyXml(cTo));
cFrom.insertChars("[FROM]");
cTo.insertChars("[TO]");
}
assertEquals(x.xmlText(), "<bar>[FROM]<foo>abcdef</foo>blah<foo>12" +
- "<foo>abcdef</foo>[TO]3456</foo></bar>");
+ "<foo>abcdef</foo>[TO]3456</foo></bar>");
//
@@ -1279,17 +1265,16 @@ public class StoreTests {
"<bar><foo x='y'>abcdef</foo><foo>123456</foo>7890</bar>");
try (XmlCursor cFrom = navDoc(x, "2dt");
- XmlCursor cTo = navDoc(x, "2dst");
- XmlCursor cTemp = navDoc(x, "2dst3c");
- XmlCursor cTemp2 = navDoc(x, "2ds3t2c")) {
+ XmlCursor cTo = navDoc(x, "2dst");
+ XmlCursor cTemp = navDoc(x, "2dst3c");
+ XmlCursor cTemp2 = navDoc(x, "2ds3t2c")) {
assertTrue(cFrom.copyXml(cTo));
cTemp.insertChars("[TEMP]");
cTemp2.insertChars("[TEMP2]");
}
- assertEquals(x.xmlText(),
- "<bar><foo x=\"y\">abcdef</foo>" +
- "<foo x=\"y\">123[TEMP]456</foo>78[TEMP2]90</bar>");
+ assertEquals(x.xmlText(), "<bar><foo x=\"y\">abcdef</foo>" +
+ "<foo x=\"y\">123[TEMP]456</foo>78[TEMP2]90</bar>");
//
@@ -1297,7 +1282,7 @@ public class StoreTests {
"<bar>xy<foo x='y'>abcdef</foo>pqr<foo>123456</foo></bar>");
try (XmlCursor cFrom = navDoc(x, "2d");
- XmlCursor cTo = navDoc(x, "2ds-2c")) {
+ XmlCursor cTo = navDoc(x, "2ds-2c")) {
assertTrue(cFrom.removeXml());
cFrom.insertChars("[FROM]");
@@ -1312,23 +1297,22 @@ public class StoreTests {
"<bar>xy<foo x='y'>abcdef</foo>pqr<foo>123456</foo></bar>");
try (XmlCursor cFrom = navDoc(x, "2d2t2c");
- XmlCursor cTo = navDoc(x, "2d2t5c")) {
+ XmlCursor cTo = navDoc(x, "2d2t5c")) {
cFrom.removeChars(2);
cFrom.insertChars("[FROM]");
cTo.insertChars("[TO]");
}
- assertEquals(x.xmlText(),
- "<bar>xy<foo x=\"y\">ab[FROM]e[TO]f" +
- "</foo>pqr<foo>123456</foo></bar>");
+ assertEquals(x.xmlText(), "<bar>xy<foo x=\"y\">ab[FROM]e[TO]f" +
+ "</foo>pqr<foo>123456</foo></bar>");
//
x = XmlObject.Factory.parse("<bar><!---->abc</bar>");
try (XmlCursor cFrom = navDoc(x, "tt");
- XmlCursor cTo = navDoc(x, "tttc")) {
+ XmlCursor cTo = navDoc(x, "tttc")) {
assertTrue(cFrom.removeXml());
cFrom.insertChars("[FROM]");
@@ -1378,7 +1362,7 @@ public class StoreTests {
x = XmlObject.Factory.parse("<r><foo>abc</foo><bar></bar></r>");
try (XmlCursor cFrom = navDoc(x, "tt");
- XmlCursor cTo = navDoc(x, "6t")) {
+ XmlCursor cTo = navDoc(x, "6t")) {
anno = new Anno();
cFrom.setBookmark(anno);
assertTrue(cFrom.moveXml(cTo));
@@ -1406,7 +1390,7 @@ public class StoreTests {
x = XmlObject.Factory.parse("<bar><foo x='y'>abc</foo></bar>");
y = XmlObject.Factory.newInstance();
try (XmlCursor c = x.newCursor();
- XmlCursor d = y.newCursor()) {
+ XmlCursor d = y.newCursor()) {
c.toNextToken();
d.toNextToken();
c.moveXmlContents(d);
@@ -1423,7 +1407,7 @@ public class StoreTests {
x = XmlObject.Factory.parse("<foo x='y'>abc</foo>");
y = XmlObject.Factory.newInstance();
try (XmlCursor d = y.newCursor();
- XmlCursor e = x.newCursor()) {
+ XmlCursor e = x.newCursor()) {
d.toNextToken();
e.copyXmlContents(d);
}
@@ -1434,7 +1418,7 @@ public class StoreTests {
}
@Test
- public void testSave() throws Exception {
+ void testSave() throws Exception {
XmlObject x;
XmlOptions options;
@@ -1553,7 +1537,7 @@ public class StoreTests {
}
@Test
- public void testSaveFrag() {
+ void testSaveFrag() {
XmlObject x;
x = XmlObject.Factory.newInstance();
@@ -1599,7 +1583,7 @@ public class StoreTests {
}
@Test
- public void testLoad() throws Exception {
+ void testLoad() throws Exception {
XmlObject x;
XmlOptions options = new XmlOptions();
@@ -1610,7 +1594,7 @@ public class StoreTests {
"<bar p='q' x='y'>ab<foo>xy</foo>cd</bar>", options);
try (XmlCursor c = navDoc(x, "t")) {
- assertSame(c.currentTokenType(), TokenType.ATTR);
+ Assertions.assertSame(c.currentTokenType(), TokenType.ATTR);
}
String open = "xmlns:open='http://www.openuri.org/fragment'";
@@ -1621,12 +1605,12 @@ public class StoreTests {
">ab<foo>xy</foo>cd</open:fragment>");
try (XmlCursor c = navDoc(x, "t")) {
- assertSame(c.currentTokenType(), TokenType.ATTR);
+ Assertions.assertSame(c.currentTokenType(), TokenType.ATTR);
}
}
@Test
- public void testCompare() throws Exception {
+ void testCompare() throws Exception {
XmlObject x;
// Forward navigation
@@ -1634,7 +1618,7 @@ public class StoreTests {
x = XmlObject.Factory.parse("<bar p='q' x='y'>ab<foo>xy</foo>cd</bar>");
try (XmlCursor cFrom = navDoc(x, "");
- XmlCursor cTo = navDoc(x, "")){
+ XmlCursor cTo = navDoc(x, "")) {
for (; ; ) {
assertEquals(0, cFrom.comparePosition(cTo));
assertTrue(cFrom.isAtSamePositionAs(cTo));
@@ -1658,7 +1642,7 @@ public class StoreTests {
x = XmlObject.Factory.parse("<bar p='q' x='y'>ab<foo>xy</foo>cd</bar>");
try (XmlCursor cFrom = navDoc(x, "r");
- XmlCursor cTo = navDoc(x, "r")) {
+ XmlCursor cTo = navDoc(x, "r")) {
for (; ; ) {
assertEquals(0, cFrom.comparePosition(cTo));
assertTrue(cFrom.isAtSamePositionAs(cTo));
@@ -1712,8 +1696,7 @@ public class StoreTests {
}
@Test
- public void testAttrSetter()
- throws Exception {
+ void testAttrSetter() throws Exception {
XmlObject x = XmlObject.Factory.parse("<foo/>");
try (XmlCursor c = x.newCursor()) {
c.toNextToken();
@@ -1723,8 +1706,7 @@ public class StoreTests {
}
@Test
- public void testNavigation()
- throws Exception {
+ void testNavigation() throws Exception {
XmlObject x = XmlObject.Factory.parse("<a><x/><y/><z/></a>");
try (XmlCursor c = x.newCursor()) {
assertFalse(c.toNextSibling());
@@ -1771,7 +1753,7 @@ public class StoreTests {
}
x = XmlObject.Factory.parse("<a>moo<!---->foo</a>");
- try (XmlCursor c = x.newCursor()) {
+ try (XmlCursor c = x.newCursor()) {
c.toStartDoc();
c.toNextToken();
c.toNextToken();
@@ -1807,8 +1789,7 @@ public class StoreTests {
}
@Test
- public void testGetName()
- throws Exception {
+ void testGetName() throws Exception {
XmlObject x = XmlObject.Factory.parse("<a x='y'>eric<!----><?moo?></a>");
try (XmlCursor c = x.newCursor()) {
assertNull(c.getName());
@@ -1834,8 +1815,7 @@ public class StoreTests {
}
@Test
- public void testGetChars()
- throws Exception {
+ void testGetChars() throws Exception {
XmlObject x = XmlObject.Factory.parse("<foo>abcdefghijkl</foo>");
try (XmlCursor c = x.newCursor()) {
c.toNextToken();
@@ -1853,8 +1833,7 @@ public class StoreTests {
}
@Test
- public void testNamespaceSubstitution()
- throws Exception {
+ void testNamespaceSubstitution() throws Exception {
HashMap<String, String> subs = new HashMap<>();
subs.put("foo", "moo");
subs.put("a", "b");
@@ -1880,7 +1859,7 @@ public class StoreTests {
}
@Test
- public void testNamespaceInsertion() {
+ void testNamespaceInsertion() {
XmlObject x = XmlObject.Factory.newInstance();
try (XmlCursor c = x.newCursor()) {
@@ -1907,12 +1886,11 @@ public class StoreTests {
return;
}
- fail();
+ Assertions.fail();
}
@Test
- public void testNil()
- throws Exception {
+ void testNil() throws Exception {
XmlObject x = noNamespace.CanBeNilDocument.Factory.parse("<canBeNil/>");
try (XmlCursor c = x.newCursor()) {
c.toFirstChild();
@@ -1931,8 +1909,7 @@ public class StoreTests {
}
@Test
- public void testParser()
- throws Exception {
+ void testParser() throws Exception {
dotestParserErrors("<hee yee='five'><haw>66</haw></any>");
dotestParserErrors("<foo></moo>");
dotestParserErrors("<a><foo></moo></a>");
@@ -1955,8 +1932,7 @@ public class StoreTests {
}
@Test
- public void testSaxParser()
- throws Exception {
+ void testSaxParser() throws Exception {
String xml = "<a x='y'><!---->x<b/><c p='q'>z</c></a>";
SAXParserFactory spf = SAXParserFactory.newInstance();
@@ -1965,21 +1941,11 @@ public class StoreTests {
InputSource is = new InputSource(new StringReader(xml));
XmlSaxHandler sh = XmlObject.Factory.newXmlSaxHandler();
- xr.setFeature(
- "http://xml.org/sax/features/namespace-prefixes",
- true);
-
- xr.setFeature(
- "http://xml.org/sax/features/namespaces", true);
-
- xr.setFeature(
- "http://xml.org/sax/features/validation", false);
-
+ xr.setFeature("http://xml.org/sax/features/namespace-prefixes", true);
+ xr.setFeature("http://xml.org/sax/features/namespaces", true);
+ xr.setFeature("http://xml.org/sax/features/validation", false);
xr.setContentHandler(sh.getContentHandler());
-
- xr.setProperty(
- "http://xml.org/sax/properties/lexical-handler",
- sh.getLexicalHandler());
+ xr.setProperty("http://xml.org/sax/properties/lexical-handler", sh.getLexicalHandler());
xr.parse(is);
@@ -1991,8 +1957,7 @@ public class StoreTests {
}
@Test
- public void testAdditionalNamespaces()
- throws Exception {
+ void testAdditionalNamespaces() throws Exception {
String xml = "<a xmlns:a='aNS'><a:b/></a>";
Map<String, String> map = new LinkedHashMap<>();
Modified: xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToCursorTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToCursorTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff
==============================================================================
--- xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToCursorTest.java (original)
+++ xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToCursorTest.java Sun Feb 6 01:51:55 2022
@@ -18,19 +18,20 @@ 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 ToCursorTest extends BasicCursorTestCase {
+public class ToCursorTest {
@Test
- public void testToCursorMoves() throws Exception {
- m_xc = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT).newCursor();
- try (XmlCursor xc0 = m_xc.newCursor()) {
+ void testToCursorMoves() throws Exception {
+
+ try (XmlCursor m_xc = cur(Common.XML_FOO_1ATTR_TEXT);
+ XmlCursor xc0 = m_xc.newCursor()) {
xc0.toEndDoc();
assertTrue(m_xc.toCursor(xc0));
@@ -41,17 +42,18 @@ public class ToCursorTest extends BasicC
/**
* FIXED: toCursor(null) does not return a boolean but throws an exception.
*/
- @Test(expected = IllegalArgumentException.class)
- public void testToCursorNull() throws Exception {
- m_xc = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT).newCursor();
- m_xc.toFirstChild();
- m_xc.toCursor(null);
+ @Test
+ void testToCursorNull() throws Exception {
+ try (XmlCursor m_xc = cur(Common.XML_FOO_1ATTR_TEXT)) {
+ m_xc.toFirstChild();
+ assertThrows(IllegalArgumentException.class, () -> m_xc.toCursor(null));
+ }
}
@Test
- public void testToCursorDifferentDocs() throws Exception {
- m_xc = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT).newCursor();
- try (XmlCursor xc0 = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT).newCursor()) {
+ void testToCursorDifferentDocs() throws Exception {
+ try (XmlCursor m_xc = cur(Common.XML_FOO_1ATTR_TEXT);
+ XmlCursor xc0 = cur(Common.XML_FOO_1ATTR_TEXT)) {
toNextTokenOfType(m_xc, TokenType.TEXT);
String s = m_xc.xmlText();
toNextTokenOfType(xc0, TokenType.TEXT);
@@ -62,12 +64,13 @@ public class ToCursorTest extends BasicC
}
@Test
- public void testToCursorThis() throws Exception {
- m_xc = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT).newCursor();
- m_xc.toFirstChild();
- String s = m_xc.xmlText();
- assertTrue(m_xc.toCursor(m_xc));
- assertEquals(s, m_xc.xmlText());
+ void testToCursorThis() throws Exception {
+ try (XmlCursor m_xc = cur(Common.XML_FOO_1ATTR_TEXT)) {
+ m_xc.toFirstChild();
+ String s = m_xc.xmlText();
+ assertTrue(m_xc.toCursor(m_xc));
+ assertEquals(s, m_xc.xmlText());
+ }
}
}
Modified: xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToFirstAttributeTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToFirstAttributeTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff
==============================================================================
--- xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToFirstAttributeTest.java (original)
+++ xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToFirstAttributeTest.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 ToFirstAttributeTest extends BasicCursorTestCase {
+public class ToFirstAttributeTest {
@Test
- public void testToFirstAttrSTARTDOC() throws Exception {
- m_xc = XmlObject.Factory.parse("<foo>text</foo>").newCursor();
- m_xc.toFirstChild();
- m_xc.insertAttributeWithValue("attr0", "val0");
- m_xc.toStartDoc();
- assertTrue(m_xc.toFirstAttribute());
- assertEquals("val0", m_xc.getTextValue());
+ void testToFirstAttrSTARTDOC() throws Exception {
+ try (XmlCursor m_xc = cur("<foo>text</foo>")) {
+ m_xc.toFirstChild();
+ m_xc.insertAttributeWithValue("attr0", "val0");
+ m_xc.toStartDoc();
+ assertTrue(m_xc.toFirstAttribute());
+ assertEquals("val0", m_xc.getTextValue());
+ }
}
@Test
- public void testToFirstAttrSTARTmoreThan1ATTR() throws Exception {
- m_xc = XmlObject.Factory.parse(Common.XML_FOO_2ATTR_TEXT).newCursor();
- toNextTokenOfType(m_xc, TokenType.START);
- assertTrue(m_xc.toFirstAttribute());
- assertEquals("val0", m_xc.getTextValue());
+ void testToFirstAttrSTARTmoreThan1ATTR() throws Exception {
+ try (XmlCursor m_xc = cur(Common.XML_FOO_2ATTR_TEXT)) {
+ toNextTokenOfType(m_xc, TokenType.START);
+ assertTrue(m_xc.toFirstAttribute());
+ assertEquals("val0", m_xc.getTextValue());
+ }
}
@Test
- public void testToFirstAttrFrom2ndATTR() throws Exception {
- m_xc = XmlObject.Factory.parse(Common.XML_FOO_2ATTR_TEXT).newCursor();
- toNextTokenOfType(m_xc, TokenType.ATTR);
- toNextTokenOfType(m_xc, TokenType.ATTR);
- assertFalse(m_xc.toFirstAttribute());
+ void testToFirstAttrFrom2ndATTR() throws Exception {
+ try (XmlCursor m_xc = cur(Common.XML_FOO_2ATTR_TEXT)) {
+ toNextTokenOfType(m_xc, TokenType.ATTR);
+ toNextTokenOfType(m_xc, TokenType.ATTR);
+ assertFalse(m_xc.toFirstAttribute());
+ }
}
@Test
- public void testToFirstAttrZeroATTR() throws Exception {
- m_xc = XmlObject.Factory.parse(Common.XML_FOO_TEXT).newCursor();
- toNextTokenOfType(m_xc, TokenType.START);
- assertFalse(m_xc.toFirstAttribute());
+ void testToFirstAttrZeroATTR() throws Exception {
+ try (XmlCursor m_xc = cur(Common.XML_FOO_TEXT)) {
+ toNextTokenOfType(m_xc, TokenType.START);
+ assertFalse(m_xc.toFirstAttribute());
+ }
}
@Test
- public void testToFirstAttrFromTEXT() throws Exception {
- m_xc = XmlObject.Factory.parse(Common.XML_FOO_2ATTR_TEXT).newCursor();
- toNextTokenOfType(m_xc, TokenType.TEXT);
- assertEquals(TokenType.TEXT, m_xc.currentTokenType());
- assertEquals("text", m_xc.getChars());
- assertFalse(m_xc.toFirstAttribute());
+ void testToFirstAttrFromTEXT() throws Exception {
+ try (XmlCursor m_xc = cur(Common.XML_FOO_2ATTR_TEXT)) {
+ toNextTokenOfType(m_xc, TokenType.TEXT);
+ assertEquals(TokenType.TEXT, m_xc.currentTokenType());
+ assertEquals("text", m_xc.getChars());
+ assertFalse(m_xc.toFirstAttribute());
+ }
}
@Test
- public void testToFirstAttrWithXMLNS() throws Exception {
- m_xc = XmlObject.Factory.parse("<foo xmlns=\"http://www.foo.org\">text</foo>").newCursor();
- toNextTokenOfType(m_xc, TokenType.START);
- assertFalse(m_xc.toFirstAttribute());
+ void testToFirstAttrWithXMLNS() throws Exception {
+ try (XmlCursor m_xc = cur("<foo xmlns=\"http://www.foo.org\">text</foo>")) {
+ toNextTokenOfType(m_xc, TokenType.START);
+ assertFalse(m_xc.toFirstAttribute());
+ }
}
}
Modified: xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToFirstChildElementTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToFirstChildElementTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff
==============================================================================
--- xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToFirstChildElementTest.java (original)
+++ xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToFirstChildElementTest.java Sun Feb 6 01:51:55 2022
@@ -16,61 +16,68 @@
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 ToFirstChildElementTest extends BasicCursorTestCase {
+public class ToFirstChildElementTest {
@Test
- public void testToFirstChildElemSTARTnested() throws Exception {
- m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar></foo>").newCursor();
- assertTrue(m_xc.toFirstChild());
- assertTrue(m_xc.toFirstChild());
- assertEquals("text", m_xc.getTextValue());
+ void testToFirstChildElemSTARTnested() throws Exception {
+ try (XmlCursor m_xc = cur("<foo>early<bar>text</bar></foo>")) {
+ assertTrue(m_xc.toFirstChild());
+ assertTrue(m_xc.toFirstChild());
+ assertEquals("text", m_xc.getTextValue());
+ }
}
@Test
- public void testToFirstChildElemFromLastChild() throws Exception {
- m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar><char>zap</char></foo>").newCursor();
- assertTrue(m_xc.toFirstChild());
- assertTrue(m_xc.toFirstChild());
- assertFalse(m_xc.toFirstChild());
- assertEquals("text", m_xc.getTextValue());
+ void testToFirstChildElemFromLastChild() throws Exception {
+ try (XmlCursor m_xc = cur("<foo>early<bar>text</bar><char>zap</char></foo>")) {
+ assertTrue(m_xc.toFirstChild());
+ assertTrue(m_xc.toFirstChild());
+ assertFalse(m_xc.toFirstChild());
+ assertEquals("text", m_xc.getTextValue());
+ }
}
@Test
- public void testToFirstChildElemFromTEXTnested() throws Exception {
- m_xc = XmlObject.Factory.parse("<foo>early<bar>text<char>zap</char></bar></foo>").newCursor();
- toNextTokenOfType(m_xc, TokenType.TEXT);
- assertEquals("early", m_xc.getChars());
- assertTrue(m_xc.toFirstChild());
- assertEquals("zap", m_xc.getTextValue());
+ void testToFirstChildElemFromTEXTnested() throws Exception {
+ try (XmlCursor m_xc = cur("<foo>early<bar>text<char>zap</char></bar></foo>")) {
+ toNextTokenOfType(m_xc, TokenType.TEXT);
+ assertEquals("early", m_xc.getChars());
+ assertTrue(m_xc.toFirstChild());
+ assertEquals("zap", m_xc.getTextValue());
+ }
}
@Test
- public void testToFirstChildElemFromATTRnested() throws Exception {
- m_xc = XmlObject.Factory.parse("<foo attr0=\"val0\">early<bar>text<char>zap</char></bar></foo>").newCursor();
- toNextTokenOfType(m_xc, TokenType.ATTR);
- assertEquals("val0", m_xc.getTextValue());
- assertTrue(m_xc.toFirstChild());
+ void testToFirstChildElemFromATTRnested() throws Exception {
+ try (XmlCursor m_xc = cur("<foo attr0=\"val0\">early<bar>text<char>zap</char></bar></foo>")) {
+ toNextTokenOfType(m_xc, TokenType.ATTR);
+ assertEquals("val0", m_xc.getTextValue());
+ assertTrue(m_xc.toFirstChild());
+ }
}
@Test
- public void testToFirstChildElemFromSTARTnoChild() throws Exception {
- m_xc = XmlObject.Factory.parse("<foo>early</foo>").newCursor();
- assertTrue(m_xc.toFirstChild());
- assertFalse(m_xc.toFirstChild());
+ void testToFirstChildElemFromSTARTnoChild() throws Exception {
+ try (XmlCursor m_xc = cur("<foo>early</foo>")) {
+ assertTrue(m_xc.toFirstChild());
+ assertFalse(m_xc.toFirstChild());
+ }
}
@Test
- public void testToFirstChildElemFromSTARTDOC() throws Exception {
- m_xc = XmlObject.Factory.parse("<foo>early</foo>").newCursor();
- assertTrue(m_xc.toFirstChild());
- assertEquals(TokenType.START, m_xc.currentTokenType());
+ void testToFirstChildElemFromSTARTDOC() throws Exception {
+ try (XmlCursor m_xc = cur("<foo>early</foo>")) {
+ assertTrue(m_xc.toFirstChild());
+ assertEquals(TokenType.START, m_xc.currentTokenType());
+ }
}
}
Modified: xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToFirstContentTokenTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToFirstContentTokenTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff
==============================================================================
--- xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToFirstContentTokenTest.java (original)
+++ xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToFirstContentTokenTest.java Sun Feb 6 01:51:55 2022
@@ -16,84 +16,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 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 ToFirstContentTokenTest extends BasicCursorTestCase {
+public class ToFirstContentTokenTest {
@Test
- public void testToFirstContentTokenFromSTARTDOC() throws Exception {
- m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar></foo>").newCursor();
- m_xc.toFirstChild();
- m_xc.insertAttributeWithValue("attr0", "val0");
- m_xc.insertNamespace("nsx", "valx");
- m_xc.toStartDoc();
- assertEquals(TokenType.START, m_xc.toFirstContentToken());
- assertEquals("earlytext", m_xc.getTextValue());
+ void testToFirstContentTokenFromSTARTDOC() throws Exception {
+ try (XmlCursor m_xc = cur("<foo>early<bar>text</bar></foo>")) {
+ m_xc.toFirstChild();
+ m_xc.insertAttributeWithValue("attr0", "val0");
+ m_xc.insertNamespace("nsx", "valx");
+ m_xc.toStartDoc();
+ assertEquals(TokenType.START, m_xc.toFirstContentToken());
+ assertEquals("earlytext", m_xc.getTextValue());
+ }
}
@Test
- public void testToFirstContentTokenFromATTR() throws Exception {
- m_xc = XmlObject.Factory.parse("<foo attr0=\"val0\" xmlns=\"nsuri\">early<bar>text</bar></foo>").newCursor();
- toNextTokenOfType(m_xc, TokenType.ATTR);
- assertEquals(TokenType.NONE, m_xc.toFirstContentToken());
- assertEquals(TokenType.ATTR, m_xc.currentTokenType());
- assertEquals("val0", m_xc.getTextValue());
+ void testToFirstContentTokenFromATTR() throws Exception {
+ try (XmlCursor m_xc = cur("<foo attr0=\"val0\" xmlns=\"nsuri\">early<bar>text</bar></foo>")) {
+ toNextTokenOfType(m_xc, TokenType.ATTR);
+ assertEquals(TokenType.NONE, m_xc.toFirstContentToken());
+ assertEquals(TokenType.ATTR, m_xc.currentTokenType());
+ assertEquals("val0", m_xc.getTextValue());
+ }
}
@Test
- public void testToFirstContentTokenFromNAMESPACE() throws Exception {
- m_xc = XmlObject.Factory.parse("<foo attr0=\"val0\" xmlns=\"nsuri\">early<bar>text</bar></foo>").newCursor();
- toNextTokenOfType(m_xc, TokenType.NAMESPACE);
- assertEquals(TokenType.NONE, m_xc.toFirstContentToken());
- assertEquals(TokenType.NAMESPACE, m_xc.currentTokenType());
+ void testToFirstContentTokenFromNAMESPACE() throws Exception {
+ try (XmlCursor m_xc = cur("<foo attr0=\"val0\" xmlns=\"nsuri\">early<bar>text</bar></foo>")) {
+ toNextTokenOfType(m_xc, TokenType.NAMESPACE);
+ assertEquals(TokenType.NONE, m_xc.toFirstContentToken());
+ assertEquals(TokenType.NAMESPACE, m_xc.currentTokenType());
- assertEquals(m_xc.getTextValue(),"nsuri");
+ assertEquals(m_xc.getTextValue(), "nsuri");
+ }
}
@Test
- public void testToFirstContentTokenFromSTARTwithContent() throws Exception {
- m_xc = XmlObject.Factory.parse("<foo attr0=\"val0\" xmlns=\"nsuri\">early<bar>text</bar></foo>").newCursor();
- toNextTokenOfType(m_xc, TokenType.START);
- assertEquals(TokenType.TEXT, m_xc.toFirstContentToken());
- assertEquals("early", m_xc.getChars());
+ void testToFirstContentTokenFromSTARTwithContent() throws Exception {
+ try (XmlCursor m_xc = cur("<foo attr0=\"val0\" xmlns=\"nsuri\">early<bar>text</bar></foo>")) {
+ toNextTokenOfType(m_xc, TokenType.START);
+ assertEquals(TokenType.TEXT, m_xc.toFirstContentToken());
+ assertEquals("early", m_xc.getChars());
+ }
}
@Test
- public void testToFirstContentTokenFromSTARTnoContent() throws Exception {
- m_xc = XmlObject.Factory.parse("<foo attr0=\"val0\" xmlns=\"nsuri\"></foo>").newCursor();
- toNextTokenOfType(m_xc, TokenType.START);
- assertEquals(TokenType.END, m_xc.toFirstContentToken());
- m_xc.toNextToken();
- assertEquals(TokenType.ENDDOC, m_xc.currentTokenType());
+ void testToFirstContentTokenFromSTARTnoContent() throws Exception {
+ try (XmlCursor m_xc = cur("<foo attr0=\"val0\" xmlns=\"nsuri\"></foo>")) {
+ toNextTokenOfType(m_xc, TokenType.START);
+ assertEquals(TokenType.END, m_xc.toFirstContentToken());
+ m_xc.toNextToken();
+ assertEquals(TokenType.ENDDOC, m_xc.currentTokenType());
+ }
}
@Test
- public void testToFirstContentTokenEmptyDocument() throws Exception {
- m_xc = XmlObject.Factory.newInstance().newCursor();
- assertEquals(TokenType.STARTDOC, m_xc.currentTokenType());
- assertEquals(TokenType.ENDDOC, m_xc.toFirstContentToken());
+ void testToFirstContentTokenEmptyDocument() throws Exception {
+ try (XmlCursor m_xc = XmlObject.Factory.newInstance().newCursor()) {
+ assertEquals(TokenType.STARTDOC, m_xc.currentTokenType());
+ assertEquals(TokenType.ENDDOC, m_xc.toFirstContentToken());
+ }
}
@Test
- public void testToFirstContentTokenFromTEXT() throws Exception {
- m_xc = XmlObject.Factory.parse("<foo attr0=\"val0\" xmlns=\"nsuri\"><bar>text</bar></foo>").newCursor();
- toNextTokenOfType(m_xc, TokenType.TEXT);
- assertEquals(TokenType.NONE, m_xc.toFirstContentToken());
- assertEquals("text", m_xc.getChars());
+ void testToFirstContentTokenFromTEXT() throws Exception {
+ try (XmlCursor m_xc = cur("<foo attr0=\"val0\" xmlns=\"nsuri\"><bar>text</bar></foo>")) {
+ toNextTokenOfType(m_xc, TokenType.TEXT);
+ assertEquals(TokenType.NONE, m_xc.toFirstContentToken());
+ assertEquals("text", m_xc.getChars());
+ }
}
@Test
- public void testToFirstContentTokenFromTEXTmiddle() throws Exception {
- m_xc = XmlObject.Factory.parse("<foo attr0=\"val0\" xmlns=\"nsuri\"><bar>text</bar></foo>").newCursor();
- toNextTokenOfType(m_xc, TokenType.TEXT);
- m_xc.toNextChar(2);
- assertEquals(TokenType.NONE, m_xc.toFirstContentToken());
- assertEquals("xt", m_xc.getChars());
+ void testToFirstContentTokenFromTEXTmiddle() throws Exception {
+ try (XmlCursor m_xc = cur("<foo attr0=\"val0\" xmlns=\"nsuri\"><bar>text</bar></foo>")) {
+ toNextTokenOfType(m_xc, TokenType.TEXT);
+ m_xc.toNextChar(2);
+ assertEquals(TokenType.NONE, m_xc.toFirstContentToken());
+ assertEquals("xt", m_xc.getChars());
+ }
}
}
Modified: xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToLastAttributeTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToLastAttributeTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff
==============================================================================
--- xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToLastAttributeTest.java (original)
+++ xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToLastAttributeTest.java Sun Feb 6 01:51:55 2022
@@ -16,62 +16,69 @@
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 ToLastAttributeTest extends BasicCursorTestCase {
+public class ToLastAttributeTest {
@Test
- public void testToLastAttrSTARTDOC() throws Exception {
- m_xc = XmlObject.Factory.parse("<foo>text</foo>").newCursor();
- m_xc.toLastChild();
- m_xc.insertAttributeWithValue("attr0", "val0");
- m_xc.insertAttributeWithValue("attr1", "val1");
- m_xc.toStartDoc();
- assertTrue(m_xc.toLastAttribute());
- assertEquals("val1", m_xc.getTextValue());
+ void testToLastAttrSTARTDOC() throws Exception {
+ try (XmlCursor m_xc = cur("<foo>text</foo>")) {
+ m_xc.toLastChild();
+ m_xc.insertAttributeWithValue("attr0", "val0");
+ m_xc.insertAttributeWithValue("attr1", "val1");
+ m_xc.toStartDoc();
+ assertTrue(m_xc.toLastAttribute());
+ assertEquals("val1", m_xc.getTextValue());
+ }
}
@Test
- public void testToLastAttrSTARTmoreThan1ATTR() throws Exception {
- m_xc = XmlObject.Factory.parse(Common.XML_FOO_2ATTR_TEXT).newCursor();
- toNextTokenOfType(m_xc, TokenType.START);
- assertTrue(m_xc.toLastAttribute());
- assertEquals("val1", m_xc.getTextValue());
+ void testToLastAttrSTARTmoreThan1ATTR() throws Exception {
+ try (XmlCursor m_xc = cur(Common.XML_FOO_2ATTR_TEXT)) {
+ toNextTokenOfType(m_xc, TokenType.START);
+ assertTrue(m_xc.toLastAttribute());
+ assertEquals("val1", m_xc.getTextValue());
+ }
}
@Test
- public void testToLastAttrFrom1stATTR() throws Exception {
- m_xc = XmlObject.Factory.parse(Common.XML_FOO_2ATTR_TEXT).newCursor();
- toNextTokenOfType(m_xc, TokenType.ATTR);
- assertFalse(m_xc.toLastAttribute());
+ void testToLastAttrFrom1stATTR() throws Exception {
+ try (XmlCursor m_xc = cur(Common.XML_FOO_2ATTR_TEXT)) {
+ toNextTokenOfType(m_xc, TokenType.ATTR);
+ assertFalse(m_xc.toLastAttribute());
+ }
}
@Test
- public void testToLastAttrZeroATTR() throws Exception {
- m_xc = XmlObject.Factory.parse(Common.XML_FOO_TEXT).newCursor();
- toNextTokenOfType(m_xc, TokenType.START);
- assertFalse(m_xc.toLastAttribute());
+ void testToLastAttrZeroATTR() throws Exception {
+ try (XmlCursor m_xc = cur(Common.XML_FOO_TEXT)) {
+ toNextTokenOfType(m_xc, TokenType.START);
+ assertFalse(m_xc.toLastAttribute());
+ }
}
@Test
- public void testToLastAttrFromTEXT() throws Exception {
- m_xc = XmlObject.Factory.parse(Common.XML_FOO_2ATTR_TEXT).newCursor();
- toNextTokenOfType(m_xc, TokenType.TEXT);
- assertFalse(m_xc.toLastAttribute());
+ void testToLastAttrFromTEXT() throws Exception {
+ try (XmlCursor m_xc = cur(Common.XML_FOO_2ATTR_TEXT)) {
+ toNextTokenOfType(m_xc, TokenType.TEXT);
+ assertFalse(m_xc.toLastAttribute());
+ }
}
@Test
- public void testToLastAttrWithXMLNS() throws Exception {
- m_xc = XmlObject.Factory.parse("<foo xmlns=\"http://www.foo.org\">text</foo>").newCursor();
- toNextTokenOfType(m_xc, TokenType.START);
- assertFalse(m_xc.toLastAttribute());
+ void testToLastAttrWithXMLNS() throws Exception {
+ try (XmlCursor m_xc = cur("<foo xmlns=\"http://www.foo.org\">text</foo>")) {
+ toNextTokenOfType(m_xc, TokenType.START);
+ assertFalse(m_xc.toLastAttribute());
+ }
}
}
Modified: xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToLastChildElementTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToLastChildElementTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff
==============================================================================
--- xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToLastChildElementTest.java (original)
+++ xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToLastChildElementTest.java Sun Feb 6 01:51:55 2022
@@ -18,67 +18,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.*;
+import static org.junit.jupiter.api.Assertions.*;
+import static xmlcursor.common.BasicCursorTestCase.cur;
+import static xmlcursor.common.BasicCursorTestCase.toNextTokenOfType;
-public class ToLastChildElementTest extends BasicCursorTestCase {
+public class ToLastChildElementTest {
@Test
- public void testToLastChildElemSTARTnestedSiblings() throws Exception {
- m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar><char>zap</char></foo>").newCursor();
- assertTrue(m_xc.toFirstChild());
- assertTrue(m_xc.toLastChild());
- assertEquals("zap", m_xc.getTextValue());
+ void testToLastChildElemSTARTnestedSiblings() throws Exception {
+ try (XmlCursor m_xc = cur("<foo>early<bar>text</bar><char>zap</char></foo>")) {
+ assertTrue(m_xc.toFirstChild());
+ assertTrue(m_xc.toLastChild());
+ assertEquals("zap", m_xc.getTextValue());
+ }
}
@Test
- public void testToLastChildElemSTARTnestedSiblingsTwice() throws Exception {
- m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar><char>zap<dar>wap</dar><ear>yap</ear></char></foo>").newCursor();
- assertTrue(m_xc.toFirstChild());
- assertTrue(m_xc.toLastChild());
- assertTrue(m_xc.toLastChild());
- assertEquals("yap", m_xc.getTextValue());
+ void testToLastChildElemSTARTnestedSiblingsTwice() throws Exception {
+ try (XmlCursor m_xc = cur("<foo>early<bar>text</bar><char>zap<dar>wap</dar><ear>yap</ear></char></foo>")) {
+ assertTrue(m_xc.toFirstChild());
+ assertTrue(m_xc.toLastChild());
+ assertTrue(m_xc.toLastChild());
+ assertEquals("yap", m_xc.getTextValue());
+ }
}
@Test
- public void testToLastChildElemFromTEXTnested() throws Exception {
- m_xc = XmlObject.Factory.parse("<foo>early<bar>text<char>zap</char><dar>yap</dar></bar></foo>").newCursor();
- toNextTokenOfType(m_xc, TokenType.TEXT);
- assertEquals("early", m_xc.getChars());
- try (XmlCursor xc0 = m_xc.newCursor()) {
- xc0.toNextSibling();
-
- assertEquals("textzapyap", xc0.getTextValue());
- xc0.toLastChild();
- assertEquals("yap", xc0.getTextValue());
- assertTrue(m_xc.toLastChild());
- assertEquals("yap", m_xc.getTextValue());
+ void testToLastChildElemFromTEXTnested() throws Exception {
+ try (XmlCursor m_xc = cur("<foo>early<bar>text<char>zap</char><dar>yap</dar></bar></foo>")) {
+ toNextTokenOfType(m_xc, TokenType.TEXT);
+ assertEquals("early", m_xc.getChars());
+ try (XmlCursor xc0 = m_xc.newCursor()) {
+ xc0.toNextSibling();
+
+ assertEquals("textzapyap", xc0.getTextValue());
+ xc0.toLastChild();
+ assertEquals("yap", xc0.getTextValue());
+ assertTrue(m_xc.toLastChild());
+ assertEquals("yap", m_xc.getTextValue());
+ }
}
}
@Test
- public void testToLastChildElemFromATTRnested() throws Exception {
- m_xc = XmlObject.Factory.parse("<foo attr0=\"val0\">early<bar>text<char>zap</char><dar>yap</dar></bar></foo>").newCursor();
- toNextTokenOfType(m_xc, TokenType.ATTR);
- assertEquals("val0", m_xc.getTextValue());
- assertTrue(m_xc.toLastChild());
+ void testToLastChildElemFromATTRnested() throws Exception {
+ try (XmlCursor m_xc = cur("<foo attr0=\"val0\">early<bar>text<char>zap</char><dar>yap</dar></bar></foo>")) {
+ toNextTokenOfType(m_xc, TokenType.ATTR);
+ assertEquals("val0", m_xc.getTextValue());
+ assertTrue(m_xc.toLastChild());
+ }
}
@Test
- public void testToLastChildElemFromSTARTnoChild() throws Exception {
- m_xc = XmlObject.Factory.parse("<foo>early</foo>").newCursor();
- assertTrue(m_xc.toFirstChild());
- assertFalse(m_xc.toLastChild());
+ void testToLastChildElemFromSTARTnoChild() throws Exception {
+ try (XmlCursor m_xc = cur("<foo>early</foo>")) {
+ assertTrue(m_xc.toFirstChild());
+ assertFalse(m_xc.toLastChild());
+ }
}
@Test
- public void testToLastChildElemFromSTARTDOC() throws Exception {
- m_xc = XmlObject.Factory.parse("<foo>early</foo>").newCursor();
- assertTrue(m_xc.toLastChild());
- assertEquals(TokenType.START, m_xc.currentTokenType());
+ void testToLastChildElemFromSTARTDOC() throws Exception {
+ try (XmlCursor m_xc = cur("<foo>early</foo>")) {
+ assertTrue(m_xc.toLastChild());
+ assertEquals(TokenType.START, m_xc.currentTokenType());
+ }
}
}
Modified: xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToNextAttributeTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToNextAttributeTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff
==============================================================================
--- xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToNextAttributeTest.java (original)
+++ xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToNextAttributeTest.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 ToNextAttributeTest extends BasicCursorTestCase {
+public class ToNextAttributeTest {
@Test
- public void testToNextAttrFromSTART() throws Exception {
- m_xc = XmlObject.Factory.parse(Common.XML_FOO_2ATTR_TEXT).newCursor();
- toNextTokenOfType(m_xc, TokenType.START);
- assertFalse(m_xc.toNextAttribute());
+ void testToNextAttrFromSTART() throws Exception {
+ try (XmlCursor m_xc = cur(Common.XML_FOO_2ATTR_TEXT)) {
+ toNextTokenOfType(m_xc, TokenType.START);
+ assertFalse(m_xc.toNextAttribute());
+ }
}
@Test
- public void testToNextAttrFromSingleATTR() throws Exception {
- m_xc = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT).newCursor();
- toNextTokenOfType(m_xc, TokenType.ATTR);
- assertFalse(m_xc.toNextAttribute());
- assertEquals("val0", m_xc.getTextValue());
+ void testToNextAttrFromSingleATTR() throws Exception {
+ try (XmlCursor m_xc = cur(Common.XML_FOO_1ATTR_TEXT)) {
+ toNextTokenOfType(m_xc, TokenType.ATTR);
+ assertFalse(m_xc.toNextAttribute());
+ assertEquals("val0", m_xc.getTextValue());
+ }
}
@Test
- public void testToNextAttrWithSiblings() throws Exception {
- m_xc = XmlObject.Factory.parse(Common.XML_FOO_2ATTR_TEXT).newCursor();
- toNextTokenOfType(m_xc, TokenType.ATTR);
- assertTrue(m_xc.toNextAttribute());
- assertEquals("val1", m_xc.getTextValue());
+ void testToNextAttrWithSiblings() throws Exception {
+ try (XmlCursor m_xc = cur(Common.XML_FOO_2ATTR_TEXT)) {
+ toNextTokenOfType(m_xc, TokenType.ATTR);
+ assertTrue(m_xc.toNextAttribute());
+ assertEquals("val1", m_xc.getTextValue());
+ }
}
@Test
- public void testToNextAttrFromLastSibling() throws Exception {
- m_xc = XmlObject.Factory.parse(Common.XML_FOO_2ATTR_TEXT).newCursor();
- toNextTokenOfType(m_xc, TokenType.ATTR);
- toNextTokenOfType(m_xc, TokenType.ATTR);
- assertFalse(m_xc.toNextAttribute());
- assertEquals("val1", m_xc.getTextValue());
+ void testToNextAttrFromLastSibling() throws Exception {
+ try (XmlCursor m_xc = cur(Common.XML_FOO_2ATTR_TEXT)) {
+ toNextTokenOfType(m_xc, TokenType.ATTR);
+ toNextTokenOfType(m_xc, TokenType.ATTR);
+ assertFalse(m_xc.toNextAttribute());
+ assertEquals("val1", m_xc.getTextValue());
+ }
}
@Test
- public void testToNextAttrWithXMLNS() throws Exception {
- m_xc = XmlObject.Factory.parse("<foo attr0=\"val0\" xmlns=\"uri\" attr1=\"val1\">text</foo>").newCursor();
- toNextTokenOfType(m_xc, TokenType.ATTR);
- assertEquals("val0", m_xc.getTextValue());
- assertTrue(m_xc.toNextAttribute());
- assertEquals("val1", m_xc.getTextValue());
- assertFalse(m_xc.toNextAttribute());
+ void testToNextAttrWithXMLNS() throws Exception {
+ try (XmlCursor m_xc = cur("<foo attr0=\"val0\" xmlns=\"uri\" attr1=\"val1\">text</foo>")) {
+ toNextTokenOfType(m_xc, TokenType.ATTR);
+ assertEquals("val0", m_xc.getTextValue());
+ assertTrue(m_xc.toNextAttribute());
+ assertEquals("val1", m_xc.getTextValue());
+ assertFalse(m_xc.toNextAttribute());
+ }
}
@Test
- public void testToNextAttrFromTEXT() throws Exception {
- m_xc = XmlObject.Factory.parse(Common.XML_FOO_2ATTR_TEXT).newCursor();
- toNextTokenOfType(m_xc, TokenType.TEXT);
- assertFalse(m_xc.toNextAttribute());
+ void testToNextAttrFromTEXT() throws Exception {
+ try (XmlCursor m_xc = cur(Common.XML_FOO_2ATTR_TEXT)) {
+ toNextTokenOfType(m_xc, TokenType.TEXT);
+ assertFalse(m_xc.toNextAttribute());
+ }
}
}
Modified: xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToNextBookmarkTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToNextBookmarkTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff
==============================================================================
--- xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToNextBookmarkTest.java (original)
+++ xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToNextBookmarkTest.java Sun Feb 6 01:51:55 2022
@@ -18,95 +18,95 @@ 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 ToNextBookmarkTest extends BasicCursorTestCase {
- private SimpleBookmark _theBookmark = new SimpleBookmark("value");
- private SimpleBookmark _theBookmark1 = new SimpleBookmark("value1");
- private DifferentBookmark _difBookmark = new DifferentBookmark("diff");
+public class ToNextBookmarkTest {
+ 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 testToNextBookmarkSameKey() 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.toStartDoc();
-
- assertEquals(_theBookmark, m_xc.toNextBookmark(SimpleBookmark.class));
- assertTrue(m_xc.isAtSamePositionAs(xc0));
- assertEquals(_theBookmark1, m_xc.toNextBookmark(SimpleBookmark.class));
- assertTrue(m_xc.isAtSamePositionAs(xc1));
- assertNull(m_xc.toNextBookmark(SimpleBookmark.class));
+ void testToNextBookmarkSameKey() 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.toStartDoc();
+
+ assertEquals(_theBookmark, m_xc.toNextBookmark(SimpleBookmark.class));
+ assertTrue(m_xc.isAtSamePositionAs(xc0));
+ assertEquals(_theBookmark1, m_xc.toNextBookmark(SimpleBookmark.class));
+ assertTrue(m_xc.isAtSamePositionAs(xc1));
+ assertNull(m_xc.toNextBookmark(SimpleBookmark.class));
+ }
}
}
}
@Test
- public void testToNextBookmarkInvalidKey() 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.toStartDoc();
- assertNull(m_xc.toNextBookmark(Object.class));
+ void testToNextBookmarkInvalidKey() 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.toStartDoc();
+ assertNull(m_xc.toNextBookmark(Object.class));
+ }
}
@Test
- public void testToNextBookmarkDifferentKeys() 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.toStartDoc();
-
- assertEquals(_theBookmark, m_xc.toNextBookmark(SimpleBookmark.class));
- assertTrue(m_xc.isAtSamePositionAs(xc0));
- assertNull(m_xc.toNextBookmark(SimpleBookmark.class));
- assertEquals(_difBookmark, m_xc.toNextBookmark(DifferentBookmark.class));
- assertTrue(m_xc.isAtSamePositionAs(xc1));
+ void testToNextBookmarkDifferentKeys() 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.toStartDoc();
+
+ assertEquals(_theBookmark, m_xc.toNextBookmark(SimpleBookmark.class));
+ assertTrue(m_xc.isAtSamePositionAs(xc0));
+ assertNull(m_xc.toNextBookmark(SimpleBookmark.class));
+ assertEquals(_difBookmark, m_xc.toNextBookmark(DifferentBookmark.class));
+ assertTrue(m_xc.isAtSamePositionAs(xc1));
+ }
}
}
}
@Test
- public void testToNextBookmarkPostRemoveChars() 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.getChars());
- m_xc.setBookmark(_theBookmark); // set bookmark at '2'
- m_xc.toPrevChar(2);
- assertEquals(3, m_xc.removeChars(3)); // '2' should be deleted, along w/ bookmark
- assertEquals("34", m_xc.getChars());
- try (XmlCursor xc1 = m_xc.newCursor()) {
- xc1.toStartDoc();
+ void testToNextBookmarkPostRemoveChars() throws Exception {
+ try (XmlCursor m_xc = cur(Common.XML_FOO_DIGITS)) {
+ toNextTokenOfType(m_xc, TokenType.TEXT);
+ m_xc.toNextChar(2);
+ assertEquals("234", m_xc.getChars());
+ m_xc.setBookmark(_theBookmark); // set bookmark at '2'
+ m_xc.toPrevChar(2);
+ assertEquals(3, m_xc.removeChars(3)); // '2' should be deleted, along w/ bookmark
+ assertEquals("34", m_xc.getChars());
+ try (XmlCursor xc1 = m_xc.newCursor()) {
+ xc1.toStartDoc();
- assertNull(xc1.toNextBookmark(SimpleBookmark.class));
- assertEquals(TokenType.STARTDOC, xc1.currentTokenType());
+ assertNull(xc1.toNextBookmark(SimpleBookmark.class));
+ assertEquals(TokenType.STARTDOC, xc1.currentTokenType());
+ }
}
}
- public class SimpleBookmark extends XmlCursor.XmlBookmark {
+ private static class SimpleBookmark extends XmlCursor.XmlBookmark {
public String text;
SimpleBookmark(String text) {
@@ -114,7 +114,7 @@ public class ToNextBookmarkTest 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/ToNextCharTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToNextCharTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff
==============================================================================
--- xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToNextCharTest.java (original)
+++ xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToNextCharTest.java Sun Feb 6 01:51:55 2022
@@ -16,62 +16,68 @@
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 ToNextCharTest extends BasicCursorTestCase {
+public class ToNextCharTest {
@Test
- public void testToNextCharNegative() throws Exception {
- m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar></foo>").newCursor();
- toNextTokenOfType(m_xc, TokenType.TEXT);
- assertEquals("early", m_xc.getChars());
- assertEquals(5, m_xc.toNextChar(-1));
- assertEquals(TokenType.START, m_xc.currentTokenType());
- assertEquals("text", m_xc.getTextValue());
+ void testToNextCharNegative() throws Exception {
+ try (XmlCursor m_xc = cur("<foo>early<bar>text</bar></foo>")) {
+ toNextTokenOfType(m_xc, TokenType.TEXT);
+ assertEquals("early", m_xc.getChars());
+ assertEquals(5, m_xc.toNextChar(-1));
+ assertEquals(TokenType.START, m_xc.currentTokenType());
+ assertEquals("text", m_xc.getTextValue());
+ }
}
@Test
- public void testToNextCharGTLength() throws Exception {
- m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar></foo>").newCursor();
- toNextTokenOfType(m_xc, TokenType.TEXT);
- assertEquals("early", m_xc.getChars());
- assertEquals(5, m_xc.toNextChar(999));
- assertEquals(TokenType.START, m_xc.currentTokenType());
- assertEquals("text", m_xc.getTextValue());
+ void testToNextCharGTLength() throws Exception {
+ try (XmlCursor m_xc = cur("<foo>early<bar>text</bar></foo>")) {
+ toNextTokenOfType(m_xc, TokenType.TEXT);
+ assertEquals("early", m_xc.getChars());
+ assertEquals(5, m_xc.toNextChar(999));
+ assertEquals(TokenType.START, m_xc.currentTokenType());
+ assertEquals("text", m_xc.getTextValue());
+ }
}
@Test
- public void testToNextCharLTLength() throws Exception {
- m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar></foo>").newCursor();
- toNextTokenOfType(m_xc, TokenType.TEXT);
- assertEquals("early", m_xc.getChars());
- assertEquals(3, m_xc.toNextChar(3));
- assertEquals(TokenType.TEXT, m_xc.currentTokenType());
- assertEquals("ly", m_xc.getChars());
+ void testToNextCharLTLength() throws Exception {
+ try (XmlCursor m_xc = cur("<foo>early<bar>text</bar></foo>")) {
+ toNextTokenOfType(m_xc, TokenType.TEXT);
+ assertEquals("early", m_xc.getChars());
+ assertEquals(3, m_xc.toNextChar(3));
+ assertEquals(TokenType.TEXT, m_xc.currentTokenType());
+ assertEquals("ly", m_xc.getChars());
+ }
}
@Test
- public void testToNextCharZero() throws Exception {
- m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar></foo>").newCursor();
- toNextTokenOfType(m_xc, TokenType.TEXT);
- assertEquals("early", m_xc.getChars());
- assertEquals(0, m_xc.toNextChar(0));
- assertEquals(TokenType.TEXT, m_xc.currentTokenType());
- assertEquals("early", m_xc.getChars());
+ void testToNextCharZero() throws Exception {
+ try (XmlCursor m_xc = cur("<foo>early<bar>text</bar></foo>")) {
+ toNextTokenOfType(m_xc, TokenType.TEXT);
+ assertEquals("early", m_xc.getChars());
+ assertEquals(0, m_xc.toNextChar(0));
+ assertEquals(TokenType.TEXT, m_xc.currentTokenType());
+ assertEquals("early", m_xc.getChars());
+ }
}
@Test
- public void testToNextCharFromATTR() 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.toNextChar(2));
- assertEquals(TokenType.ATTR, m_xc.currentTokenType());
- assertEquals("val0", m_xc.getTextValue());
+ void testToNextCharFromATTR() 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.toNextChar(2));
+ assertEquals(TokenType.ATTR, m_xc.currentTokenType());
+ assertEquals("val0", m_xc.getTextValue());
+ }
}
}
Modified: xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToNextElementTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToNextElementTest.java?rev=1897795&r1=1897794&r2=1897795&view=diff
==============================================================================
--- xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToNextElementTest.java (original)
+++ xmlbeans/trunk/src/test/java/xmlcursor/checkin/ToNextElementTest.java Sun Feb 6 01:51:55 2022
@@ -16,47 +16,52 @@
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 ToNextElementTest extends BasicCursorTestCase {
+public class ToNextElementTest {
@Test
- public void testToNextElementFromSTARTDOC() throws Exception {
- m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar></foo>").newCursor();
- assertFalse(m_xc.toNextSibling());
- assertEquals(TokenType.STARTDOC, m_xc.currentTokenType());
+ void testToNextElementFromSTARTDOC() throws Exception {
+ try (XmlCursor m_xc = cur("<foo>early<bar>text</bar></foo>")) {
+ assertFalse(m_xc.toNextSibling());
+ assertEquals(TokenType.STARTDOC, m_xc.currentTokenType());
+ }
}
@Test
- public void testToNextElementSiblings() throws Exception {
- m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar><char>zap<dar>wap</dar><ear>yap</ear></char></foo>").newCursor();
- assertTrue(m_xc.toFirstChild());
- assertTrue(m_xc.toFirstChild());
- assertEquals("text", m_xc.getTextValue());
- assertTrue(m_xc.toNextSibling());
- assertEquals("zapwapyap", m_xc.getTextValue());
- assertFalse(m_xc.toNextSibling());
+ void testToNextElementSiblings() throws Exception {
+ try (XmlCursor m_xc = cur("<foo>early<bar>text</bar><char>zap<dar>wap</dar><ear>yap</ear></char></foo>")) {
+ assertTrue(m_xc.toFirstChild());
+ assertTrue(m_xc.toFirstChild());
+ assertEquals("text", m_xc.getTextValue());
+ assertTrue(m_xc.toNextSibling());
+ assertEquals("zapwapyap", m_xc.getTextValue());
+ assertFalse(m_xc.toNextSibling());
+ }
}
@Test
- public void testToNextElementFromATTR() throws Exception {
- m_xc = XmlObject.Factory.parse("<foo attr0=\"val0\">early<bar>text</bar><char>zap<dar>wap</dar><ear>yap</ear></char></foo>").newCursor();
- toNextTokenOfType(m_xc, TokenType.ATTR);
- assertEquals("val0", m_xc.getTextValue());
- assertTrue(m_xc.toNextSibling());
+ void testToNextElementFromATTR() throws Exception {
+ try (XmlCursor m_xc = cur("<foo attr0=\"val0\">early<bar>text</bar><char>zap<dar>wap</dar><ear>yap</ear></char></foo>")) {
+ toNextTokenOfType(m_xc, TokenType.ATTR);
+ assertEquals("val0", m_xc.getTextValue());
+ assertTrue(m_xc.toNextSibling());
+ }
}
@Test
- public void testToNextElementFromTEXT() throws Exception {
- m_xc = XmlObject.Factory.parse("<foo attr0=\"val0\">early<bar>text</bar><char>zap<dar>wap</dar><ear>yap</ear></char></foo>").newCursor();
- toNextTokenOfType(m_xc, TokenType.TEXT);
- assertEquals("early", m_xc.getChars());
- assertTrue(m_xc.toNextSibling());
- assertEquals("text", m_xc.getTextValue());
+ void testToNextElementFromTEXT() throws Exception {
+ try (XmlCursor m_xc = cur("<foo attr0=\"val0\">early<bar>text</bar><char>zap<dar>wap</dar><ear>yap</ear></char></foo>")) {
+ toNextTokenOfType(m_xc, TokenType.TEXT);
+ assertEquals("early", m_xc.getChars());
+ assertTrue(m_xc.toNextSibling());
+ assertEquals("text", m_xc.getTextValue());
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org