You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ng...@apache.org on 2010/06/26 22:40:05 UTC
svn commit: r958281 [4/22] - in /mina/vysper/trunk:
demo/pubsub/client/src/main/java/org/apache/vysper/demo/pubsub/client/
nbxml/src/main/java/org/apache/vysper/charset/
nbxml/src/main/java/org/apache/vysper/xml/decoder/
nbxml/src/main/java/org/apache/...
Modified: mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/fragment/XMLElementTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/fragment/XMLElementTestCase.java?rev=958281&r1=958280&r2=958281&view=diff
==============================================================================
--- mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/fragment/XMLElementTestCase.java (original)
+++ mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/fragment/XMLElementTestCase.java Sat Jun 26 20:39:54 2010
@@ -19,54 +19,36 @@
*/
package org.apache.vysper.xml.fragment;
-import junit.framework.TestCase;
-
-
+import java.util.Collections;
import java.util.List;
import java.util.Map;
-import java.util.Collections;
-import org.apache.vysper.xml.fragment.Attribute;
-import org.apache.vysper.xml.fragment.Namespaces;
-import org.apache.vysper.xml.fragment.XMLElement;
-import org.apache.vysper.xml.fragment.XMLElementBuilder;
-import org.apache.vysper.xml.fragment.XMLSemanticError;
-import org.apache.vysper.xml.fragment.XMLText;
+import junit.framework.TestCase;
/**
*/
public class XMLElementTestCase extends TestCase {
public void testBasicGetters() {
- XMLElement xmlElement = new XMLElementBuilder("message", "urn:test").
- addAttribute("lang", "de").
- addAttribute(Namespaces.XML, "lang", "cn").
- addAttribute("xmllang", "en").
- build();
-
+ XMLElement xmlElement = new XMLElementBuilder("message", "urn:test").addAttribute("lang", "de").addAttribute(
+ Namespaces.XML, "lang", "cn").addAttribute("xmllang", "en").build();
+
assertEquals("message", xmlElement.getName());
assertEquals("urn:test", xmlElement.getNamespaceURI());
assertEquals("cn", xmlElement.getXMLLang());
-
+
assertSame(Collections.emptyList(), xmlElement.getInnerElements());
List<Attribute> list = xmlElement.getAttributes();
assertNotNull(list);
-
+
assertEquals(3, list.size());
}
public void testInnerTextGetters() {
-
- XMLElement xmlElement = new XMLElementBuilder("message", "jabber:test").
- addText("t1").
- startInnerElement("i1").
- endInnerElement().
- addText("t2").
- addText("t3").
- startInnerElement("i2").
- endInnerElement().
- addText("t4").
- build();
+
+ XMLElement xmlElement = new XMLElementBuilder("message", "jabber:test").addText("t1").startInnerElement("i1")
+ .endInnerElement().addText("t2").addText("t3").startInnerElement("i2").endInnerElement().addText("t4")
+ .build();
List<XMLText> list = xmlElement.getInnerTexts();
assertEquals(4, list.size());
@@ -83,10 +65,7 @@ public class XMLElementTestCase extends
// test succeeded
}
- xmlElement = new XMLElementBuilder("message", "jabber:test").
- startInnerElement("i1").
- endInnerElement().
- build();
+ xmlElement = new XMLElementBuilder("message", "jabber:test").startInnerElement("i1").endInnerElement().build();
try {
assertNull(xmlElement.getSingleInnerText());
} catch (XMLSemanticError xmlSemanticError) {
@@ -95,23 +74,11 @@ public class XMLElementTestCase extends
}
public void testInnerElementGetters() {
-
- XMLElement xmlElement = new XMLElementBuilder("message", "jabber:test").
- addText("t1").
- startInnerElement("i1").
- endInnerElement().
- startInnerElement("i2").
- addAttribute("order", "1").
- endInnerElement().
- startInnerElement("i2").
- addAttribute("order", "2").
- endInnerElement().
- addText("t2").
- addText("t3").
- startInnerElement("i3").
- endInnerElement().
- addText("t4").
- build();
+
+ XMLElement xmlElement = new XMLElementBuilder("message", "jabber:test").addText("t1").startInnerElement("i1")
+ .endInnerElement().startInnerElement("i2").addAttribute("order", "1").endInnerElement()
+ .startInnerElement("i2").addAttribute("order", "2").endInnerElement().addText("t2").addText("t3")
+ .startInnerElement("i3").endInnerElement().addText("t4").build();
List<XMLElement> list = xmlElement.getInnerElements();
assertEquals(4, list.size());
@@ -131,22 +98,15 @@ public class XMLElementTestCase extends
fail("must not raise exception");
}
- xmlElement = new XMLElementBuilder("message", "jabber:test").
- addText("t1").
- build();
+ xmlElement = new XMLElementBuilder("message", "jabber:test").addText("t1").build();
try {
assertNull(xmlElement.getSingleInnerElementsNamed("none"));
} catch (XMLSemanticError xmlSemanticError) {
fail("must not raise error");
}
- xmlElement = new XMLElementBuilder("message", "jabber:test").
- startInnerElement("i").
- addAttribute("order", "1").
- endInnerElement().
- startInnerElement("another").
- endInnerElement().
- build();
+ xmlElement = new XMLElementBuilder("message", "jabber:test").startInnerElement("i").addAttribute("order", "1")
+ .endInnerElement().startInnerElement("another").endInnerElement().build();
try {
XMLElement singleXmlElement = xmlElement.getSingleInnerElementsNamed("i");
assertEquals("i", singleXmlElement.getName());
@@ -154,14 +114,8 @@ public class XMLElementTestCase extends
fail("must not raise error");
}
- xmlElement = new XMLElementBuilder("message", "jabber:test").
- startInnerElement("i").
- addAttribute("order", "1").
- endInnerElement().
- startInnerElement("i").
- addAttribute("order", "2").
- endInnerElement().
- build();
+ xmlElement = new XMLElementBuilder("message", "jabber:test").startInnerElement("i").addAttribute("order", "1")
+ .endInnerElement().startInnerElement("i").addAttribute("order", "2").endInnerElement().build();
try {
xmlElement.getSingleInnerElementsNamed("i");
fail("must raise error, more than one i-element");
@@ -169,25 +123,13 @@ public class XMLElementTestCase extends
// test succeeded
}
}
-
+
public void testInnerElementsNamed() {
-
- XMLElement xmlElement = new XMLElementBuilder("message", "jabber:test").
- addText("t1").
- startInnerElement("body").
- endInnerElement().
- startInnerElement("body").
- addAttribute("order", "1").
- endInnerElement().
- startInnerElement("body").
- addAttribute("order", "2").
- endInnerElement().
- addText("body").
- addText("t3").
- startInnerElement("single").
- endInnerElement().
- addText("t4").
- build();
+
+ XMLElement xmlElement = new XMLElementBuilder("message", "jabber:test").addText("t1").startInnerElement("body")
+ .endInnerElement().startInnerElement("body").addAttribute("order", "1").endInnerElement()
+ .startInnerElement("body").addAttribute("order", "2").endInnerElement().addText("body").addText("t3")
+ .startInnerElement("single").endInnerElement().addText("t4").build();
List<XMLElement> list = xmlElement.getInnerElementsNamed("no-exist");
assertEquals(0, list.size());
@@ -204,7 +146,7 @@ public class XMLElementTestCase extends
List<XMLElement> named = xmlElement.getInnerElementsNamed("body");
assertEquals(3, named.size());
-
+
try {
xmlElement.getSingleInnerElementsNamed("body");
fail("no single element");
@@ -212,41 +154,21 @@ public class XMLElementTestCase extends
// success
}
}
-
+
public void testLanguageMapping() {
-
- XMLElement xmlElement = new XMLElementBuilder("message", "jabber:test").
- addText("t1").
- startInnerElement("body").
- endInnerElement().
- startInnerElement("body").
- addAttribute(Namespaces.XML, "lang", "en").
- endInnerElement().
- startInnerElement("body").
- addAttribute(Namespaces.XML, "lang", "de").
- endInnerElement().
- addText("body").
- addText("t3").
- startInnerElement("single").
- addAttribute(Namespaces.XML, "lang", "ru").
- endInnerElement().
- startInnerElement("body_inconsistent").
- addAttribute(Namespaces.XML, "lang", "ru").
- endInnerElement().
- startInnerElement("body_inconsistent").
- addAttribute(Namespaces.XML, "lang", "ru").
- endInnerElement().
- startInnerElement("body_lang_null").
- addAttribute("order", "1").
- endInnerElement().
- startInnerElement("body_lang_null").
- addAttribute("order", "2").
- endInnerElement().
- addText("t4").
- build();
+
+ XMLElement xmlElement = new XMLElementBuilder("message", "jabber:test").addText("t1").startInnerElement("body")
+ .endInnerElement().startInnerElement("body").addAttribute(Namespaces.XML, "lang", "en")
+ .endInnerElement().startInnerElement("body").addAttribute(Namespaces.XML, "lang", "de")
+ .endInnerElement().addText("body").addText("t3").startInnerElement("single").addAttribute(
+ Namespaces.XML, "lang", "ru").endInnerElement().startInnerElement("body_inconsistent")
+ .addAttribute(Namespaces.XML, "lang", "ru").endInnerElement().startInnerElement("body_inconsistent")
+ .addAttribute(Namespaces.XML, "lang", "ru").endInnerElement().startInnerElement("body_lang_null")
+ .addAttribute("order", "1").endInnerElement().startInnerElement("body_lang_null").addAttribute("order",
+ "2").endInnerElement().addText("t4").build();
try {
- Map<String,XMLElement> map = xmlElement.getInnerElementsByXMLLangNamed("body");
+ Map<String, XMLElement> map = xmlElement.getInnerElementsByXMLLangNamed("body");
assertEquals(3, map.size());
XMLElement element = map.get("en");
assertEquals("en", element.getXMLLang());
@@ -254,19 +176,19 @@ public class XMLElementTestCase extends
assertEquals("de", element.getXMLLang());
element = map.get(null);
assertEquals(null, element.getXMLLang());
-
+
} catch (XMLSemanticError xmlSemanticError) {
fail("no error expected");
}
-
+
try {
- Map<String,XMLElement> map = xmlElement.getInnerElementsByXMLLangNamed("body_lang_null");
+ Map<String, XMLElement> map = xmlElement.getInnerElementsByXMLLangNamed("body_lang_null");
fail("semantic error expected, same language occurs 2 times");
} catch (XMLSemanticError xmlSemanticError) {
// success
}
try {
- Map<String,XMLElement> map = xmlElement.getInnerElementsByXMLLangNamed("body_lang_null");
+ Map<String, XMLElement> map = xmlElement.getInnerElementsByXMLLangNamed("body_lang_null");
fail("semantic error expected, language does not occur 2 times");
} catch (XMLSemanticError xmlSemanticError) {
// success
@@ -274,11 +196,9 @@ public class XMLElementTestCase extends
}
public void testGetAttribute() {
- XMLElement xmlElement = new XMLElementBuilder("test").
- addAttribute("foo", "bar").
- addAttribute(Namespaces.XML, "lang", "cn").
- build();
-
+ XMLElement xmlElement = new XMLElementBuilder("test").addAttribute("foo", "bar").addAttribute(Namespaces.XML,
+ "lang", "cn").build();
+
assertEquals("bar", xmlElement.getAttribute("foo").getValue());
assertNull(xmlElement.getAttribute("http://example.com", "foo"));
assertNull(xmlElement.getAttribute("lang"));
Modified: mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/AbstractAsyncXMLReaderTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/AbstractAsyncXMLReaderTestCase.java?rev=958281&r1=958280&r2=958281&view=diff
==============================================================================
--- mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/AbstractAsyncXMLReaderTestCase.java (original)
+++ mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/AbstractAsyncXMLReaderTestCase.java Sat Jun 26 20:39:54 2010
@@ -39,119 +39,124 @@ import org.apache.vysper.xml.sax.impl.Te
import org.apache.vysper.xml.sax.impl.TestHandler.TestEvent;
import org.xml.sax.Attributes;
-
/**
* @author The Apache MINA Project (dev@mina.apache.org)
*/
public abstract class AbstractAsyncXMLReaderTestCase extends TestCase {
- private static final Attributes EMPTY_ATTRIBUTES = new DefaultAttributes();
-
- protected void assertStartElement(String expectedUri, String expectedLocalName, String expectedQName,
- TestEvent actual) {
- assertStartElement(expectedUri, expectedLocalName, expectedQName, EMPTY_ATTRIBUTES, actual);
- }
-
- protected Attributes attributes(Attribute...attributes) {
- List<Attribute> list = new ArrayList<Attribute>();
- for(Attribute attribute : attributes) {
- list.add(attribute);
- }
- return new DefaultAttributes(list);
- }
-
- protected void assertStartElement(String expectedUri, String expectedLocalName, String expectedQName, Attributes expectedAttributes,
- TestEvent actual) {
- printIfFatal(actual);
- if(!(actual instanceof StartElementEvent)) fail("Event must be StartElementEvent but was " + actual.getClass());
- StartElementEvent startElementEvent = (StartElementEvent) actual;
- assertEquals("URI", expectedUri, startElementEvent.getURI());
- assertEquals("local name", expectedLocalName, startElementEvent.getLocalName());
- assertEquals("qName", expectedQName, startElementEvent.getQName());
- assertAttributes(expectedAttributes, startElementEvent.getAtts());
- }
-
- private void printIfFatal(TestEvent actual) {
- if(actual instanceof FatalErrorEvent) {
- ((FatalErrorEvent)actual).getException().printStackTrace();
- }
-
- }
-
- protected void assertAttributes(Attributes expectedAttrs, Attributes actualAttrs) {
- assertEquals("Attribute count", expectedAttrs.getLength(), actualAttrs.getLength());
-
- for(int i = 0; i<expectedAttrs.getLength(); i++) {
- int actualIndex = actualAttrs.getIndex(expectedAttrs.getQName(i));
- assertTrue("Actual attribute not found for QName " + expectedAttrs.getQName(i), actualIndex > -1);
-
- assertEquals("Local name[" + i + "]", expectedAttrs.getLocalName(i), actualAttrs.getLocalName(actualIndex));
- assertEquals("Qname[" + i + "]", expectedAttrs.getQName(i), actualAttrs.getQName(actualIndex));
- assertEquals("URI[" + i + "]", expectedAttrs.getURI(i), actualAttrs.getURI(actualIndex));
- assertEquals("Value[" + i + "]", expectedAttrs.getValue(i), actualAttrs.getValue(actualIndex));
- }
- }
-
- protected void assertEndElement(String expectedUri, String expectedLocalName, String expectedQName,
- TestEvent actual) {
- printIfFatal(actual);
- if(!(actual instanceof EndElementEvent)) fail("Event must be EndElementEvent");
- EndElementEvent endElementEvent = (EndElementEvent) actual;
- assertEquals("URI", expectedUri, endElementEvent.getURI());
- assertEquals("local name", expectedLocalName, endElementEvent.getLocalName());
- assertEquals("qName", expectedQName, endElementEvent.getQName());
- }
-
- protected void assertStartDocument(TestEvent actual) {
- printIfFatal(actual);
- if(!(actual instanceof StartDocumentEvent)) fail("Event must be StartDocumentEvent but is " + actual.getClass());
- }
-
- protected void assertEndDocument(TestEvent actual) {
- printIfFatal(actual);
- if(!(actual instanceof EndDocumentEvent)) fail("Event must be EndDocumentEvent");
- }
-
- protected void assertText(String expected, TestEvent actual) {
- printIfFatal(actual);
- if(!(actual instanceof CharacterEvent)) fail("Event must be CharacterEvent");
-
- assertEquals(expected, ((CharacterEvent)actual).getCharacters());
- }
-
- protected List<TestEvent> parse(String xml) throws Exception {
- return parse(xml, null, null);
- }
-
- protected List<TestEvent> parse(String xml, Map<String, Boolean> features, Map<String, Object> properties) throws Exception {
- TestHandler handler = new TestHandler();
- NonBlockingXMLReader reader = new DefaultNonBlockingXMLReader();
- if(features != null) {
- for(Entry<String, Boolean> feature : features.entrySet()) {
- reader.setFeature(feature.getKey(), feature.getValue());
- }
- }
- if(properties != null) {
- for(Entry<String, Object> property : properties.entrySet()) {
- reader.setProperty(property.getKey(), property.getValue());
- }
- }
-
- reader.setContentHandler(handler);
- reader.setErrorHandler(handler);
-
- reader.parse(IoBuffer.wrap(xml.getBytes("UTF-8")), CharsetUtil.UTF8_DECODER);
-
- return handler.getEvents();
- }
-
- protected void assertFatalError(TestEvent actual) {
- if(!(actual instanceof FatalErrorEvent)) fail("Event must be FatalErrorEvent but is "+ actual.getClass());
- }
-
- protected void assertNoMoreevents(Iterator events) {
- if(events.hasNext()) {
- fail("Must not be any more evens, but found one " + events.next().getClass());
- }
- }
+ private static final Attributes EMPTY_ATTRIBUTES = new DefaultAttributes();
+
+ protected void assertStartElement(String expectedUri, String expectedLocalName, String expectedQName,
+ TestEvent actual) {
+ assertStartElement(expectedUri, expectedLocalName, expectedQName, EMPTY_ATTRIBUTES, actual);
+ }
+
+ protected Attributes attributes(Attribute... attributes) {
+ List<Attribute> list = new ArrayList<Attribute>();
+ for (Attribute attribute : attributes) {
+ list.add(attribute);
+ }
+ return new DefaultAttributes(list);
+ }
+
+ protected void assertStartElement(String expectedUri, String expectedLocalName, String expectedQName,
+ Attributes expectedAttributes, TestEvent actual) {
+ printIfFatal(actual);
+ if (!(actual instanceof StartElementEvent))
+ fail("Event must be StartElementEvent but was " + actual.getClass());
+ StartElementEvent startElementEvent = (StartElementEvent) actual;
+ assertEquals("URI", expectedUri, startElementEvent.getURI());
+ assertEquals("local name", expectedLocalName, startElementEvent.getLocalName());
+ assertEquals("qName", expectedQName, startElementEvent.getQName());
+ assertAttributes(expectedAttributes, startElementEvent.getAtts());
+ }
+
+ private void printIfFatal(TestEvent actual) {
+ if (actual instanceof FatalErrorEvent) {
+ ((FatalErrorEvent) actual).getException().printStackTrace();
+ }
+
+ }
+
+ protected void assertAttributes(Attributes expectedAttrs, Attributes actualAttrs) {
+ assertEquals("Attribute count", expectedAttrs.getLength(), actualAttrs.getLength());
+
+ for (int i = 0; i < expectedAttrs.getLength(); i++) {
+ int actualIndex = actualAttrs.getIndex(expectedAttrs.getQName(i));
+ assertTrue("Actual attribute not found for QName " + expectedAttrs.getQName(i), actualIndex > -1);
+
+ assertEquals("Local name[" + i + "]", expectedAttrs.getLocalName(i), actualAttrs.getLocalName(actualIndex));
+ assertEquals("Qname[" + i + "]", expectedAttrs.getQName(i), actualAttrs.getQName(actualIndex));
+ assertEquals("URI[" + i + "]", expectedAttrs.getURI(i), actualAttrs.getURI(actualIndex));
+ assertEquals("Value[" + i + "]", expectedAttrs.getValue(i), actualAttrs.getValue(actualIndex));
+ }
+ }
+
+ protected void assertEndElement(String expectedUri, String expectedLocalName, String expectedQName, TestEvent actual) {
+ printIfFatal(actual);
+ if (!(actual instanceof EndElementEvent))
+ fail("Event must be EndElementEvent");
+ EndElementEvent endElementEvent = (EndElementEvent) actual;
+ assertEquals("URI", expectedUri, endElementEvent.getURI());
+ assertEquals("local name", expectedLocalName, endElementEvent.getLocalName());
+ assertEquals("qName", expectedQName, endElementEvent.getQName());
+ }
+
+ protected void assertStartDocument(TestEvent actual) {
+ printIfFatal(actual);
+ if (!(actual instanceof StartDocumentEvent))
+ fail("Event must be StartDocumentEvent but is " + actual.getClass());
+ }
+
+ protected void assertEndDocument(TestEvent actual) {
+ printIfFatal(actual);
+ if (!(actual instanceof EndDocumentEvent))
+ fail("Event must be EndDocumentEvent");
+ }
+
+ protected void assertText(String expected, TestEvent actual) {
+ printIfFatal(actual);
+ if (!(actual instanceof CharacterEvent))
+ fail("Event must be CharacterEvent");
+
+ assertEquals(expected, ((CharacterEvent) actual).getCharacters());
+ }
+
+ protected List<TestEvent> parse(String xml) throws Exception {
+ return parse(xml, null, null);
+ }
+
+ protected List<TestEvent> parse(String xml, Map<String, Boolean> features, Map<String, Object> properties)
+ throws Exception {
+ TestHandler handler = new TestHandler();
+ NonBlockingXMLReader reader = new DefaultNonBlockingXMLReader();
+ if (features != null) {
+ for (Entry<String, Boolean> feature : features.entrySet()) {
+ reader.setFeature(feature.getKey(), feature.getValue());
+ }
+ }
+ if (properties != null) {
+ for (Entry<String, Object> property : properties.entrySet()) {
+ reader.setProperty(property.getKey(), property.getValue());
+ }
+ }
+
+ reader.setContentHandler(handler);
+ reader.setErrorHandler(handler);
+
+ reader.parse(IoBuffer.wrap(xml.getBytes("UTF-8")), CharsetUtil.UTF8_DECODER);
+
+ return handler.getEvents();
+ }
+
+ protected void assertFatalError(TestEvent actual) {
+ if (!(actual instanceof FatalErrorEvent))
+ fail("Event must be FatalErrorEvent but is " + actual.getClass());
+ }
+
+ protected void assertNoMoreevents(Iterator events) {
+ if (events.hasNext()) {
+ fail("Must not be any more evens, but found one " + events.next().getClass());
+ }
+ }
}
\ No newline at end of file
Modified: mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/DefaultAsyncXMLReaderTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/DefaultAsyncXMLReaderTestCase.java?rev=958281&r1=958280&r2=958281&view=diff
==============================================================================
--- mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/DefaultAsyncXMLReaderTestCase.java (original)
+++ mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/DefaultAsyncXMLReaderTestCase.java Sat Jun 26 20:39:54 2010
@@ -27,123 +27,121 @@ import org.xml.sax.SAXException;
import org.xml.sax.SAXNotRecognizedException;
import org.xml.sax.SAXNotSupportedException;
-
/**
* @author The Apache MINA Project (dev@mina.apache.org)
*/
public class DefaultAsyncXMLReaderTestCase extends AbstractAsyncXMLReaderTestCase {
- public void testParseAfterFatalError() throws Exception {
- TestHandler handler = new TestHandler();
- NonBlockingXMLReader reader = new DefaultNonBlockingXMLReader();
- reader.setContentHandler(handler);
- reader.setErrorHandler(handler);
-
- // causes a fatal error
- reader.parse(IoBuffer.wrap("<root></error>".getBytes("UTF-8")), CharsetUtil.UTF8_DECODER);
-
- try {
- // not allowed to parse after an error
- reader.parse(IoBuffer.wrap("<root>".getBytes("UTF-8")), CharsetUtil.UTF8_DECODER);
- fail("Must throw SAXException");
- } catch(SAXException e) {
- // OK
- }
- }
-
-
- public void testParseAfterEndDocument() throws Exception {
- TestHandler handler = new TestHandler();
- NonBlockingXMLReader reader = new DefaultNonBlockingXMLReader();
- reader.setContentHandler(handler);
- reader.setErrorHandler(handler);
-
- // causes a fatal error
- reader.parse(IoBuffer.wrap("<root></root>".getBytes("UTF-8")), CharsetUtil.UTF8_DECODER);
-
- try {
- // not allowed to parse after end of document
- reader.parse(IoBuffer.wrap("<root>".getBytes("UTF-8")), CharsetUtil.UTF8_DECODER);
- fail("Must throw SAXException");
- } catch(SAXException e) {
- // OK
- }
- }
-
- public void testSetDtdHandlerNotSupported() {
- try {
- new DefaultNonBlockingXMLReader().setDTDHandler(new DTDHandler() {
- public void unparsedEntityDecl(String name, String publicId,
- String systemId, String notationName) throws SAXException {
- }
- public void notationDecl(String name, String publicId, String systemId)
- throws SAXException {
- }
- });
- fail("Not supported, must throw RuntimeException");
- } catch(RuntimeException e) {
- // OK
- }
- }
-
- public void testGetDtdHandlerNotSupported() {
- try {
- new DefaultNonBlockingXMLReader().getDTDHandler();
- fail("Not supported, must throw RuntimeException");
- } catch(RuntimeException e) {
- // OK
- }
- }
-
- public void testSetNotRecognizedFeature() throws SAXNotSupportedException {
- DefaultNonBlockingXMLReader reader = new DefaultNonBlockingXMLReader();
- try {
- reader.setFeature("http://example.com", true);
- fail("Must throw SAXNotRecognizedException");
- } catch (SAXNotRecognizedException e) {
- // OK
- }
- }
-
- public void testSetNotSupportedFeature() throws SAXNotRecognizedException {
- DefaultNonBlockingXMLReader reader = new DefaultNonBlockingXMLReader();
- try {
- reader.setFeature("http://xml.org/sax/features/namespaces", false);
- fail("Must throw SAXNotSupportedException");
- } catch (SAXNotSupportedException e) {
- // OK
- }
- }
-
- public void testSetFeature() throws SAXNotRecognizedException, SAXNotSupportedException {
- DefaultNonBlockingXMLReader reader = new DefaultNonBlockingXMLReader();
- reader.setFeature("http://xml.org/sax/features/namespaces", true);
- }
-
- public void testGetFeature() throws SAXNotRecognizedException, SAXNotSupportedException {
- DefaultNonBlockingXMLReader reader = new DefaultNonBlockingXMLReader();
- assertTrue(reader.getFeature("http://xml.org/sax/features/namespaces"));
- }
-
- public void testGetUnknownFeature() throws SAXNotSupportedException {
- DefaultNonBlockingXMLReader reader = new DefaultNonBlockingXMLReader();
- try {
- assertTrue(reader.getFeature("http://example.com"));
- fail("Must throw SAXNotRecognizedException");
- } catch(SAXNotRecognizedException e) {
- // ok
- }
- }
-
- public void testSetFeatureDuringParse() throws Exception {
- DefaultNonBlockingXMLReader reader = new DefaultNonBlockingXMLReader();
- reader.parse(IoBuffer.wrap("<foo />".getBytes("UTF-8")), CharsetUtil.UTF8_DECODER);
- try {
- reader.setFeature("http://xml.org/sax/features/namespaces", true);
- fail("Must throw SAXNotSupportedException");
- } catch(SAXNotSupportedException e) {
- // ok
- }
- }
+ public void testParseAfterFatalError() throws Exception {
+ TestHandler handler = new TestHandler();
+ NonBlockingXMLReader reader = new DefaultNonBlockingXMLReader();
+ reader.setContentHandler(handler);
+ reader.setErrorHandler(handler);
+
+ // causes a fatal error
+ reader.parse(IoBuffer.wrap("<root></error>".getBytes("UTF-8")), CharsetUtil.UTF8_DECODER);
+
+ try {
+ // not allowed to parse after an error
+ reader.parse(IoBuffer.wrap("<root>".getBytes("UTF-8")), CharsetUtil.UTF8_DECODER);
+ fail("Must throw SAXException");
+ } catch (SAXException e) {
+ // OK
+ }
+ }
+
+ public void testParseAfterEndDocument() throws Exception {
+ TestHandler handler = new TestHandler();
+ NonBlockingXMLReader reader = new DefaultNonBlockingXMLReader();
+ reader.setContentHandler(handler);
+ reader.setErrorHandler(handler);
+
+ // causes a fatal error
+ reader.parse(IoBuffer.wrap("<root></root>".getBytes("UTF-8")), CharsetUtil.UTF8_DECODER);
+
+ try {
+ // not allowed to parse after end of document
+ reader.parse(IoBuffer.wrap("<root>".getBytes("UTF-8")), CharsetUtil.UTF8_DECODER);
+ fail("Must throw SAXException");
+ } catch (SAXException e) {
+ // OK
+ }
+ }
+
+ public void testSetDtdHandlerNotSupported() {
+ try {
+ new DefaultNonBlockingXMLReader().setDTDHandler(new DTDHandler() {
+ public void unparsedEntityDecl(String name, String publicId, String systemId, String notationName)
+ throws SAXException {
+ }
+
+ public void notationDecl(String name, String publicId, String systemId) throws SAXException {
+ }
+ });
+ fail("Not supported, must throw RuntimeException");
+ } catch (RuntimeException e) {
+ // OK
+ }
+ }
+
+ public void testGetDtdHandlerNotSupported() {
+ try {
+ new DefaultNonBlockingXMLReader().getDTDHandler();
+ fail("Not supported, must throw RuntimeException");
+ } catch (RuntimeException e) {
+ // OK
+ }
+ }
+
+ public void testSetNotRecognizedFeature() throws SAXNotSupportedException {
+ DefaultNonBlockingXMLReader reader = new DefaultNonBlockingXMLReader();
+ try {
+ reader.setFeature("http://example.com", true);
+ fail("Must throw SAXNotRecognizedException");
+ } catch (SAXNotRecognizedException e) {
+ // OK
+ }
+ }
+
+ public void testSetNotSupportedFeature() throws SAXNotRecognizedException {
+ DefaultNonBlockingXMLReader reader = new DefaultNonBlockingXMLReader();
+ try {
+ reader.setFeature("http://xml.org/sax/features/namespaces", false);
+ fail("Must throw SAXNotSupportedException");
+ } catch (SAXNotSupportedException e) {
+ // OK
+ }
+ }
+
+ public void testSetFeature() throws SAXNotRecognizedException, SAXNotSupportedException {
+ DefaultNonBlockingXMLReader reader = new DefaultNonBlockingXMLReader();
+ reader.setFeature("http://xml.org/sax/features/namespaces", true);
+ }
+
+ public void testGetFeature() throws SAXNotRecognizedException, SAXNotSupportedException {
+ DefaultNonBlockingXMLReader reader = new DefaultNonBlockingXMLReader();
+ assertTrue(reader.getFeature("http://xml.org/sax/features/namespaces"));
+ }
+
+ public void testGetUnknownFeature() throws SAXNotSupportedException {
+ DefaultNonBlockingXMLReader reader = new DefaultNonBlockingXMLReader();
+ try {
+ assertTrue(reader.getFeature("http://example.com"));
+ fail("Must throw SAXNotRecognizedException");
+ } catch (SAXNotRecognizedException e) {
+ // ok
+ }
+ }
+
+ public void testSetFeatureDuringParse() throws Exception {
+ DefaultNonBlockingXMLReader reader = new DefaultNonBlockingXMLReader();
+ reader.parse(IoBuffer.wrap("<foo />".getBytes("UTF-8")), CharsetUtil.UTF8_DECODER);
+ try {
+ reader.setFeature("http://xml.org/sax/features/namespaces", true);
+ fail("Must throw SAXNotSupportedException");
+ } catch (SAXNotSupportedException e) {
+ // ok
+ }
+ }
}
\ No newline at end of file
Modified: mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/NameTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/NameTestCase.java?rev=958281&r1=958280&r2=958281&view=diff
==============================================================================
--- mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/NameTestCase.java (original)
+++ mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/NameTestCase.java Sat Jun 26 20:39:54 2010
@@ -21,28 +21,24 @@ package org.apache.vysper.xml.sax.impl;
import junit.framework.TestCase;
-import org.apache.vysper.xml.sax.impl.XMLParser;
-
-
-
/**
* @author The Apache MINA Project (dev@mina.apache.org)
*/
public class NameTestCase extends TestCase {
- public void testValidName() {
- assertTrue(XMLParser.NAME_PATTERN.matcher("abc").find());
- assertTrue(XMLParser.NAME_PATTERN.matcher("_abc").find());
- assertTrue(XMLParser.NAME_PATTERN.matcher(":abc").find());
- assertTrue(XMLParser.NAME_PATTERN.matcher("Aabc").find());
- assertTrue(XMLParser.NAME_PATTERN.matcher("\u00C8abc").find());
- assertTrue(XMLParser.NAME_PATTERN.matcher("\u00C8abc").find());
- assertFalse(XMLParser.NAME_PATTERN.matcher("3abc").find());
- assertFalse(XMLParser.NAME_PATTERN.matcher("\u2001abc").find());
- assertTrue(XMLParser.NAME_PATTERN.matcher("a3bc").find());
- assertFalse(XMLParser.NAME_PATTERN.matcher("-abc").find());
- assertTrue(XMLParser.NAME_PATTERN.matcher("ab-c").find());
-
- }
+ public void testValidName() {
+ assertTrue(XMLParser.NAME_PATTERN.matcher("abc").find());
+ assertTrue(XMLParser.NAME_PATTERN.matcher("_abc").find());
+ assertTrue(XMLParser.NAME_PATTERN.matcher(":abc").find());
+ assertTrue(XMLParser.NAME_PATTERN.matcher("Aabc").find());
+ assertTrue(XMLParser.NAME_PATTERN.matcher("\u00C8abc").find());
+ assertTrue(XMLParser.NAME_PATTERN.matcher("\u00C8abc").find());
+ assertFalse(XMLParser.NAME_PATTERN.matcher("3abc").find());
+ assertFalse(XMLParser.NAME_PATTERN.matcher("\u2001abc").find());
+ assertTrue(XMLParser.NAME_PATTERN.matcher("a3bc").find());
+ assertFalse(XMLParser.NAME_PATTERN.matcher("-abc").find());
+ assertTrue(XMLParser.NAME_PATTERN.matcher("ab-c").find());
+
+ }
}
\ No newline at end of file
Modified: mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/ParseAttributesTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/ParseAttributesTestCase.java?rev=958281&r1=958280&r2=958281&view=diff
==============================================================================
--- mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/ParseAttributesTestCase.java (original)
+++ mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/ParseAttributesTestCase.java Sat Jun 26 20:39:54 2010
@@ -21,85 +21,79 @@ package org.apache.vysper.xml.sax.impl;
import java.util.Iterator;
-import org.apache.vysper.xml.sax.impl.Attribute;
import org.apache.vysper.xml.sax.impl.TestHandler.TestEvent;
-
-
/**
* @author The Apache MINA Project (dev@mina.apache.org)
*/
public class ParseAttributesTestCase extends AbstractAsyncXMLReaderTestCase {
- public void testSimpleAttribute() throws Exception {
- Iterator<TestEvent> events = parse("<root att='foo' />").iterator();
+ public void testSimpleAttribute() throws Exception {
+ Iterator<TestEvent> events = parse("<root att='foo' />").iterator();
+
+ assertStartDocument(events.next());
+ assertStartElement("", "root", "root", attributes(new Attribute("att", "", "att", "foo")), events.next());
+ assertEndElement("", "root", "root", events.next());
+ assertEndDocument(events.next());
+
+ assertFalse(events.hasNext());
+ }
+
+ public void testMultipleAttribute() throws Exception {
+ Iterator<TestEvent> events = parse("<root att='foo' att2='bar' />").iterator();
+
+ assertStartDocument(events.next());
+ assertStartElement("", "root", "root", attributes(new Attribute("att", "", "att", "foo"), new Attribute("att2",
+ "", "att2", "bar")), events.next());
+ assertEndElement("", "root", "root", events.next());
+ assertEndDocument(events.next());
+
+ assertFalse(events.hasNext());
+ }
+
+ public void testAttributeWithDoubleQuote() throws Exception {
+ Iterator<TestEvent> events = parse("<root att='f\"oo' />").iterator();
+
+ assertStartDocument(events.next());
+ assertStartElement("", "root", "root", attributes(new Attribute("att", "", "att", "f\"oo")), events.next());
+ assertEndElement("", "root", "root", events.next());
+ assertEndDocument(events.next());
+
+ assertFalse(events.hasNext());
+ }
+
+ public void testAttributeWithSingleQuote() throws Exception {
+ Iterator<TestEvent> events = parse("<root att=\"f'oo\" />").iterator();
+
+ assertStartDocument(events.next());
+ assertStartElement("", "root", "root", attributes(new Attribute("att", "", "att", "f'oo")), events.next());
+ assertEndElement("", "root", "root", events.next());
+ assertEndDocument(events.next());
+
+ assertFalse(events.hasNext());
+ }
+
+ public void testAttributeWithEscapedAmp() throws Exception {
+ Iterator<TestEvent> events = parse("<root att='f&oo' />").iterator();
+
+ assertStartDocument(events.next());
+ assertStartElement("", "root", "root", attributes(new Attribute("att", "", "att", "f&oo")), events.next());
+ assertEndElement("", "root", "root", events.next());
+ assertEndDocument(events.next());
+
+ assertFalse(events.hasNext());
+ }
+
+ // Namespace declarations should not be included in attribute
+ public void testExcludeNsAttributes() throws Exception {
+ Iterator<TestEvent> events = parse("<root att='foo' xmlns:p='http://bar.com' />").iterator();
+
+ assertStartDocument(events.next());
+ assertStartElement("", "root", "root", attributes(new Attribute("att", "", "att", "foo")), events.next());
+ assertEndElement("", "root", "root", events.next());
+ assertEndDocument(events.next());
- assertStartDocument(events.next());
- assertStartElement("", "root", "root", attributes(new Attribute("att", "", "att", "foo")), events.next());
- assertEndElement("", "root", "root", events.next());
- assertEndDocument(events.next());
-
- assertFalse(events.hasNext());
- }
-
- public void testMultipleAttribute() throws Exception {
- Iterator<TestEvent> events = parse("<root att='foo' att2='bar' />").iterator();
-
- assertStartDocument(events.next());
- assertStartElement("", "root", "root",
- attributes(new Attribute("att", "", "att", "foo"), new Attribute("att2", "", "att2", "bar")), events.next());
- assertEndElement("", "root", "root", events.next());
- assertEndDocument(events.next());
-
- assertFalse(events.hasNext());
- }
-
- public void testAttributeWithDoubleQuote() throws Exception {
- Iterator<TestEvent> events = parse("<root att='f\"oo' />").iterator();
-
- assertStartDocument(events.next());
- assertStartElement("", "root", "root",
- attributes(new Attribute("att", "", "att", "f\"oo")), events.next());
- assertEndElement("", "root", "root", events.next());
- assertEndDocument(events.next());
-
- assertFalse(events.hasNext());
- }
-
- public void testAttributeWithSingleQuote() throws Exception {
- Iterator<TestEvent> events = parse("<root att=\"f'oo\" />").iterator();
-
- assertStartDocument(events.next());
- assertStartElement("", "root", "root",
- attributes(new Attribute("att", "", "att", "f'oo")), events.next());
- assertEndElement("", "root", "root", events.next());
- assertEndDocument(events.next());
-
- assertFalse(events.hasNext());
- }
-
- public void testAttributeWithEscapedAmp() throws Exception {
- Iterator<TestEvent> events = parse("<root att='f&oo' />").iterator();
-
- assertStartDocument(events.next());
- assertStartElement("", "root", "root",
- attributes(new Attribute("att", "", "att", "f&oo")), events.next());
- assertEndElement("", "root", "root", events.next());
- assertEndDocument(events.next());
-
- assertFalse(events.hasNext());
- }
-
- // Namespace declarations should not be included in attribute
- public void testExcludeNsAttributes() throws Exception {
- Iterator<TestEvent> events = parse("<root att='foo' xmlns:p='http://bar.com' />").iterator();
-
- assertStartDocument(events.next());
- assertStartElement("", "root", "root", attributes(new Attribute("att", "", "att", "foo")), events.next());
- assertEndElement("", "root", "root", events.next());
- assertEndDocument(events.next());
-
- assertFalse(events.hasNext());
- }
+ assertFalse(events.hasNext());
+ }
}
\ No newline at end of file
Modified: mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/ParseCommentsTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/ParseCommentsTestCase.java?rev=958281&r1=958280&r2=958281&view=diff
==============================================================================
--- mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/ParseCommentsTestCase.java (original)
+++ mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/ParseCommentsTestCase.java Sat Jun 26 20:39:54 2010
@@ -25,7 +25,6 @@ import java.util.Map;
import org.apache.vysper.xml.sax.impl.TestHandler.TestEvent;
-
/**
* Comments will not generate events, the parser should just support parsing them, unless forbidden
*
@@ -33,97 +32,97 @@ import org.apache.vysper.xml.sax.impl.Te
*/
public class ParseCommentsTestCase extends AbstractAsyncXMLReaderTestCase {
- public void testCommentFirst() throws Exception {
- Iterator<TestEvent> events = parse("<!-- comment --><root />").iterator();
+ public void testCommentFirst() throws Exception {
+ Iterator<TestEvent> events = parse("<!-- comment --><root />").iterator();
+
+ assertStartDocument(events.next());
+ assertStartElement("", "root", "root", events.next());
+ assertEndElement("", "root", "root", events.next());
+ assertEndDocument(events.next());
+
+ assertNoMoreevents(events);
+ }
+
+ public void testCommentInElement() throws Exception {
+ Iterator<TestEvent> events = parse("<root><!-- comment --></root>").iterator();
+
+ assertStartDocument(events.next());
+ assertStartElement("", "root", "root", events.next());
+ assertEndElement("", "root", "root", events.next());
+ assertEndDocument(events.next());
+
+ assertNoMoreevents(events);
+ }
+
+ public void testCommentLast() throws Exception {
+ Iterator<TestEvent> events = parse("<root /><!-- comment -->").iterator();
+
+ assertStartDocument(events.next());
+ assertStartElement("", "root", "root", events.next());
+ assertEndElement("", "root", "root", events.next());
+ assertEndDocument(events.next());
+
+ assertNoMoreevents(events);
+ }
+
+ public void testCommentAdvancedContent() throws Exception {
+ Iterator<TestEvent> events = parse("<root><!-- 3 comment with multiple words --></root>").iterator();
+
+ assertStartDocument(events.next());
+ assertStartElement("", "root", "root", events.next());
+ assertEndElement("", "root", "root", events.next());
+ assertEndDocument(events.next());
+
+ assertNoMoreevents(events);
+ }
+
+ public void testNotWellformedComment1() throws Exception {
+ Iterator<TestEvent> events = parse("<root><!- comment --></root>").iterator();
+
+ assertStartDocument(events.next());
+ assertStartElement("", "root", "root", events.next());
+ assertFatalError(events.next());
+ assertNoMoreevents(events);
+ }
+
+ public void testNotWellformedComment2() throws Exception {
+ Iterator<TestEvent> events = parse("<root><!-- comment -></root>").iterator();
+
+ assertStartDocument(events.next());
+ assertStartElement("", "root", "root", events.next());
+ assertFatalError(events.next());
+ assertNoMoreevents(events);
+ }
+
+ public void testNotWellformedComment3() throws Exception {
+ Iterator<TestEvent> events = parse("<root><!-- comment ></root>").iterator();
+
+ assertStartDocument(events.next());
+ assertStartElement("", "root", "root", events.next());
+ assertFatalError(events.next());
+ assertNoMoreevents(events);
+ }
+
+ public void testNotWellformedComment4() throws Exception {
+ Iterator<TestEvent> events = parse("<root><! comment --></root>").iterator();
+
+ assertStartDocument(events.next());
+ assertStartElement("", "root", "root", events.next());
+ assertFatalError(events.next());
+ assertNoMoreevents(events);
+ }
+
+ public void testCommentNotAllowed() throws Exception {
+ Map<String, Boolean> features = new HashMap<String, Boolean>();
+ features.put("http://mina.apache.org/vysper/features/comments-allowed", false);
+
+ Iterator<TestEvent> events = parse("<root><!-- comment --></root>", features, null).iterator();
+
+ assertStartDocument(events.next());
+ assertStartElement("", "root", "root", events.next());
+ assertFatalError(events.next());
- assertStartDocument(events.next());
- assertStartElement("", "root", "root", events.next());
- assertEndElement("", "root", "root", events.next());
- assertEndDocument(events.next());
-
- assertNoMoreevents(events);
- }
-
- public void testCommentInElement() throws Exception {
- Iterator<TestEvent> events = parse("<root><!-- comment --></root>").iterator();
-
- assertStartDocument(events.next());
- assertStartElement("", "root", "root", events.next());
- assertEndElement("", "root", "root", events.next());
- assertEndDocument(events.next());
-
- assertNoMoreevents(events);
- }
-
- public void testCommentLast() throws Exception {
- Iterator<TestEvent> events = parse("<root /><!-- comment -->").iterator();
-
- assertStartDocument(events.next());
- assertStartElement("", "root", "root", events.next());
- assertEndElement("", "root", "root", events.next());
- assertEndDocument(events.next());
-
- assertNoMoreevents(events);
- }
-
- public void testCommentAdvancedContent() throws Exception {
- Iterator<TestEvent> events = parse("<root><!-- 3 comment with multiple words --></root>").iterator();
-
- assertStartDocument(events.next());
- assertStartElement("", "root", "root", events.next());
- assertEndElement("", "root", "root", events.next());
- assertEndDocument(events.next());
-
- assertNoMoreevents(events);
- }
-
- public void testNotWellformedComment1() throws Exception {
- Iterator<TestEvent> events = parse("<root><!- comment --></root>").iterator();
-
- assertStartDocument(events.next());
- assertStartElement("", "root", "root", events.next());
- assertFatalError(events.next());
- assertNoMoreevents(events);
- }
-
- public void testNotWellformedComment2() throws Exception {
- Iterator<TestEvent> events = parse("<root><!-- comment -></root>").iterator();
-
- assertStartDocument(events.next());
- assertStartElement("", "root", "root", events.next());
- assertFatalError(events.next());
- assertNoMoreevents(events);
- }
-
- public void testNotWellformedComment3() throws Exception {
- Iterator<TestEvent> events = parse("<root><!-- comment ></root>").iterator();
-
- assertStartDocument(events.next());
- assertStartElement("", "root", "root", events.next());
- assertFatalError(events.next());
- assertNoMoreevents(events);
- }
-
- public void testNotWellformedComment4() throws Exception {
- Iterator<TestEvent> events = parse("<root><! comment --></root>").iterator();
-
- assertStartDocument(events.next());
- assertStartElement("", "root", "root", events.next());
- assertFatalError(events.next());
- assertNoMoreevents(events);
- }
-
- public void testCommentNotAllowed() throws Exception {
- Map<String, Boolean> features = new HashMap<String, Boolean>();
- features.put("http://mina.apache.org/vysper/features/comments-allowed", false);
-
- Iterator<TestEvent> events = parse("<root><!-- comment --></root>", features, null).iterator();
-
- assertStartDocument(events.next());
- assertStartElement("", "root", "root", events.next());
- assertFatalError(events.next());
-
- assertNoMoreevents(events);
- }
+ assertNoMoreevents(events);
+ }
}
\ No newline at end of file
Modified: mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/ParseElementsTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/ParseElementsTestCase.java?rev=958281&r1=958280&r2=958281&view=diff
==============================================================================
--- mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/ParseElementsTestCase.java (original)
+++ mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/ParseElementsTestCase.java Sat Jun 26 20:39:54 2010
@@ -23,139 +23,136 @@ import java.util.Iterator;
import org.apache.vysper.xml.sax.impl.TestHandler.TestEvent;
-
/**
* @author The Apache MINA Project (dev@mina.apache.org)
*/
public class ParseElementsTestCase extends AbstractAsyncXMLReaderTestCase {
- public void testEmptyElement() throws Exception {
- Iterator<TestEvent> events = parse("<root />").iterator();
+ public void testEmptyElement() throws Exception {
+ Iterator<TestEvent> events = parse("<root />").iterator();
+
+ assertStartDocument(events.next());
+ assertStartElement("", "root", "root", events.next());
+ assertEndElement("", "root", "root", events.next());
+ assertEndDocument(events.next());
+
+ assertNoMoreevents(events);
+ }
+
+ public void testElement() throws Exception {
+ Iterator<TestEvent> events = parse("<root></root>").iterator();
+
+ assertStartDocument(events.next());
+ assertStartElement("", "root", "root", events.next());
+ assertEndElement("", "root", "root", events.next());
+ assertEndDocument(events.next());
+
+ assertNoMoreevents(events);
+ }
+
+ public void testElements() throws Exception {
+ Iterator<TestEvent> events = parse("<root><child><inner /></child></root>").iterator();
+
+ assertStartDocument(events.next());
+ assertStartElement("", "root", "root", events.next());
+ assertStartElement("", "child", "child", events.next());
+ assertStartElement("", "inner", "inner", events.next());
+
+ assertEndElement("", "inner", "inner", events.next());
+ assertEndElement("", "child", "child", events.next());
+ assertEndElement("", "root", "root", events.next());
+ assertEndDocument(events.next());
+
+ assertNoMoreevents(events);
+ }
+
+ public void testIllegalClosingElement() throws Exception {
+ Iterator<TestEvent> events = parse("<root><child /></error>").iterator();
+
+ assertStartDocument(events.next());
+ assertStartElement("", "root", "root", events.next());
+ assertStartElement("", "child", "child", events.next());
+ assertEndElement("", "child", "child", events.next());
+ assertFatalError(events.next());
+
+ assertNoMoreevents(events);
+ }
+
+ public void testNumberAsFirstCharInName() throws Exception {
+ Iterator<TestEvent> events = parse("<1root />").iterator();
+
+ assertStartDocument(events.next());
+ assertFatalError(events.next());
+
+ assertNoMoreevents(events);
+ }
+
+ public void testDashAsFirstCharInName() throws Exception {
+ Iterator<TestEvent> events = parse("<-root />").iterator();
+
+ assertStartDocument(events.next());
+ assertFatalError(events.next());
+
+ assertNoMoreevents(events);
+ }
+
+ public void testNumberInName() throws Exception {
+ Iterator<TestEvent> events = parse("<r1oot />").iterator();
+
+ assertStartDocument(events.next());
+ assertStartElement("", "r1oot", "r1oot", events.next());
+ assertEndElement("", "r1oot", "r1oot", events.next());
+ assertEndDocument(events.next());
+
+ assertNoMoreevents(events);
+ }
+
+ public void testInvalidUnicodeInName() throws Exception {
+ Iterator<TestEvent> events = parse("<r\u2190oot />").iterator();
+
+ assertStartDocument(events.next());
+ assertFatalError(events.next());
+
+ assertNoMoreevents(events);
+ }
+
+ public void testValidUnicodeInName() throws Exception {
+ Iterator<TestEvent> events = parse("<r\u218Foot />").iterator();
+
+ assertStartDocument(events.next());
+ assertStartElement("", "r\u218Foot", "r\u218Foot", events.next());
+ assertEndElement("", "r\u218Foot", "r\u218Foot", events.next());
+ assertEndDocument(events.next());
+
+ assertNoMoreevents(events);
+ }
+
+ public void testXmlBeginName() throws Exception {
+ Iterator<TestEvent> events = parse("<xmlroot />").iterator();
+
+ assertStartDocument(events.next());
+ assertFatalError(events.next());
+
+ assertNoMoreevents(events);
+ }
+
+ public void testXmlInsideName() throws Exception {
+ Iterator<TestEvent> events = parse("<roxmlot />").iterator();
+
+ assertStartDocument(events.next());
+ assertStartElement("", "roxmlot", "roxmlot", events.next());
+ assertEndElement("", "roxmlot", "roxmlot", events.next());
+ assertEndDocument(events.next());
+
+ assertNoMoreevents(events);
+ }
- assertStartDocument(events.next());
- assertStartElement("", "root", "root", events.next());
- assertEndElement("", "root", "root", events.next());
- assertEndDocument(events.next());
-
- assertNoMoreevents(events);
- }
-
- public void testElement() throws Exception {
- Iterator<TestEvent> events = parse("<root></root>").iterator();
-
- assertStartDocument(events.next());
- assertStartElement("", "root", "root", events.next());
- assertEndElement("", "root", "root", events.next());
- assertEndDocument(events.next());
-
- assertNoMoreevents(events);
- }
-
- public void testElements() throws Exception {
- Iterator<TestEvent> events = parse("<root><child><inner /></child></root>").iterator();
-
- assertStartDocument(events.next());
- assertStartElement("", "root", "root", events.next());
- assertStartElement("", "child", "child", events.next());
- assertStartElement("", "inner", "inner", events.next());
-
- assertEndElement("", "inner", "inner", events.next());
- assertEndElement("", "child", "child", events.next());
- assertEndElement("", "root", "root", events.next());
- assertEndDocument(events.next());
-
- assertNoMoreevents(events);
- }
-
- public void testIllegalClosingElement() throws Exception {
- Iterator<TestEvent> events = parse("<root><child /></error>").iterator();
-
- assertStartDocument(events.next());
- assertStartElement("", "root", "root", events.next());
- assertStartElement("", "child", "child", events.next());
- assertEndElement("", "child", "child", events.next());
- assertFatalError(events.next());
-
- assertNoMoreevents(events);
- }
-
- public void testNumberAsFirstCharInName() throws Exception {
- Iterator<TestEvent> events = parse("<1root />").iterator();
-
- assertStartDocument(events.next());
- assertFatalError(events.next());
-
- assertNoMoreevents(events);
- }
-
- public void testDashAsFirstCharInName() throws Exception {
- Iterator<TestEvent> events = parse("<-root />").iterator();
-
- assertStartDocument(events.next());
- assertFatalError(events.next());
-
- assertNoMoreevents(events);
- }
-
- public void testNumberInName() throws Exception {
- Iterator<TestEvent> events = parse("<r1oot />").iterator();
-
- assertStartDocument(events.next());
- assertStartElement("", "r1oot", "r1oot", events.next());
- assertEndElement("", "r1oot", "r1oot", events.next());
- assertEndDocument(events.next());
-
- assertNoMoreevents(events);
- }
-
- public void testInvalidUnicodeInName() throws Exception {
- Iterator<TestEvent> events = parse("<r\u2190oot />").iterator();
-
- assertStartDocument(events.next());
- assertFatalError(events.next());
-
- assertNoMoreevents(events);
- }
-
- public void testValidUnicodeInName() throws Exception {
- Iterator<TestEvent> events = parse("<r\u218Foot />").iterator();
-
- assertStartDocument(events.next());
- assertStartElement("", "r\u218Foot", "r\u218Foot", events.next());
- assertEndElement("", "r\u218Foot", "r\u218Foot", events.next());
- assertEndDocument(events.next());
-
-
- assertNoMoreevents(events);
- }
-
- public void testXmlBeginName() throws Exception {
- Iterator<TestEvent> events = parse("<xmlroot />").iterator();
-
- assertStartDocument(events.next());
- assertFatalError(events.next());
-
- assertNoMoreevents(events);
- }
-
- public void testXmlInsideName() throws Exception {
- Iterator<TestEvent> events = parse("<roxmlot />").iterator();
-
- assertStartDocument(events.next());
- assertStartElement("", "roxmlot", "roxmlot", events.next());
- assertEndElement("", "roxmlot", "roxmlot", events.next());
- assertEndDocument(events.next());
-
- assertNoMoreevents(events);
- }
-
-
- public void testMixedXmlBeginName() throws Exception {
- Iterator<TestEvent> events = parse("<XmLroot />").iterator();
+ public void testMixedXmlBeginName() throws Exception {
+ Iterator<TestEvent> events = parse("<XmLroot />").iterator();
- assertStartDocument(events.next());
- assertFatalError(events.next());
+ assertStartDocument(events.next());
+ assertFatalError(events.next());
- assertNoMoreevents(events);
- }
+ assertNoMoreevents(events);
+ }
}
\ No newline at end of file
Modified: mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/ParseNamespacesTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/ParseNamespacesTestCase.java?rev=958281&r1=958280&r2=958281&view=diff
==============================================================================
--- mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/ParseNamespacesTestCase.java (original)
+++ mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/ParseNamespacesTestCase.java Sat Jun 26 20:39:54 2010
@@ -21,136 +21,134 @@ package org.apache.vysper.xml.sax.impl;
import java.util.Iterator;
-import org.apache.vysper.xml.sax.impl.Attribute;
import org.apache.vysper.xml.sax.impl.TestHandler.TestEvent;
-
/**
* @author The Apache MINA Project (dev@mina.apache.org)
*/
public class ParseNamespacesTestCase extends AbstractAsyncXMLReaderTestCase {
- public void testNamespacedElement() throws Exception {
- Iterator<TestEvent> events = parse("<root xmlns='urn:test'></root>").iterator();
+ public void testNamespacedElement() throws Exception {
+ Iterator<TestEvent> events = parse("<root xmlns='urn:test'></root>").iterator();
+
+ assertStartDocument(events.next());
+ assertStartElement("urn:test", "root", "root", events.next());
+ assertEndElement("urn:test", "root", "root", events.next());
+ assertEndDocument(events.next());
+
+ assertFalse(events.hasNext());
+ }
+
+ public void testNamespacedAttribute() throws Exception {
+ Iterator<TestEvent> events = parse("<root p:att='foo' xmlns:p='urn:test'></root>").iterator();
+
+ assertStartDocument(events.next());
+ assertStartElement("", "root", "root", attributes(new Attribute("att", "urn:test", "p:att", "foo")), events
+ .next());
+ assertEndElement("", "root", "root", events.next());
+ assertEndDocument(events.next());
+
+ assertFalse(events.hasNext());
+ }
+
+ public void testDefaultedAttribute() throws Exception {
+ Iterator<TestEvent> events = parse("<root att='foo' xmlns='urn:test'></root>").iterator();
+
+ assertStartDocument(events.next());
+ assertStartElement("urn:test", "root", "root", attributes(new Attribute("att", "", "att", "foo")), events
+ .next());
+ assertEndElement("urn:test", "root", "root", events.next());
+ assertEndDocument(events.next());
+
+ assertFalse(events.hasNext());
+ }
+
+ public void testSimpleQNameElement() throws Exception {
+ Iterator<TestEvent> events = parse("<p:root xmlns:p='urn:test'></p:root>").iterator();
+
+ assertStartDocument(events.next());
+ assertStartElement("urn:test", "root", "p:root", events.next());
+ assertEndElement("urn:test", "root", "p:root", events.next());
+ assertEndDocument(events.next());
+
+ assertFalse(events.hasNext());
+ }
+
+ public void testNamespacedInheritanceElement() throws Exception {
+ Iterator<TestEvent> events = parse("<root xmlns='urn:test'><child /></root>").iterator();
+
+ assertStartDocument(events.next());
+ assertStartElement("urn:test", "root", "root", events.next());
+ assertStartElement("urn:test", "child", "child", events.next());
+ assertEndElement("urn:test", "child", "child", events.next());
+ assertEndElement("urn:test", "root", "root", events.next());
+ assertEndDocument(events.next());
+
+ assertFalse(events.hasNext());
+ }
+
+ public void testOverrideNamespacedElement() throws Exception {
+ Iterator<TestEvent> events = parse("<root xmlns='urn:test'><child xmlns='urn:child' /></root>").iterator();
+
+ assertStartDocument(events.next());
+ assertStartElement("urn:test", "root", "root", events.next());
+ assertStartElement("urn:child", "child", "child", events.next());
+ assertEndElement("urn:child", "child", "child", events.next());
+ assertEndElement("urn:test", "root", "root", events.next());
+ assertEndDocument(events.next());
+
+ assertFalse(events.hasNext());
+ }
+
+ public void testResetNamespacedElement() throws Exception {
+ Iterator<TestEvent> events = parse("<root xmlns='urn:test'><child xmlns='' /></root>").iterator();
+
+ assertStartDocument(events.next());
+ assertStartElement("urn:test", "root", "root", events.next());
+ assertStartElement("", "child", "child", events.next());
+ assertEndElement("", "child", "child", events.next());
+ assertEndElement("urn:test", "root", "root", events.next());
+ assertEndDocument(events.next());
+
+ assertFalse(events.hasNext());
+ }
+
+ public void testInvalidPrefixElement() throws Exception {
+ Iterator<TestEvent> events = parse("<p1:root xmlns:p1='urn:test' xmlns:p2='urn:test'></p2:root>").iterator();
+
+ assertStartDocument(events.next());
+ assertStartElement("urn:test", "root", "p1:root", events.next());
+ assertFatalError(events.next());
+
+ assertFalse(events.hasNext());
+ }
+
+ public void testUnknownPrefixOnElement() throws Exception {
+ Iterator<TestEvent> events = parse("<p:root />").iterator();
+
+ assertStartDocument(events.next());
+ assertFatalError(events.next());
+
+ assertFalse(events.hasNext());
+ }
+
+ public void testUnknownPrefixOnAttribute() throws Exception {
+ Iterator<TestEvent> events = parse("<root p:att='foo' />").iterator();
+
+ assertStartDocument(events.next());
+ assertFatalError(events.next());
+
+ assertFalse(events.hasNext());
+ }
+
+ public void testInvalidNamespaceElement() throws Exception {
+ Iterator<TestEvent> events = parse("<p1:root xmlns:p1='urn:test' xmlns:p2='urn:foo'></p2:root>").iterator();
+
+ assertStartDocument(events.next());
+ assertStartElement("urn:test", "root", "p1:root", events.next());
+ assertFatalError(events.next());
- assertStartDocument(events.next());
- assertStartElement("urn:test", "root", "root", events.next());
- assertEndElement("urn:test", "root", "root", events.next());
- assertEndDocument(events.next());
-
- assertFalse(events.hasNext());
- }
-
- public void testNamespacedAttribute() throws Exception {
- Iterator<TestEvent> events = parse("<root p:att='foo' xmlns:p='urn:test'></root>").iterator();
-
- assertStartDocument(events.next());
- assertStartElement("", "root", "root", attributes(new Attribute("att", "urn:test", "p:att", "foo")), events.next());
- assertEndElement("", "root", "root", events.next());
- assertEndDocument(events.next());
-
- assertFalse(events.hasNext());
- }
-
- public void testDefaultedAttribute() throws Exception {
- Iterator<TestEvent> events = parse("<root att='foo' xmlns='urn:test'></root>").iterator();
-
- assertStartDocument(events.next());
- assertStartElement("urn:test", "root", "root", attributes(new Attribute("att", "", "att", "foo")), events.next());
- assertEndElement("urn:test", "root", "root", events.next());
- assertEndDocument(events.next());
-
- assertFalse(events.hasNext());
- }
-
-
- public void testSimpleQNameElement() throws Exception {
- Iterator<TestEvent> events = parse("<p:root xmlns:p='urn:test'></p:root>").iterator();
-
- assertStartDocument(events.next());
- assertStartElement("urn:test", "root", "p:root", events.next());
- assertEndElement("urn:test", "root", "p:root", events.next());
- assertEndDocument(events.next());
-
- assertFalse(events.hasNext());
- }
-
- public void testNamespacedInheritanceElement() throws Exception {
- Iterator<TestEvent> events = parse("<root xmlns='urn:test'><child /></root>").iterator();
-
- assertStartDocument(events.next());
- assertStartElement("urn:test", "root", "root", events.next());
- assertStartElement("urn:test", "child", "child", events.next());
- assertEndElement("urn:test", "child", "child", events.next());
- assertEndElement("urn:test", "root", "root", events.next());
- assertEndDocument(events.next());
-
- assertFalse(events.hasNext());
- }
-
- public void testOverrideNamespacedElement() throws Exception {
- Iterator<TestEvent> events = parse("<root xmlns='urn:test'><child xmlns='urn:child' /></root>").iterator();
-
- assertStartDocument(events.next());
- assertStartElement("urn:test", "root", "root", events.next());
- assertStartElement("urn:child", "child", "child", events.next());
- assertEndElement("urn:child", "child", "child", events.next());
- assertEndElement("urn:test", "root", "root", events.next());
- assertEndDocument(events.next());
-
- assertFalse(events.hasNext());
- }
-
- public void testResetNamespacedElement() throws Exception {
- Iterator<TestEvent> events = parse("<root xmlns='urn:test'><child xmlns='' /></root>").iterator();
-
- assertStartDocument(events.next());
- assertStartElement("urn:test", "root", "root", events.next());
- assertStartElement("", "child", "child", events.next());
- assertEndElement("", "child", "child", events.next());
- assertEndElement("urn:test", "root", "root", events.next());
- assertEndDocument(events.next());
-
- assertFalse(events.hasNext());
- }
-
- public void testInvalidPrefixElement() throws Exception {
- Iterator<TestEvent> events = parse("<p1:root xmlns:p1='urn:test' xmlns:p2='urn:test'></p2:root>").iterator();
-
- assertStartDocument(events.next());
- assertStartElement("urn:test", "root", "p1:root", events.next());
- assertFatalError(events.next());
-
- assertFalse(events.hasNext());
- }
-
- public void testUnknownPrefixOnElement() throws Exception {
- Iterator<TestEvent> events = parse("<p:root />").iterator();
-
- assertStartDocument(events.next());
- assertFatalError(events.next());
-
- assertFalse(events.hasNext());
- }
-
- public void testUnknownPrefixOnAttribute() throws Exception {
- Iterator<TestEvent> events = parse("<root p:att='foo' />").iterator();
-
- assertStartDocument(events.next());
- assertFatalError(events.next());
-
- assertFalse(events.hasNext());
- }
-
-
- public void testInvalidNamespaceElement() throws Exception {
- Iterator<TestEvent> events = parse("<p1:root xmlns:p1='urn:test' xmlns:p2='urn:foo'></p2:root>").iterator();
-
- assertStartDocument(events.next());
- assertStartElement("urn:test", "root", "p1:root", events.next());
- assertFatalError(events.next());
-
- assertFalse(events.hasNext());
- }
+ assertFalse(events.hasNext());
+ }
}
\ No newline at end of file
Modified: mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/ParseTextTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/ParseTextTestCase.java?rev=958281&r1=958280&r2=958281&view=diff
==============================================================================
--- mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/ParseTextTestCase.java (original)
+++ mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/ParseTextTestCase.java Sat Jun 26 20:39:54 2010
@@ -23,82 +23,78 @@ import java.util.Iterator;
import org.apache.vysper.xml.sax.impl.TestHandler.TestEvent;
-
-
/**
* @author The Apache MINA Project (dev@mina.apache.org)
*/
public class ParseTextTestCase extends AbstractAsyncXMLReaderTestCase {
- public void testSimpleText() throws Exception {
- Iterator<TestEvent> events = parse("<root>text</root>").iterator();
+ public void testSimpleText() throws Exception {
+ Iterator<TestEvent> events = parse("<root>text</root>").iterator();
+
+ assertStartDocument(events.next());
+ assertStartElement("", "root", "root", events.next());
+ assertText("text", events.next());
+ assertEndElement("", "root", "root", events.next());
+ assertEndDocument(events.next());
+
+ assertFalse(events.hasNext());
+ }
+
+ public void testEscapedAmp() throws Exception {
+ Iterator<TestEvent> events = parse("<root>t&ext</root>").iterator();
+
+ assertStartDocument(events.next());
+ assertStartElement("", "root", "root", events.next());
+ assertText("t&ext", events.next());
+ assertEndElement("", "root", "root", events.next());
+ assertEndDocument(events.next());
+
+ assertFalse(events.hasNext());
+ }
+
+ public void testDoubleEscapedAmp() throws Exception {
+ Iterator<TestEvent> events = parse("<root>t&amp;ext</root>").iterator();
+
+ assertStartDocument(events.next());
+ assertStartElement("", "root", "root", events.next());
+ assertText("t&ext", events.next());
+ assertEndElement("", "root", "root", events.next());
+ assertEndDocument(events.next());
+
+ assertFalse(events.hasNext());
+ }
+
+ public void testUnicodeEscape() throws Exception {
+ Iterator<TestEvent> events = parse("<root>tûext</root>").iterator();
+
+ assertStartDocument(events.next());
+ assertStartElement("", "root", "root", events.next());
+ assertText("tûext", events.next());
+ assertEndElement("", "root", "root", events.next());
+ assertEndDocument(events.next());
+
+ assertFalse(events.hasNext());
+ }
+
+ public void testUnicodeHexEscape() throws Exception {
+ Iterator<TestEvent> events = parse("<root>tûext</root>").iterator();
+
+ assertStartDocument(events.next());
+ assertStartElement("", "root", "root", events.next());
+ assertText("tûext", events.next());
+ assertEndElement("", "root", "root", events.next());
+ assertEndDocument(events.next());
+
+ assertFalse(events.hasNext());
+ }
+
+ public void testTextOnly() throws Exception {
+ Iterator<TestEvent> events = parse("text</root>").iterator();
- assertStartDocument(events.next());
- assertStartElement("", "root", "root", events.next());
- assertText("text", events.next());
- assertEndElement("", "root", "root", events.next());
- assertEndDocument(events.next());
-
- assertFalse(events.hasNext());
- }
-
- public void testEscapedAmp() throws Exception {
- Iterator<TestEvent> events = parse("<root>t&ext</root>").iterator();
-
- assertStartDocument(events.next());
- assertStartElement("", "root", "root", events.next());
- assertText("t&ext", events.next());
- assertEndElement("", "root", "root", events.next());
- assertEndDocument(events.next());
-
- assertFalse(events.hasNext());
- }
-
- public void testDoubleEscapedAmp() throws Exception {
- Iterator<TestEvent> events = parse("<root>t&amp;ext</root>").iterator();
-
- assertStartDocument(events.next());
- assertStartElement("", "root", "root", events.next());
- assertText("t&ext", events.next());
- assertEndElement("", "root", "root", events.next());
- assertEndDocument(events.next());
-
- assertFalse(events.hasNext());
- }
-
-
- public void testUnicodeEscape() throws Exception {
- Iterator<TestEvent> events = parse("<root>tûext</root>").iterator();
-
- assertStartDocument(events.next());
- assertStartElement("", "root", "root", events.next());
- assertText("tûext", events.next());
- assertEndElement("", "root", "root", events.next());
- assertEndDocument(events.next());
-
- assertFalse(events.hasNext());
- }
-
- public void testUnicodeHexEscape() throws Exception {
- Iterator<TestEvent> events = parse("<root>tûext</root>").iterator();
-
- assertStartDocument(events.next());
- assertStartElement("", "root", "root", events.next());
- assertText("tûext", events.next());
- assertEndElement("", "root", "root", events.next());
- assertEndDocument(events.next());
-
- assertFalse(events.hasNext());
- }
-
- public void testTextOnly() throws Exception {
- Iterator<TestEvent> events = parse("text</root>").iterator();
-
- assertStartDocument(events.next());
- assertFatalError(events.next());
-
- assertNoMoreevents(events);
- }
+ assertStartDocument(events.next());
+ assertFatalError(events.next());
+ assertNoMoreevents(events);
+ }
}
\ No newline at end of file
Modified: mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/ParseXmlDeclarationTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/ParseXmlDeclarationTestCase.java?rev=958281&r1=958280&r2=958281&view=diff
==============================================================================
--- mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/ParseXmlDeclarationTestCase.java (original)
+++ mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/ParseXmlDeclarationTestCase.java Sat Jun 26 20:39:54 2010
@@ -23,22 +23,21 @@ import java.util.Iterator;
import org.apache.vysper.xml.sax.impl.TestHandler.TestEvent;
-
/**
* @author The Apache MINA Project (dev@mina.apache.org)
*/
public class ParseXmlDeclarationTestCase extends AbstractAsyncXMLReaderTestCase {
- public void testEmptyElement() throws Exception {
- Iterator<TestEvent> events = parse("<?xml version=\"1.0\"?>\n <root />").iterator();
+ public void testEmptyElement() throws Exception {
+ Iterator<TestEvent> events = parse("<?xml version=\"1.0\"?>\n <root />").iterator();
+
+ assertStartDocument(events.next());
+ // no event for the declaration
+ assertStartElement("", "root", "root", events.next());
+ assertEndElement("", "root", "root", events.next());
+ assertEndDocument(events.next());
- assertStartDocument(events.next());
- // no event for the declaration
- assertStartElement("", "root", "root", events.next());
- assertEndElement("", "root", "root", events.next());
- assertEndDocument(events.next());
-
- assertNoMoreevents(events);
- }
+ assertNoMoreevents(events);
+ }
}
\ No newline at end of file
Modified: mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/StreamRestartTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/StreamRestartTestCase.java?rev=958281&r1=958280&r2=958281&view=diff
==============================================================================
--- mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/StreamRestartTestCase.java (original)
+++ mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/StreamRestartTestCase.java Sat Jun 26 20:39:54 2010
@@ -25,52 +25,52 @@ import java.util.Map;
import org.apache.vysper.xml.sax.impl.TestHandler.TestEvent;
-
/**
* @author The Apache MINA Project (dev@mina.apache.org)
*/
public class StreamRestartTestCase extends AbstractAsyncXMLReaderTestCase {
- public void testRestartByXmlDeclaration() throws Exception {
- Map<String, Boolean> features = new HashMap<String, Boolean>();
- features.put(DefaultNonBlockingXMLReader.FEATURE_RESTART_ALLOWED, true);
-
- Iterator<TestEvent> events = parse("<?xml version=\"1.0\"?>\n <root><?xml version=\"1.0\"?><root />", features, null).iterator();
-
- assertStartDocument(events.next());
- // no event for the declaration
- assertStartElement("", "root", "root", events.next());
-
- // parser gets restarted
- assertStartDocument(events.next());
- assertStartElement("", "root", "root", events.next());
- assertEndElement("", "root", "root", events.next());
- assertEndDocument(events.next());
-
- assertNoMoreevents(events);
- }
-
- public void testRestartByQName() throws Exception {
- Map<String, Boolean> features = new HashMap<String, Boolean>();
- features.put(DefaultNonBlockingXMLReader.FEATURE_RESTART_ALLOWED, true);
-
- Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(DefaultNonBlockingXMLReader.PROPERTY_RESTART_QNAME, "root");
-
- Iterator<TestEvent> events = parse("<root><foo><root />", features, properties).iterator();
-
- assertStartDocument(events.next());
- // no event for the declaration
- assertStartElement("", "root", "root", events.next());
- assertStartElement("", "foo", "foo", events.next());
-
- // parser gets restarted
- assertStartDocument(events.next());
- assertStartElement("", "root", "root", events.next());
- assertEndElement("", "root", "root", events.next());
- assertEndDocument(events.next());
-
- assertNoMoreevents(events);
- }
+ public void testRestartByXmlDeclaration() throws Exception {
+ Map<String, Boolean> features = new HashMap<String, Boolean>();
+ features.put(DefaultNonBlockingXMLReader.FEATURE_RESTART_ALLOWED, true);
+
+ Iterator<TestEvent> events = parse("<?xml version=\"1.0\"?>\n <root><?xml version=\"1.0\"?><root />", features,
+ null).iterator();
+
+ assertStartDocument(events.next());
+ // no event for the declaration
+ assertStartElement("", "root", "root", events.next());
+
+ // parser gets restarted
+ assertStartDocument(events.next());
+ assertStartElement("", "root", "root", events.next());
+ assertEndElement("", "root", "root", events.next());
+ assertEndDocument(events.next());
+
+ assertNoMoreevents(events);
+ }
+
+ public void testRestartByQName() throws Exception {
+ Map<String, Boolean> features = new HashMap<String, Boolean>();
+ features.put(DefaultNonBlockingXMLReader.FEATURE_RESTART_ALLOWED, true);
+
+ Map<String, Object> properties = new HashMap<String, Object>();
+ properties.put(DefaultNonBlockingXMLReader.PROPERTY_RESTART_QNAME, "root");
+
+ Iterator<TestEvent> events = parse("<root><foo><root />", features, properties).iterator();
+
+ assertStartDocument(events.next());
+ // no event for the declaration
+ assertStartElement("", "root", "root", events.next());
+ assertStartElement("", "foo", "foo", events.next());
+
+ // parser gets restarted
+ assertStartDocument(events.next());
+ assertStartElement("", "root", "root", events.next());
+ assertEndElement("", "root", "root", events.next());
+ assertEndDocument(events.next());
+
+ assertNoMoreevents(events);
+ }
}