sebb 2004/02/08 09:28:39
Modified: src/protocol/http/org/apache/jmeter/protocol/http/parser
HTMLParser.java
Log:
Check that Collection contains only URLs
Revision Changes Path
1.18 +16 -4
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.java
Index: HTMLParser.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- HTMLParser.java 6 Feb 2004 00:05:54 -0000 1.17
+++ HTMLParser.java 8 Feb 2004 17:28:39 -0000 1.18
@@ -64,6 +64,7 @@
import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Comparator;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
@@ -459,16 +460,27 @@
} else {
// Convert both to Sets
expected = new TreeSet(getFile(resultFile)).iterator();
- TreeSet temp = new TreeSet();
+ TreeSet temp = new TreeSet(new Comparator(){
+ public int compare(Object o1, Object o2)
+ {
+ return (o1.toString().compareTo(o2.toString()));
+ }});
while (result.hasNext()){
- temp.add(result.next().toString());
+ temp.add(result.next());
}
result=temp.iterator();
}
while (expected.hasNext()) {
assertTrue("Expecting another
result",result.hasNext());
- assertEquals(expected.next(),
result.next().toString());
+ try
+ {
+ assertEquals(expected.next(),((URL) result.next()).toString());
+ }
+ catch (ClassCastException e)
+ {
+ fail("Expected URL, but got "+e.toString());
+ }
}
assertFalse("Should have reached the end of the
results",result.hasNext());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
