[Htmlparser-cvs] htmlparser/src/org/htmlparser/tests/nodeDecoratorTests DecodingNodeTest.java,1.3,1.4 EscapeCharacterRemovingNodeTest.java,1.3,1.4 NonBreakingSpaceConvertingNodeTest.java,1.2,1.3

[<jke...@us...>]

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

Modified Files:
	DecodingNodeTest.java EscapeCharacterRemovingNodeTest.java 
	NonBreakingSpaceConvertingNodeTest.java 
Log Message:
added more support for string node factory, fixed an error in the NodeArray class

Index: DecodingNodeTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/nodeDecoratorTests/DecodingNodeTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DecodingNodeTest.java	29 Jun 2003 12:29:32 -0000	1.3
--- DecodingNodeTest.java	12 Jul 2003 00:33:59 -0000	1.4
***************
*** 31,34 ****
--- 31,35 ----
  package org.htmlparser.tests.nodeDecoratorTests;
  
+ import org.htmlparser.StringNodeFactory;
  import org.htmlparser.tests.ParserTestCase;
  import org.htmlparser.util.NodeIterator;
***************
*** 44,49 ****
  		throws ParserException {
  		StringBuffer decodedContent = new StringBuffer();
  		createParser(STRING_TO_DECODE);
! 		parser.setNodeDecoding(true);  // tell parser to decode StringNodes
  		NodeIterator nodes = parser.elements();
  		
--- 45,52 ----
  		throws ParserException {
  		StringBuffer decodedContent = new StringBuffer();
+ 		StringNodeFactory stringNodeFactory = new StringNodeFactory();
+ 		stringNodeFactory.setNodeDecoding(true);
  		createParser(STRING_TO_DECODE);
! 		parser.setStringNodeFactory(stringNodeFactory); 
  		NodeIterator nodes = parser.elements();
  		

Index: EscapeCharacterRemovingNodeTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/nodeDecoratorTests/EscapeCharacterRemovingNodeTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** EscapeCharacterRemovingNodeTest.java	29 Jun 2003 12:29:32 -0000	1.3
--- EscapeCharacterRemovingNodeTest.java	12 Jul 2003 00:33:59 -0000	1.4
***************
*** 31,34 ****
--- 31,35 ----
  package org.htmlparser.tests.nodeDecoratorTests;
  
+ import org.htmlparser.StringNodeFactory;
  import org.htmlparser.tests.ParserTestCase;
  import org.htmlparser.util.NodeIterator;
***************
*** 43,48 ****
  		throws ParserException {
  		StringBuffer decodedContent = new StringBuffer();
  		createParser(STRING_TO_DECODE);
! 		parser.setEscapeCharacterRemoval(true);  
  		NodeIterator nodes = parser.elements();
  		
--- 44,53 ----
  		throws ParserException {
  		StringBuffer decodedContent = new StringBuffer();
+ 
+ 		StringNodeFactory stringNodeFactory = new StringNodeFactory();
+ 		stringNodeFactory.setEscapeCharacterRemoval(true);
  		createParser(STRING_TO_DECODE);
! 		parser.setStringNodeFactory(stringNodeFactory); 
! 
  		NodeIterator nodes = parser.elements();
  		
***************
*** 87,93 ****
  
  		StringBuffer decodedContent = new StringBuffer();
  		createParser(ENCODED_WORKSHOP_TITLE);
! 		parser.setEscapeCharacterRemoval(true);
! 		parser.setNodeDecoding(true);
  		NodeIterator nodes = parser.elements();
  		
--- 92,102 ----
  
  		StringBuffer decodedContent = new StringBuffer();
+ 		
+ 		StringNodeFactory stringNodeFactory = new StringNodeFactory();
+ 		stringNodeFactory.setNodeDecoding(true);
+ 		stringNodeFactory.setEscapeCharacterRemoval(true);
+ 		
  		createParser(ENCODED_WORKSHOP_TITLE);
! 		parser.setStringNodeFactory(stringNodeFactory);
  		NodeIterator nodes = parser.elements();
  		

Index: NonBreakingSpaceConvertingNodeTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/nodeDecoratorTests/NonBreakingSpaceConvertingNodeTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NonBreakingSpaceConvertingNodeTest.java	29 Jun 2003 12:29:32 -0000	1.2
--- NonBreakingSpaceConvertingNodeTest.java	12 Jul 2003 00:33:59 -0000	1.3
***************
*** 31,34 ****
--- 31,35 ----
  package org.htmlparser.tests.nodeDecoratorTests;
  
+ import org.htmlparser.StringNodeFactory;
  import org.htmlparser.tests.ParserTestCase;
  import org.htmlparser.util.NodeIterator;
***************
*** 43,48 ****
  		throws ParserException {
  		StringBuffer decodedContent = new StringBuffer();
  		createParser(STRING_TO_DECODE);
! 		parser.setNonBreakSpaceConversion(true);  
  		NodeIterator nodes = parser.elements();
  		
--- 44,53 ----
  		throws ParserException {
  		StringBuffer decodedContent = new StringBuffer();
+ 		
+ 		StringNodeFactory stringNodeFactory = new StringNodeFactory();
+ 		stringNodeFactory.setNonBreakSpaceConversion(true);
  		createParser(STRING_TO_DECODE);
! 		parser.setStringNodeFactory(stringNodeFactory); 
! 
  		NodeIterator nodes = parser.elements();