Skip to content

Commit 894b792

Browse files
committed
add tests
1 parent 85c0881 commit 894b792

File tree

22 files changed

+76
-8
lines changed

22 files changed

+76
-8
lines changed

net.lecousin.core/.settings/org.eclipse.wst.validation.prefs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ disabled=06target
66
eclipse.preferences.version=1
77
override=true
88
suspend=false
9-
vals/org.eclipse.wst.xml.core.xml/groups=0107include05111contentType128org.eclipse.core.runtime.xmlT111contentType134org.eclipse.wst.xml.core.xmlsourceT111contentType134org.eclipse.wst.xml.core.xslsourceT111contentType134org.eclipse.jst.jsp.core.tldsourceT07fileext03xmlF0107exclude06113projectNature134org.eclipse.jst.j2ee.ejb.EJBNature113projectNature130org.eclipse.jst.j2ee.EARNature04file08.projectT0104file110.classpathT0104file110.settings/T0204file133src/test/resources/xml-test-suiteF02
9+
vals/org.eclipse.wst.xml.core.xml/groups=0107include05111contentType128org.eclipse.core.runtime.xmlT111contentType134org.eclipse.wst.xml.core.xmlsourceT111contentType134org.eclipse.wst.xml.core.xslsourceT111contentType134org.eclipse.jst.jsp.core.tldsourceT07fileext03xmlF0107exclude07113projectNature134org.eclipse.jst.j2ee.ejb.EJBNature113projectNature130org.eclipse.jst.j2ee.EARNature04file08.projectT0104file110.classpathT0104file110.settings/T0204file133src/test/resources/xml-test-suiteF0204file133src/test/resources/xml-unit-testsF02
1010
vf.version=3

net.lecousin.core/src/test/java/net/lecousin/framework/core/tests/xml/TestXMLStreamEventsAsync.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,4 +109,20 @@ public void testInnerText() throws Exception {
109109
xml.start().blockThrow(0);
110110
Assert.assertEquals("Hello World", xml.readInnerText().blockResult(0).trim().asString());
111111
}
112+
113+
@Test(timeout=120000)
114+
public void testErrors() {
115+
for (int i = 1; i <= 15; ++i) {
116+
String s = Integer.toString(i);
117+
while (s.length() != 3) s = "0" + s;
118+
try {
119+
XMLStreamEventsAsync xml = parse("xml-unit-tests/error/error" + s + ".xml");
120+
xml.start().blockThrow(0);
121+
xml.closeElement().blockThrow(0);
122+
throw new AssertionError("Error expected");
123+
} catch (Exception err) {
124+
// ok
125+
}
126+
}
127+
}
112128
}

net.lecousin.core/src/test/java/net/lecousin/framework/core/tests/xml/TestXMLStreamEventsSync.java

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
import java.util.Map;
44

5-
import org.junit.Assert;
6-
import org.junit.Test;
7-
85
import net.lecousin.framework.core.test.LCCoreAbstractTest;
96
import net.lecousin.framework.xml.XMLStreamEvents.Attribute;
107
import net.lecousin.framework.xml.XMLStreamEvents.ElementContext;
118
import net.lecousin.framework.xml.XMLStreamEventsSync;
129

10+
import org.junit.Assert;
11+
import org.junit.Test;
12+
1313
public abstract class TestXMLStreamEventsSync extends LCCoreAbstractTest {
1414

1515
protected abstract XMLStreamEventsSync parse(String resource) throws Exception;
@@ -129,4 +129,19 @@ public void testInnerText() throws Exception {
129129
Assert.assertEquals("Hello World", xml.readInnerText().trim().asString());
130130
}
131131

132+
@Test(timeout=120000)
133+
public void testErrors() {
134+
for (int i = 1; i <= 15; ++i) {
135+
String s = Integer.toString(i);
136+
while (s.length() != 3) s = "0" + s;
137+
try {
138+
XMLStreamEventsSync xml = parse("xml-unit-tests/error/error" + s + ".xml");
139+
xml.start();
140+
xml.closeElement();
141+
throw new AssertionError("Error expected");
142+
} catch (Exception err) {
143+
// ok
144+
}
145+
}
146+
}
132147
}

net.lecousin.core/src/test/java/net/lecousin/framework/core/tests/xml/TestXMLStreamReaderAsync.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ public void testLongTextAndCData() throws Exception {
8585

8686
xml = parse("xml-test-suite/mine/longText.xml");
8787
xml.start().blockThrow(0);
88+
xml.getPosition();
8889
xml.setMaximumTextSize(555);
8990
xml.setMaximumCDataSize(666);
9091
xml.searchElement("testText").blockThrow(0);
@@ -95,6 +96,10 @@ public void testLongTextAndCData() throws Exception {
9596
xml.next().blockThrow(0);
9697
} while (!Event.Type.CDATA.equals(xml.event.type));
9798
Assert.assertEquals(666, xml.event.text.length());
99+
do {
100+
xml.next().blockThrow(0);
101+
} while (!Event.Type.COMMENT.equals(xml.event.type));
102+
Assert.assertEquals(553, xml.event.text.length());
98103

99104
xml = parse("xml-test-suite/mine/longText.xml");
100105
xml.start().blockThrow(0);
@@ -108,6 +113,10 @@ public void testLongTextAndCData() throws Exception {
108113
xml.next().blockThrow(0);
109114
} while (!Event.Type.CDATA.equals(xml.event.type));
110115
Assert.assertEquals(2012, xml.event.text.length());
116+
do {
117+
xml.next().blockThrow(0);
118+
} while (!Event.Type.COMMENT.equals(xml.event.type));
119+
Assert.assertEquals(2015, xml.event.text.length());
111120
}
112121

113122
}

net.lecousin.core/src/test/resources/xml-test-suite/mine/longText.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,13 @@ Phasellus neque felis, sollicitudin ut suscipit sit amet, consectetur vel leo. D
1818
Donec purus enim, consectetur eget ultricies euismod, semper sit amet mauris. Fusce urna nisl, gravida vel maximus in, finibus in justo. Fusce efficitur arcu id ultrices iaculis. Etiam eros neque, dignissim id lacus at, iaculis scelerisque sem. Praesent efficitur placerat lacinia. Fusce odio tellus, interdum in nunc eu, vulputate molestie leo. Praesent lorem justo, dapibus non amet.
1919
]]>
2020
</testCData>
21+
<testComment>
22+
<!--
23+
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce a odio feugiat, ullamcorper lectus eget, facilisis nulla. Nam ullamcorper pulvinar rhoncus. Pellentesque a tristique velit. Vivamus ut erat non elit blandit ornare. Pellentesque tincidunt lectus lectus, vel vestibulum neque efficitur nec. Ut volutpat ante varius purus eleifend, sit amet ornare urna efficitur. Maecenas eget quam ac enim cursus condimentum. In egestas nulla ac massa gravida commodo. Vestibulum ullamcorper, augue placerat ornare elementum, augue lacus cursus erat, ac mollis ex lacus et turpis. In eget faucibus justo, a eleifend quam. Aenean at diam quam. In quam enim, efficitur sit amet blandit quis, euismod sed neque. Nam laoreet euismod elit, bibendum varius odio aliquam ac. Nam eu tortor fringilla, pharetra velit quis, sagittis ligula. Sed bibendum, nunc non ultricies posuere, orci urna porta urna, commodo dignissim nunc sem sodales nunc.
24+
25+
Phasellus neque felis, sollicitudin ut suscipit sit amet, consectetur vel leo. Donec interdum malesuada sapien, non pulvinar nisl sagittis eget. Morbi hendrerit volutpat turpis sit amet tempor. Pellentesque sollicitudin vestibulum ipsum, nec dictum mi. Vestibulum egestas malesuada nunc, at tempor nisl tincidunt et. Aliquam aliquet nunc ut tincidunt iaculis. Aenean mollis est id tellus interdum tristique. Suspendisse vitae fringilla lorem. Nam cursus, ex eget maximus placerat, purus mi luctus metus, quis convallis ligula quam sit amet arcu. Fusce efficitur tellus sapien, ornare tristique quam eleifend eget. Nullam ac tortor ut sapien pellentesque vestibulum vitae sit amet urna.
26+
27+
Donec purus enim, consectetur eget ultricies euismod, semper sit amet mauris. Fusce urna nisl, gravida vel maximus in, finibus in justo. Fusce efficitur arcu id ultrices iaculis. Etiam eros neque, dignissim id lacus at, iaculis scelerisque sem. Praesent efficitur placerat lacinia. Fusce odio tellus, interdum in nunc eu, vulputate molestie leo. Praesent lorem justo, dapibus non amet.
28+
-->
29+
</testComment>
2130
</theRoot>

net.lecousin.core/src/test/resources/xml-unit-tests/error/error001.xml

Whitespace-only changes.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<!
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<,
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<!,

0 commit comments

Comments
 (0)