CVS Update: xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests
Aleksander Andrzej Slominski <[email protected]>
| Newsgroups | gmane.text.xml.xmlpull.devel |
|---|---|
| Message-ID | <[email protected]> |
aslom 02/09/02 15:19:54
Modified: src/java/tests/org/xmlpull/v1/tests TestSerializeWithNs.java
TestSetInput.java
Log:
changed TestSetInput to allow reading bytes by setInput
chnaged TesSerializeWithNs to use more descriptive namespace names ...
Revision Changes Path
1.4 +34 -34 xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestSerializeWithNs.java
Index: TestSerializeWithNs.java
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestSerializeWithNs.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -t -w -r1.3 -r1.4
--- TestSerializeWithNs.java 2002/08/28 04:32:57 1.3
+++ TestSerializeWithNs.java 2002/09/02 20:19:54 1.4
@@ -205,8 +205,8 @@
// check namespaces generation with explicit prefixes
- // byte[] binput = ("<foo xmlns='n' xmlns:ns1='n1' xmlns:ns2='n2'>"+
- // "<ns1:bar xmlns:ns1='x1' xmlns:ns3='n3' xmlns='n1'>"+
+ // byte[] binput = ("<foo xmlns='namesp' xmlns:ns1='namesp1' xmlns:ns2='namesp2'>"+
+ // "<ns1:bar xmlns:ns1='x1' xmlns:ns3='namesp3' xmlns='n1'>"+
// "<ns2:gugu a1='v1' ns2:a2='v2' xml:lang='en' ns1:a3=\"v3\"/>"+
// "<baz xmlns:ns1='y1'></baz>"+
// "</ns1:bar></foo>").getBytes("US-ASCII");
@@ -214,28 +214,28 @@
ser.setOutput(baos, "UTF8");
ser.startDocument(null, null);
- ser.setPrefix("", "n");
- ser.setPrefix("ns1", "n1");
- ser.setPrefix("ns2", "n2");
+ ser.setPrefix("", "namesp");
+ ser.setPrefix("ns1", "namesp1");
+ ser.setPrefix("ns2", "namesp2");
ser.startTag("", "foo");
ser.setPrefix("ns1", "x1");
- ser.setPrefix("ns3", "n3");
- ser.setPrefix("", "n1");
+ ser.setPrefix("ns3", "namesp3");
+ ser.setPrefix("", "namesp1");
ser.startTag("x1", "bar");
- ser.startTag("n2", "gugu");
+ ser.startTag("namesp2", "gugu");
ser.attribute("", "a1", "v1");
- ser.attribute("n2", "a2", "v2");
+ ser.attribute("namesp2", "a2", "v2");
ser.attribute("http://www.w3.org/XML/1998/namespace", "lang", "en");
ser.attribute("x1", "a3", "v3");
- ser.endTag("n2", "gugu");
+ ser.endTag("namesp2", "gugu");
ser.setPrefix("ns1", "y1");
- ser.startTag("n1", "baz");
+ ser.startTag("namesp1", "baz");
- ser.endTag("n1", "baz");
+ ser.endTag("namesp1", "baz");
ser.endTag("x1", "bar");
@@ -253,12 +253,12 @@
checkParserStateNs(xpp, 0, xpp.START_DOCUMENT, null, 0, null, null, null, false, -1);
xpp.next();
- checkParserStateNs(xpp, 1, xpp.START_TAG, null, 3, "n", "foo", null, false, 0);
+ checkParserStateNs(xpp, 1, xpp.START_TAG, null, 3, "namesp", "foo", null, false, 0);
assertEquals(0, xpp.getNamespaceCount(0));
assertEquals(3, xpp.getNamespaceCount(1));
- checkNamespace(xpp, 0, null, "n", true);
- checkNamespace(xpp, 1, "ns1", "n1", true);
- checkNamespace(xpp, 2, "ns2", "n2", true);
+ checkNamespace(xpp, 0, null, "namesp", true);
+ checkNamespace(xpp, 1, "ns1", "namesp1", true);
+ checkNamespace(xpp, 2, "ns2", "namesp2", true);
xpp.next();
checkParserStateNs(xpp, 2, xpp.START_TAG, "ns1", 6, "x1", "bar", null, false, 0);
@@ -266,40 +266,40 @@
assertEquals(3, xpp.getNamespaceCount(1));
assertEquals(6, xpp.getNamespaceCount(2));
checkNamespace(xpp, 3, "ns1", "x1", true);
- checkNamespace(xpp, 4, "ns3", "n3", true);
- checkNamespace(xpp, 5, null, "n1", true);
+ checkNamespace(xpp, 4, "ns3", "namesp3", true);
+ checkNamespace(xpp, 5, null, "namesp1", true);
xpp.next();
- checkParserStateNs(xpp, 3, xpp.START_TAG, "ns2", 6, "n2", "gugu", null, true, 4);
+ checkParserStateNs(xpp, 3, xpp.START_TAG, "ns2", 6, "namesp2", "gugu", null, true, 4);
assertEquals(6, xpp.getNamespaceCount(2));
assertEquals(6, xpp.getNamespaceCount(3));
assertEquals("x1", xpp.getNamespace("ns1"));
- assertEquals("n2", xpp.getNamespace("ns2"));
- assertEquals("n3", xpp.getNamespace("ns3"));
+ assertEquals("namesp2", xpp.getNamespace("ns2"));
+ assertEquals("namesp3", xpp.getNamespace("ns3"));
checkAttribNs(xpp, 0, null, "", "a1", "v1");
- checkAttribNs(xpp, 1, "ns2", "n2", "a2", "v2");
+ checkAttribNs(xpp, 1, "ns2", "namesp2", "a2", "v2");
checkAttribNs(xpp, 2, "xml", "http://www.w3.org/XML/1998/namespace", "lang", "en");
checkAttribNs(xpp, 3, "ns1", "x1", "a3", "v3");
xpp.next();
- checkParserStateNs(xpp, 3, xpp.END_TAG, "ns2", 6, "n2", "gugu", null, false, -1);
+ checkParserStateNs(xpp, 3, xpp.END_TAG, "ns2", 6, "namesp2", "gugu", null, false, -1);
xpp.next();
- checkParserStateNs(xpp, 3, xpp.START_TAG, null, 7, "n1", "baz", null, xpp.isEmptyElementTag(), 0);
+ checkParserStateNs(xpp, 3, xpp.START_TAG, null, 7, "namesp1", "baz", null, xpp.isEmptyElementTag(), 0);
assertEquals(0, xpp.getNamespaceCount(0));
assertEquals(3, xpp.getNamespaceCount(1));
assertEquals(6, xpp.getNamespaceCount(2));
assertEquals(7, xpp.getNamespaceCount(3));
checkNamespace(xpp, 6, "ns1", "y1", true);
assertEquals("y1", xpp.getNamespace("ns1"));
- assertEquals("n2", xpp.getNamespace("ns2"));
- assertEquals("n3", xpp.getNamespace("ns3"));
+ assertEquals("namesp2", xpp.getNamespace("ns2"));
+ assertEquals("namesp3", xpp.getNamespace("ns3"));
xpp.next();
- checkParserStateNs(xpp, 3, xpp.END_TAG, null, 7, "n1", "baz", null, false, -1);
+ checkParserStateNs(xpp, 3, xpp.END_TAG, null, 7, "namesp1", "baz", null, false, -1);
assertEquals("y1", xpp.getNamespace("ns1"));
- assertEquals("n2", xpp.getNamespace("ns2"));
- assertEquals("n3", xpp.getNamespace("ns3"));
+ assertEquals("namesp2", xpp.getNamespace("ns2"));
+ assertEquals("namesp3", xpp.getNamespace("ns3"));
// check that declared namespaces can be accessed for current end tag
assertEquals(3, xpp.getDepth());
@@ -308,9 +308,9 @@
// chekc that namespace is accessible by direct addresssing
assertEquals(null, xpp.getNamespacePrefix(0));
- assertEquals("n", xpp.getNamespaceUri(0));
+ assertEquals("namesp", xpp.getNamespaceUri(0));
assertEquals("ns1", xpp.getNamespacePrefix(1));
- assertEquals("n1", xpp.getNamespaceUri(1));
+ assertEquals("namesp1", xpp.getNamespaceUri(1));
assertEquals("ns1", xpp.getNamespacePrefix(3));
assertEquals("x1", xpp.getNamespaceUri(3));
assertEquals("ns1", xpp.getNamespacePrefix(6));
@@ -323,10 +323,10 @@
assertEquals("x1", xpp.getNamespace("ns1"));
xpp.next();
- checkParserStateNs(xpp, 1, xpp.END_TAG, null, 3, "n", "foo", null, false, -1);
+ checkParserStateNs(xpp, 1, xpp.END_TAG, null, 3, "namesp", "foo", null, false, -1);
- assertEquals("n1", xpp.getNamespace("ns1"));
- assertEquals("n2", xpp.getNamespace("ns2"));
+ assertEquals("namesp1", xpp.getNamespace("ns1"));
+ assertEquals("namesp2", xpp.getNamespace("ns2"));
assertEquals(null, xpp.getNamespace("ns3"));
xpp.next();
1.4 +6 -6 xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestSetInput.java
Index: TestSetInput.java
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestSetInput.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -t -w -r1.3 -r1.4
--- TestSetInput.java 2002/08/01 04:45:36 1.3
+++ TestSetInput.java 2002/09/02 20:19:54 1.4
@@ -123,7 +123,7 @@
assertEquals(null, xpp.getInputEncoding());
checkParserStateNs(xpp, 0, xpp.START_DOCUMENT, null, 0, null, null, null, false, -1);
- assertEquals("read() not called before next()", false, isw.calledRead());
+ //assertEquals("read() not called before next()", false, isw.calledRead());
xpp.nextToken();
assertEquals("read() must be called after next()", true, isw.calledRead());
@@ -141,7 +141,7 @@
xpp.setInput(isw, null );
assertEquals(null, xpp.getInputEncoding());
checkParserStateNs(xpp, 0, xpp.START_DOCUMENT, null, 0, null, null, null, false, -1);
- assertEquals("read() not called before next()", false, isw.calledRead());
+ //assertEquals("read() not called before next()", false, isw.calledRead());
xpp.next();
assertEquals("read() must be called after next()", true, isw.calledRead());