CVS Update: xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests

aslom       03/07/30 11:51:09

  Modified:    src/java/tests/org/xmlpull/v1/tests TestCdsect.java
                        TestMisc.java
  Log:
  updated tests to check for
  
  Revision  Changes    Path
  1.3       +19 -0     xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestCdsect.java
  
  Index: TestCdsect.java
  ===================================================================
  RCS file: /l/extreme/cvspub/xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestCdsect.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -t -w -r1.2 -r1.3
  --- TestCdsect.java	18 Feb 2003 19:48:10 -0000	1.2
  +++ TestCdsect.java	30 Jul 2003 16:51:08 -0000	1.3
  @@ -76,6 +76,25 @@
           checkParserStateNs(xpp, 0, XmlPullParser.END_DOCUMENT, null, 0, null, null, null, false, -1);
       }
   
  +    public void testCdsectWithComment() throws Exception {
  +        XmlPullParser xpp = factory.newPullParser();
  +        assertEquals(true, xpp.getFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES));
  +
  +        final String XML =
  +            "<t> \n<![CDATA[foo<![CDATA[ \r\n\r]]-->]]>\r</t>";
  +
  +        xpp.setInput(new StringReader(XML));
  +        checkParserStateNs(xpp, 0, XmlPullParser.START_DOCUMENT, null, 0, null, null, null, false, -1);
  +        xpp.next();
  +        checkParserStateNs(xpp, 1, XmlPullParser.START_TAG, null, 0, "", "t", null, false/*empty*/, 0);
  +        xpp.next();
  +        checkParserStateNs(xpp, 1, XmlPullParser.TEXT, null, 0, null, null, " \nfoo<![CDATA[ \n\n]]-->\n", false, -1);
  +        xpp.next();
  +        checkParserStateNs(xpp, 1, XmlPullParser.END_TAG, null, 0, "", "t", null, false, -1);
  +        xpp.next();
  +        checkParserStateNs(xpp, 0, XmlPullParser.END_DOCUMENT, null, 0, null, null, null, false, -1);
  +    }
  +
   
   
   }
  
  
  
  1.20      +29 -0     xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestMisc.java
  
  Index: TestMisc.java
  ===================================================================
  RCS file: /l/extreme/cvspub/xmlpull-api-v1/src/java/tests/org/xmlpull/v1/tests/TestMisc.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -b -t -w -r1.19 -r1.20
  --- TestMisc.java	15 Jun 2003 16:35:09 -0000	1.19
  +++ TestMisc.java	30 Jul 2003 16:51:08 -0000	1.20
  @@ -529,6 +529,35 @@
   
       }
   
  +
  +    public void testEntities() throws Exception {
  +        XmlPullParser pp = factory.newPullParser();
  +        final String XML = "<root><foo>&amp;</foo>\n<foo>&lt;&amp;</foo></root>";
  +        pp.setInput( new StringReader( XML ) );
  +        pp.require( XmlPullParser.START_DOCUMENT, null, null);
  +        pp.next();
  +        pp.require( XmlPullParser.START_TAG, null, "root");
  +
  +        pp.next();
  +        pp.require( XmlPullParser.START_TAG, null, "foo");
  +        pp.next();
  +        pp.require( XmlPullParser.TEXT, null, null);
  +        assertEquals("&", pp.getText());
  +        pp.nextTag();
  +        pp.require( XmlPullParser.END_TAG, null, "foo");
  +
  +        pp.nextTag();
  +        pp.require( XmlPullParser.START_TAG, null, "foo");
  +        pp.next();
  +        pp.require( XmlPullParser.TEXT, null, null);
  +        assertEquals("<&", pp.getText());
  +        pp.nextToken();
  +        pp.require( XmlPullParser.END_TAG, null, "foo");
  +
  +        pp.nextToken();
  +        pp.require( XmlPullParser.END_TAG, null, "root");
  +    }
  +
       public static void main (String[] args) {
           junit.textui.TestRunner.run (new TestSuite(TestMisc.class));
       }
  
  
  


------------------------ Yahoo! Groups Sponsor ---------------------~-->
Buy Ink Cartridges or Refill Kits for Your HP, Epson, Canon or Lexmark
Printer at Myinks.com. Free s/h on orders $50 or more to the US & Canada. http://www.c1tracking.com/l.asp?cid=5511
http://us.click.yahoo.com/sO0ANB/LIdGAA/ySSFAA/2U_rlB/TM
---------------------------------------------------------------------~->

To unsubscribe from this group, send an email to:
[email protected]

 

Your use of Yahoo! Groups is subject to http://docs.yahoo.com/info/terms/