juergen 2003/03/21 05:01:40
Modified:
testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor
TProcessors.java
Log:
improved header comparison (based on new httpClient)
Revision Changes Path
1.48 +9 -16
jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/TProcessors.java
Index: TProcessors.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/TProcessors.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- TProcessors.java 7 Feb 2003 14:59:37 -0000 1.47
+++ TProcessors.java 21 Mar 2003 13:01:40 -0000 1.48
@@ -1121,7 +1121,7 @@
Header headToMatch = (Header) header.next();
boolean oneHeaderMatched = allowHeaders.contains(headToMatch.getName())
|| // head to be compared
- verifyOneHeader(headToMatch, m.getResponseHeaders()); //
compare it
+ verifyOneHeader(headToMatch,
m.getResponseHeader(headToMatch.getName())); //
compare it
if (!oneHeaderMatched){
if (result) {
@@ -1151,18 +1151,11 @@
- private boolean verifyOneHeader(Header h, Header[] headers){
+ private boolean verifyOneHeader(Header expected, Header received){
boolean result = false;
- for (int counter=0; counter<headers.length; counter++) {
- Header temp1 = (Header) headers[counter];
- String hName1 = temp1.getName();
- String hValue1 = temp1.getValue();
- if(hName1.equalsIgnoreCase(h.getName()) &&
- (h.getValue().equals("*") ||
hValue1.equalsIgnoreCase(h.getValue()))){
- result = true;
- //break;
- }
- }
+ result = received != null &&
+ (expected.getValue().equals("*") ||
+
received.getValue().equalsIgnoreCase(expected.getValue()));
return result;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
