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 2019/01/18 23:08:48 UTC
svn commit: r1851656 [17/28] - in /xmlbeans/trunk: ./ external/ lib/
resources/ resources/typeimpl/ resources/typeimpl/org/
resources/typeimpl/org/apache/ resources/typeimpl/org/apache/xmlbeans/
resources/typeimpl/org/apache/xmlbeans/impl/ resources/ty...
Modified: xmlbeans/trunk/test/src/xmlcursor/checkin/ToCursorTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/xmlcursor/checkin/ToCursorTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/xmlcursor/checkin/ToCursorTest.java (original)
+++ xmlbeans/trunk/test/src/xmlcursor/checkin/ToCursorTest.java Fri Jan 18 23:08:44 2019
@@ -16,46 +16,25 @@
package xmlcursor.checkin;
-import org.apache.xmlbeans.XmlOptions;
-import junit.framework.*;
-import junit.framework.Assert.*;
-
-import java.io.*;
-
-import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlBeans;
import org.apache.xmlbeans.XmlCursor.TokenType;
-import org.apache.xmlbeans.XmlDocumentProperties;
-import org.apache.xmlbeans.XmlCursor.XmlBookmark;
-
-import javax.xml.namespace.QName;
-
-import xmlcursor.common.*;
+import org.apache.xmlbeans.XmlObject;
+import org.junit.Test;
+import xmlcursor.common.BasicCursorTestCase;
+import xmlcursor.common.Common;
-import java.net.URL;
+import static org.junit.Assert.*;
-/**
- *
- *
- */
public class ToCursorTest extends BasicCursorTestCase {
- public ToCursorTest(String sName) {
- super(sName);
- }
-
- public static Test suite() {
- return new TestSuite(ToCursorTest.class);
- }
-
+ @Test
public void testToCursorMoves() throws Exception {
m_xc = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT).newCursor();
XmlCursor xc0 = m_xc.newCursor();
xc0.toEndDoc();
try {
- assertEquals(true, m_xc.toCursor(xc0));
- assertEquals(true, xc0.isAtSamePositionAs(m_xc));
+ assertTrue(m_xc.toCursor(xc0));
+ assertTrue(xc0.isAtSamePositionAs(m_xc));
} finally {
xc0.dispose();
}
@@ -64,20 +43,14 @@ 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();
- String s = m_xc.xmlText();
- boolean caught = false;
- try {
- m_xc.toCursor(null);
- } catch (java.lang.IllegalArgumentException e) {
- caught = true;
- }
- assertTrue("toCursor(null) did not throw IllegalArgumentException", caught);
- assertEquals(s, m_xc.xmlText());
+ m_xc.toCursor(null);
}
+ @Test
public void testToCursorDifferentDocs() throws Exception {
m_xc = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT).newCursor();
XmlCursor xc0 = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT).newCursor();
@@ -85,18 +58,19 @@ public class ToCursorTest extends BasicC
String s = m_xc.xmlText();
toNextTokenOfType(xc0, TokenType.TEXT);
try {
- assertEquals(false, m_xc.toCursor(xc0));
+ assertFalse(m_xc.toCursor(xc0));
assertEquals(s, m_xc.xmlText());
} finally {
xc0.dispose();
}
}
+ @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();
- assertEquals(true, m_xc.toCursor(m_xc));
+ assertTrue(m_xc.toCursor(m_xc));
assertEquals(s, m_xc.xmlText());
}
Modified: xmlbeans/trunk/test/src/xmlcursor/checkin/ToFirstAttributeTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/xmlcursor/checkin/ToFirstAttributeTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/xmlcursor/checkin/ToFirstAttributeTest.java (original)
+++ xmlbeans/trunk/test/src/xmlcursor/checkin/ToFirstAttributeTest.java Fri Jan 18 23:08:44 2019
@@ -16,80 +16,63 @@
package xmlcursor.checkin;
-import org.apache.xmlbeans.XmlOptions;
-import junit.framework.*;
-import junit.framework.Assert.*;
-
-import java.io.*;
-
-import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlBeans;
import org.apache.xmlbeans.XmlCursor.TokenType;
-import org.apache.xmlbeans.XmlDocumentProperties;
-import org.apache.xmlbeans.XmlCursor.XmlBookmark;
-
-import javax.xml.namespace.QName;
-
-import xmlcursor.common.*;
+import org.apache.xmlbeans.XmlObject;
+import org.junit.Test;
+import xmlcursor.common.BasicCursorTestCase;
+import xmlcursor.common.Common;
-import java.net.URL;
+import static org.junit.Assert.*;
-/**
- *
- *
- */
public class ToFirstAttributeTest extends BasicCursorTestCase {
- public ToFirstAttributeTest(String sName) {
- super(sName);
- }
-
- public static Test suite() {
- return new TestSuite(ToFirstAttributeTest.class);
- }
-
+ @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();
- assertEquals(true, m_xc.toFirstAttribute());
+ 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);
- assertEquals(true, m_xc.toFirstAttribute());
+ 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);
- assertEquals(false, m_xc.toFirstAttribute());
+ 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);
- assertEquals(false, m_xc.toFirstAttribute());
+ 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());
- assertEquals(false, m_xc.toFirstAttribute());
+ 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);
- assertEquals(false, m_xc.toFirstAttribute());
+ assertFalse(m_xc.toFirstAttribute());
}
}
Modified: xmlbeans/trunk/test/src/xmlcursor/checkin/ToFirstChildElementTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/xmlcursor/checkin/ToFirstChildElementTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/xmlcursor/checkin/ToFirstChildElementTest.java (original)
+++ xmlbeans/trunk/test/src/xmlcursor/checkin/ToFirstChildElementTest.java Fri Jan 18 23:08:44 2019
@@ -16,78 +16,60 @@
package xmlcursor.checkin;
-import org.apache.xmlbeans.XmlOptions;
-import junit.framework.*;
-import junit.framework.Assert.*;
-
-import java.io.*;
-
-import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlBeans;
import org.apache.xmlbeans.XmlCursor.TokenType;
-import org.apache.xmlbeans.XmlDocumentProperties;
-import org.apache.xmlbeans.XmlCursor.XmlBookmark;
-
-import javax.xml.namespace.QName;
-
-import xmlcursor.common.*;
+import org.apache.xmlbeans.XmlObject;
+import org.junit.Test;
+import xmlcursor.common.BasicCursorTestCase;
-import java.net.URL;
+import static org.junit.Assert.*;
-/**
- *
- *
- */
public class ToFirstChildElementTest extends BasicCursorTestCase {
- public ToFirstChildElementTest(String sName) {
- super(sName);
- }
-
- public static Test suite() {
- return new TestSuite(ToFirstChildElementTest.class);
- }
-
+ @Test
public void testToFirstChildElemSTARTnested() throws Exception {
m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar></foo>").newCursor();
- assertEquals(true, m_xc.toFirstChild());
- assertEquals(true, m_xc.toFirstChild());
+ 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();
- assertEquals(true, m_xc.toFirstChild());
- assertEquals(true, m_xc.toFirstChild());
- assertEquals(false, m_xc.toFirstChild());
+ 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());
- assertEquals(true, m_xc.toFirstChild());
+ 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());
- assertEquals(true, m_xc.toFirstChild());
+ assertTrue(m_xc.toFirstChild());
}
+ @Test
public void testToFirstChildElemFromSTARTnoChild() throws Exception {
m_xc = XmlObject.Factory.parse("<foo>early</foo>").newCursor();
- assertEquals(true, m_xc.toFirstChild());
- assertEquals(false, m_xc.toFirstChild());
+ assertTrue(m_xc.toFirstChild());
+ assertFalse(m_xc.toFirstChild());
}
+ @Test
public void testToFirstChildElemFromSTARTDOC() throws Exception {
m_xc = XmlObject.Factory.parse("<foo>early</foo>").newCursor();
- assertEquals(true, m_xc.toFirstChild());
+ assertTrue(m_xc.toFirstChild());
assertEquals(TokenType.START, m_xc.currentTokenType());
}
}
Modified: xmlbeans/trunk/test/src/xmlcursor/checkin/ToFirstContentTokenTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/xmlcursor/checkin/ToFirstContentTokenTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/xmlcursor/checkin/ToFirstContentTokenTest.java (original)
+++ xmlbeans/trunk/test/src/xmlcursor/checkin/ToFirstContentTokenTest.java Fri Jan 18 23:08:44 2019
@@ -16,39 +16,16 @@
package xmlcursor.checkin;
-import org.apache.xmlbeans.XmlOptions;
-import junit.framework.*;
-import junit.framework.Assert.*;
-
-import java.io.*;
-
-import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlBeans;
import org.apache.xmlbeans.XmlCursor.TokenType;
-import org.apache.xmlbeans.XmlDocumentProperties;
-import org.apache.xmlbeans.XmlCursor.XmlBookmark;
-
-import javax.xml.namespace.QName;
-
-import xmlcursor.common.*;
-
-import java.net.URL;
+import org.apache.xmlbeans.XmlObject;
+import org.junit.Test;
+import xmlcursor.common.BasicCursorTestCase;
+import static org.junit.Assert.assertEquals;
-/**
- *
- *
- */
public class ToFirstContentTokenTest extends BasicCursorTestCase {
- public ToFirstContentTokenTest(String sName) {
- super(sName);
- }
-
- public static Test suite() {
- return new TestSuite(ToFirstContentTokenTest.class);
- }
+ @Test
public void testToFirstContentTokenFromSTARTDOC() throws Exception {
m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar></foo>").newCursor();
m_xc.toFirstChild();
@@ -59,6 +36,7 @@ public class ToFirstContentTokenTest ext
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);
@@ -67,6 +45,7 @@ public class ToFirstContentTokenTest ext
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);
@@ -76,6 +55,7 @@ public class ToFirstContentTokenTest ext
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);
@@ -83,6 +63,7 @@ public class ToFirstContentTokenTest ext
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);
@@ -91,12 +72,14 @@ public class ToFirstContentTokenTest ext
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());
}
+ @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);
@@ -104,6 +87,7 @@ public class ToFirstContentTokenTest ext
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);
@@ -111,6 +95,5 @@ public class ToFirstContentTokenTest ext
assertEquals(TokenType.NONE, m_xc.toFirstContentToken());
assertEquals("xt", m_xc.getChars());
}
-
}
Modified: xmlbeans/trunk/test/src/xmlcursor/checkin/ToLastAttributeTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/xmlcursor/checkin/ToLastAttributeTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/xmlcursor/checkin/ToLastAttributeTest.java (original)
+++ xmlbeans/trunk/test/src/xmlcursor/checkin/ToLastAttributeTest.java Fri Jan 18 23:08:44 2019
@@ -16,78 +16,62 @@
package xmlcursor.checkin;
-import org.apache.xmlbeans.XmlOptions;
-import junit.framework.*;
-import junit.framework.Assert.*;
-
-import java.io.*;
-
-import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlBeans;
import org.apache.xmlbeans.XmlCursor.TokenType;
-import org.apache.xmlbeans.XmlDocumentProperties;
-import org.apache.xmlbeans.XmlCursor.XmlBookmark;
-
-import javax.xml.namespace.QName;
-
-import xmlcursor.common.*;
+import org.apache.xmlbeans.XmlObject;
+import org.junit.Test;
+import xmlcursor.common.BasicCursorTestCase;
+import xmlcursor.common.Common;
-import java.net.URL;
+import static org.junit.Assert.*;
-/**
- *
- *
- */
public class ToLastAttributeTest extends BasicCursorTestCase {
- public ToLastAttributeTest(String sName) {
- super(sName);
- }
-
- public static Test suite() {
- return new TestSuite(ToLastAttributeTest.class);
- }
+ @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();
- assertEquals(true, m_xc.toLastAttribute());
+ 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);
- assertEquals(true, m_xc.toLastAttribute());
+ 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);
- assertEquals(false, m_xc.toLastAttribute());
+ 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);
- assertEquals(false, m_xc.toLastAttribute());
+ 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);
- assertEquals(false, m_xc.toLastAttribute());
+ 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);
- assertEquals(false, m_xc.toLastAttribute());
+ assertFalse(m_xc.toLastAttribute());
}
}
Modified: xmlbeans/trunk/test/src/xmlcursor/checkin/ToLastChildElementTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/xmlcursor/checkin/ToLastChildElementTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/xmlcursor/checkin/ToLastChildElementTest.java (original)
+++ xmlbeans/trunk/test/src/xmlcursor/checkin/ToLastChildElementTest.java Fri Jan 18 23:08:44 2019
@@ -16,54 +16,34 @@
package xmlcursor.checkin;
-import org.apache.xmlbeans.XmlOptions;
-import junit.framework.*;
-import junit.framework.Assert.*;
-
-import java.io.*;
-
-import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlBeans;
import org.apache.xmlbeans.XmlCursor.TokenType;
-import org.apache.xmlbeans.XmlDocumentProperties;
-import org.apache.xmlbeans.XmlCursor.XmlBookmark;
-
-import javax.xml.namespace.QName;
-
-import xmlcursor.common.*;
+import org.apache.xmlbeans.XmlObject;
+import org.junit.Test;
+import xmlcursor.common.BasicCursorTestCase;
-import java.net.URL;
+import static org.junit.Assert.*;
-/**
- *
- *
- */
public class ToLastChildElementTest extends BasicCursorTestCase {
- public ToLastChildElementTest(String sName) {
- super(sName);
- }
-
- public static Test suite() {
- return new TestSuite(ToLastChildElementTest.class);
- }
-
+ @Test
public void testToLastChildElemSTARTnestedSiblings() throws Exception {
m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar><char>zap</char></foo>").newCursor();
- assertEquals(true, m_xc.toFirstChild());
- assertEquals(true, m_xc.toLastChild());
+ 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();
- assertEquals(true, m_xc.toFirstChild());
- assertEquals(true, m_xc.toLastChild());
- assertEquals(true, m_xc.toLastChild());
+ 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);
@@ -74,29 +54,32 @@ public class ToLastChildElementTest exte
assertEquals("textzapyap", xc0.getTextValue());
xc0.toLastChild();
assertEquals("yap", xc0.getTextValue());
- assertEquals(true, m_xc.toLastChild());
+ assertTrue(m_xc.toLastChild());
assertEquals("yap", m_xc.getTextValue());
} finally {
xc0.dispose();
}
}
+ @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());
- assertEquals(true, m_xc.toLastChild());
+ assertTrue(m_xc.toLastChild());
}
+ @Test
public void testToLastChildElemFromSTARTnoChild() throws Exception {
m_xc = XmlObject.Factory.parse("<foo>early</foo>").newCursor();
- assertEquals(true, m_xc.toFirstChild());
- assertEquals(false, m_xc.toLastChild());
+ assertTrue(m_xc.toFirstChild());
+ assertFalse(m_xc.toLastChild());
}
+ @Test
public void testToLastChildElemFromSTARTDOC() throws Exception {
m_xc = XmlObject.Factory.parse("<foo>early</foo>").newCursor();
- assertEquals(true, m_xc.toLastChild());
+ assertTrue(m_xc.toLastChild());
assertEquals(TokenType.START, m_xc.currentTokenType());
}
}
Modified: xmlbeans/trunk/test/src/xmlcursor/checkin/ToNextAttributeTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/xmlcursor/checkin/ToNextAttributeTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/xmlcursor/checkin/ToNextAttributeTest.java (original)
+++ xmlbeans/trunk/test/src/xmlcursor/checkin/ToNextAttributeTest.java Fri Jan 18 23:08:44 2019
@@ -16,80 +16,63 @@
package xmlcursor.checkin;
-import org.apache.xmlbeans.XmlOptions;
-import junit.framework.*;
-import junit.framework.Assert.*;
-
-import java.io.*;
-
-import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlBeans;
import org.apache.xmlbeans.XmlCursor.TokenType;
-import org.apache.xmlbeans.XmlDocumentProperties;
-import org.apache.xmlbeans.XmlCursor.XmlBookmark;
-
-import javax.xml.namespace.QName;
-
-import xmlcursor.common.*;
+import org.apache.xmlbeans.XmlObject;
+import org.junit.Test;
+import xmlcursor.common.BasicCursorTestCase;
+import xmlcursor.common.Common;
-import java.net.URL;
+import static org.junit.Assert.*;
-/**
- *
- *
- */
public class ToNextAttributeTest extends BasicCursorTestCase {
- public ToNextAttributeTest(String sName) {
- super(sName);
- }
-
- public static Test suite() {
- return new TestSuite(ToNextAttributeTest.class);
- }
-
+ @Test
public void testToNextAttrFromSTART() throws Exception {
m_xc = XmlObject.Factory.parse(Common.XML_FOO_2ATTR_TEXT).newCursor();
toNextTokenOfType(m_xc, TokenType.START);
- assertEquals(false, m_xc.toNextAttribute());
+ 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);
- assertEquals(false, m_xc.toNextAttribute());
+ 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);
- assertEquals(true, m_xc.toNextAttribute());
+ 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);
- assertEquals(false, m_xc.toNextAttribute());
+ 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());
- assertEquals(true, m_xc.toNextAttribute());
+ assertTrue(m_xc.toNextAttribute());
assertEquals("val1", m_xc.getTextValue());
- assertEquals(false, m_xc.toNextAttribute());
+ 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);
- assertEquals(false, m_xc.toNextAttribute());
+ assertFalse(m_xc.toNextAttribute());
}
}
Modified: xmlbeans/trunk/test/src/xmlcursor/checkin/ToNextBookmarkTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/xmlcursor/checkin/ToNextBookmarkTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/xmlcursor/checkin/ToNextBookmarkTest.java (original)
+++ xmlbeans/trunk/test/src/xmlcursor/checkin/ToNextBookmarkTest.java Fri Jan 18 23:08:44 2019
@@ -16,43 +16,22 @@
package xmlcursor.checkin;
-import org.apache.xmlbeans.XmlOptions;
-import junit.framework.*;
-import junit.framework.Assert.*;
-
-import java.io.*;
-
-import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlBeans;
import org.apache.xmlbeans.XmlCursor.TokenType;
-import org.apache.xmlbeans.XmlDocumentProperties;
-import org.apache.xmlbeans.XmlCursor.XmlBookmark;
-
-import javax.xml.namespace.QName;
-
-import xmlcursor.common.*;
+import org.apache.xmlbeans.XmlObject;
+import org.junit.Test;
+import xmlcursor.common.BasicCursorTestCase;
+import xmlcursor.common.Common;
-import java.net.URL;
+import static org.junit.Assert.*;
-/**
- *
- *
- */
public class ToNextBookmarkTest extends BasicCursorTestCase {
private SimpleBookmark _theBookmark = new SimpleBookmark("value");
private SimpleBookmark _theBookmark1 = new SimpleBookmark("value1");
private DifferentBookmark _difBookmark = new DifferentBookmark("diff");
- public ToNextBookmarkTest(String sName) {
- super(sName);
- }
-
- public static Test suite() {
- return new TestSuite(ToNextBookmarkTest.class);
- }
-
+ @Test
public void testToNextBookmarkSameKey() throws Exception {
m_xo = XmlObject.Factory.parse(Common.XML_FOO_TEXT);
m_xc = m_xo.newCursor();
@@ -65,16 +44,17 @@ public class ToNextBookmarkTest extends
m_xc.toStartDoc();
try {
assertEquals(_theBookmark, m_xc.toNextBookmark(SimpleBookmark.class));
- assertEquals(true, m_xc.isAtSamePositionAs(xc0));
+ assertTrue(m_xc.isAtSamePositionAs(xc0));
assertEquals(_theBookmark1, m_xc.toNextBookmark(SimpleBookmark.class));
- assertEquals(true, m_xc.isAtSamePositionAs(xc1));
- assertEquals(null, m_xc.toNextBookmark(SimpleBookmark.class));
+ assertTrue(m_xc.isAtSamePositionAs(xc1));
+ assertNull(m_xc.toNextBookmark(SimpleBookmark.class));
} finally {
xc0.dispose();
xc1.dispose();
}
}
+ @Test
public void testToNextBookmarkInvalidKey() throws Exception {
m_xo = XmlObject.Factory.parse(Common.XML_FOO_TEXT);
m_xc = m_xo.newCursor();
@@ -83,9 +63,10 @@ public class ToNextBookmarkTest extends
toNextTokenOfType(m_xc, TokenType.END);
m_xc.setBookmark(_theBookmark1);
m_xc.toStartDoc();
- assertEquals(null, m_xc.toNextBookmark(Object.class));
+ 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();
@@ -98,16 +79,17 @@ public class ToNextBookmarkTest extends
m_xc.toStartDoc();
try {
assertEquals(_theBookmark, m_xc.toNextBookmark(SimpleBookmark.class));
- assertEquals(true, m_xc.isAtSamePositionAs(xc0));
- assertEquals(null, m_xc.toNextBookmark(SimpleBookmark.class));
+ assertTrue(m_xc.isAtSamePositionAs(xc0));
+ assertNull(m_xc.toNextBookmark(SimpleBookmark.class));
assertEquals(_difBookmark, m_xc.toNextBookmark(DifferentBookmark.class));
- assertEquals(true, m_xc.isAtSamePositionAs(xc1));
+ assertTrue(m_xc.isAtSamePositionAs(xc1));
} finally {
xc0.dispose();
xc1.dispose();
}
}
+ @Test
public void testToNextBookmarkPostRemoveChars() throws Exception {
m_xo = XmlObject.Factory.parse(Common.XML_FOO_DIGITS);
m_xc = m_xo.newCursor();
@@ -121,7 +103,7 @@ public class ToNextBookmarkTest extends
XmlCursor xc1 = m_xc.newCursor();
xc1.toStartDoc();
try {
- assertEquals(null, xc1.toNextBookmark(SimpleBookmark.class));
+ assertNull(xc1.toNextBookmark(SimpleBookmark.class));
assertEquals(TokenType.STARTDOC, xc1.currentTokenType());
} finally {
xc1.dispose();
@@ -131,7 +113,7 @@ public class ToNextBookmarkTest extends
public class SimpleBookmark extends XmlCursor.XmlBookmark {
public String text;
- public SimpleBookmark(String text) {
+ SimpleBookmark(String text) {
this.text = text;
}
}
@@ -139,7 +121,7 @@ public class ToNextBookmarkTest extends
public class DifferentBookmark extends XmlCursor.XmlBookmark {
public String text;
- public DifferentBookmark(String text) {
+ DifferentBookmark(String text) {
this.text = text;
}
}
Modified: xmlbeans/trunk/test/src/xmlcursor/checkin/ToNextCharTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/xmlcursor/checkin/ToNextCharTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/xmlcursor/checkin/ToNextCharTest.java (original)
+++ xmlbeans/trunk/test/src/xmlcursor/checkin/ToNextCharTest.java Fri Jan 18 23:08:44 2019
@@ -16,39 +16,15 @@
package xmlcursor.checkin;
-import org.apache.xmlbeans.XmlOptions;
-import junit.framework.*;
-import junit.framework.Assert.*;
-
-import java.io.*;
-
-import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlBeans;
import org.apache.xmlbeans.XmlCursor.TokenType;
-import org.apache.xmlbeans.XmlDocumentProperties;
-import org.apache.xmlbeans.XmlCursor.XmlBookmark;
-
-import javax.xml.namespace.QName;
-
-import xmlcursor.common.*;
-
-import java.net.URL;
+import org.apache.xmlbeans.XmlObject;
+import org.junit.Test;
+import xmlcursor.common.BasicCursorTestCase;
+import static org.junit.Assert.assertEquals;
-/**
- *
- *
- */
public class ToNextCharTest extends BasicCursorTestCase {
- public ToNextCharTest(String sName) {
- super(sName);
- }
-
- public static Test suite() {
- return new TestSuite(ToNextCharTest.class);
- }
-
+ @Test
public void testToNextCharNegative() throws Exception {
m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar></foo>").newCursor();
toNextTokenOfType(m_xc, TokenType.TEXT);
@@ -58,6 +34,7 @@ public class ToNextCharTest extends Basi
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);
@@ -67,6 +44,7 @@ public class ToNextCharTest extends Basi
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);
@@ -76,6 +54,7 @@ public class ToNextCharTest extends Basi
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);
@@ -85,6 +64,7 @@ public class ToNextCharTest extends Basi
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);
Modified: xmlbeans/trunk/test/src/xmlcursor/checkin/ToNextElementTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/xmlcursor/checkin/ToNextElementTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/xmlcursor/checkin/ToNextElementTest.java (original)
+++ xmlbeans/trunk/test/src/xmlcursor/checkin/ToNextElementTest.java Fri Jan 18 23:08:44 2019
@@ -16,67 +16,46 @@
package xmlcursor.checkin;
-import org.apache.xmlbeans.XmlOptions;
-import junit.framework.*;
-import junit.framework.Assert.*;
-
-import java.io.*;
-
-import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlBeans;
import org.apache.xmlbeans.XmlCursor.TokenType;
-import org.apache.xmlbeans.XmlDocumentProperties;
-import org.apache.xmlbeans.XmlCursor.XmlBookmark;
-
-import javax.xml.namespace.QName;
-
-import xmlcursor.common.*;
-
-import java.net.URL;
+import org.apache.xmlbeans.XmlObject;
+import org.junit.Test;
+import xmlcursor.common.BasicCursorTestCase;
+import static org.junit.Assert.*;
-/**
- *
- *
- */
public class ToNextElementTest extends BasicCursorTestCase {
- public ToNextElementTest(String sName) {
- super(sName);
- }
-
- public static Test suite() {
- return new TestSuite(ToNextElementTest.class);
- }
-
+ @Test
public void testToNextElementFromSTARTDOC() throws Exception {
m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar></foo>").newCursor();
- assertEquals(false, m_xc.toNextSibling());
+ 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();
- assertEquals(true, m_xc.toFirstChild());
- assertEquals(true, m_xc.toFirstChild());
+ assertTrue(m_xc.toFirstChild());
+ assertTrue(m_xc.toFirstChild());
assertEquals("text", m_xc.getTextValue());
- assertEquals(true, m_xc.toNextSibling());
+ assertTrue(m_xc.toNextSibling());
assertEquals("zapwapyap", m_xc.getTextValue());
- assertEquals(false, m_xc.toNextSibling());
+ 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());
- assertEquals(true, m_xc.toNextSibling());
+ 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());
- assertEquals(true, m_xc.toNextSibling());
+ assertTrue(m_xc.toNextSibling());
assertEquals("text", m_xc.getTextValue());
}
}
Modified: xmlbeans/trunk/test/src/xmlcursor/checkin/ToNextSelectionTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/xmlcursor/checkin/ToNextSelectionTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/xmlcursor/checkin/ToNextSelectionTest.java (original)
+++ xmlbeans/trunk/test/src/xmlcursor/checkin/ToNextSelectionTest.java Fri Jan 18 23:08:44 2019
@@ -16,39 +16,15 @@
package xmlcursor.checkin;
-import org.apache.xmlbeans.XmlOptions;
-import junit.framework.*;
-import junit.framework.Assert.*;
-
-import java.io.*;
-
-import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlBeans;
-import org.apache.xmlbeans.XmlCursor.TokenType;
-import org.apache.xmlbeans.XmlDocumentProperties;
-import org.apache.xmlbeans.XmlCursor.XmlBookmark;
-
-import javax.xml.namespace.QName;
-
-import xmlcursor.common.*;
-
-import java.net.URL;
+import org.apache.xmlbeans.XmlObject;
+import org.junit.Test;
+import xmlcursor.common.BasicCursorTestCase;
+import static org.junit.Assert.*;
-/**
- *
- *
- */
public class ToNextSelectionTest extends BasicCursorTestCase {
- public ToNextSelectionTest(String sName) {
- super(sName);
- }
-
- public static Test suite() {
- return new TestSuite(ToNextSelectionTest.class);
- }
-
+ @Test
public void testToNextSelectionMultipleReturns() throws Exception {
String sXml = "<foo><b>0</b><b>1</b><b>2</b><b>3</b><b>4</b><b>5</b><b>6</b></foo>";
m_xc = XmlObject.Factory.parse(sXml).newCursor();
@@ -56,12 +32,13 @@ public class ToNextSelectionTest extends
m_xc.toNextSelection();
for (int i = 0; i < 6; i++) {
assertEquals("" + i, m_xc.getTextValue());
- assertEquals(true, m_xc.toNextSelection());
+ assertTrue(m_xc.toNextSelection());
}
assertEquals("6", m_xc.getTextValue());
- assertEquals(false, m_xc.toNextSelection());
+ assertFalse(m_xc.toNextSelection());
}
+ @Test
public void testToNextSelectionAfterClear() throws Exception {
String sXml = "<foo><b>0</b><b>1</b><b>2</b><b>3</b><b>4</b><b>5</b><b>6</b></foo>";
m_xc = XmlObject.Factory.parse(sXml).newCursor();
@@ -69,39 +46,42 @@ public class ToNextSelectionTest extends
m_xc.toNextSelection();
for (int i = 0; i < 3; i++) {
assertEquals("" + i, m_xc.getTextValue());
- assertEquals(true, m_xc.toNextSelection());
+ assertTrue(m_xc.toNextSelection());
}
m_xc.clearSelections();
assertEquals("3", m_xc.getTextValue());
- assertEquals(false, m_xc.toNextSelection());
+ assertFalse(m_xc.toNextSelection());
}
+ @Test
public void testToNextSelectionBeforeSelect() throws Exception {
String sXml = "<foo><b>0</b><b>1</b><b>2</b><b>3</b><b>4</b><b>5</b><b>6</b></foo>";
m_xc = XmlObject.Factory.parse(sXml).newCursor();
- assertEquals(false, m_xc.toNextSelection());
+ assertFalse(m_xc.toNextSelection());
m_xc.selectPath("$this//b");
m_xc.toNextSelection();
for (int i = 0; i < 6; i++) {
assertEquals("" + i, m_xc.getTextValue());
- assertEquals(true, m_xc.toNextSelection());
+ assertTrue(m_xc.toNextSelection());
}
assertEquals("6", m_xc.getTextValue());
- assertEquals(false, m_xc.toNextSelection());
+ assertFalse(m_xc.toNextSelection());
}
+ @Test
public void testToNextSelectionOtherCursor() throws Exception {
String sXml = "<foo><b>0</b><b>1</b><b>2</b><b>3</b><b>4</b><b>5</b><b>6</b></foo>";
m_xc = XmlObject.Factory.parse(sXml).newCursor();
XmlCursor xc0 = m_xc.newCursor();
try {
m_xc.selectPath("$this//b");
- assertEquals(false, xc0.toNextSelection());
+ assertFalse(xc0.toNextSelection());
} finally {
xc0.dispose();
}
}
+ @Test
public void testToNextSelectionTwoCursorsDifferentSelections() throws Exception {
String sXml = "<foo><a>X</a><b>0</b><a>Y</a><b>1</b><a>Z</a><b>2</b></foo>";
m_xc = XmlObject.Factory.parse(sXml).newCursor();
@@ -113,15 +93,16 @@ public class ToNextSelectionTest extends
m_xc.selectPath("$this//b");
m_xc.toNextSelection();
assertEquals(3, m_xc.getSelectionCount());
- assertEquals(true, xc0.toNextSelection());
+ assertTrue(xc0.toNextSelection());
assertEquals("Y", xc0.getTextValue());
- assertEquals(true, m_xc.toNextSelection());
+ assertTrue(m_xc.toNextSelection());
assertEquals("1", m_xc.getTextValue());
} finally {
xc0.dispose();
}
}
+ @Test
public void testToNextSelectionTwoCursorsSameSelections() throws Exception {
String sXml = "<foo><a>X</a><b>0</b><a>Y</a><b>1</b><a>Z</a><b>2</b></foo>";
m_xc = XmlObject.Factory.parse(sXml).newCursor();
@@ -133,16 +114,16 @@ public class ToNextSelectionTest extends
m_xc.selectPath("$this//b");
m_xc.toNextSelection();
assertEquals(3, m_xc.getSelectionCount());
- assertEquals(true, xc0.toNextSelection());
+ assertTrue(xc0.toNextSelection());
assertEquals("1", xc0.getTextValue());
- assertEquals(true, m_xc.toNextSelection());
+ assertTrue(m_xc.toNextSelection());
assertEquals("1", m_xc.getTextValue());
- assertEquals(true, xc0.toNextSelection());
+ assertTrue(xc0.toNextSelection());
assertEquals("2", xc0.getTextValue());
- assertEquals(true, m_xc.toNextSelection());
+ assertTrue(m_xc.toNextSelection());
assertEquals("2", m_xc.getTextValue());
- assertEquals(false, xc0.toNextSelection());
- assertEquals(false, m_xc.toNextSelection());
+ assertFalse(xc0.toNextSelection());
+ assertFalse(m_xc.toNextSelection());
} finally {
xc0.dispose();
}
Modified: xmlbeans/trunk/test/src/xmlcursor/checkin/ToNextSiblingTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/xmlcursor/checkin/ToNextSiblingTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/xmlcursor/checkin/ToNextSiblingTest.java (original)
+++ xmlbeans/trunk/test/src/xmlcursor/checkin/ToNextSiblingTest.java Fri Jan 18 23:08:44 2019
@@ -15,37 +15,25 @@
package xmlcursor.checkin;
-import junit.framework.*;
-
import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.XmlCursor;
+import org.junit.Test;
+import xmlcursor.common.BasicCursorTestCase;
import javax.xml.namespace.QName;
-import xmlcursor.common.*;
+import static org.junit.Assert.*;
/**
* checkin tests for XmlCursor toNextSibling methods
*
*/
-public class ToNextSiblingTest extends BasicCursorTestCase
-{
- public ToNextSiblingTest(String name)
- {
- super(name);
- }
-
- public static Test suite()
- {
- return new TestSuite(ToNextSiblingTest.class);
- }
-
+public class ToNextSiblingTest extends BasicCursorTestCase {
private static String xml0 = "<root><a/><b/><c/></root>";
private static String xml1 = "<root xmlns=\"somenamespace\"><a/><b/><c/></root>";
/** test toNextSibling(String name) where there is no namespace */
- public void testName() throws Exception
- {
+ @Test
+ public void testName() throws Exception {
m_xc = XmlObject.Factory.parse(xml0).newCursor();
m_xc.toNextToken();
m_xc.toChild(0);
@@ -67,8 +55,8 @@ public class ToNextSiblingTest extends B
}
/** test toNextSibling(String name) where there is a namespace */
- public void testIncompleteName() throws Exception
- {
+ @Test
+ public void testIncompleteName() throws Exception {
m_xc = XmlObject.Factory.parse(xml1).newCursor();
m_xc.toNextToken();
m_xc.toChild(0);
@@ -82,8 +70,8 @@ public class ToNextSiblingTest extends B
}
/** test toNextSibling(String namespace, String localname) */
- public void testNamespaceAndLocalName0() throws Exception
- {
+ @Test
+ public void testNamespaceAndLocalName0() throws Exception {
m_xc = XmlObject.Factory.parse(xml0).newCursor();
m_xc.toNextToken();
m_xc.toChild(0);
@@ -105,8 +93,8 @@ public class ToNextSiblingTest extends B
}
/** test toNextSibling(String namespace, String localname) */
- public void testNamespaceAndLocalName1() throws Exception
- {
+ @Test
+ public void testNamespaceAndLocalName1() throws Exception {
m_xc = XmlObject.Factory.parse(xml1).newCursor();
m_xc.toNextToken();
m_xc.toChild(0);
@@ -128,8 +116,8 @@ public class ToNextSiblingTest extends B
}
/** test toNextSibling(QName qName) */
- public void testQName() throws Exception
- {
+ @Test
+ public void testQName() throws Exception {
m_xc = XmlObject.Factory.parse(xml1).newCursor();
m_xc.toNextToken();
m_xc.toChild(0);
Modified: xmlbeans/trunk/test/src/xmlcursor/checkin/ToParentElementTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/xmlcursor/checkin/ToParentElementTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/xmlcursor/checkin/ToParentElementTest.java (original)
+++ xmlbeans/trunk/test/src/xmlcursor/checkin/ToParentElementTest.java Fri Jan 18 23:08:44 2019
@@ -16,81 +16,64 @@
package xmlcursor.checkin;
-import org.apache.xmlbeans.XmlOptions;
-import junit.framework.*;
-import junit.framework.Assert.*;
-
-import java.io.*;
-
-import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlBeans;
import org.apache.xmlbeans.XmlCursor.TokenType;
-import org.apache.xmlbeans.XmlDocumentProperties;
-import org.apache.xmlbeans.XmlCursor.XmlBookmark;
-
-import javax.xml.namespace.QName;
-
-import xmlcursor.common.*;
+import org.apache.xmlbeans.XmlObject;
+import org.junit.Test;
+import xmlcursor.common.BasicCursorTestCase;
-import java.net.URL;
+import static org.junit.Assert.*;
-/**
- *
- *
- */
public class ToParentElementTest extends BasicCursorTestCase {
- public ToParentElementTest(String sName) {
- super(sName);
- }
-
- public static Test suite() {
- return new TestSuite(ToParentElementTest.class);
- }
+ @Test
public void testToParentElementFromSTARTDOC() throws Exception {
m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar></foo>").newCursor();
- assertEquals(false, m_xc.toParent());
+ assertFalse(m_xc.toParent());
assertEquals(TokenType.STARTDOC, m_xc.currentTokenType());
}
+ @Test
public void testToParentElementFromFirstChildOfSTARTDOC() throws Exception {
m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar></foo>").newCursor();
m_xc.toFirstChild();
- assertEquals(true, m_xc.toParent());
+ assertTrue(m_xc.toParent());
assertEquals(TokenType.STARTDOC, m_xc.currentTokenType());
}
+ @Test
public void testToParentElementFromPrevTokenOfENDDOC() throws Exception {
m_xc = XmlObject.Factory.parse("<foo>text</foo>").newCursor();
m_xc.toEndDoc();
m_xc.toPrevToken();
assertEquals(TokenType.END, m_xc.currentTokenType());
- assertEquals(true, m_xc.toParent());
+ assertTrue(m_xc.toParent());
assertEquals(TokenType.START, m_xc.currentTokenType());
}
+ @Test
public void testToParentElementNested() throws Exception {
m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar><char>zap<dar>wap</dar><ear>yap</ear></char></foo>").newCursor();
m_xc.selectPath("$this//ear");
m_xc.toNextSelection();
assertEquals("yap", m_xc.getTextValue());
- assertEquals(true, m_xc.toParent());
+ assertTrue(m_xc.toParent());
assertEquals("zapwapyap", m_xc.getTextValue());
}
+ @Test
public void testToParentElementFromATTR() throws Exception {
m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar><char>zap<dar>wap</dar><ear attr0=\"val0\">yap</ear></char></foo>").newCursor();
toNextTokenOfType(m_xc, TokenType.ATTR);
assertEquals("val0", m_xc.getTextValue());
- assertEquals(true, m_xc.toParent());
+ assertTrue(m_xc.toParent());
assertEquals("yap", m_xc.getTextValue());
- assertEquals(true, m_xc.toParent());
+ assertTrue(m_xc.toParent());
assertEquals("zapwapyap", m_xc.getTextValue());
}
+ @Test
public void testToParentElementFromTEXT() throws Exception {
m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar><char>zap<dar>wap</dar><ear>yap</ear></char></foo>").newCursor();
m_xc.selectPath("$this//ear");
@@ -98,9 +81,9 @@ public class ToParentElementTest extends
m_xc.toNextToken();
assertEquals(TokenType.TEXT, m_xc.currentTokenType());
assertEquals("yap", m_xc.getChars());
- assertEquals(true, m_xc.toParent());
+ assertTrue(m_xc.toParent());
assertEquals("yap", m_xc.getTextValue());
- assertEquals(true, m_xc.toParent());
+ assertTrue(m_xc.toParent());
assertEquals("zapwapyap", m_xc.getTextValue());
}
}
Modified: xmlbeans/trunk/test/src/xmlcursor/checkin/ToPrevAttributeTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/xmlcursor/checkin/ToPrevAttributeTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/xmlcursor/checkin/ToPrevAttributeTest.java (original)
+++ xmlbeans/trunk/test/src/xmlcursor/checkin/ToPrevAttributeTest.java Fri Jan 18 23:08:44 2019
@@ -16,81 +16,63 @@
package xmlcursor.checkin;
-import org.apache.xmlbeans.XmlOptions;
-import junit.framework.*;
-import junit.framework.Assert.*;
-
-import java.io.*;
-
-import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlBeans;
import org.apache.xmlbeans.XmlCursor.TokenType;
-import org.apache.xmlbeans.XmlDocumentProperties;
-import org.apache.xmlbeans.XmlCursor.XmlBookmark;
-
-import javax.xml.namespace.QName;
-
-import xmlcursor.common.*;
-
-import java.net.URL;
+import org.apache.xmlbeans.XmlObject;
+import org.junit.Test;
+import xmlcursor.common.BasicCursorTestCase;
+import xmlcursor.common.Common;
+import static org.junit.Assert.*;
-/**
- *
- *
- */
public class ToPrevAttributeTest extends BasicCursorTestCase {
- public ToPrevAttributeTest(String sName) {
- super(sName);
- }
-
- public static Test suite() {
- return new TestSuite(ToPrevAttributeTest.class);
- }
-
+ @Test
public void testtoPrevAttrFromSTART() throws Exception {
m_xc = XmlObject.Factory.parse(Common.XML_FOO_2ATTR_TEXT).newCursor();
toNextTokenOfType(m_xc, TokenType.START);
- assertEquals(false, m_xc.toPrevAttribute());
+ assertFalse(m_xc.toPrevAttribute());
}
+ @Test
public void testtoPrevAttrFromSingleATTR() throws Exception {
m_xc = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT).newCursor();
toNextTokenOfType(m_xc, TokenType.ATTR);
- assertEquals(false, m_xc.toPrevAttribute());
+ assertFalse(m_xc.toPrevAttribute());
assertEquals("val0", m_xc.getTextValue());
}
+ @Test
public void testtoPrevAttrWithSiblings() throws Exception {
m_xc = XmlObject.Factory.parse(Common.XML_FOO_2ATTR_TEXT).newCursor();
toNextTokenOfType(m_xc, TokenType.ATTR);
toNextTokenOfType(m_xc, TokenType.ATTR);
assertEquals("val1", m_xc.getTextValue());
- assertEquals(true, m_xc.toPrevAttribute());
+ assertTrue(m_xc.toPrevAttribute());
assertEquals("val0", m_xc.getTextValue());
}
+ @Test
public void testtoPrevAttrFromFirstSibling() throws Exception {
m_xc = XmlObject.Factory.parse(Common.XML_FOO_2ATTR_TEXT).newCursor();
toNextTokenOfType(m_xc, TokenType.ATTR);
- assertEquals(false, m_xc.toPrevAttribute());
+ assertFalse(m_xc.toPrevAttribute());
assertEquals("val0", m_xc.getTextValue());
}
+ @Test
public void testtoPrevAttrWithXMLNS() throws Exception {
m_xc = XmlObject.Factory.parse("<foo attr0=\"val0\" xmlns=\"uri\" attr1=\"val1\">text</foo>").newCursor();
toNextTokenOfType(m_xc, TokenType.ATTR);
toNextTokenOfType(m_xc, TokenType.ATTR);
assertEquals("val1", m_xc.getTextValue());
- assertEquals(true, m_xc.toPrevAttribute());
+ assertTrue(m_xc.toPrevAttribute());
assertEquals("val0", m_xc.getTextValue());
- assertEquals(false, m_xc.toPrevAttribute());
+ assertFalse(m_xc.toPrevAttribute());
}
+ @Test
public void testtoPrevAttrFromTEXT() throws Exception {
m_xc = XmlObject.Factory.parse(Common.XML_FOO_2ATTR_TEXT).newCursor();
toNextTokenOfType(m_xc, TokenType.TEXT);
- assertEquals(false, m_xc.toPrevAttribute());
+ assertFalse(m_xc.toPrevAttribute());
}
}
Modified: xmlbeans/trunk/test/src/xmlcursor/checkin/ToPrevBookmarkTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/xmlcursor/checkin/ToPrevBookmarkTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/xmlcursor/checkin/ToPrevBookmarkTest.java (original)
+++ xmlbeans/trunk/test/src/xmlcursor/checkin/ToPrevBookmarkTest.java Fri Jan 18 23:08:44 2019
@@ -16,32 +16,22 @@
package xmlcursor.checkin;
-import junit.framework.*;
-
-
-import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.XmlCursor.TokenType;
-import xmlcursor.common.*;
+import org.apache.xmlbeans.XmlObject;
+import org.junit.Test;
+import xmlcursor.common.BasicCursorTestCase;
+import xmlcursor.common.Common;
+
+import static org.junit.Assert.*;
-/**
- *
- *
- */
public class ToPrevBookmarkTest extends BasicCursorTestCase {
private SimpleBookmark _theBookmark = new SimpleBookmark("value");
private SimpleBookmark _theBookmark1 = new SimpleBookmark("value1");
private DifferentBookmark _difBookmark = new DifferentBookmark("diff");
- public ToPrevBookmarkTest(String sName) {
- super(sName);
- }
-
- public static Test suite() {
- return new TestSuite(ToPrevBookmarkTest.class);
- }
-
+ @Test
public void testToPrevBookmarkSameKey() throws Exception {
m_xo = XmlObject.Factory.parse(Common.XML_FOO_TEXT);
m_xc = m_xo.newCursor();
@@ -54,16 +44,17 @@ public class ToPrevBookmarkTest extends
m_xc.toEndDoc();
try {
assertEquals(_theBookmark1, m_xc.toPrevBookmark(SimpleBookmark.class));
- assertEquals(true, m_xc.isAtSamePositionAs(xc1));
+ assertTrue(m_xc.isAtSamePositionAs(xc1));
assertEquals(_theBookmark, m_xc.toPrevBookmark(SimpleBookmark.class));
- assertEquals(true, m_xc.isAtSamePositionAs(xc0));
- assertEquals(null, m_xc.toPrevBookmark(SimpleBookmark.class));
+ assertTrue(m_xc.isAtSamePositionAs(xc0));
+ assertNull(m_xc.toPrevBookmark(SimpleBookmark.class));
} finally {
xc0.dispose();
xc1.dispose();
}
}
+ @Test
public void testToPrevBookmarkInvalidKey() throws Exception {
m_xo = XmlObject.Factory.parse(Common.XML_FOO_TEXT);
m_xc = m_xo.newCursor();
@@ -72,9 +63,10 @@ public class ToPrevBookmarkTest extends
toNextTokenOfType(m_xc, TokenType.END);
m_xc.setBookmark(_theBookmark1);
m_xc.toEndDoc();
- assertEquals(null, m_xc.toPrevBookmark(Object.class));
+ assertNull(m_xc.toPrevBookmark(Object.class));
}
+ @Test
public void testToPrevBookmarkDifferentKeys() throws Exception {
m_xo = XmlObject.Factory.parse(Common.XML_FOO_TEXT);
m_xc = m_xo.newCursor();
@@ -87,16 +79,17 @@ public class ToPrevBookmarkTest extends
m_xc.toEndDoc();
try {
assertEquals(_difBookmark, m_xc.toPrevBookmark(DifferentBookmark.class));
- assertEquals(true, m_xc.isAtSamePositionAs(xc1));
- assertEquals(null, m_xc.toPrevBookmark(DifferentBookmark.class));
+ assertTrue(m_xc.isAtSamePositionAs(xc1));
+ assertNull(m_xc.toPrevBookmark(DifferentBookmark.class));
assertEquals(_theBookmark, m_xc.toPrevBookmark(SimpleBookmark.class));
- assertEquals(true, m_xc.isAtSamePositionAs(xc0));
+ assertTrue(m_xc.isAtSamePositionAs(xc0));
} finally {
xc0.dispose();
xc1.dispose();
}
}
+ @Test
public void testToPrevBookmarkPostSetTextValue() throws Exception {
m_xo = XmlObject.Factory.parse(Common.XML_FOO_TEXT);
m_xc = m_xo.newCursor();
@@ -110,7 +103,7 @@ public class ToPrevBookmarkTest extends
m_xc.setTextValue("changed"); // changes text, should destroy bm
m_xc.toEndDoc();
try {
- assertEquals(null, xc1.toPrevBookmark(SimpleBookmark.class));
+ assertNull(xc1.toPrevBookmark(SimpleBookmark.class));
assertEquals(TokenType.ENDDOC, xc1.currentTokenType());
} finally {
xc1.dispose();
@@ -120,7 +113,7 @@ public class ToPrevBookmarkTest extends
public class SimpleBookmark extends XmlCursor.XmlBookmark {
public String text;
- public SimpleBookmark(String text) {
+ SimpleBookmark(String text) {
this.text = text;
}
}
@@ -128,7 +121,7 @@ public class ToPrevBookmarkTest extends
public class DifferentBookmark extends XmlCursor.XmlBookmark {
public String text;
- public DifferentBookmark(String text) {
+ DifferentBookmark(String text) {
this.text = text;
}
}
Modified: xmlbeans/trunk/test/src/xmlcursor/checkin/ToPrevCharTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/xmlcursor/checkin/ToPrevCharTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/xmlcursor/checkin/ToPrevCharTest.java (original)
+++ xmlbeans/trunk/test/src/xmlcursor/checkin/ToPrevCharTest.java Fri Jan 18 23:08:44 2019
@@ -16,39 +16,16 @@
package xmlcursor.checkin;
-import org.apache.xmlbeans.XmlOptions;
-import junit.framework.*;
-import junit.framework.Assert.*;
-
-import java.io.*;
-
-import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlBeans;
import org.apache.xmlbeans.XmlCursor.TokenType;
-import org.apache.xmlbeans.XmlDocumentProperties;
-import org.apache.xmlbeans.XmlCursor.XmlBookmark;
-
-import javax.xml.namespace.QName;
-
-import xmlcursor.common.*;
+import org.apache.xmlbeans.XmlObject;
+import org.junit.Test;
+import xmlcursor.common.BasicCursorTestCase;
-import java.net.URL;
+import static org.junit.Assert.assertEquals;
-/**
- *
- *
- */
public class ToPrevCharTest extends BasicCursorTestCase {
- public ToPrevCharTest(String sName) {
- super(sName);
- }
-
- public static Test suite() {
- return new TestSuite(ToPrevCharTest.class);
- }
-
+ @Test
public void testToPrevCharNegative() throws Exception {
m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar></foo>").newCursor();
toNextTokenOfType(m_xc, TokenType.TEXT);
@@ -59,6 +36,7 @@ public class ToPrevCharTest extends Basi
assertEquals("early", m_xc.getChars());
}
+ @Test
public void testToPrevCharGTLength() throws Exception {
m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar></foo>").newCursor();
toNextTokenOfType(m_xc, TokenType.TEXT);
@@ -69,6 +47,7 @@ public class ToPrevCharTest extends Basi
assertEquals("early", m_xc.getChars());
}
+ @Test
public void testToPrevCharLTLength() throws Exception {
m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar></foo>").newCursor();
toNextTokenOfType(m_xc, TokenType.TEXT);
@@ -79,6 +58,7 @@ public class ToPrevCharTest extends Basi
assertEquals("rly", m_xc.getChars());
}
+ @Test
public void testToPrevCharZero() throws Exception {
m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar></foo>").newCursor();
toNextTokenOfType(m_xc, TokenType.TEXT);
@@ -89,6 +69,7 @@ public class ToPrevCharTest extends Basi
assertEquals("text", m_xc.getTextValue());
}
+ @Test
public void testToPrevCharFromATTR() throws Exception {
m_xc = XmlObject.Factory.parse("<foo attr0=\"val0\">early<bar>text</bar></foo>").newCursor();
toNextTokenOfType(m_xc, TokenType.ATTR);
Modified: xmlbeans/trunk/test/src/xmlcursor/checkin/ToPrevElementTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/xmlcursor/checkin/ToPrevElementTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/xmlcursor/checkin/ToPrevElementTest.java (original)
+++ xmlbeans/trunk/test/src/xmlcursor/checkin/ToPrevElementTest.java Fri Jan 18 23:08:44 2019
@@ -16,45 +16,24 @@
package xmlcursor.checkin;
-import org.apache.xmlbeans.XmlOptions;
-import junit.framework.*;
-import junit.framework.Assert.*;
-
-import java.io.*;
-
-import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlBeans;
import org.apache.xmlbeans.XmlCursor.TokenType;
-import org.apache.xmlbeans.XmlDocumentProperties;
-import org.apache.xmlbeans.XmlCursor.XmlBookmark;
-
-import javax.xml.namespace.QName;
-
-import xmlcursor.common.*;
+import org.apache.xmlbeans.XmlObject;
+import org.junit.Test;
+import xmlcursor.common.BasicCursorTestCase;
-import java.net.URL;
+import static org.junit.Assert.*;
-/**
- *
- *
- */
public class ToPrevElementTest extends BasicCursorTestCase {
- public ToPrevElementTest(String sName) {
- super(sName);
- }
-
- public static Test suite() {
- return new TestSuite(ToPrevElementTest.class);
- }
-
+ @Test
public void testToPrevElementFromSTARTDOC() throws Exception {
m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar></foo>").newCursor();
- assertEquals(false, m_xc.toPrevSibling());
+ assertFalse(m_xc.toPrevSibling());
assertEquals(TokenType.STARTDOC, m_xc.currentTokenType());
}
+ @Test
public void testToPrevElementFromENDDOC() throws Exception {
m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar></foo>").newCursor();
XmlCursor xc0 = m_xc.newCursor();
@@ -62,36 +41,39 @@ public class ToPrevElementTest extends B
m_xc.toEndDoc();
m_xc.toPrevSibling();
try {
- assertEquals(true, m_xc.isAtSamePositionAs(xc0));
+ assertTrue(m_xc.isAtSamePositionAs(xc0));
} finally {
xc0.dispose();
}
}
+ @Test
public void testToPrevElementSiblings() throws Exception {
m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar><char>zap<dar>wap</dar><ear>yap</ear></char></foo>").newCursor();
m_xc.selectPath("$this//ear");
m_xc.toNextSelection();
assertEquals("yap", m_xc.getTextValue());
- assertEquals(true, m_xc.toPrevSibling());
+ assertTrue(m_xc.toPrevSibling());
assertEquals("wap", m_xc.getTextValue());
- assertEquals(false, m_xc.toPrevSibling());
+ assertFalse(m_xc.toPrevSibling());
}
+ @Test
public void testToPrevElementFromATTR() throws Exception {
m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar><char>zap<dar>wap</dar><ear attr0=\"val0\">yap</ear></char></foo>").newCursor();
toNextTokenOfType(m_xc, TokenType.ATTR);
assertEquals("val0", m_xc.getTextValue());
- assertEquals(false, m_xc.toPrevSibling());
+ assertFalse(m_xc.toPrevSibling());
}
+ @Test
public void testToPrevElementFromTEXT() throws Exception {
m_xc = XmlObject.Factory.parse("<foo>early<bar>text</bar><char>zap<dar>wap</dar><ear><a/>yap</ear></char></foo>").newCursor();
m_xc.selectPath("$this//ear");
m_xc.toNextSelection();
toNextTokenOfType(m_xc, TokenType.TEXT);
assertEquals("yap", m_xc.getChars());
- assertEquals(true, m_xc.toPrevSibling());
+ assertTrue(m_xc.toPrevSibling());
assertEquals("", m_xc.getTextValue());
}
}
Modified: xmlbeans/trunk/test/src/xmlcursor/checkin/TokensTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/xmlcursor/checkin/TokensTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/xmlcursor/checkin/TokensTest.java (original)
+++ xmlbeans/trunk/test/src/xmlcursor/checkin/TokensTest.java Fri Jan 18 23:08:44 2019
@@ -16,61 +16,56 @@
package xmlcursor.checkin;
-import junit.framework.*;
-
-import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlCursor.TokenType;
+import org.apache.xmlbeans.XmlObject;
+import org.junit.Test;
+import xmlcursor.common.BasicCursorTestCase;
+import xmlcursor.common.Common;
-import xmlcursor.common.*;
-
+import static org.junit.Assert.*;
-/**
- *
- *
- */
public class TokensTest extends BasicCursorTestCase {
- public TokensTest(String sName) {
- super(sName);
- }
-
- public static Test suite() {
- return new TestSuite(TokensTest.class);
- }
+ @Test
public void testHasNextToken() throws Exception {
m_xo = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT);
m_xc = m_xo.newCursor();
toNextTokenOfType(m_xc, TokenType.TEXT);
- assertEquals(true, m_xc.hasNextToken());
+ assertTrue(m_xc.hasNextToken());
}
+ @Test
public void testHasNextTokenENDDOC() throws Exception {
m_xo = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT);
m_xc = m_xo.newCursor();
m_xc.toEndDoc();
- assertEquals(false, m_xc.hasNextToken());
+ assertFalse(m_xc.hasNextToken());
}
+ @Test
public void testHasPrevToken() throws Exception {
m_xo = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT);
m_xc = m_xo.newCursor();
toNextTokenOfType(m_xc, TokenType.TEXT);
- assertEquals(true, m_xc.hasPrevToken());
+ assertTrue(m_xc.hasPrevToken());
}
+ @Test
public void testHasPrevTokenSTARTDOC() throws Exception {
m_xo = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT);
m_xc = m_xo.newCursor();
- assertEquals(false, m_xc.hasPrevToken());
+ assertFalse(m_xc.hasPrevToken());
}
+ @Test
public void testToEndTokenFromSTARTDOC() throws Exception {
m_xo = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT);
m_xc = m_xo.newCursor();
assertEquals(TokenType.ENDDOC, m_xc.toEndToken());
}
+ @Test
public void testToEndTokenFromSTART() throws Exception {
m_xo = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT);
m_xc = m_xo.newCursor();
@@ -78,6 +73,7 @@ public class TokensTest extends BasicCur
assertEquals(TokenType.END, m_xc.toEndToken());
}
+ @Test
public void testToEndTokenFromTEXTmiddle() throws Exception {
m_xo = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT);
m_xc = m_xo.newCursor();
@@ -86,6 +82,7 @@ public class TokensTest extends BasicCur
assertEquals(TokenType.NONE, m_xc.toEndToken());
}
+ @Test
public void testToFirstContentTokenFromSTARTDOC() throws Exception {
m_xo = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT);
m_xc = m_xo.newCursor();
@@ -93,6 +90,7 @@ public class TokensTest extends BasicCur
assertEquals(TokenType.START, m_xc.currentTokenType());
}
+ @Test
public void testToFirstContentTokenFromATTR() throws Exception {
m_xo = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT);
m_xc = m_xo.newCursor();
@@ -101,6 +99,7 @@ public class TokensTest extends BasicCur
assertEquals(TokenType.ATTR, m_xc.currentTokenType());
}
+ @Test
public void testToFirstContentTokenFromSTARTwithContent() throws Exception {
m_xo = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT);
m_xc = m_xo.newCursor();
@@ -108,6 +107,7 @@ public class TokensTest extends BasicCur
assertEquals(TokenType.TEXT, m_xc.toFirstContentToken());
}
+ @Test
public void testToFirstContentTokenFromSTARTwithoutContent() throws Exception {
m_xo = XmlObject.Factory.parse(Common.XML_FOO_1ATTR);
m_xc = m_xo.newCursor();
@@ -115,6 +115,7 @@ public class TokensTest extends BasicCur
assertEquals(TokenType.END, m_xc.toFirstContentToken());
}
+ @Test
public void testToNextTokenFromENDDOC() throws Exception {
m_xo = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT);
m_xc = m_xo.newCursor();
@@ -122,6 +123,7 @@ public class TokensTest extends BasicCur
assertEquals(TokenType.NONE, m_xc.toNextToken());
}
+ @Test
public void testToNextTokenNAMESPACE() throws Exception {
m_xo = XmlObject.Factory.parse(Common.XML_FOO_NS);
m_xc = m_xo.newCursor();
@@ -129,6 +131,7 @@ public class TokensTest extends BasicCur
assertEquals(TokenType.NAMESPACE, m_xc.toNextToken());
}
+ @Test
public void testToPrevTokenSTARTDOC() throws Exception {
m_xo = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT);
m_xc = m_xo.newCursor();
@@ -136,13 +139,12 @@ public class TokensTest extends BasicCur
assertEquals(TokenType.STARTDOC, m_xc.currentTokenType());
}
+ @Test
public void testToPrevTokenENDDOC() throws Exception {
m_xo = XmlObject.Factory.parse(Common.XML_FOO_1ATTR_TEXT);
m_xc = m_xo.newCursor();
m_xc.toEndDoc();
assertEquals(TokenType.END, m_xc.toPrevToken());
}
-
-
}
Modified: xmlbeans/trunk/test/src/xmlcursor/common/BasicCursorTestCase.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/xmlcursor/common/BasicCursorTestCase.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/xmlcursor/common/BasicCursorTestCase.java (original)
+++ xmlbeans/trunk/test/src/xmlcursor/common/BasicCursorTestCase.java Fri Jan 18 23:08:44 2019
@@ -17,33 +17,19 @@
package xmlcursor.common;
-import junit.framework.*;
-import junit.framework.Assert.*;
-import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.XmlCursor.TokenType;
-import org.apache.xmlbeans.XmlError;
+import org.apache.xmlbeans.XmlObject;
+import org.junit.After;
-import javax.xml.namespace.QName;
-import java.util.*;
+import static org.junit.Assert.*;
-/**
- *
- */
-public class BasicCursorTestCase extends TestCase {
+public class BasicCursorTestCase {
protected XmlObject m_xo;
protected XmlCursor m_xc;
- public BasicCursorTestCase(String sName) {
- super(sName);
- }
-
- protected void setUp() throws Exception {
- }
-
- protected void tearDown() throws Exception
- {
- super.tearDown();
+ @After
+ public void tearDown() throws Exception {
m_xo = null;
if (m_xc != null) {
m_xc.dispose();
@@ -117,7 +103,6 @@ public class BasicCursorTestCase extends
*
* TODO: should really compare values also.
*
- * @param tc a TestCase
* @param a a XmlCursor
* @param b a XmlCursor
*
Modified: xmlbeans/trunk/test/src/xmlcursor/common/Common.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/xmlcursor/common/Common.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/xmlcursor/common/Common.java (original)
+++ xmlbeans/trunk/test/src/xmlcursor/common/Common.java Fri Jan 18 23:08:44 2019
@@ -19,9 +19,6 @@ package xmlcursor.common;
-/**
- *
- */
public class Common {
public final static String XMLFRAG_BEGINTAG = "<xml-fragment>";
public final static String XMLFRAG_ENDTAG = "</xml-fragment>";
@@ -40,7 +37,6 @@ public class Common {
public final static String XML_FOO_BAR_WS_ONLY = "<foo> <bar> </bar> </foo>";
public final static String XML_FOO_NS = "<foo xmlns=\"http://www.foo.org\"></foo>";
public final static String XML_FOO_NS_PREFIX = "<foo xmlns:edi='http://ecommerce.org/schema'><!-- the 'price' element's namespace is http://ecommerce.org/schema --> <edi:price units='Euro'>32.18</edi:price></foo>";
- public final static String XML_FOO_BAR_SIBLINGS = "<foo><bar>text0</bar><bar>text1</bar></foo>";
public final static String XML_FOO_BAR_NESTED_SIBLINGS = "<foo attr0=\"val0\"><bar>text0<zed>nested0</zed></bar><bar>text1<zed>nested1</zed></bar></foo>";
public final static String XML_FOO_PROCINST = "<?xml-stylesheet type=\"text/xsl\" xmlns=\"http://openuri.org/shipping/\"?><foo>text</foo>";
public final static String XML_FOO_COMMENT = "<!-- comment text --><foo>text</foo>";
@@ -51,32 +47,17 @@ public class Common {
- public final static String TRANXML_DIR = "tranxml/Version4.0/";
- public final static String TRANXML_SCHEMAS_DIR = TRANXML_DIR + "schemas/StandAlone/";
- public final static String TRANXML_EXAMPLEDOCS_DIR = TRANXML_DIR + "ExampleDocs/";
public final static String CLM_NS = "http://www.tranxml.org/TranXML/Version4.0";
public final static String CLM_XSI_NS = "xmlns:xsi=\"http://www.w3.org/2000/10/XMLSchema-instance\"";
public final static String CLM_NS_XQUERY_DEFAULT = "declare default element namespace \"" + CLM_NS + "\"; ";
- public final static String TRANXML_FILE_CLM = TRANXML_EXAMPLEDOCS_DIR + "CarLocationMessage.xml";
- public final static String TRANXML_FILE_RBL = TRANXML_EXAMPLEDOCS_DIR + "RailBillOfLading.xml";
- public final static String TRANXML_FILE_SRCWBI = TRANXML_EXAMPLEDOCS_DIR + "SimpleRailCarrierWaybillInterchange.xml";
- public final static String TRANXML_FILE_TOAIRA = TRANXML_EXAMPLEDOCS_DIR + "TerminalOperationsAndIntermodalRampActivity.xml";
+ public final static String TRANXML_FILE_CLM = "xbean/xmlcursor/CarLocationMessage.xml";
public final static String TRANXML_FILE_XMLCURSOR_PO = "xbean/xmlcursor/po.xml";
public final static String XML_SCHEMA_TYPE_SUFFIX = "http://www.w3.org/2001/XMLSchema";
public final static String TRANXML_SCHEMA_TYPE_SUFFIX = CLM_NS;
- public static final String XMLCASES_JAR = "xmlcases.jar";
- public static final String XSDCASES_JAR = "xsdcases.jar";
-
- public static final String XMLCURSOR_JAR = "xmlcursor.jar";
- public static final String CARLOCATIONMESSAGE_JAR = "CarLocationMessage_40_LX.xsd.jar";
- public static final String RAILBILLOFLADING_JAR = "RailBillOfLading_V40_LX.xsd.jar";
- public static final String SIMPLERAILCARRIERWAYBILLINTERCHANGE_JAR = "SimpleRailCarrierWaybillInterchange_V40_LX.xsd.jar";
- public static final String TERMINALOPERATIONSANDINTERMODALRAMPACTIVITY_JAR = "TerminalOperationsAndIntermodalRampActivity_V40_LX.xsd.jar";
-
public static String wrapInXmlFrag(String text) {
return XMLFRAG_BEGINTAG + text + XMLFRAG_ENDTAG;
}
Modified: xmlbeans/trunk/test/src/xmlcursor/detailed/CopyCharsTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/xmlcursor/detailed/CopyCharsTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/xmlcursor/detailed/CopyCharsTest.java (original)
+++ xmlbeans/trunk/test/src/xmlcursor/detailed/CopyCharsTest.java Fri Jan 18 23:08:44 2019
@@ -16,72 +16,51 @@
package xmlcursor.detailed;
-import org.apache.xmlbeans.XmlOptions;
-import junit.framework.*;
-import junit.framework.Assert.*;
-
-import java.io.*;
-
-import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlBeans;
import org.apache.xmlbeans.XmlCursor.TokenType;
+import org.apache.xmlbeans.XmlObject;
+import org.junit.Test;
+import xmlcursor.common.BasicCursorTestCase;
+import xmlcursor.common.Common;
-import xmlcursor.common.*;
-
-import java.net.URL;
+import static org.junit.Assert.*;
-/**
- *
- *
- */
public class CopyCharsTest extends BasicCursorTestCase {
- public CopyCharsTest(String sName) {
- super(sName);
- }
-
- public static Test suite() {
- return new TestSuite(CopyCharsTest.class);
- }
-
+ @Test(expected = IllegalArgumentException.class)
public void testCopyCharsToNull() throws Exception {
m_xo = XmlObject.Factory.parse(Common.XML_FOO_DIGITS);
m_xc = m_xo.newCursor();
toNextTokenOfType(m_xc, TokenType.TEXT);
- try {
- m_xc.copyChars(4, null);
- fail("Expected IllegalArgumentException");
- } catch (IllegalArgumentException ise) {
- }
- assertEquals(true, true);
+ m_xc.copyChars(4, null);
}
+ @Test
public void testCopyCharsNegative() throws Exception {
- m_xo = XmlObject.Factory
- .parse("<foo><bar>0123</bar><bar>WXYZ</bar></foo>");
+ m_xo = XmlObject.Factory.parse("<foo><bar>0123</bar><bar>WXYZ</bar></foo>");
m_xc = m_xo.newCursor();
toNextTokenOfType(m_xc, TokenType.TEXT);
XmlCursor xc0 = m_xc.newCursor();
toNextTokenOfType(m_xc, TokenType.TEXT);
XmlCursor xc1 = m_xc.newCursor();
- try {
- assertEquals(false, xc0.isAtSamePositionAs(xc1));
+ try {
+ assertFalse(xc0.isAtSamePositionAs(xc1));
assertEquals(4, xc1.copyChars(-1, xc0));
- assertEquals(TokenType.TEXT, xc0.currentTokenType());
- assertEquals("0123", xc0.getTextValue());
+ assertEquals(TokenType.TEXT, xc0.currentTokenType());
+ assertEquals("0123", xc0.getTextValue());
xc0.toPrevToken();
- assertEquals(TokenType.START,xc0.prevTokenType());
+ assertEquals(TokenType.START, xc0.prevTokenType());
assertEquals("WXYZ0123", xc0.getTextValue());
assertEquals(TokenType.TEXT, xc1.currentTokenType());
- assertEquals(TokenType.START,xc1.prevTokenType());
- assertEquals("WXYZ", xc1.getTextValue());
- } finally {
+ assertEquals(TokenType.START, xc1.prevTokenType());
+ assertEquals("WXYZ", xc1.getTextValue());
+ } finally {
xc0.dispose();
xc1.dispose();
- }
+ }
}
+ @Test
public void testCopyCharsZero() throws Exception {
m_xo = XmlObject.Factory.parse("<foo><bar>0123</bar><bar>WXYZ</bar></foo>");
m_xc = m_xo.newCursor();
@@ -90,7 +69,7 @@ public class CopyCharsTest extends Basic
toNextTokenOfType(m_xc, TokenType.TEXT);
XmlCursor xc1 = m_xc.newCursor();
try {
- assertEquals(false, xc0.isAtSamePositionAs(xc1));
+ assertFalse(xc0.isAtSamePositionAs(xc1));
assertEquals(0, xc1.copyChars(0, xc0));
assertEquals("0123", xc0.getTextValue());
xc0.toPrevToken();
@@ -103,7 +82,7 @@ public class CopyCharsTest extends Basic
}
}
-
+ @Test
public void testCopyCharsThis() throws Exception {
m_xo = XmlObject.Factory.parse("<foo><bar>0123</bar><bar>WXYZ</bar></foo>");
m_xc = m_xo.newCursor();
@@ -111,7 +90,7 @@ public class CopyCharsTest extends Basic
XmlCursor xc0 = m_xc.newCursor();
XmlCursor xc1 = m_xc.newCursor();
try {
- assertEquals(true, xc0.isAtSamePositionAs(xc1));
+ assertTrue(xc0.isAtSamePositionAs(xc1));
assertEquals(4, xc1.copyChars(4, xc0));
assertEquals("0123", xc0.getTextValue());
xc0.toPrevToken();
@@ -123,6 +102,7 @@ public class CopyCharsTest extends Basic
}
}
+ @Test
public void testCopyCharsGTmax() throws Exception {
m_xo = XmlObject.Factory.parse("<foo><bar>0123</bar><bar>WXYZ</bar></foo>");
m_xc = m_xo.newCursor();
@@ -131,7 +111,7 @@ public class CopyCharsTest extends Basic
toNextTokenOfType(m_xc, TokenType.TEXT);
XmlCursor xc1 = m_xc.newCursor();
try {
- assertEquals(false, xc0.isAtSamePositionAs(xc1));
+ assertFalse(xc0.isAtSamePositionAs(xc1));
assertEquals(4, xc1.copyChars(1000, xc0));
// verify xc0
assertEquals("0123", xc0.getTextValue());
@@ -145,6 +125,7 @@ public class CopyCharsTest extends Basic
}
}
+ @Test
public void testCopyCharsToDifferentDocument() throws Exception {
m_xo = XmlObject.Factory.parse(Common.XML_FOO_DIGITS);
m_xc = m_xo.newCursor();
@@ -161,18 +142,14 @@ public class CopyCharsTest extends Basic
assertEquals("01234", m_xc.getTextValue());
}
+ @Test(expected = IllegalArgumentException.class)
public void testCopyCharsToEmptyDocumentSTARTDOC() throws Exception {
m_xo = XmlObject.Factory.parse(Common.XML_FOO_DIGITS);
m_xc = m_xo.newCursor();
XmlObject xo = XmlObject.Factory.newInstance();
XmlCursor xc1 = xo.newCursor();
toNextTokenOfType(m_xc, TokenType.TEXT);
- try {
- assertEquals(5, m_xc.copyChars(5, xc1));
- fail("Expected IllegalArgumentException");
- } catch (IllegalArgumentException ise) {
- }
- assertEquals(true, true);
+ assertEquals(5, m_xc.copyChars(5, xc1));
}
}
Modified: xmlbeans/trunk/test/src/xmlcursor/detailed/CopyTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/xmlcursor/detailed/CopyTest.java?rev=1851656&r1=1851655&r2=1851656&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/xmlcursor/detailed/CopyTest.java (original)
+++ xmlbeans/trunk/test/src/xmlcursor/detailed/CopyTest.java Fri Jan 18 23:08:44 2019
@@ -14,31 +14,34 @@
*/
package xmlcursor.detailed;
-import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlCursor;
+import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
-import junit.framework.TestCase;
+import org.junit.Ignore;
+import org.junit.Test;
-/**
- */
-public class CopyTest extends TestCase{
+import static org.junit.Assert.assertEquals;
+
+public class CopyTest {
-//this is per CR128353
- public void testCopyNamespaceMigration()throws XmlException{
- String s1="<X xmlns=\"foo\" xmlns:xsi=\"bar\"><zzz>123</zzz></X>";
- String s2="<Y> ... [some content] ... </Y>";
- XmlCursor xc1=XmlObject.Factory.parse(s1).newCursor();
+ //this is per CR128353
+ @Test
+ @Ignore("doesn't work anymore without Piccolo Parser")
+ public void testCopyNamespaceMigration() throws XmlException {
+ String s1 = "<X xmlns=\"foo\" xmlns:xsi=\"bar\"><zzz>123</zzz></X>";
+ String s2 = "<Y> ... [some content] ... </Y>";
+ XmlCursor xc1 = XmlObject.Factory.parse(s1).newCursor();
xc1.toFirstContentToken();
xc1.toFirstChild();
- XmlCursor xc2=XmlObject.Factory.parse(s2).newCursor();
- assertEquals(XmlCursor.TokenType.START,xc2.toFirstContentToken());
+ XmlCursor xc2 = XmlObject.Factory.parse(s2).newCursor();
+ assertEquals(XmlCursor.TokenType.START, xc2.toFirstContentToken());
xc2.toNextToken();
xc1.copyXml(xc2);
xc2.toStartDoc();
assertEquals("<Y>" +
- "<foo:zzz xmlns:foo=\"foo\" xmlns:xsi=\"bar\">123</foo:zzz>" +
- " ... [some content] ... </Y>",xc2.xmlText());
- xc1.dispose();
+ "<foo:zzz xmlns:foo=\"foo\" xmlns:xsi=\"bar\">123</foo:zzz>" +
+ " ... [some content] ... </Y>", xc2.xmlText());
+ xc1.dispose();
xc2.dispose();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org