Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18039/src/org/htmlparser/tests
Modified Files:
ParserTest.java FunctionalTests.java
InstanceofPerformanceTest.java ParserTestCase.java
PerformanceTest.java
Log Message:
Remove unused variables and other fixes exposed by turning on compiler warnings.
Index: FunctionalTests.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/FunctionalTests.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** FunctionalTests.java 25 Jan 2004 21:33:12 -0000 1.55
--- FunctionalTests.java 31 Jul 2004 16:42:33 -0000 1.56
***************
*** 86,90 ****
Node node;
for (NodeIterator e= parser.elements();e.hasMoreNodes();) {
! node = (Node)e.nextNode();
if (node instanceof ImageTag) {
parserImgTagCount++;
--- 86,90 ----
Node node;
for (NodeIterator e= parser.elements();e.hasMoreNodes();) {
! node = e.nextNode();
if (node instanceof ImageTag) {
parserImgTagCount++;
Index: InstanceofPerformanceTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/InstanceofPerformanceTest.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** InstanceofPerformanceTest.java 16 Jun 2004 02:17:26 -0000 1.21
--- InstanceofPerformanceTest.java 31 Jul 2004 16:42:33 -0000 1.22
***************
*** 76,80 ****
for (long i=0;i<numTimes;i++) {
for (Enumeration e = formChildren.elements();e.hasMoreElements();) {
! Node node = (Node)e.nextElement();
}
}
--- 76,80 ----
for (long i=0;i<numTimes;i++) {
for (Enumeration e = formChildren.elements();e.hasMoreElements();) {
! e.nextElement();
}
}
***************
*** 88,92 ****
for (long i=0;i<numTimes;i++) {
for (SimpleNodeIterator e = formTag.children();e.hasMoreNodes();) {
! Node node = e.nextNode();
}
}
--- 88,92 ----
for (long i=0;i<numTimes;i++) {
for (SimpleNodeIterator e = formTag.children();e.hasMoreNodes();) {
! e.nextNode();
}
}
Index: ParserTestCase.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/ParserTestCase.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** ParserTestCase.java 17 Jul 2004 13:45:04 -0000 1.51
--- ParserTestCase.java 31 Jul 2004 16:42:33 -0000 1.52
***************
*** 358,362 ****
if (a.isWhitespace ())
continue;
- String actualValue = actualTag.getAttribute (a.getName ());
String expectedValue = expectedTag.getAttribute (a.getName ());
if (null == expectedValue)
--- 358,361 ----
Index: PerformanceTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/PerformanceTest.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** PerformanceTest.java 2 Jan 2004 16:24:55 -0000 1.47
--- PerformanceTest.java 31 Jul 2004 16:42:33 -0000 1.48
***************
*** 27,31 ****
package org.htmlparser.tests;
- import org.htmlparser.Node;
import org.htmlparser.Parser;
import org.htmlparser.util.DefaultParserFeedback;
--- 27,30 ----
***************
*** 58,66 ****
// Create the parser object
parser = new Parser(file,new DefaultParserFeedback());
- Node node;
long start=System.currentTimeMillis();
! for (NodeIterator e = parser.elements();e.hasMoreNodes();) {
! node = e.nextNode();
! }
long elapsedTime=System.currentTimeMillis()-start;
if (i!=0)
--- 57,63 ----
// Create the parser object
parser = new Parser(file,new DefaultParserFeedback());
long start=System.currentTimeMillis();
! for (NodeIterator e = parser.elements();e.hasMoreNodes();)
! e.nextNode();
long elapsedTime=System.currentTimeMillis()-start;
if (i!=0)
***************
*** 86,94 ****
// Create the parser object
parser = new Parser(file,new DefaultParserFeedback());
- Node node;
long start=System.currentTimeMillis();
! for (NodeIterator e = parser.elements();e.hasMoreNodes();) {
! node = e.nextNode();
! }
long elapsedTime=System.currentTimeMillis()-start;
if (i!=0)
--- 83,89 ----
// Create the parser object
parser = new Parser(file,new DefaultParserFeedback());
long start=System.currentTimeMillis();
! for (NodeIterator e = parser.elements();e.hasMoreNodes();)
! e.nextNode();
long elapsedTime=System.currentTimeMillis()-start;
if (i!=0)
Index: ParserTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/ParserTest.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** ParserTest.java 2 Jul 2004 00:49:29 -0000 1.60
--- ParserTest.java 31 Jul 2004 16:42:33 -0000 1.61
***************
*** 558,565 ****
public void testNullUrl() {
- Parser parser;
try
{
! parser = new Parser("http://none.existant.url.org", Parser.noFeedback);
assertTrue("Should have thrown an exception!",false);
}
--- 558,564 ----
public void testNullUrl() {
try
{
! new Parser("http://none.existant.url.org", Parser.noFeedback);
assertTrue("Should have thrown an exception!",false);
}
***************
*** 834,838 ****
nodes = new Node[0];
}
- int count = nodes.length;
assertTrue ("node count", 3 == nodes.length);
}
--- 833,836 ----
|
