[Htmlparser-cvs] htmlparser/src/org/htmlparser/tests/parserHelperTests CompositeTagScannerHelperTest.java,1.24,1.25 StringParserTest.java,1.40,1.41

[<der...@us...>]

Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/parserHelperTests
In directory sc8-pr-cvs1:/tmp/cvs-serv13708/tests/parserHelperTests

Modified Files:
	CompositeTagScannerHelperTest.java StringParserTest.java 
Log Message:
Clean up the last few failing tests.
*** The bar is green again ***



Index: CompositeTagScannerHelperTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/parserHelperTests/CompositeTagScannerHelperTest.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** CompositeTagScannerHelperTest.java	21 Oct 2003 02:24:00 -0000	1.24
--- CompositeTagScannerHelperTest.java	25 Oct 2003 20:19:44 -0000	1.25
***************
*** 32,35 ****
--- 32,36 ----
  import org.htmlparser.tags.Tag;
  import org.htmlparser.tests.ParserTestCase;
+ import org.htmlparser.util.ParserException;
  
  /**
***************
*** 52,77 ****
  
      protected void setUp() {
- //        helper =
- //            new CompositeTagScannerHelper(null,null,null,null,null,false);
      }
  
!     public void testIsXmlEndTagForRealXml() {
!         fail ("not implemented");
! //        Tag tag = new Tag(
! //            new TagData(
! //                0,0,"something/",""
! //            )
! //        );
! //        assertTrue("should be an xml end tag",helper.isXmlEndTag(tag));
      }
  
!     public void testIsXmlEndTagForFalseMatches() {
!         fail ("not implemented");
! //        Tag tag = new Tag(
! //            new TagData(
! //                0,0,"a href=http://someurl.com/",""
! //            )
! //        );
! //        assertFalse("should not be an xml end tag",helper.isXmlEndTag(tag));
      }
  }
--- 53,74 ----
  
      protected void setUp() {
      }
  
!     public void testIsXmlEndTagForRealXml () throws ParserException
!     {
!         String html = "<something/>";
!         createParser (html);
!         parseAndAssertNodeCount (1);
!         assertTrue("should be a tag", node[0] instanceof Tag);
!         assertTrue("should be an xml end tag", ((Tag)node[0]).isEmptyXmlTag ());
      }
  
!     public void testIsXmlEndTagForFalseMatches () throws ParserException
!     {
!         String html = "<a href=http://someurl.com/>";
!         createParser (html);
!         parseAndAssertNodeCount (1);
!         assertTrue("should be a tag", node[0] instanceof Tag);
!         assertTrue("should not be an xml end tag", !((Tag)node[0]).isEmptyXmlTag ());
      }
  }

Index: StringParserTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/parserHelperTests/StringParserTest.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** StringParserTest.java	21 Oct 2003 02:24:00 -0000	1.40
--- StringParserTest.java	25 Oct 2003 20:19:44 -0000	1.41
***************
*** 89,93 ****
          LinkTag linkNode = (LinkTag)node[1];
          assertEquals("Link is","http://www.adobe.com",linkNode.getLink());
!         assertEquals("Link text is","Adobe \r\nAcrobat Reader",linkNode.getLinkText());
  
          assertTrue("Third node should be a string node",node[2] instanceof StringNode);
--- 89,93 ----
          LinkTag linkNode = (LinkTag)node[1];
          assertEquals("Link is","http://www.adobe.com",linkNode.getLink());
!         assertEquals("Link text is","Adobe \nAcrobat Reader",linkNode.getLinkText());
  
          assertTrue("Third node should be a string node",node[2] instanceof StringNode);