You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2023/06/18 20:50:52 UTC
[httpcomponents-client] 02/02: Corrected matchers for cache unit tests
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a commit to branch 5.3.x
in repository https://gitbox.apache.org/repos/asf/httpcomponents-client.git
commit 77c4bcd1448417e0320842113809e0edf6e50ea0
Author: Oleg Kalnichevski <ol...@apache.org>
AuthorDate: Sun Jun 18 22:50:38 2023 +0200
Corrected matchers for cache unit tests
---
.../org/apache/hc/client5/http/impl/cache/ContainsHeaderMatcher.java | 5 ++---
.../org/apache/hc/client5/http/impl/cache/HttpCacheEntryMatcher.java | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/ContainsHeaderMatcher.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/ContainsHeaderMatcher.java
index 34646005b..d7f786ce5 100644
--- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/ContainsHeaderMatcher.java
+++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/ContainsHeaderMatcher.java
@@ -29,14 +29,13 @@ package org.apache.hc.client5.http.impl.cache;
import java.util.Iterator;
import java.util.Objects;
-import org.apache.hc.client5.http.cache.HttpCacheEntry;
import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.MessageHeaders;
import org.hamcrest.BaseMatcher;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
-public class ContainsHeaderMatcher extends BaseMatcher<HttpCacheEntry> {
+public class ContainsHeaderMatcher extends BaseMatcher<MessageHeaders> {
private final String headerName;
private final Object headerValue;
@@ -65,7 +64,7 @@ public class ContainsHeaderMatcher extends BaseMatcher<HttpCacheEntry> {
description.appendText("contains header ").appendValue(headerValue).appendText(": ").appendValue(headerValue);
}
- public static Matcher<HttpCacheEntry> contains(final String headerName, final Object headerValue) {
+ public static Matcher<MessageHeaders> contains(final String headerName, final Object headerValue) {
return new ContainsHeaderMatcher(headerName, headerValue);
}
diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/HttpCacheEntryMatcher.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/HttpCacheEntryMatcher.java
index accd1cd2b..a9d3b51cf 100644
--- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/HttpCacheEntryMatcher.java
+++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/HttpCacheEntryMatcher.java
@@ -73,7 +73,7 @@ public class HttpCacheEntryMatcher extends BaseMatcher<HttpCacheEntry> {
if (expectedValue.getStatus() != otherValue.getStatus()) {
return false;
}
- if (!headersEqual(expectedValue.requestHeaderIterator(), otherValue.requestHeaderIterator())) {
+ if (!headersEqual(expectedValue.headerIterator(), otherValue.headerIterator())) {
return false;
}
if (!instantEqual(expectedValue.getResponseInstant(), otherValue.getResponseInstant())) {