From b8849c60e6b98ea6160a572ff293168e0077b195 Mon Sep 17 00:00:00 2001 From: Arturo Bernal Date: Thu, 5 Feb 2026 20:26:15 +0100 Subject: [PATCH] Replace Hamcrest assertions with JUnit assertions --- httpclient5-cache/pom.xml | 5 - .../http/cache/TestHttpCacheEntryFactory.java | 45 +++---- .../impl/cache/CacheControlGeneratorTest.java | 26 ++-- .../impl/cache/ContainsHeaderMatcher.java | 41 ++---- .../impl/cache/HttpCacheEntryMatcher.java | 100 +++++++-------- ...tAbstractSerializingAsyncCacheStorage.java | 24 ++-- .../TestAbstractSerializingCacheStorage.java | 24 ++-- .../impl/cache/TestBasicHttpAsyncCache.java | 67 +++++----- .../http/impl/cache/TestBasicHttpCache.java | 71 +++++------ .../TestByteArrayCacheEntrySerializer.java | 3 +- .../cache/TestConditionalRequestBuilder.java | 23 ++-- ...TestHttpByteArrayCacheEntrySerializer.java | 26 ++-- .../cache/TestProtocolRecommendations.java | 15 ++- .../impl/cache/TestProtocolRequirements.java | 9 +- .../impl/cache/TestViaCacheGenerator.java | 26 ++-- .../http/schedule/TestConcurrentCountMap.java | 8 +- httpclient5-fluent/pom.xml | 5 - httpclient5-sse/pom.xml | 5 - httpclient5-testing/pom.xml | 5 - ...ractHttpAsyncClientAuthenticationTest.java | 15 +-- .../AbstractHttpAsyncFundamentalsTest.java | 38 +++--- .../async/AbstractHttpAsyncRedirectsTest.java | 11 +- .../AbstractHttpReactiveFundamentalsTest.java | 31 +++-- .../client5/testing/async/TestHttp1Async.java | 40 +++--- .../testing/async/TestHttp1AsyncMinimal.java | 10 +- .../testing/async/TestHttp1Reactive.java | 38 +++--- .../async/TestHttp1ReactiveMinimal.java | 10 +- .../async/TestHttp1RequestReExecution.java | 12 +- .../async/TestHttpAsyncProtocolPolicy.java | 14 +-- .../TestHttpAsyncRequestMultiplexing.java | 10 +- .../sync/TestClientAuthentication.java | 18 +-- .../sync/TestClientRequestReExecution.java | 8 +- .../sync/TestDefaultClientTlsStrategy.java | 15 +-- .../TestFutureRequestExecutionService.java | 7 +- .../client5/testing/sync/TestRedirects.java | 13 +- httpclient5/pom.xml | 5 - .../hc/client5/http/ContentTypeMatcher.java | 33 ++--- .../apache/hc/client5/http/HeaderMatcher.java | 38 ++---- .../hc/client5/http/HeadersMatcher.java | 55 +++----- .../hc/client5/http/NameValuePairMatcher.java | 68 ---------- .../client5/http/NameValuePairsMatcher.java | 77 +++++------- .../methods/TestSimpleMessageBuilders.java | 118 +++++++++--------- .../http/impl/ContentCodingSupportTest.java | 29 ++--- .../impl/auth/TestAuthChallengeParser.java | 98 ++++++++------- .../http/impl/routing/TestRoutingSupport.java | 7 +- .../http/protocol/TestRequestUpgrade.java | 22 ++-- .../http/ssl/TestDistinguishedNameParser.java | 104 ++++++++------- .../hc/client5/http/utils/TestDnsUtils.java | 20 ++- pom.xml | 8 +- 49 files changed, 587 insertions(+), 913 deletions(-) delete mode 100644 httpclient5/src/test/java/org/apache/hc/client5/http/NameValuePairMatcher.java diff --git a/httpclient5-cache/pom.xml b/httpclient5-cache/pom.xml index cae388da85..5c812133b3 100644 --- a/httpclient5-cache/pom.xml +++ b/httpclient5-cache/pom.xml @@ -69,11 +69,6 @@ spymemcached true - - org.hamcrest - hamcrest - test - org.mockito mockito-core diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/cache/TestHttpCacheEntryFactory.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/cache/TestHttpCacheEntryFactory.java index 46092c24da..8a0f277cca 100644 --- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/cache/TestHttpCacheEntryFactory.java +++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/cache/TestHttpCacheEntryFactory.java @@ -47,7 +47,6 @@ import org.apache.hc.core5.http.message.BasicHttpRequest; import org.apache.hc.core5.http.message.BasicHttpResponse; import org.apache.hc.core5.http.message.HeaderGroup; -import org.hamcrest.MatcherAssert; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -99,10 +98,9 @@ void testFilterHopByHopAndConnectionSpecificHeaders() { new BasicHeader(HttpHeaders.CONTENT_TYPE, ContentType.TEXT_PLAIN.toString()), new BasicHeader(HttpHeaders.CONTENT_LENGTH, "111")); final HeaderGroup filteredHeaders = HttpCacheEntryFactory.filterHopByHopHeaders(response); - MatcherAssert.assertThat(filteredHeaders.getHeaders(), HeadersMatcher.same( + HeadersMatcher.assertSame(filteredHeaders.getHeaders(), new BasicHeader("X-custom", "my stuff"), - new BasicHeader(HttpHeaders.CONTENT_TYPE, ContentType.TEXT_PLAIN.toString()) - )); + new BasicHeader(HttpHeaders.CONTENT_TYPE, ContentType.TEXT_PLAIN.toString())); } @Test @@ -113,8 +111,8 @@ void testHeadersAreMergedCorrectly() { final HeaderGroup mergedHeaders = impl.mergeHeaders(entry, response); - MatcherAssert.assertThat(mergedHeaders, ContainsHeaderMatcher.contains("Date", DateUtils.formatStandardDate(responseDate))); - MatcherAssert.assertThat(mergedHeaders, ContainsHeaderMatcher.contains("ETag", "\"etag\"")); + ContainsHeaderMatcher.assertContains(mergedHeaders, "Date", DateUtils.formatStandardDate(responseDate)); + ContainsHeaderMatcher.assertContains(mergedHeaders, "ETag", "\"etag\""); } @Test @@ -132,10 +130,10 @@ void testNewerHeadersReplaceExistingHeaders() { final HeaderGroup mergedHeaders = impl.mergeHeaders(entry, response); - MatcherAssert.assertThat(mergedHeaders, ContainsHeaderMatcher.contains("Date", DateUtils.formatStandardDate(requestDate))); - MatcherAssert.assertThat(mergedHeaders, ContainsHeaderMatcher.contains("ETag", "\"etag\"")); - MatcherAssert.assertThat(mergedHeaders, ContainsHeaderMatcher.contains("Last-Modified", DateUtils.formatStandardDate(responseDate))); - MatcherAssert.assertThat(mergedHeaders, ContainsHeaderMatcher.contains("Cache-Control", "public")); + ContainsHeaderMatcher.assertContains(mergedHeaders, "Date", DateUtils.formatStandardDate(requestDate)); + ContainsHeaderMatcher.assertContains(mergedHeaders, "ETag", "\"etag\""); + ContainsHeaderMatcher.assertContains(mergedHeaders, "Last-Modified", DateUtils.formatStandardDate(responseDate)); + ContainsHeaderMatcher.assertContains(mergedHeaders, "Cache-Control", "public"); } @Test @@ -149,10 +147,10 @@ void testNewHeadersAreAddedByMerge() { final HeaderGroup mergedHeaders = impl.mergeHeaders(entry, response); - MatcherAssert.assertThat(mergedHeaders, ContainsHeaderMatcher.contains("Date", DateUtils.formatStandardDate(requestDate))); - MatcherAssert.assertThat(mergedHeaders, ContainsHeaderMatcher.contains("ETag", "\"etag\"")); - MatcherAssert.assertThat(mergedHeaders, ContainsHeaderMatcher.contains("Last-Modified", DateUtils.formatStandardDate(responseDate))); - MatcherAssert.assertThat(mergedHeaders, ContainsHeaderMatcher.contains("Cache-Control", "public")); + ContainsHeaderMatcher.assertContains(mergedHeaders, "Date", DateUtils.formatStandardDate(requestDate)); + ContainsHeaderMatcher.assertContains(mergedHeaders, "ETag", "\"etag\""); + ContainsHeaderMatcher.assertContains(mergedHeaders, "Last-Modified", DateUtils.formatStandardDate(responseDate)); + ContainsHeaderMatcher.assertContains(mergedHeaders, "Cache-Control", "public"); } @Test @@ -165,7 +163,7 @@ void entryWithMalformedDateIsStillUpdated() { final HeaderGroup mergedHeaders = impl.mergeHeaders(entry, response); - MatcherAssert.assertThat(mergedHeaders, ContainsHeaderMatcher.contains("ETag", "\"new\"")); + ContainsHeaderMatcher.assertContains(mergedHeaders, "ETag", "\"new\""); } @Test @@ -178,7 +176,7 @@ void entryIsStillUpdatedByResponseWithMalformedDate() { final HeaderGroup mergedHeaders = impl.mergeHeaders(entry, response); - MatcherAssert.assertThat(mergedHeaders, ContainsHeaderMatcher.contains("ETag", "\"new\"")); + ContainsHeaderMatcher.assertContains(mergedHeaders, "ETag", "\"new\""); } @Test @@ -215,8 +213,7 @@ void testCreateRootVariantEntry() { final HttpCacheEntry newRoot = impl.createRoot(newEntry, variants); - MatcherAssert.assertThat(newRoot, HttpCacheEntryMatcher.equivalent( - HttpTestUtils.makeCacheEntry( + HttpCacheEntryMatcher.assertEquivalent(newRoot, HttpTestUtils.makeCacheEntry( tenSecondsAgo, oneSecondAgo, Method.GET, @@ -234,7 +231,7 @@ void testCreateRootVariantEntry() { new BasicHeader("X-custom", "my stuff") }, variants - ))); + )); Assertions.assertTrue(newRoot.hasVariants()); Assertions.assertNull(newRoot.getResource()); @@ -261,8 +258,7 @@ void testCreateResourceEntry() { final Resource resource = HttpTestUtils.makeRandomResource(128); final HttpCacheEntry newEntry = impl.create(tenSecondsAgo, oneSecondAgo, host, request, response, resource); - MatcherAssert.assertThat(newEntry, HttpCacheEntryMatcher.equivalent( - HttpTestUtils.makeCacheEntry( + HttpCacheEntryMatcher.assertEquivalent(newEntry, HttpTestUtils.makeCacheEntry( tenSecondsAgo, oneSecondAgo, Method.GET, @@ -279,7 +275,7 @@ void testCreateResourceEntry() { new BasicHeader("X-custom", "my stuff") }, resource - ))); + )); Assertions.assertFalse(newEntry.hasVariants()); } @@ -321,8 +317,7 @@ void testCreateUpdatedResourceEntry() { final HttpCacheEntry updatedEntry = impl.createUpdated(tenSecondsAgo, oneSecondAgo, host, request, response, entry); - MatcherAssert.assertThat(updatedEntry, HttpCacheEntryMatcher.equivalent( - HttpTestUtils.makeCacheEntry( + HttpCacheEntryMatcher.assertEquivalent(updatedEntry, HttpTestUtils.makeCacheEntry( tenSecondsAgo, oneSecondAgo, Method.GET, @@ -341,7 +336,7 @@ void testCreateUpdatedResourceEntry() { new BasicHeader("Cache-Control", "public") }, resource - ))); + )); Assertions.assertFalse(updatedEntry.hasVariants()); } diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/CacheControlGeneratorTest.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/CacheControlGeneratorTest.java index 058ecd89da..33bfc440e1 100644 --- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/CacheControlGeneratorTest.java +++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/CacheControlGeneratorTest.java @@ -26,8 +26,6 @@ */ package org.apache.hc.client5.http.impl.cache; -import static org.hamcrest.MatcherAssert.assertThat; - import org.apache.hc.client5.http.HeaderMatcher; import org.apache.hc.client5.http.cache.RequestCacheControl; import org.junit.jupiter.api.Assertions; @@ -39,7 +37,7 @@ class CacheControlGeneratorTest { @Test void testGenerateRequestCacheControlHeader() { - assertThat(generator.generate( + HeaderMatcher.assertSame(generator.generate( RequestCacheControl.builder() .setMaxAge(12) .setMaxStale(23) @@ -48,10 +46,9 @@ void testGenerateRequestCacheControlHeader() { .setNoStore(true) .setOnlyIfCached(true) .setStaleIfError(56) - .build()), - HeaderMatcher.same("Cache-Control", "max-age=12, max-stale=23, " + - "min-fresh=34, no-cache, no-store, only-if-cached, stale-if-error=56")); - assertThat(generator.generate( + .build()), "Cache-Control", "max-age=12, max-stale=23, " + + "min-fresh=34, no-cache, no-store, only-if-cached, stale-if-error=56"); + HeaderMatcher.assertSame(generator.generate( RequestCacheControl.builder() .setMaxAge(12) .setNoCache(true) @@ -60,20 +57,17 @@ void testGenerateRequestCacheControlHeader() { .setNoStore(true) .setStaleIfError(56) .setOnlyIfCached(true) - .build()), - HeaderMatcher.same("Cache-Control", "max-age=12, max-stale=23, " + - "min-fresh=34, no-cache, no-store, only-if-cached, stale-if-error=56")); - assertThat(generator.generate( + .build()), "Cache-Control", "max-age=12, max-stale=23, " + + "min-fresh=34, no-cache, no-store, only-if-cached, stale-if-error=56"); + HeaderMatcher.assertSame(generator.generate( RequestCacheControl.builder() .setMaxAge(0) - .build()), - HeaderMatcher.same("Cache-Control", "max-age=0")); - assertThat(generator.generate( + .build()), "Cache-Control", "max-age=0"); + HeaderMatcher.assertSame(generator.generate( RequestCacheControl.builder() .setMaxAge(-1) .setMinFresh(10) - .build()), - HeaderMatcher.same("Cache-Control", "min-fresh=10")); + .build()), "Cache-Control", "min-fresh=10"); } @Test 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 0ec9a53b90..a2fa23b9a0 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 @@ -31,41 +31,20 @@ 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; +import org.junit.jupiter.api.Assertions; -public class ContainsHeaderMatcher extends BaseMatcher { +public class ContainsHeaderMatcher { - private final String headerName; - private final Object headerValue; - - public ContainsHeaderMatcher(final String headerName, final Object headerValue) { - this.headerName = headerName; - this.headerValue = headerValue; - } - - @Override - public boolean matches(final Object item) { - if (item instanceof MessageHeaders) { - final MessageHeaders messageHeaders = (MessageHeaders) item; - for (final Iterator
it = messageHeaders.headerIterator(); it.hasNext(); ) { - final Header header = it.next(); - if (headerName.equalsIgnoreCase(header.getName()) && Objects.equals(headerValue, header.getValue())) { - return true; - } + public static void assertContains(final MessageHeaders messageHeaders, + final String headerName, final Object headerValue) { + Assertions.assertNotNull(messageHeaders, "Expected headers"); + for (final Iterator
it = messageHeaders.headerIterator(); it.hasNext(); ) { + final Header header = it.next(); + if (headerName.equalsIgnoreCase(header.getName()) && Objects.equals(headerValue, header.getValue())) { + return; } } - return false; - } - - @Override - public void describeTo(final Description description) { - description.appendText("contains header ").appendValue(headerName).appendText(": ").appendValue(headerValue); - } - - public static Matcher contains(final String headerName, final Object headerValue) { - return new ContainsHeaderMatcher(headerName, headerValue); + Assertions.fail("Expected header '" + headerName + "' with value '" + 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 93c1d6e8f8..d279e465f3 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 @@ -37,58 +37,55 @@ import org.apache.hc.client5.http.cache.Resource; import org.apache.hc.client5.http.cache.ResourceIOException; import org.apache.hc.core5.http.Header; -import org.hamcrest.BaseMatcher; -import org.hamcrest.Description; -import org.hamcrest.Matcher; +import org.junit.jupiter.api.Assertions; -public class HttpCacheEntryMatcher extends BaseMatcher { +public class HttpCacheEntryMatcher { - private final HttpCacheEntry expectedValue; - - public HttpCacheEntryMatcher(final HttpCacheEntry expectedValue) { - this.expectedValue = expectedValue; + public static void assertEquivalent(final HttpCacheEntry actual, final HttpCacheEntry expected) { + try { + Assertions.assertTrue(equivalent(expected, actual), "Expected equivalent cache entry"); + } catch (final ResourceIOException ex) { + Assertions.fail("Failed to read cached resource", ex); + } } - @Override - public boolean matches(final Object item) { - if (item instanceof HttpCacheEntry) { - try { - final HttpCacheEntry otherValue = (HttpCacheEntry) item; - - if (!setEqual(expectedValue.getVariants(), otherValue.getVariants())) { - return false; - } - if (!Objects.equals(expectedValue.getRequestMethod(), otherValue.getRequestMethod())) { - return false; - } - if (!Objects.equals(expectedValue.getRequestURI(), otherValue.getRequestURI())) { - return false; - } - if (!headersEqual(expectedValue.requestHeaderIterator(), otherValue.requestHeaderIterator())) { - return false; - } - if (!instantEqual(expectedValue.getRequestInstant(), otherValue.getRequestInstant())) { - return false; - } - if (expectedValue.getStatus() != otherValue.getStatus()) { - return false; - } - if (!headersEqual(expectedValue.headerIterator(), otherValue.headerIterator())) { - return false; - } - if (!instantEqual(expectedValue.getResponseInstant(), otherValue.getResponseInstant())) { - return false; - } - final Resource expectedResource = expectedValue.getResource(); - final byte[] expectedContent = expectedResource != null ? expectedResource.get() : null; - final Resource otherResource = otherValue.getResource(); - final byte[] otherContent = otherResource != null ? otherResource.get() : null; - return Arrays.equals(expectedContent, otherContent); - } catch (final ResourceIOException ex) { - throw new RuntimeException(ex); - } + private static boolean equivalent(final HttpCacheEntry expectedValue, final HttpCacheEntry otherValue) + throws ResourceIOException { + if (expectedValue == null && otherValue == null) { + return true; + } + if (expectedValue == null || otherValue == null) { + return false; + } + if (!setEqual(expectedValue.getVariants(), otherValue.getVariants())) { + return false; + } + if (!Objects.equals(expectedValue.getRequestMethod(), otherValue.getRequestMethod())) { + return false; + } + if (!Objects.equals(expectedValue.getRequestURI(), otherValue.getRequestURI())) { + return false; + } + if (!headersEqual(expectedValue.requestHeaderIterator(), otherValue.requestHeaderIterator())) { + return false; + } + if (!instantEqual(expectedValue.getRequestInstant(), otherValue.getRequestInstant())) { + return false; + } + if (expectedValue.getStatus() != otherValue.getStatus()) { + return false; + } + if (!headersEqual(expectedValue.headerIterator(), otherValue.headerIterator())) { + return false; } - return false; + if (!instantEqual(expectedValue.getResponseInstant(), otherValue.getResponseInstant())) { + return false; + } + final Resource expectedResource = expectedValue.getResource(); + final byte[] expectedContent = expectedResource != null ? expectedResource.get() : null; + final Resource otherResource = otherValue.getResource(); + final byte[] otherContent = otherResource != null ? otherResource.get() : null; + return Arrays.equals(expectedContent, otherContent); } private static boolean instantEqual(final Instant expected, final Instant other) { @@ -121,13 +118,4 @@ private static boolean setEqual(final Set expected, final Set actual) { return actual.containsAll(expected); } - @Override - public void describeTo(final Description description) { - description.appendValue(expectedValue); - } - - public static Matcher equivalent(final HttpCacheEntry target) { - return new HttpCacheEntryMatcher(target); - } - } diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestAbstractSerializingAsyncCacheStorage.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestAbstractSerializingAsyncCacheStorage.java index a6269eb50b..2dd5a9243f 100644 --- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestAbstractSerializingAsyncCacheStorage.java +++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestAbstractSerializingAsyncCacheStorage.java @@ -26,7 +26,6 @@ */ package org.apache.hc.client5.http.impl.cache; -import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -42,7 +41,6 @@ import org.apache.hc.client5.http.cache.ResourceIOException; import org.apache.hc.core5.concurrent.Cancellable; import org.apache.hc.core5.concurrent.FutureCallback; -import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -116,7 +114,7 @@ void testCacheGetNullEntry() { impl.getEntry(key, cacheEntryCallback); final ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(HttpCacheEntry.class); Mockito.verify(cacheEntryCallback).completed(argumentCaptor.capture()); - assertThat(argumentCaptor.getValue(), CoreMatchers.nullValue()); + Assertions.assertNull(argumentCaptor.getValue()); Mockito.verify(impl).restore(ArgumentMatchers.eq("bar"), ArgumentMatchers.any()); } @@ -136,7 +134,7 @@ void testCacheGet() { final ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(HttpCacheEntry.class); Mockito.verify(cacheEntryCallback).completed(argumentCaptor.capture()); final HttpCacheEntry resultingEntry = argumentCaptor.getValue(); - assertThat(resultingEntry, HttpCacheEntryMatcher.equivalent(value)); + HttpCacheEntryMatcher.assertEquivalent(resultingEntry, value); Mockito.verify(impl).restore(ArgumentMatchers.eq("bar"), ArgumentMatchers.any()); } @@ -154,7 +152,7 @@ void testCacheGetKeyMismatch() { impl.getEntry(key, cacheEntryCallback); final ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(HttpCacheEntry.class); Mockito.verify(cacheEntryCallback).completed(argumentCaptor.capture()); - assertThat(argumentCaptor.getValue(), CoreMatchers.nullValue()); + Assertions.assertNull(argumentCaptor.getValue()); Mockito.verify(impl).restore(ArgumentMatchers.eq("bar"), ArgumentMatchers.any()); } @@ -197,7 +195,7 @@ void testCacheUpdateNullEntry() { }); impl.updateEntry(key, existing -> { - assertThat(existing, CoreMatchers.nullValue()); + Assertions.assertNull(existing); return updatedValue; }, operationCallback); @@ -261,7 +259,7 @@ void testCacheCASUpdateKeyMismatch() throws Exception { }); impl.updateEntry(key, existing -> { - assertThat(existing, CoreMatchers.nullValue()); + Assertions.assertNull(existing); return updatedValue; }, operationCallback); @@ -383,9 +381,9 @@ void testBulkGet() { Mockito.verify(bulkCacheEntryCallback).completed(argumentCaptor.capture()); final Map entryMap = argumentCaptor.getValue(); - assertThat(entryMap, CoreMatchers.notNullValue()); - assertThat(entryMap.get(key1), HttpCacheEntryMatcher.equivalent(value1)); - assertThat(entryMap.get(key2), HttpCacheEntryMatcher.equivalent(value2)); + Assertions.assertNotNull(entryMap); + HttpCacheEntryMatcher.assertEquivalent(entryMap.get(key1), value1); + HttpCacheEntryMatcher.assertEquivalent(entryMap.get(key2), value2); verify(impl, Mockito.times(2)).digestToStorageKey(key1); verify(impl, Mockito.times(2)).digestToStorageKey(key2); @@ -428,9 +426,9 @@ void testBulkGetKeyMismatch() { Mockito.verify(bulkCacheEntryCallback).completed(argumentCaptor.capture()); final Map entryMap = argumentCaptor.getValue(); - assertThat(entryMap, CoreMatchers.notNullValue()); - assertThat(entryMap.get(key1), HttpCacheEntryMatcher.equivalent(value1)); - assertThat(entryMap.get(key2), CoreMatchers.nullValue()); + Assertions.assertNotNull(entryMap); + HttpCacheEntryMatcher.assertEquivalent(entryMap.get(key1), value1); + Assertions.assertNull(entryMap.get(key2)); verify(impl, Mockito.times(2)).digestToStorageKey(key1); verify(impl, Mockito.times(2)).digestToStorageKey(key2); diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestAbstractSerializingCacheStorage.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestAbstractSerializingCacheStorage.java index 8cefa163d7..2df6c658c6 100644 --- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestAbstractSerializingCacheStorage.java +++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestAbstractSerializingCacheStorage.java @@ -26,7 +26,6 @@ */ package org.apache.hc.client5.http.impl.cache; -import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -40,7 +39,6 @@ import org.apache.hc.client5.http.cache.HttpCacheStorageEntry; import org.apache.hc.client5.http.cache.HttpCacheUpdateException; import org.apache.hc.client5.http.cache.ResourceIOException; -import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -91,7 +89,7 @@ void testCacheGetNullEntry() throws Exception { verify(impl).restore("bar"); - assertThat(resultingEntry, CoreMatchers.nullValue()); + Assertions.assertNull(resultingEntry); } @Test @@ -106,7 +104,7 @@ void testCacheGet() throws Exception { verify(impl).restore("bar"); - assertThat(resultingEntry, HttpCacheEntryMatcher.equivalent(value)); + HttpCacheEntryMatcher.assertEquivalent(resultingEntry, value); } @Test @@ -121,7 +119,7 @@ void testCacheGetKeyMismatch() throws Exception { verify(impl).restore("bar"); - assertThat(resultingEntry, CoreMatchers.nullValue()); + Assertions.assertNull(resultingEntry); } @Test @@ -143,7 +141,7 @@ void testCacheUpdateNullEntry() throws Exception { when(impl.getForUpdateCAS("bar")).thenReturn(null); impl.updateEntry(key, existing -> { - assertThat(existing, CoreMatchers.nullValue()); + Assertions.assertNull(existing); return updatedValue; }); @@ -181,7 +179,7 @@ void testCacheCASUpdateKeyMismatch() throws Exception { when(impl.updateCAS(ArgumentMatchers.eq("bar"), ArgumentMatchers.eq("stuff"), ArgumentMatchers.any())).thenReturn(true); impl.updateEntry(key, existing -> { - assertThat(existing, CoreMatchers.nullValue()); + Assertions.assertNull(existing); return updatedValue; }); @@ -252,9 +250,9 @@ void testBulkGet() throws Exception { }); final Map entryMap = impl.getEntries(Arrays.asList(key1, key2)); - assertThat(entryMap, CoreMatchers.notNullValue()); - assertThat(entryMap.get(key1), HttpCacheEntryMatcher.equivalent(value1)); - assertThat(entryMap.get(key2), HttpCacheEntryMatcher.equivalent(value2)); + Assertions.assertNotNull(entryMap); + HttpCacheEntryMatcher.assertEquivalent(entryMap.get(key1), value1); + HttpCacheEntryMatcher.assertEquivalent(entryMap.get(key2), value2); verify(impl, Mockito.times(2)).digestToStorageKey(key1); verify(impl, Mockito.times(2)).digestToStorageKey(key2); @@ -286,9 +284,9 @@ void testBulkGetKeyMismatch() throws Exception { }); final Map entryMap = impl.getEntries(Arrays.asList(key1, key2)); - assertThat(entryMap, CoreMatchers.notNullValue()); - assertThat(entryMap.get(key1), HttpCacheEntryMatcher.equivalent(value1)); - assertThat(entryMap.get(key2), CoreMatchers.nullValue()); + Assertions.assertNotNull(entryMap); + HttpCacheEntryMatcher.assertEquivalent(entryMap.get(key1), value1); + Assertions.assertNull(entryMap.get(key2)); verify(impl, Mockito.times(2)).digestToStorageKey(key1); verify(impl, Mockito.times(2)).digestToStorageKey(key2); diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestBasicHttpAsyncCache.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestBasicHttpAsyncCache.java index 068fadef2a..25a8a3b026 100644 --- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestBasicHttpAsyncCache.java +++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestBasicHttpAsyncCache.java @@ -58,7 +58,6 @@ import org.apache.hc.core5.http.message.BasicHttpResponse; import org.apache.hc.core5.net.URIBuilder; import org.apache.hc.core5.util.ByteArrayBuffer; -import org.hamcrest.MatcherAssert; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -325,10 +324,8 @@ void testGetVariantCacheEntriesReturnsAllVariants() throws Exception { assertNotNull(variantMap); assertEquals(2, variantMap.size()); - MatcherAssert.assertThat(variantMap.get("{accept-encoding=gzip}" + rootKey), - HttpCacheEntryMatcher.equivalent(hit1.entry)); - MatcherAssert.assertThat(variantMap.get("{accept-encoding=identity}" + rootKey), - HttpCacheEntryMatcher.equivalent(hit2.entry)); + HttpCacheEntryMatcher.assertEquivalent(variantMap.get("{accept-encoding=gzip}" + rootKey), hit1.entry); + HttpCacheEntryMatcher.assertEquivalent(variantMap.get("{accept-encoding=identity}" + rootKey), hit2.entry); } @Test @@ -374,15 +371,13 @@ void testUpdateCacheEntry() throws Exception { Assertions.assertEquals(1, backing.map.size()); Assertions.assertSame(updated.entry, backing.map.get(hit1.getEntryKey())); - MatcherAssert.assertThat( + HeadersMatcher.assertSame( updated.entry.getHeaders(), - HeadersMatcher.same( - new BasicHeader("Server", "MockOrigin/1.0"), - new BasicHeader("ETag", "\"etag1\""), - new BasicHeader("Content-Encoding","gzip"), - new BasicHeader("Date", DateUtils.formatStandardDate(now)), - new BasicHeader("Cache-Control", "max-age=3600, public") - )); + new BasicHeader("Server", "MockOrigin/1.0"), + new BasicHeader("ETag", "\"etag1\""), + new BasicHeader("Content-Encoding","gzip"), + new BasicHeader("Date", DateUtils.formatStandardDate(now)), + new BasicHeader("Cache-Control", "max-age=3600, public")); } @Test @@ -430,16 +425,14 @@ void testUpdateVariantCacheEntry() throws Exception { Assertions.assertEquals(2, backing.map.size()); Assertions.assertSame(updated.entry, backing.map.get(hit1.getEntryKey())); - MatcherAssert.assertThat( + HeadersMatcher.assertSame( updated.entry.getHeaders(), - HeadersMatcher.same( - new BasicHeader("Server", "MockOrigin/1.0"), - new BasicHeader("ETag", "\"etag1\""), - new BasicHeader("Content-Encoding","gzip"), - new BasicHeader("Vary","User-Agent"), - new BasicHeader("Date", DateUtils.formatStandardDate(now)), - new BasicHeader("Cache-Control", "max-age=3600, public") - )); + new BasicHeader("Server", "MockOrigin/1.0"), + new BasicHeader("ETag", "\"etag1\""), + new BasicHeader("Content-Encoding","gzip"), + new BasicHeader("Vary","User-Agent"), + new BasicHeader("Date", DateUtils.formatStandardDate(now)), + new BasicHeader("Cache-Control", "max-age=3600, public")); } @Test @@ -486,15 +479,14 @@ void testUpdateCacheEntryTurnsVariant() throws Exception { Assertions.assertNotNull(updated); Assertions.assertEquals(2, backing.map.size()); - MatcherAssert.assertThat( + HeadersMatcher.assertSame( updated.entry.getHeaders(), - HeadersMatcher.same( - new BasicHeader("Server", "MockOrigin/1.0"), - new BasicHeader("ETag", "\"etag1\""), - new BasicHeader("Content-Encoding","gzip"), - new BasicHeader("Date", DateUtils.formatStandardDate(now)), - new BasicHeader("Cache-Control", "max-age=3600, public"), - new BasicHeader("Vary","User-Agent"))); + new BasicHeader("Server", "MockOrigin/1.0"), + new BasicHeader("ETag", "\"etag1\""), + new BasicHeader("Content-Encoding","gzip"), + new BasicHeader("Date", DateUtils.formatStandardDate(now)), + new BasicHeader("Cache-Control", "max-age=3600, public"), + new BasicHeader("Vary","User-Agent")); } @Test @@ -540,15 +532,14 @@ void testStoreFromNegotiatedVariant() throws Exception { Assertions.assertNotNull(hit2); Assertions.assertEquals(3, backing.map.size()); - MatcherAssert.assertThat( + HeadersMatcher.assertSame( hit2.entry.getHeaders(), - HeadersMatcher.same( - new BasicHeader("Server", "MockOrigin/1.0"), - new BasicHeader("ETag", "\"etag1\""), - new BasicHeader("Content-Encoding","gzip"), - new BasicHeader("Vary","User-Agent"), - new BasicHeader("Date", DateUtils.formatStandardDate(now)), - new BasicHeader("Cache-Control", "max-age=3600, public"))); + new BasicHeader("Server", "MockOrigin/1.0"), + new BasicHeader("ETag", "\"etag1\""), + new BasicHeader("Content-Encoding","gzip"), + new BasicHeader("Vary","User-Agent"), + new BasicHeader("Date", DateUtils.formatStandardDate(now)), + new BasicHeader("Cache-Control", "max-age=3600, public")); } @Test diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestBasicHttpCache.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestBasicHttpCache.java index 1fadffaddc..35f78ebe8b 100644 --- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestBasicHttpCache.java +++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestBasicHttpCache.java @@ -57,7 +57,6 @@ import org.apache.hc.core5.http.message.BasicHttpResponse; import org.apache.hc.core5.net.URIBuilder; import org.apache.hc.core5.util.ByteArrayBuffer; -import org.hamcrest.MatcherAssert; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -248,10 +247,8 @@ void testGetVariantCacheEntriesReturnsAllVariants() throws Exception { assertNotNull(variantMap); assertEquals(2, variantMap.size()); - MatcherAssert.assertThat(variantMap.get("{accept-encoding=gzip}" + rootKey), - HttpCacheEntryMatcher.equivalent(hit1.entry)); - MatcherAssert.assertThat(variantMap.get("{accept-encoding=identity}" + rootKey), - HttpCacheEntryMatcher.equivalent(hit2.entry)); + HttpCacheEntryMatcher.assertEquivalent(variantMap.get("{accept-encoding=gzip}" + rootKey), hit1.entry); + HttpCacheEntryMatcher.assertEquivalent(variantMap.get("{accept-encoding=identity}" + rootKey), hit2.entry); } @Test @@ -283,15 +280,14 @@ void testUpdateCacheEntry() throws Exception { Assertions.assertEquals(1, backing.map.size()); Assertions.assertSame(updated.entry, backing.map.get(hit1.getEntryKey())); - MatcherAssert.assertThat( + HeadersMatcher.assertSame( updated.entry.getHeaders(), - HeadersMatcher.same( - new BasicHeader("Server", "MockOrigin/1.0"), - new BasicHeader("ETag", "\"etag1\""), - new BasicHeader("Content-Encoding","gzip"), - new BasicHeader("Date", DateUtils.formatStandardDate(now)), - new BasicHeader("Cache-Control", "max-age=3600, public") - )); + new BasicHeader("Server", "MockOrigin/1.0"), + new BasicHeader("ETag", "\"etag1\""), + new BasicHeader("Content-Encoding","gzip"), + new BasicHeader("Date", DateUtils.formatStandardDate(now)), + new BasicHeader("Cache-Control", "max-age=3600, public") + ); } @Test @@ -325,16 +321,15 @@ void testUpdateVariantCacheEntry() throws Exception { Assertions.assertEquals(2, backing.map.size()); Assertions.assertSame(updated.entry, backing.map.get(hit1.getEntryKey())); - MatcherAssert.assertThat( + HeadersMatcher.assertSame( updated.entry.getHeaders(), - HeadersMatcher.same( - new BasicHeader("Server", "MockOrigin/1.0"), - new BasicHeader("ETag", "\"etag1\""), - new BasicHeader("Content-Encoding","gzip"), - new BasicHeader("Vary","User-Agent"), - new BasicHeader("Date", DateUtils.formatStandardDate(now)), - new BasicHeader("Cache-Control", "max-age=3600, public") - )); + new BasicHeader("Server", "MockOrigin/1.0"), + new BasicHeader("ETag", "\"etag1\""), + new BasicHeader("Content-Encoding","gzip"), + new BasicHeader("Vary","User-Agent"), + new BasicHeader("Date", DateUtils.formatStandardDate(now)), + new BasicHeader("Cache-Control", "max-age=3600, public") + ); } @Test @@ -367,15 +362,15 @@ void testUpdateCacheEntryTurnsVariant() throws Exception { Assertions.assertNotNull(updated); Assertions.assertEquals(2, backing.map.size()); - MatcherAssert.assertThat( + HeadersMatcher.assertSame( updated.entry.getHeaders(), - HeadersMatcher.same( - new BasicHeader("Server", "MockOrigin/1.0"), - new BasicHeader("ETag", "\"etag1\""), - new BasicHeader("Content-Encoding","gzip"), - new BasicHeader("Date", DateUtils.formatStandardDate(now)), - new BasicHeader("Cache-Control", "max-age=3600, public"), - new BasicHeader("Vary","User-Agent"))); + new BasicHeader("Server", "MockOrigin/1.0"), + new BasicHeader("ETag", "\"etag1\""), + new BasicHeader("Content-Encoding","gzip"), + new BasicHeader("Date", DateUtils.formatStandardDate(now)), + new BasicHeader("Cache-Control", "max-age=3600, public"), + new BasicHeader("Vary","User-Agent") + ); } @Test @@ -408,15 +403,15 @@ void testStoreFromNegotiatedVariant() throws Exception { Assertions.assertNotNull(hit2); Assertions.assertEquals(3, backing.map.size()); - MatcherAssert.assertThat( + HeadersMatcher.assertSame( hit2.entry.getHeaders(), - HeadersMatcher.same( - new BasicHeader("Server", "MockOrigin/1.0"), - new BasicHeader("ETag", "\"etag1\""), - new BasicHeader("Content-Encoding","gzip"), - new BasicHeader("Vary","User-Agent"), - new BasicHeader("Date", DateUtils.formatStandardDate(now)), - new BasicHeader("Cache-Control", "max-age=3600, public"))); + new BasicHeader("Server", "MockOrigin/1.0"), + new BasicHeader("ETag", "\"etag1\""), + new BasicHeader("Content-Encoding","gzip"), + new BasicHeader("Vary","User-Agent"), + new BasicHeader("Date", DateUtils.formatStandardDate(now)), + new BasicHeader("Cache-Control", "max-age=3600, public") + ); } @Test diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestByteArrayCacheEntrySerializer.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestByteArrayCacheEntrySerializer.java index c46e047020..5ff4497f3d 100644 --- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestByteArrayCacheEntrySerializer.java +++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestByteArrayCacheEntrySerializer.java @@ -27,7 +27,6 @@ package org.apache.hc.client5.http.impl.cache; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -252,7 +251,7 @@ public void readWriteVerify(final HttpCacheStorageEntry writeEntry) throws Excep final HttpCacheStorageEntry readEntry = impl.deserialize(bytes); // compare assertEquals(readEntry.getKey(), writeEntry.getKey()); - assertThat(readEntry.getContent(), HttpCacheEntryMatcher.equivalent(writeEntry.getContent())); + HttpCacheEntryMatcher.assertEquivalent(readEntry.getContent(), writeEntry.getContent()); } diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestConditionalRequestBuilder.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestConditionalRequestBuilder.java index 3e1e080295..dc11a292b8 100644 --- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestConditionalRequestBuilder.java +++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestConditionalRequestBuilder.java @@ -29,6 +29,7 @@ import java.time.Instant; import java.util.ArrayList; import java.util.Arrays; +import java.util.HashSet; import java.util.Iterator; import java.util.List; @@ -45,8 +46,6 @@ import org.apache.hc.core5.http.message.BasicHttpRequest; import org.apache.hc.core5.http.message.MessageSupport; import org.apache.hc.core5.http.support.BasicRequestBuilder; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -83,11 +82,10 @@ void testBuildConditionalRequestWithLastModified() { Assertions.assertEquals(theUri, newRequest.getRequestUri()); Assertions.assertEquals(2, newRequest.getHeaders().length); - MatcherAssert.assertThat( + HeadersMatcher.assertSame( newRequest.getHeaders(), - HeadersMatcher.same( - new BasicHeader("Accept-Encoding", "gzip"), - new BasicHeader("If-Modified-Since", lastModified))); + new BasicHeader("Accept-Encoding", "gzip"), + new BasicHeader("If-Modified-Since", lastModified)); } @Test @@ -136,12 +134,11 @@ void testBuildConditionalRequestWithETag() { Assertions.assertEquals(theMethod, newRequest.getMethod()); Assertions.assertEquals(theUri, newRequest.getRequestUri()); - MatcherAssert.assertThat( + HeadersMatcher.assertSame( newRequest.getHeaders(), - HeadersMatcher.same( - new BasicHeader("Accept-Encoding", "gzip"), - new BasicHeader("If-None-Match", theETag), - new BasicHeader("If-Modified-Since", DateUtils.formatStandardDate(now)))); + new BasicHeader("Accept-Encoding", "gzip"), + new BasicHeader("If-None-Match", theETag), + new BasicHeader("If-Modified-Since", DateUtils.formatStandardDate(now))); } @Test @@ -272,7 +269,9 @@ void testBuildConditionalRequestFromVariants() { while (it.hasNext()) { etags.add(ETag.parse(it.next())); } - MatcherAssert.assertThat(etags, Matchers.containsInAnyOrder(etag1, etag2, etag3)); + Assertions.assertEquals( + new HashSet<>(Arrays.asList(etag1, etag2, etag3)), + new HashSet<>(etags)); } } diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestHttpByteArrayCacheEntrySerializer.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestHttpByteArrayCacheEntrySerializer.java index faeb68d2bc..9a70a70baf 100644 --- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestHttpByteArrayCacheEntrySerializer.java +++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestHttpByteArrayCacheEntrySerializer.java @@ -44,8 +44,6 @@ import org.apache.hc.core5.http.HttpStatus; import org.apache.hc.core5.http.message.BasicHeader; import org.apache.hc.core5.util.ByteArrayBuffer; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -72,8 +70,8 @@ void testSimpleSerializeAndDeserialize() throws Exception { final byte[] serialized = httpCacheEntrySerializer.serialize(storageEntry); final HttpCacheStorageEntry deserialized = httpCacheEntrySerializer.deserialize(serialized); - MatcherAssert.assertThat(deserialized.getKey(), Matchers.equalTo(storageEntry.getKey())); - MatcherAssert.assertThat(deserialized.getContent(), HttpCacheEntryMatcher.equivalent(storageEntry.getContent())); + Assertions.assertEquals(storageEntry.getKey(), deserialized.getKey()); + HttpCacheEntryMatcher.assertEquivalent(deserialized.getContent(), storageEntry.getContent()); } @Test @@ -89,8 +87,8 @@ void testSerializeAndDeserializeLargeContent() throws Exception { final byte[] serialized = httpCacheEntrySerializer.serialize(storageEntry); final HttpCacheStorageEntry deserialized = httpCacheEntrySerializer.deserialize(serialized); - MatcherAssert.assertThat(deserialized.getKey(), Matchers.equalTo(storageEntry.getKey())); - MatcherAssert.assertThat(deserialized.getContent(), HttpCacheEntryMatcher.equivalent(storageEntry.getContent())); + Assertions.assertEquals(storageEntry.getKey(), deserialized.getKey()); + HttpCacheEntryMatcher.assertEquivalent(deserialized.getContent(), storageEntry.getContent()); } /** @@ -331,8 +329,8 @@ void noHeadersTest() throws Exception { final byte[] serialized = httpCacheEntrySerializer.serialize(storageEntry); final HttpCacheStorageEntry deserialized = httpCacheEntrySerializer.deserialize(serialized); - MatcherAssert.assertThat(deserialized.getKey(), Matchers.equalTo(storageEntry.getKey())); - MatcherAssert.assertThat(deserialized.getContent(), HttpCacheEntryMatcher.equivalent(storageEntry.getContent())); + Assertions.assertEquals(storageEntry.getKey(), deserialized.getKey()); + HttpCacheEntryMatcher.assertEquivalent(deserialized.getContent(), storageEntry.getContent()); } /** @@ -349,8 +347,8 @@ void emptyBodyTest() throws Exception { final byte[] serialized = httpCacheEntrySerializer.serialize(storageEntry); final HttpCacheStorageEntry deserialized = httpCacheEntrySerializer.deserialize(serialized); - MatcherAssert.assertThat(deserialized.getKey(), Matchers.equalTo(storageEntry.getKey())); - MatcherAssert.assertThat(deserialized.getContent(), HttpCacheEntryMatcher.equivalent(storageEntry.getContent())); + Assertions.assertEquals(storageEntry.getKey(), deserialized.getKey()); + HttpCacheEntryMatcher.assertEquivalent(deserialized.getContent(), storageEntry.getContent()); } /** @@ -367,8 +365,8 @@ void noBodyTest() throws Exception { final byte[] serialized = httpCacheEntrySerializer.serialize(storageEntry); final HttpCacheStorageEntry deserialized = httpCacheEntrySerializer.deserialize(serialized); - MatcherAssert.assertThat(deserialized.getKey(), Matchers.equalTo(storageEntry.getKey())); - MatcherAssert.assertThat(deserialized.getContent(), HttpCacheEntryMatcher.equivalent(storageEntry.getContent())); + Assertions.assertEquals(storageEntry.getKey(), deserialized.getKey()); + HttpCacheEntryMatcher.assertEquivalent(deserialized.getContent(), storageEntry.getContent()); } /** @@ -390,8 +388,8 @@ void testSimpleVariantMap() throws Exception { final byte[] serialized = httpCacheEntrySerializer.serialize(storageEntry); final HttpCacheStorageEntry deserialized = httpCacheEntrySerializer.deserialize(serialized); - MatcherAssert.assertThat(deserialized.getKey(), Matchers.equalTo(storageEntry.getKey())); - MatcherAssert.assertThat(deserialized.getContent(), HttpCacheEntryMatcher.equivalent(storageEntry.getContent())); + Assertions.assertEquals(storageEntry.getKey(), deserialized.getKey()); + HttpCacheEntryMatcher.assertEquivalent(deserialized.getContent(), storageEntry.getContent()); } /** diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRecommendations.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRecommendations.java index 3355aa469a..d85abff194 100644 --- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRecommendations.java +++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRecommendations.java @@ -55,7 +55,6 @@ import org.apache.hc.core5.http.message.BasicClassicHttpRequest; import org.apache.hc.core5.http.message.BasicClassicHttpResponse; import org.apache.hc.core5.http.message.MessageSupport; -import org.hamcrest.MatcherAssert; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; @@ -336,7 +335,7 @@ private void testDoesNotModifyHeaderOnResponses(final String headerName) throws final ClassicHttpResponse result = execute(request); - MatcherAssert.assertThat(result, ContainsHeaderMatcher.contains(headerName, headerValue)); + ContainsHeaderMatcher.assertContains(result, headerName, headerValue); } private void testDoesNotModifyHeaderOnRequests(final String headerName) throws Exception { @@ -588,7 +587,7 @@ void testUsesLastModifiedDateForCacheConditionalRequests() throws Exception { Mockito.verify(mockExecChain, Mockito.times(2)).proceed(reqCapture.capture(), Mockito.any()); final ClassicHttpRequest captured = reqCapture.getValue(); - MatcherAssert.assertThat(captured, ContainsHeaderMatcher.contains("If-Modified-Since", lmDate)); + ContainsHeaderMatcher.assertContains(captured, "If-Modified-Since", lmDate); } @Test @@ -620,8 +619,8 @@ void testUsesBothLastModifiedAndETagForConditionalRequestsIfAvailable() throws E final ClassicHttpRequest captured = reqCapture.getValue(); - MatcherAssert.assertThat(captured, ContainsHeaderMatcher.contains("If-Modified-Since", lmDate)); - MatcherAssert.assertThat(captured, ContainsHeaderMatcher.contains("If-None-Match", etag)); + ContainsHeaderMatcher.assertContains(captured, "If-Modified-Since", lmDate); + ContainsHeaderMatcher.assertContains(captured, "If-None-Match", etag); } @Test @@ -801,9 +800,9 @@ void testResponseToExistingVariantsUpdatesEntry() throws Exception { final ClassicHttpResponse result2 = execute(req4); assertEquals(HttpStatus.SC_OK, result1.getCode()); - MatcherAssert.assertThat(result1, ContainsHeaderMatcher.contains("ETag", "\"etag1\"")); - MatcherAssert.assertThat(result1, ContainsHeaderMatcher.contains("Date", DateUtils.formatStandardDate(now))); - MatcherAssert.assertThat(result2, ContainsHeaderMatcher.contains("Date", DateUtils.formatStandardDate(now))); + ContainsHeaderMatcher.assertContains(result1, "ETag", "\"etag1\""); + ContainsHeaderMatcher.assertContains(result1, "Date", DateUtils.formatStandardDate(now)); + ContainsHeaderMatcher.assertContains(result2, "Date", DateUtils.formatStandardDate(now)); } @Test diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRequirements.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRequirements.java index 3b1659f033..4a11becef3 100644 --- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRequirements.java +++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRequirements.java @@ -26,8 +26,6 @@ */ package org.apache.hc.client5.http.impl.cache; -import static org.hamcrest.MatcherAssert.assertThat; - import java.io.IOException; import java.io.InputStream; import java.net.SocketTimeoutException; @@ -59,7 +57,6 @@ import org.apache.hc.core5.http.message.BasicClassicHttpResponse; import org.apache.hc.core5.http.message.BasicHeader; import org.apache.hc.core5.http.message.MessageSupport; -import org.hamcrest.MatcherAssert; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -236,7 +233,7 @@ void testUnknownHeadersOnRequestsAreForwarded() throws Exception { final ArgumentCaptor reqCapture = ArgumentCaptor.forClass(ClassicHttpRequest.class); Mockito.verify(mockExecChain).proceed(reqCapture.capture(), Mockito.any()); final ClassicHttpRequest forwarded = reqCapture.getValue(); - MatcherAssert.assertThat(forwarded, ContainsHeaderMatcher.contains("X-Unknown-Header", "blahblah")); + ContainsHeaderMatcher.assertContains(forwarded, "X-Unknown-Header", "blahblah"); } @Test @@ -245,7 +242,7 @@ void testUnknownHeadersOnResponsesAreForwarded() throws Exception { Mockito.when(mockExecChain.proceed(Mockito.any(), Mockito.any())).thenReturn(originResponse); final ClassicHttpResponse result = execute(request); - MatcherAssert.assertThat(result, ContainsHeaderMatcher.contains("X-Unknown-Header", "blahblah")); + ContainsHeaderMatcher.assertContains(result, "X-Unknown-Header", "blahblah"); } @Test @@ -655,7 +652,7 @@ void testAgeHeaderPopulatedFromCacheEntryCurrentAge() throws Exception { // We then add the "residentTime" which is "now - responseTime", // which is the current time minus the time the cache entry was created. In this case, that is 8 seconds. // So, the total age is "corrected_initial_age" + "residentTime" = 2 + 8 = 10 seconds. - assertThat(result, ContainsHeaderMatcher.contains("Age", "10")); + ContainsHeaderMatcher.assertContains(result, "Age", "10"); } @Test diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestViaCacheGenerator.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestViaCacheGenerator.java index ffc62841b9..907e6fa35e 100644 --- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestViaCacheGenerator.java +++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestViaCacheGenerator.java @@ -28,8 +28,6 @@ import org.apache.hc.core5.http.HttpVersion; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -53,22 +51,14 @@ void testViaValueGeneration() { @Test void testViaValueLookup() { - MatcherAssert.assertThat(impl.lookup(HttpVersion.DEFAULT), - Matchers.startsWith("1.1 localhost (Apache-HttpClient/")); - MatcherAssert.assertThat(impl.lookup(HttpVersion.HTTP_1_0), - Matchers.startsWith("1.0 localhost (Apache-HttpClient/")); - MatcherAssert.assertThat(impl.lookup(HttpVersion.HTTP_1_1), - Matchers.startsWith("1.1 localhost (Apache-HttpClient/")); - MatcherAssert.assertThat(impl.lookup(HttpVersion.HTTP_2), - Matchers.startsWith("2.0 localhost (Apache-HttpClient/")); - MatcherAssert.assertThat(impl.lookup(HttpVersion.HTTP_2_0), - Matchers.startsWith("2.0 localhost (Apache-HttpClient/")); - MatcherAssert.assertThat(impl.lookup(HttpVersion.HTTP_1_0), - Matchers.startsWith("1.0 localhost (Apache-HttpClient/")); - MatcherAssert.assertThat(impl.lookup(HttpVersion.HTTP_1_1), - Matchers.startsWith("1.1 localhost (Apache-HttpClient/")); - MatcherAssert.assertThat(impl.lookup(HttpVersion.HTTP_2_0), - Matchers.startsWith("2.0 localhost (Apache-HttpClient/")); + Assertions.assertTrue(impl.lookup(HttpVersion.DEFAULT).startsWith("1.1 localhost (Apache-HttpClient/")); + Assertions.assertTrue(impl.lookup(HttpVersion.HTTP_1_0).startsWith("1.0 localhost (Apache-HttpClient/")); + Assertions.assertTrue(impl.lookup(HttpVersion.HTTP_1_1).startsWith("1.1 localhost (Apache-HttpClient/")); + Assertions.assertTrue(impl.lookup(HttpVersion.HTTP_2).startsWith("2.0 localhost (Apache-HttpClient/")); + Assertions.assertTrue(impl.lookup(HttpVersion.HTTP_2_0).startsWith("2.0 localhost (Apache-HttpClient/")); + Assertions.assertTrue(impl.lookup(HttpVersion.HTTP_1_0).startsWith("1.0 localhost (Apache-HttpClient/")); + Assertions.assertTrue(impl.lookup(HttpVersion.HTTP_1_1).startsWith("1.1 localhost (Apache-HttpClient/")); + Assertions.assertTrue(impl.lookup(HttpVersion.HTTP_2_0).startsWith("2.0 localhost (Apache-HttpClient/")); Assertions.assertEquals(3, impl.internalCache.size()); } diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/schedule/TestConcurrentCountMap.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/schedule/TestConcurrentCountMap.java index 175867d1a8..61c75b4413 100644 --- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/schedule/TestConcurrentCountMap.java +++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/schedule/TestConcurrentCountMap.java @@ -26,9 +26,7 @@ */ package org.apache.hc.client5.http.schedule; -import static org.hamcrest.MatcherAssert.assertThat; - -import org.hamcrest.CoreMatchers; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; class TestConcurrentCountMap @@ -42,10 +40,10 @@ class TestConcurrentCountMap void testBasics() { map.increaseCount(IDENTIFIER); map.increaseCount(IDENTIFIER); - assertThat(map.getCount(IDENTIFIER), CoreMatchers.equalTo(2)); + Assertions.assertEquals(2, map.getCount(IDENTIFIER)); map.resetCount(IDENTIFIER); - assertThat(map.getCount(IDENTIFIER), CoreMatchers.equalTo(0)); + Assertions.assertEquals(0, map.getCount(IDENTIFIER)); } } diff --git a/httpclient5-fluent/pom.xml b/httpclient5-fluent/pom.xml index 1eae60d171..453ca0660c 100644 --- a/httpclient5-fluent/pom.xml +++ b/httpclient5-fluent/pom.xml @@ -70,11 +70,6 @@ junit-jupiter test - - org.hamcrest - hamcrest - test - org.mockito mockito-core diff --git a/httpclient5-sse/pom.xml b/httpclient5-sse/pom.xml index 61f2bb5bb6..6a390c4086 100644 --- a/httpclient5-sse/pom.xml +++ b/httpclient5-sse/pom.xml @@ -70,11 +70,6 @@ junit-jupiter test - - org.hamcrest - hamcrest - test - org.mockito mockito-core diff --git a/httpclient5-testing/pom.xml b/httpclient5-testing/pom.xml index 42176ccb5a..caccb2b348 100644 --- a/httpclient5-testing/pom.xml +++ b/httpclient5-testing/pom.xml @@ -93,11 +93,6 @@ junit-platform-launcher test - - org.hamcrest - hamcrest - test - org.mockito mockito-core diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractHttpAsyncClientAuthenticationTest.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractHttpAsyncClientAuthenticationTest.java index 76f455f640..6e4544f9ed 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractHttpAsyncClientAuthenticationTest.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractHttpAsyncClientAuthenticationTest.java @@ -26,8 +26,6 @@ */ package org.apache.hc.client5.testing.async; -import static org.hamcrest.MatcherAssert.assertThat; - import java.security.SecureRandom; import java.util.Arrays; import java.util.Collections; @@ -73,7 +71,6 @@ import org.apache.hc.core5.http.config.RegistryBuilder; import org.apache.hc.core5.http.support.BasicResponseBuilder; import org.apache.hc.core5.net.URIAuthority; -import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; @@ -314,9 +311,8 @@ void testBasicAuthenticationCredentialsCachingByPathPrefix() throws Exception { // There should be only single auth strategy call for all successful message exchanges Mockito.verify(authStrategy).select(Mockito.any(), Mockito.any(), Mockito.any()); - assertThat( - responseQueue.stream().map(HttpResponse::getCode).collect(Collectors.toList()), - CoreMatchers.equalTo(Arrays.asList(401, 200, 200, 200, 200))); + Assertions.assertEquals(Arrays.asList(401, 200, 200, 200, 200), + responseQueue.stream().map(HttpResponse::getCode).collect(Collectors.toList())); responseQueue.clear(); authCache.clear(); @@ -338,9 +334,8 @@ void testBasicAuthenticationCredentialsCachingByPathPrefix() throws Exception { // There should be an auth strategy call for all successful message exchanges Mockito.verify(authStrategy, Mockito.times(3)).select(Mockito.any(), Mockito.any(), Mockito.any()); - assertThat( - responseQueue.stream().map(HttpResponse::getCode).collect(Collectors.toList()), - CoreMatchers.equalTo(Arrays.asList(401, 200, 401, 200, 401, 200))); + Assertions.assertEquals(Arrays.asList(401, 200, 401, 200, 401, 200), + responseQueue.stream().map(HttpResponse::getCode).collect(Collectors.toList())); } @Test @@ -357,7 +352,7 @@ void testAuthenticationUserinfoInRequestFailure() throws Exception { .setPath("/") .build(), context, null); final ExecutionException exception = Assertions.assertThrows(ExecutionException.class, () -> future.get()); - assertThat(exception.getCause(), CoreMatchers.instanceOf(ProtocolException.class)); + Assertions.assertInstanceOf(ProtocolException.class, exception.getCause()); } @Test diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractHttpAsyncFundamentalsTest.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractHttpAsyncFundamentalsTest.java index fdc2fbc654..e9c00f7283 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractHttpAsyncFundamentalsTest.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractHttpAsyncFundamentalsTest.java @@ -26,8 +26,6 @@ */ package org.apache.hc.client5.testing.async; -import static org.hamcrest.MatcherAssert.assertThat; - import java.util.LinkedList; import java.util.Queue; import java.util.Random; @@ -55,7 +53,7 @@ import org.apache.hc.core5.http.nio.entity.BasicAsyncEntityConsumer; import org.apache.hc.core5.http.nio.support.BasicRequestProducer; import org.apache.hc.core5.http.nio.support.BasicResponseConsumer; -import org.hamcrest.CoreMatchers; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; abstract class AbstractHttpAsyncFundamentalsTest extends AbstractIntegrationTestBase { @@ -84,11 +82,11 @@ void testSequentialGetRequests() throws Exception { .setPath("/random/2048") .build(), null); final SimpleHttpResponse response = future.get(); - assertThat(response, CoreMatchers.notNullValue()); - assertThat(response.getCode(), CoreMatchers.equalTo(200)); + Assertions.assertNotNull(response); + Assertions.assertEquals(200, response.getCode()); final String body = response.getBodyText(); - assertThat(body, CoreMatchers.notNullValue()); - assertThat(body.length(), CoreMatchers.equalTo(2048)); + Assertions.assertNotNull(body); + Assertions.assertEquals(2048, body.length()); } } @@ -104,10 +102,10 @@ void testSequentialHeadRequests() throws Exception { .setPath("/random/2048") .build(), null); final SimpleHttpResponse response = future.get(); - assertThat(response, CoreMatchers.notNullValue()); - assertThat(response.getCode(), CoreMatchers.equalTo(200)); + Assertions.assertNotNull(response); + Assertions.assertEquals(200, response.getCode()); final String body = response.getBodyText(); - assertThat(body, CoreMatchers.nullValue()); + Assertions.assertNull(body); } } @@ -125,11 +123,11 @@ void testSequentialPostRequests() throws Exception { AsyncEntityProducers.create(b1, ContentType.APPLICATION_OCTET_STREAM)), new BasicResponseConsumer<>(new BasicAsyncEntityConsumer()), HttpClientContext.create(), null); final Message responseMessage = future.get(); - assertThat(responseMessage, CoreMatchers.notNullValue()); + Assertions.assertNotNull(responseMessage); final HttpResponse response = responseMessage.getHead(); - assertThat(response.getCode(), CoreMatchers.equalTo(200)); + Assertions.assertEquals(200, response.getCode()); final byte[] b2 = responseMessage.getBody(); - assertThat(b1, CoreMatchers.equalTo(b2)); + Assertions.assertArrayEquals(b1, b2); } } @@ -156,11 +154,11 @@ void testConcurrentPostRequests() throws Exception { while (!queue.isEmpty()) { final Future> future = queue.remove(); final Message responseMessage = future.get(); - assertThat(responseMessage, CoreMatchers.notNullValue()); + Assertions.assertNotNull(responseMessage); final HttpResponse response = responseMessage.getHead(); - assertThat(response.getCode(), CoreMatchers.equalTo(200)); + Assertions.assertEquals(200, response.getCode()); final byte[] b2 = responseMessage.getBody(); - assertThat(b1, CoreMatchers.equalTo(b2)); + Assertions.assertArrayEquals(b1, b2); } } @@ -217,7 +215,7 @@ public void cancelled() { }); } - assertThat(countDownLatch.await(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit()), CoreMatchers.equalTo(true)); + Assertions.assertTrue(countDownLatch.await(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit())); executorService.shutdownNow(); executorService.awaitTermination(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit()); @@ -227,7 +225,7 @@ public void cancelled() { if (response == null) { break; } - assertThat(response.getCode(), CoreMatchers.equalTo(200)); + Assertions.assertEquals(200, response.getCode()); } } @@ -242,8 +240,8 @@ void testBadRequest() throws Exception { .setPath("/random/boom") .build(), null); final SimpleHttpResponse response = future.get(); - assertThat(response, CoreMatchers.notNullValue()); - assertThat(response.getCode(), CoreMatchers.equalTo(400)); + Assertions.assertNotNull(response); + Assertions.assertEquals(400, response.getCode()); } } diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractHttpAsyncRedirectsTest.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractHttpAsyncRedirectsTest.java index 61ff411b0b..d91f0eba39 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractHttpAsyncRedirectsTest.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractHttpAsyncRedirectsTest.java @@ -26,8 +26,6 @@ */ package org.apache.hc.client5.testing.async; -import static org.hamcrest.MatcherAssert.assertThat; - import java.net.InetSocketAddress; import java.net.URI; import java.util.concurrent.ExecutionException; @@ -64,7 +62,6 @@ import org.apache.hc.core5.http.protocol.HttpCoreContext; import org.apache.hc.core5.net.URIBuilder; import org.apache.hc.core5.util.TimeValue; -import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -328,7 +325,7 @@ void testMaxRedirectCheck() throws Exception { .build(), null); future.get(); }); - assertThat(exception.getCause(), CoreMatchers.instanceOf(RedirectException.class)); + Assertions.assertInstanceOf(RedirectException.class, exception.getCause()); } @Test @@ -355,7 +352,7 @@ void testCircularRedirect() throws Exception { .build(), null); future.get(); }); - assertThat(exception.getCause(), CoreMatchers.instanceOf(CircularRedirectException.class)); + Assertions.assertInstanceOf(CircularRedirectException.class, exception.getCause()); } @Test @@ -510,7 +507,7 @@ void testRejectBogusRedirectLocation() throws Exception { .build(), null); future.get(); }); - assertThat(exception.getCause(), CoreMatchers.instanceOf(HttpException.class)); + Assertions.assertInstanceOf(HttpException.class, exception.getCause()); } @Test @@ -538,7 +535,7 @@ void testRejectInvalidRedirectLocation() throws Exception { .build(), null); future.get(); }); - assertThat(exception.getCause(), CoreMatchers.instanceOf(ProtocolException.class)); + Assertions.assertInstanceOf(ProtocolException.class, exception.getCause()); } @Test diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractHttpReactiveFundamentalsTest.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractHttpReactiveFundamentalsTest.java index ad8e93d9ba..b855cb76cf 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractHttpReactiveFundamentalsTest.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractHttpReactiveFundamentalsTest.java @@ -27,8 +27,6 @@ package org.apache.hc.client5.testing.async; import static java.util.concurrent.TimeUnit.MILLISECONDS; -import static org.hamcrest.MatcherAssert.assertThat; - import java.io.ByteArrayOutputStream; import java.nio.ByteBuffer; import java.nio.channels.Channels; @@ -71,7 +69,6 @@ import org.apache.hc.core5.testing.reactive.ReactiveEchoProcessor; import org.apache.hc.core5.testing.reactive.ReactiveRandomProcessor; import org.apache.hc.core5.util.TextUtils; -import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; @@ -97,12 +94,12 @@ void testSequentialGetRequests() throws Exception { client.execute(AsyncRequestBuilder.get(target + "/random/2048").build(), consumer, null); final Message> response = consumer.getResponseFuture().get(); - assertThat(response, CoreMatchers.notNullValue()); - assertThat(response.getHead().getCode(), CoreMatchers.equalTo(200)); + Assertions.assertNotNull(response); + Assertions.assertEquals(200, response.getHead().getCode()); final String body = publisherToString(response.getBody()); - assertThat(body, CoreMatchers.notNullValue()); - assertThat(body.length(), CoreMatchers.equalTo(2048)); + Assertions.assertNotNull(body); + Assertions.assertEquals(2048, body.length()); } } @@ -120,11 +117,11 @@ void testSequentialHeadRequests() throws Exception { client.execute(AsyncRequestBuilder.head(target + "/random/2048").build(), consumer, null); final Message> response = consumer.getResponseFuture().get(); - assertThat(response, CoreMatchers.notNullValue()); - assertThat(response.getHead().getCode(), CoreMatchers.equalTo(200)); + Assertions.assertNotNull(response); + Assertions.assertEquals(200, response.getHead().getCode()); final String body = publisherToString(response.getBody()); - assertThat(body, CoreMatchers.nullValue()); + Assertions.assertNull(body); } } @@ -150,11 +147,11 @@ void testSequentialPostRequests() throws Exception { final Future>> responseFuture = consumer.getResponseFuture(); final Message> responseMessage = responseFuture.get(); - assertThat(responseMessage, CoreMatchers.notNullValue()); + Assertions.assertNotNull(responseMessage); final HttpResponse response = responseMessage.getHead(); - assertThat(response.getCode(), CoreMatchers.equalTo(200)); + Assertions.assertEquals(200, response.getCode()); final byte[] b2 = publisherToByteArray(responseMessage.getBody()); - assertThat(b1, CoreMatchers.equalTo(b2)); + Assertions.assertArrayEquals(b1, b2); } } @@ -256,7 +253,7 @@ public void cancelled() { }); } - assertThat(countDownLatch.await(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit()), CoreMatchers.equalTo(true)); + Assertions.assertTrue(countDownLatch.await(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit())); executorService.shutdownNow(); executorService.awaitTermination(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit()); @@ -266,7 +263,7 @@ public void cancelled() { if (response == null) { break; } - assertThat(response.getHead().getCode(), CoreMatchers.equalTo(200)); + Assertions.assertEquals(200, response.getHead().getCode()); } } @@ -284,8 +281,8 @@ void testBadRequest() throws Exception { final Future>> future = consumer.getResponseFuture(); final HttpResponse response = future.get().getHead(); - assertThat(response, CoreMatchers.notNullValue()); - assertThat(response.getCode(), CoreMatchers.equalTo(400)); + Assertions.assertNotNull(response); + Assertions.assertEquals(400, response.getCode()); } static String publisherToString(final Publisher publisher) throws Exception { diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1Async.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1Async.java index b6fdf02a46..700c631b36 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1Async.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1Async.java @@ -26,8 +26,6 @@ */ package org.apache.hc.client5.testing.async; -import static org.hamcrest.MatcherAssert.assertThat; - import java.util.Random; import java.util.concurrent.Executors; import java.util.concurrent.Future; @@ -47,7 +45,7 @@ import org.apache.hc.core5.http.HttpHeaders; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.URIScheme; -import org.hamcrest.CoreMatchers; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; @@ -81,11 +79,11 @@ public void testSequentialGetRequestsCloseConnection(final int concurrentConns) .addHeader(HttpHeaders.CONNECTION, HeaderElements.CLOSE) .build(), null); final SimpleHttpResponse response = future.get(); - assertThat(response, CoreMatchers.notNullValue()); - assertThat(response.getCode(), CoreMatchers.equalTo(200)); + Assertions.assertNotNull(response); + Assertions.assertEquals(200, response.getCode()); final String body = response.getBodyText(); - assertThat(body, CoreMatchers.notNullValue()); - assertThat(body.length(), CoreMatchers.equalTo(2048)); + Assertions.assertNotNull(body); + Assertions.assertEquals(2048, body.length()); } } @@ -103,11 +101,11 @@ void testSharedPool() throws Exception { .setPath("/random/2048") .build(), null); final SimpleHttpResponse response1 = future1.get(); - assertThat(response1, CoreMatchers.notNullValue()); - assertThat(response1.getCode(), CoreMatchers.equalTo(200)); + Assertions.assertNotNull(response1); + Assertions.assertEquals(200, response1.getCode()); final String body1 = response1.getBodyText(); - assertThat(body1, CoreMatchers.notNullValue()); - assertThat(body1.length(), CoreMatchers.equalTo(2048)); + Assertions.assertNotNull(body1); + Assertions.assertEquals(2048, body1.length()); try (final CloseableHttpAsyncClient httpclient2 = HttpAsyncClients.custom() @@ -121,11 +119,11 @@ void testSharedPool() throws Exception { .setPath("/random/2048") .build(), null); final SimpleHttpResponse response2 = future2.get(); - assertThat(response2, CoreMatchers.notNullValue()); - assertThat(response2.getCode(), CoreMatchers.equalTo(200)); + Assertions.assertNotNull(response2); + Assertions.assertEquals(200, response2.getCode()); final String body2 = response2.getBodyText(); - assertThat(body2, CoreMatchers.notNullValue()); - assertThat(body2.length(), CoreMatchers.equalTo(2048)); + Assertions.assertNotNull(body2); + Assertions.assertEquals(2048, body2.length()); } final Future future3 = client.execute( @@ -134,11 +132,11 @@ void testSharedPool() throws Exception { .setPath("/random/2048") .build(), null); final SimpleHttpResponse response3 = future3.get(); - assertThat(response3, CoreMatchers.notNullValue()); - assertThat(response3.getCode(), CoreMatchers.equalTo(200)); + Assertions.assertNotNull(response3); + Assertions.assertEquals(200, response3.getCode()); final String body3 = response3.getBodyText(); - assertThat(body3, CoreMatchers.notNullValue()); - assertThat(body3.length(), CoreMatchers.equalTo(2048)); + Assertions.assertNotNull(body3); + Assertions.assertEquals(2048, body3.length()); } @Test @@ -196,8 +194,8 @@ void testRequestCancellation() throws Exception { .setPath("/random/1000") .build(), null); final SimpleHttpResponse response = future.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit()); - assertThat(response, CoreMatchers.notNullValue()); - assertThat(response.getCode(), CoreMatchers.equalTo(200)); + Assertions.assertNotNull(response); + Assertions.assertEquals(200, response.getCode()); } } finally { diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1AsyncMinimal.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1AsyncMinimal.java index ba90657c3d..5148836537 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1AsyncMinimal.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1AsyncMinimal.java @@ -26,8 +26,6 @@ */ package org.apache.hc.client5.testing.async; -import static org.hamcrest.MatcherAssert.assertThat; - import java.util.LinkedList; import java.util.Queue; import java.util.Random; @@ -49,7 +47,7 @@ import org.apache.hc.core5.http.nio.entity.BasicAsyncEntityConsumer; import org.apache.hc.core5.http.nio.support.BasicRequestProducer; import org.apache.hc.core5.http.nio.support.BasicResponseConsumer; -import org.hamcrest.CoreMatchers; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; abstract class TestHttp1AsyncMinimal extends AbstractHttpAsyncFundamentalsTest { @@ -85,11 +83,11 @@ void testConcurrentPostRequestsSameEndpoint() throws Exception { while (!queue.isEmpty()) { final Future> future = queue.remove(); final Message responseMessage = future.get(); - assertThat(responseMessage, CoreMatchers.notNullValue()); + Assertions.assertNotNull(responseMessage); final HttpResponse response = responseMessage.getHead(); - assertThat(response.getCode(), CoreMatchers.equalTo(200)); + Assertions.assertEquals(200, response.getCode()); final byte[] b2 = responseMessage.getBody(); - assertThat(b1, CoreMatchers.equalTo(b2)); + Assertions.assertArrayEquals(b1, b2); endpoint.releaseAndReuse(); } } finally { diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1Reactive.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1Reactive.java index 66d1e6c37f..6e51310baa 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1Reactive.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1Reactive.java @@ -27,8 +27,6 @@ package org.apache.hc.client5.testing.async; import static java.util.concurrent.TimeUnit.MILLISECONDS; -import static org.hamcrest.MatcherAssert.assertThat; - import java.nio.ByteBuffer; import org.apache.hc.client5.http.async.methods.SimpleHttpRequest; @@ -50,7 +48,7 @@ import org.apache.hc.core5.reactive.ReactiveResponseConsumer; import org.apache.hc.core5.reactive.ReactiveServerExchangeHandler; import org.apache.hc.core5.testing.reactive.ReactiveRandomProcessor; -import org.hamcrest.CoreMatchers; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; import org.junit.jupiter.params.ParameterizedTest; @@ -89,11 +87,11 @@ public void testSequentialGetRequestsCloseConnection(final int concurrentConns) client.execute(request, consumer, null); final Message> response = consumer.getResponseFuture().get(); - assertThat(response, CoreMatchers.notNullValue()); - assertThat(response.getHead().getCode(), CoreMatchers.equalTo(200)); + Assertions.assertNotNull(response); + Assertions.assertEquals(200, response.getHead().getCode()); final String body = publisherToString(response.getBody()); - assertThat(body, CoreMatchers.notNullValue()); - assertThat(body.length(), CoreMatchers.equalTo(2048)); + Assertions.assertNotNull(body); + Assertions.assertEquals(2048, body.length()); } } @@ -114,12 +112,12 @@ void testSharedPool() throws Exception { client.execute(request1, consumer1, null); final Message> response1 = consumer1.getResponseFuture().get(); - assertThat(response1, CoreMatchers.notNullValue()); - assertThat(response1.getHead(), CoreMatchers.notNullValue()); - assertThat(response1.getHead().getCode(), CoreMatchers.equalTo(200)); + Assertions.assertNotNull(response1); + Assertions.assertNotNull(response1.getHead()); + Assertions.assertEquals(200, response1.getHead().getCode()); final String body1 = publisherToString(response1.getBody()); - assertThat(body1, CoreMatchers.notNullValue()); - assertThat(body1.length(), CoreMatchers.equalTo(2048)); + Assertions.assertNotNull(body1); + Assertions.assertEquals(2048, body1.length()); try (final CloseableHttpAsyncClient httpclient2 = HttpAsyncClients.custom() @@ -133,11 +131,11 @@ void testSharedPool() throws Exception { httpclient2.execute(request2, consumer2, null); final Message> response2 = consumer2.getResponseFuture().get(); - assertThat(response2, CoreMatchers.notNullValue()); - assertThat(response2.getHead().getCode(), CoreMatchers.equalTo(200)); + Assertions.assertNotNull(response2); + Assertions.assertEquals(200, response2.getHead().getCode()); final String body2 = publisherToString(response2.getBody()); - assertThat(body2, CoreMatchers.notNullValue()); - assertThat(body2.length(), CoreMatchers.equalTo(2048)); + Assertions.assertNotNull(body2); + Assertions.assertEquals(2048, body2.length()); } final AsyncRequestProducer request3 = AsyncRequestBuilder.get(target + "/random/2048").build(); @@ -146,11 +144,11 @@ void testSharedPool() throws Exception { client.execute(request3, consumer3, null); final Message> response3 = consumer3.getResponseFuture().get(); - assertThat(response3, CoreMatchers.notNullValue()); - assertThat(response3.getHead().getCode(), CoreMatchers.equalTo(200)); + Assertions.assertNotNull(response3); + Assertions.assertEquals(200, response3.getHead().getCode()); final String body3 = publisherToString(response3.getBody()); - assertThat(body3, CoreMatchers.notNullValue()); - assertThat(body3.length(), CoreMatchers.equalTo(2048)); + Assertions.assertNotNull(body3); + Assertions.assertEquals(2048, body3.length()); } } diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1ReactiveMinimal.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1ReactiveMinimal.java index 113b51188f..2feea1fa7b 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1ReactiveMinimal.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1ReactiveMinimal.java @@ -26,8 +26,6 @@ */ package org.apache.hc.client5.testing.async; -import static org.hamcrest.MatcherAssert.assertThat; - import java.util.LinkedList; import java.util.Queue; import java.util.Random; @@ -51,7 +49,7 @@ import org.apache.hc.core5.http.nio.support.BasicResponseConsumer; import org.apache.hc.core5.reactive.ReactiveServerExchangeHandler; import org.apache.hc.core5.testing.reactive.ReactiveEchoProcessor; -import org.hamcrest.CoreMatchers; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; abstract class TestHttp1ReactiveMinimal extends AbstractHttpReactiveFundamentalsTest { @@ -88,11 +86,11 @@ void testConcurrentPostRequestsSameEndpoint() throws Exception { while (!queue.isEmpty()) { final Future> future = queue.remove(); final Message responseMessage = future.get(); - assertThat(responseMessage, CoreMatchers.notNullValue()); + Assertions.assertNotNull(responseMessage); final HttpResponse response = responseMessage.getHead(); - assertThat(response.getCode(), CoreMatchers.equalTo(200)); + Assertions.assertEquals(200, response.getCode()); final byte[] b2 = responseMessage.getBody(); - assertThat(b1, CoreMatchers.equalTo(b2)); + Assertions.assertArrayEquals(b1, b2); endpoint.releaseAndReuse(); } } finally { diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1RequestReExecution.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1RequestReExecution.java index 4b00ee0202..ca741c0b67 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1RequestReExecution.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1RequestReExecution.java @@ -26,8 +26,6 @@ */ package org.apache.hc.client5.testing.async; -import static org.hamcrest.MatcherAssert.assertThat; - import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicInteger; @@ -43,7 +41,7 @@ import org.apache.hc.core5.http.HttpStatus; import org.apache.hc.core5.http.URIScheme; import org.apache.hc.core5.util.TimeValue; -import org.hamcrest.CoreMatchers; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -90,8 +88,8 @@ void testGiveUpAfterOneRetry() throws Exception { .setPath("/random/2048") .build(), null); final SimpleHttpResponse response = future.get(); - assertThat(response, CoreMatchers.notNullValue()); - assertThat(response.getCode(), CoreMatchers.equalTo(HttpStatus.SC_SERVICE_UNAVAILABLE)); + Assertions.assertNotNull(response); + Assertions.assertEquals(HttpStatus.SC_SERVICE_UNAVAILABLE, response.getCode()); } @Test @@ -109,8 +107,8 @@ void testDoNotGiveUpEasily() throws Exception { .setPath("/random/2048") .build(), null); final SimpleHttpResponse response = future.get(); - assertThat(response, CoreMatchers.notNullValue()); - assertThat(response.getCode(), CoreMatchers.equalTo(HttpStatus.SC_OK)); + Assertions.assertNotNull(response); + Assertions.assertEquals(HttpStatus.SC_OK, response.getCode()); } } diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttpAsyncProtocolPolicy.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttpAsyncProtocolPolicy.java index 4c0613c08a..5bc7e38d8e 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttpAsyncProtocolPolicy.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttpAsyncProtocolPolicy.java @@ -26,8 +26,6 @@ */ package org.apache.hc.client5.testing.async; -import static org.hamcrest.MatcherAssert.assertThat; - import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicReference; @@ -42,7 +40,7 @@ import org.apache.hc.core5.http.ProtocolVersion; import org.apache.hc.core5.http.URIScheme; import org.apache.hc.core5.http2.HttpVersionPolicy; -import org.hamcrest.CoreMatchers; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; abstract class TestHttpAsyncProtocolPolicy extends AbstractIntegrationTestBase { @@ -74,12 +72,12 @@ void testRequestContext() throws Exception { .setPath("/random/2048") .build(), null); final SimpleHttpResponse response = future.get(); - assertThat(response, CoreMatchers.notNullValue()); - assertThat(response.getCode(), CoreMatchers.equalTo(200)); + Assertions.assertNotNull(response); + Assertions.assertEquals(200, response.getCode()); final String body = response.getBodyText(); - assertThat(body, CoreMatchers.notNullValue()); - assertThat(body.length(), CoreMatchers.equalTo(2048)); - assertThat(versionRef.get(), CoreMatchers.equalTo(version)); + Assertions.assertNotNull(body); + Assertions.assertEquals(2048, body.length()); + Assertions.assertEquals(version, versionRef.get()); } } diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttpAsyncRequestMultiplexing.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttpAsyncRequestMultiplexing.java index e387e8e854..5c801a9f3c 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttpAsyncRequestMultiplexing.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttpAsyncRequestMultiplexing.java @@ -26,8 +26,6 @@ */ package org.apache.hc.client5.testing.async; -import static org.hamcrest.MatcherAssert.assertThat; - import java.util.LinkedList; import java.util.Queue; import java.util.Random; @@ -49,7 +47,7 @@ import org.apache.hc.core5.http.nio.support.BasicRequestProducer; import org.apache.hc.core5.http.nio.support.BasicResponseConsumer; import org.apache.hc.core5.http2.HttpVersionPolicy; -import org.hamcrest.CoreMatchers; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; abstract class TestHttpAsyncRequestMultiplexing extends AbstractIntegrationTestBase { @@ -87,11 +85,11 @@ void testConcurrentPostRequests() throws Exception { while (!queue.isEmpty()) { final Future> future = queue.remove(); final Message responseMessage = future.get(); - assertThat(responseMessage, CoreMatchers.notNullValue()); + Assertions.assertNotNull(responseMessage); final HttpResponse response = responseMessage.getHead(); - assertThat(response.getCode(), CoreMatchers.equalTo(200)); + Assertions.assertEquals(200, response.getCode()); final byte[] b2 = responseMessage.getBody(); - assertThat(b1, CoreMatchers.equalTo(b2)); + Assertions.assertArrayEquals(b1, b2); } } diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestClientAuthentication.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestClientAuthentication.java index 84eabde95e..b22c00ee78 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestClientAuthentication.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestClientAuthentication.java @@ -26,8 +26,6 @@ */ package org.apache.hc.client5.testing.sync; -import static org.hamcrest.MatcherAssert.assertThat; - import java.io.ByteArrayInputStream; import java.nio.charset.StandardCharsets; import java.security.SecureRandom; @@ -84,7 +82,6 @@ import org.apache.hc.core5.http.protocol.HttpContext; import org.apache.hc.core5.http.support.BasicResponseBuilder; import org.apache.hc.core5.net.URIAuthority; -import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; @@ -342,9 +339,8 @@ void testBasicAuthenticationCredentialsCaching() throws Exception { Mockito.verify(authStrategy).select(Mockito.any(), Mockito.any(), Mockito.any()); - assertThat( - responseQueue.stream().map(HttpResponse::getCode).collect(Collectors.toList()), - CoreMatchers.equalTo(Arrays.asList(401, 200, 200, 200, 200, 200))); + Assertions.assertEquals(Arrays.asList(401, 200, 200, 200, 200, 200), + responseQueue.stream().map(HttpResponse::getCode).collect(Collectors.toList())); } @Test @@ -385,9 +381,8 @@ void testBasicAuthenticationCredentialsCachingByPathPrefix() throws Exception { // There should be only single auth strategy call for all successful message exchanges Mockito.verify(authStrategy).select(Mockito.any(), Mockito.any(), Mockito.any()); - assertThat( - responseQueue.stream().map(HttpResponse::getCode).collect(Collectors.toList()), - CoreMatchers.equalTo(Arrays.asList(401, 200, 200, 200, 200))); + Assertions.assertEquals(Arrays.asList(401, 200, 200, 200, 200), + responseQueue.stream().map(HttpResponse::getCode).collect(Collectors.toList())); responseQueue.clear(); authCache.clear(); @@ -407,9 +402,8 @@ void testBasicAuthenticationCredentialsCachingByPathPrefix() throws Exception { // There should be an auth strategy call for all successful message exchanges Mockito.verify(authStrategy, Mockito.times(2)).select(Mockito.any(), Mockito.any(), Mockito.any()); - assertThat( - responseQueue.stream().map(HttpResponse::getCode).collect(Collectors.toList()), - CoreMatchers.equalTo(Arrays.asList(200, 401, 200, 200, 401, 200))); + Assertions.assertEquals(Arrays.asList(200, 401, 200, 200, 401, 200), + responseQueue.stream().map(HttpResponse::getCode).collect(Collectors.toList())); } @Test diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestClientRequestReExecution.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestClientRequestReExecution.java index 30b36b82d4..8e9cf807fc 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestClientRequestReExecution.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestClientRequestReExecution.java @@ -26,8 +26,6 @@ */ package org.apache.hc.client5.testing.sync; -import static org.hamcrest.MatcherAssert.assertThat; - import java.util.concurrent.atomic.AtomicInteger; import org.apache.hc.client5.http.impl.DefaultHttpRequestRetryStrategy; import org.apache.hc.client5.http.protocol.HttpClientContext; @@ -45,7 +43,7 @@ import org.apache.hc.core5.http.io.entity.EntityUtils; import org.apache.hc.core5.http.io.support.ClassicRequestBuilder; import org.apache.hc.core5.util.TimeValue; -import org.hamcrest.CoreMatchers; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -91,7 +89,7 @@ void testGiveUpAfterOneRetry() throws Exception { EntityUtils.consume(r.getEntity()); return r; }); - assertThat(response.getCode(), CoreMatchers.equalTo(HttpStatus.SC_SERVICE_UNAVAILABLE)); + Assertions.assertEquals(HttpStatus.SC_SERVICE_UNAVAILABLE, response.getCode()); } @Test @@ -112,7 +110,7 @@ void testDoNotGiveUpEasily() throws Exception { EntityUtils.consume(r.getEntity()); return r; }); - assertThat(response.getCode(), CoreMatchers.equalTo(HttpStatus.SC_OK)); + Assertions.assertEquals(HttpStatus.SC_OK, response.getCode()); } } diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestDefaultClientTlsStrategy.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestDefaultClientTlsStrategy.java index 74305be447..5f43e6c902 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestDefaultClientTlsStrategy.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestDefaultClientTlsStrategy.java @@ -27,8 +27,6 @@ package org.apache.hc.client5.testing.sync; -import static org.hamcrest.MatcherAssert.assertThat; - import java.io.IOException; import java.net.InetAddress; import java.net.Socket; @@ -55,9 +53,6 @@ import org.apache.hc.core5.io.CloseMode; import org.apache.hc.core5.ssl.SSLContexts; import org.apache.hc.core5.ssl.TrustStrategy; -import org.hamcrest.CoreMatchers; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -335,9 +330,7 @@ void testWeakCiphersDisabledByDefault() { for (final String cipherSuite : weakCiphersSuites) { final Exception exception = Assertions.assertThrows(Exception.class, () -> testWeakCipherDisabledByDefault(cipherSuite)); - assertThat(exception, CoreMatchers.anyOf( - CoreMatchers.instanceOf(IOException.class), - CoreMatchers.instanceOf(IllegalArgumentException.class))); + Assertions.assertTrue(exception instanceof IOException || exception instanceof IllegalArgumentException); } } @@ -392,7 +385,7 @@ void testHostnameVerificationClient() throws Exception { null, context); final SSLSession session = upgradedSocket.getSession(); - MatcherAssert.assertThat(Objects.toString(session.getPeerPrincipal()), Matchers.startsWith("CN=localhost")); + Assertions.assertTrue(Objects.toString(session.getPeerPrincipal()).startsWith("CN=localhost")); } final HttpHost target2 = new HttpHost("https", InetAddress.getLoopbackAddress(), "some-other-host", server.getLocalPort()); @@ -425,7 +418,7 @@ void testHostnameVerificationClient() throws Exception { null, context); final SSLSession session = upgradedSocket.getSession(); - MatcherAssert.assertThat(Objects.toString(session.getPeerPrincipal()), Matchers.startsWith("CN=localhost")); + Assertions.assertTrue(Objects.toString(session.getPeerPrincipal()).startsWith("CN=localhost")); } } @@ -455,7 +448,7 @@ void testHostnameVerificationBuiltIn() throws Exception { null, context); final SSLSession session = upgradedSocket.getSession(); - MatcherAssert.assertThat(Objects.toString(session.getPeerPrincipal()), Matchers.startsWith("CN=localhost")); + Assertions.assertTrue(Objects.toString(session.getPeerPrincipal()).startsWith("CN=localhost")); } final HttpHost target2 = new HttpHost("https", InetAddress.getLoopbackAddress(), "some-other-host", server.getLocalPort()); diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestFutureRequestExecutionService.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestFutureRequestExecutionService.java index 6f302c3ff7..7f7c81d2ae 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestFutureRequestExecutionService.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestFutureRequestExecutionService.java @@ -26,8 +26,6 @@ */ package org.apache.hc.client5.testing.sync; -import static org.hamcrest.MatcherAssert.assertThat; - import java.net.InetAddress; import java.util.LinkedList; import java.util.Queue; @@ -54,7 +52,6 @@ import org.apache.hc.core5.http.impl.bootstrap.HttpServer; import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap; import org.apache.hc.core5.http.io.HttpClientResponseHandler; -import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; @@ -118,9 +115,7 @@ void shouldCancel() { new HttpGet(uri), HttpClientContext.create(), new OkidokiHandler()); task.cancel(true); final Exception exception = Assertions.assertThrows(Exception.class, task::get); - assertThat(exception, CoreMatchers.anyOf( - CoreMatchers.instanceOf(CancellationException.class), - CoreMatchers.instanceOf(ExecutionException.class))); + Assertions.assertTrue(exception instanceof CancellationException || exception instanceof ExecutionException); } @Test diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestRedirects.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestRedirects.java index e074f715fb..511c980041 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestRedirects.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestRedirects.java @@ -26,8 +26,6 @@ */ package org.apache.hc.client5.testing.sync; -import static org.hamcrest.MatcherAssert.assertThat; - import java.io.IOException; import java.io.InterruptedIOException; import java.net.ConnectException; @@ -83,7 +81,6 @@ import org.apache.hc.core5.io.CloseMode; import org.apache.hc.core5.net.URIBuilder; import org.apache.hc.core5.util.TimeValue; -import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -513,7 +510,7 @@ void testRejectBogusRedirectLocation() throws Exception { final ClientProtocolException exception = Assertions.assertThrows(ClientProtocolException.class, () -> client.execute(target, httpget, response -> null)); - assertThat(exception.getCause(), CoreMatchers.instanceOf(HttpException.class)); + Assertions.assertInstanceOf(HttpException.class, exception.getCause()); } @Test @@ -537,7 +534,7 @@ void testRejectInvalidRedirectLocation() throws Exception { final ClientProtocolException exception = Assertions.assertThrows(ClientProtocolException.class, () -> client.execute(target, httpget, response -> null)); - assertThat(exception.getCause(), CoreMatchers.instanceOf(ProtocolException.class)); + Assertions.assertInstanceOf(ProtocolException.class, exception.getCause()); } @Test @@ -647,9 +644,9 @@ public void handle(final ClassicHttpRequest request, Assertions.assertEquals(new URIBuilder().setHttpHost(target).setPath("/random/100").build(), reqWrapper.getUri()); - assertThat(values.poll(), CoreMatchers.equalTo("gzip, deflate, lz4-framed, lz4-block, bzip2, pack200, deflate64, x-gzip")); - assertThat(values.poll(), CoreMatchers.equalTo("gzip, deflate, lz4-framed, lz4-block, bzip2, pack200, deflate64, x-gzip")); - assertThat(values.poll(), CoreMatchers.nullValue()); + Assertions.assertEquals("gzip, deflate, lz4-framed, lz4-block, bzip2, pack200, deflate64, x-gzip", values.poll()); + Assertions.assertEquals("gzip, deflate, lz4-framed, lz4-block, bzip2, pack200, deflate64, x-gzip", values.poll()); + Assertions.assertNull(values.poll()); } @Test diff --git a/httpclient5/pom.xml b/httpclient5/pom.xml index 561ca52cc4..3097aca27a 100644 --- a/httpclient5/pom.xml +++ b/httpclient5/pom.xml @@ -99,11 +99,6 @@ junit-platform-launcher test - - org.hamcrest - hamcrest - test - org.mockito mockito-core diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/ContentTypeMatcher.java b/httpclient5/src/test/java/org/apache/hc/client5/http/ContentTypeMatcher.java index 79ce6d1840..954d0199b2 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/ContentTypeMatcher.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/ContentTypeMatcher.java @@ -27,34 +27,15 @@ package org.apache.hc.client5.http; import org.apache.hc.core5.http.ContentType; -import org.hamcrest.BaseMatcher; -import org.hamcrest.Description; -import org.hamcrest.Matcher; +import org.junit.jupiter.api.Assertions; -public class ContentTypeMatcher extends BaseMatcher { +public class ContentTypeMatcher { - private final ContentType expectedContentType; - - public ContentTypeMatcher(final ContentType contentType) { - this.expectedContentType = contentType; - } - - @Override - public boolean matches(final Object item) { - if (item instanceof ContentType) { - final ContentType contentType = (ContentType) item; - return contentType.isSameMimeType(expectedContentType); - } - return false; - } - - @Override - public void describeTo(final Description description) { - description.appendText("same MIME type as ").appendValue(expectedContentType); - } - - public static Matcher sameMimeType(final ContentType contentType) { - return new ContentTypeMatcher(contentType); + public static void assertSameMimeType(final ContentType actual, final ContentType expected) { + Assertions.assertNotNull(actual, "Expected content type"); + Assertions.assertNotNull(expected, "Expected content type"); + Assertions.assertTrue(actual.isSameMimeType(expected), + "Expected MIME type '" + expected.getMimeType() + "' but was '" + actual.getMimeType() + "'"); } } diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/HeaderMatcher.java b/httpclient5/src/test/java/org/apache/hc/client5/http/HeaderMatcher.java index c18b36713b..38d3b0755e 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/HeaderMatcher.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/HeaderMatcher.java @@ -26,39 +26,17 @@ */ package org.apache.hc.client5.http; -import java.util.Objects; - import org.apache.hc.core5.http.Header; -import org.hamcrest.BaseMatcher; -import org.hamcrest.Description; -import org.hamcrest.Matcher; - -public class HeaderMatcher extends BaseMatcher
{ - - private final String headerName; - private final Object headerValue; - - public HeaderMatcher(final String headerName, final Object headerValue) { - this.headerName = headerName; - this.headerValue = headerValue; - } - - @Override - public boolean matches(final Object item) { - if (item instanceof Header) { - final Header header = (Header) item; - return headerName.equalsIgnoreCase(header.getName()) && Objects.equals(headerValue, header.getValue()); - } - return false; - } +import org.junit.jupiter.api.Assertions; - @Override - public void describeTo(final Description description) { - description.appendText("same header as ").appendValue(headerValue).appendText(": ").appendValue(headerValue); - } +public class HeaderMatcher { - public static Matcher
same(final String headerName, final Object headerValue) { - return new HeaderMatcher(headerName, headerValue); + public static void assertSame(final Header header, final String headerName, final Object headerValue) { + Assertions.assertNotNull(header, "Expected header '" + headerName + "'"); + Assertions.assertTrue(headerName.equalsIgnoreCase(header.getName()), + "Expected header name '" + headerName + "' but was '" + header.getName() + "'"); + Assertions.assertEquals(headerValue, header.getValue(), + "Expected header '" + headerName + "' value '" + headerValue + "' but was '" + header.getValue() + "'"); } } diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/HeadersMatcher.java b/httpclient5/src/test/java/org/apache/hc/client5/http/HeadersMatcher.java index 0840b7fd5e..0c72022f4f 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/HeadersMatcher.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/HeadersMatcher.java @@ -26,47 +26,24 @@ */ package org.apache.hc.client5.http; -import java.util.Objects; - import org.apache.hc.core5.http.Header; -import org.hamcrest.BaseMatcher; -import org.hamcrest.Description; -import org.hamcrest.Matcher; - -public class HeadersMatcher extends BaseMatcher { - - private final Header[] expectedHeaders; - - public HeadersMatcher(final Header... headers) { - this.expectedHeaders = headers; - } - - @Override - public boolean matches(final Object item) { - if (item instanceof Header[]) { - final Header[] headers = (Header[]) item; - if (headers.length == expectedHeaders.length) { - for (int i = 0; i < headers.length; i++) { - final Header h1 = headers[i]; - final Header h2 = expectedHeaders[i]; - if (!h1.getName().equalsIgnoreCase(h2.getName()) - || !Objects.equals(h1.getValue(), h2.getValue())) { - return false; - } - } - return true; - } +import org.junit.jupiter.api.Assertions; + +public class HeadersMatcher { + + public static void assertSame(final Header[] headers, final Header... expectedHeaders) { + Assertions.assertNotNull(headers, "Expected headers"); + Assertions.assertEquals(expectedHeaders.length, headers.length, + "Expected " + expectedHeaders.length + " headers but got " + headers.length); + for (int i = 0; i < headers.length; i++) { + final Header actual = headers[i]; + final Header expected = expectedHeaders[i]; + Assertions.assertTrue(actual.getName().equalsIgnoreCase(expected.getName()), + "Expected header name '" + expected.getName() + "' but was '" + actual.getName() + "'"); + Assertions.assertEquals(expected.getValue(), actual.getValue(), + "Expected header '" + expected.getName() + "' value '" + expected.getValue() + + "' but was '" + actual.getValue() + "'"); } - return false; - } - - @Override - public void describeTo(final Description description) { - description.appendText("same headers as ").appendValueList("[", ", ", "]", expectedHeaders); - } - - public static Matcher same(final Header... headers) { - return new HeadersMatcher(headers); } } diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/NameValuePairMatcher.java b/httpclient5/src/test/java/org/apache/hc/client5/http/NameValuePairMatcher.java deleted file mode 100644 index 7404707a24..0000000000 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/NameValuePairMatcher.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * . - * - */ -package org.apache.hc.client5.http; - -import java.util.Objects; - -import org.apache.hc.core5.http.NameValuePair; -import org.hamcrest.BaseMatcher; -import org.hamcrest.Description; -import org.hamcrest.Matcher; - -public class NameValuePairMatcher extends BaseMatcher { - - private final String name; - private final String value; - - public NameValuePairMatcher(final String name, final String value) { - this.name = name; - this.value = value; - } - - @Override - public boolean matches(final Object item) { - if (item instanceof NameValuePair) { - final NameValuePair nvp = (NameValuePair) item; - return Objects.equals(nvp.getName(), name) && Objects.equals(nvp.getValue(), value); - } - return false; - } - - @Override - public void describeTo(final Description description) { - description.appendText("equals ").appendValue(name).appendText("=").appendValue(value); - } - - public static Matcher equals(final String name, final String value) { - return new NameValuePairMatcher(name, value); - } - - public static Matcher same(final String name, final String value) { - return new NameValuePairMatcher(name, value); - } - -} diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/NameValuePairsMatcher.java b/httpclient5/src/test/java/org/apache/hc/client5/http/NameValuePairsMatcher.java index 88d4b52cfb..a3cfe92bba 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/NameValuePairsMatcher.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/NameValuePairsMatcher.java @@ -26,59 +26,46 @@ */ package org.apache.hc.client5.http; -import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; -import java.util.List; -import java.util.Objects; +import java.util.Iterator; import org.apache.hc.core5.http.NameValuePair; -import org.hamcrest.BaseMatcher; -import org.hamcrest.Description; -import org.hamcrest.Matcher; +import org.junit.jupiter.api.Assertions; -public class NameValuePairsMatcher extends BaseMatcher> { +public class NameValuePairsMatcher { - private final List expectedNameValuePairList; - - public NameValuePairsMatcher(final List nameValuePairList) { - this.expectedNameValuePairList = nameValuePairList; - } - - @Override - public boolean matches(final Object item) { - if (item instanceof Collection) { - final Collection collection = (Collection) item; - int i = 0; - for (final Object obj : collection) { - if (obj instanceof NameValuePair) { - final NameValuePair nvp1 = (NameValuePair) obj; - final NameValuePair nvp2 = expectedNameValuePairList.get(i); - if (!nvp1.getName().equalsIgnoreCase(nvp2.getName()) - || !Objects.equals(nvp1.getValue(), nvp2.getValue())) { - return false; - } - } else { - return false; - } - i++; - } - return true; + public static void assertSame(final Collection actual, + final Collection expected) { + Assertions.assertNotNull(actual, "Expected name/value pairs"); + Assertions.assertNotNull(expected, "Expected name/value pairs"); + Assertions.assertEquals(expected.size(), actual.size(), + "Expected " + expected.size() + " name/value pairs but got " + actual.size()); + final Iterator actualIterator = actual.iterator(); + final Iterator expectedIterator = expected.iterator(); + while (actualIterator.hasNext() && expectedIterator.hasNext()) { + final NameValuePair actualPair = actualIterator.next(); + final NameValuePair expectedPair = expectedIterator.next(); + Assertions.assertTrue(actualPair.getName().equalsIgnoreCase(expectedPair.getName()), + "Expected name '" + expectedPair.getName() + "' but was '" + actualPair.getName() + "'"); + Assertions.assertEquals(expectedPair.getValue(), actualPair.getValue(), + "Expected value for '" + expectedPair.getName() + "'"); } - return false; - } - - @Override - public void describeTo(final Description description) { - description.appendText("same name/value pairs as ").appendValueList("[", ", ", "]", expectedNameValuePairList); - } - - public static Matcher> same(final Collection nameValuePairs) { - return new NameValuePairsMatcher(new ArrayList<>(nameValuePairs)); } - public static Matcher> same(final NameValuePair... nameValuePairs) { - return new NameValuePairsMatcher(Arrays.asList(nameValuePairs)); + public static void assertSame(final Collection actual, + final NameValuePair... expected) { + Assertions.assertNotNull(actual, "Expected name/value pairs"); + Assertions.assertEquals(expected.length, actual.size(), + "Expected " + expected.length + " name/value pairs but got " + actual.size()); + int i = 0; + for (final NameValuePair actualPair : actual) { + final NameValuePair expectedPair = expected[i]; + Assertions.assertTrue(actualPair.getName().equalsIgnoreCase(expectedPair.getName()), + "Expected name '" + expectedPair.getName() + "' but was '" + actualPair.getName() + "'"); + Assertions.assertEquals(expectedPair.getValue(), actualPair.getValue(), + "Expected value for '" + expectedPair.getName() + "'"); + i++; + } } } diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/async/methods/TestSimpleMessageBuilders.java b/httpclient5/src/test/java/org/apache/hc/client5/http/async/methods/TestSimpleMessageBuilders.java index 56dbb5c8c5..cc326eb469 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/async/methods/TestSimpleMessageBuilders.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/async/methods/TestSimpleMessageBuilders.java @@ -27,8 +27,6 @@ package org.apache.hc.client5.http.async.methods; -import static org.hamcrest.MatcherAssert.assertThat; - import java.net.URI; import java.nio.charset.StandardCharsets; import java.util.Arrays; @@ -43,7 +41,6 @@ import org.apache.hc.core5.http.message.BasicHeader; import org.apache.hc.core5.http.message.BasicNameValuePair; import org.apache.hc.core5.net.URIAuthority; -import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -76,38 +73,38 @@ void testResponseBasics() { builder.addHeader("h1", "v1"); builder.addHeader("h1", "v2"); builder.addHeader("h2", "v2"); - assertThat(builder.getHeaders(), HeadersMatcher.same( - new BasicHeader("h1", "v1"), new BasicHeader("h1", "v2"), new BasicHeader("h2", "v2"))); - assertThat(builder.getHeaders("h1"), HeadersMatcher.same( - new BasicHeader("h1", "v1"), new BasicHeader("h1", "v2"))); - assertThat(builder.getFirstHeader("h1"), HeaderMatcher.same("h1", "v1")); - assertThat(builder.getLastHeader("h1"), HeaderMatcher.same("h1", "v2")); + HeadersMatcher.assertSame(builder.getHeaders(), + new BasicHeader("h1", "v1"), new BasicHeader("h1", "v2"), new BasicHeader("h2", "v2")); + HeadersMatcher.assertSame(builder.getHeaders("h1"), + new BasicHeader("h1", "v1"), new BasicHeader("h1", "v2")); + HeaderMatcher.assertSame(builder.getFirstHeader("h1"), "h1", "v1"); + HeaderMatcher.assertSame(builder.getLastHeader("h1"), "h1", "v2"); final SimpleHttpResponse r3 = builder.build(); - assertThat(r3.getHeaders(), HeadersMatcher.same( - new BasicHeader("h1", "v1"), new BasicHeader("h1", "v2"), new BasicHeader("h2", "v2"))); - assertThat(r3.getHeaders("h1"), HeadersMatcher.same( - new BasicHeader("h1", "v1"), new BasicHeader("h1", "v2"))); - assertThat(r3.getFirstHeader("h1"), HeaderMatcher.same("h1", "v1")); - assertThat(r3.getLastHeader("h1"), HeaderMatcher.same("h1", "v2")); + HeadersMatcher.assertSame(r3.getHeaders(), + new BasicHeader("h1", "v1"), new BasicHeader("h1", "v2"), new BasicHeader("h2", "v2")); + HeadersMatcher.assertSame(r3.getHeaders("h1"), + new BasicHeader("h1", "v1"), new BasicHeader("h1", "v2")); + HeaderMatcher.assertSame(r3.getFirstHeader("h1"), "h1", "v1"); + HeaderMatcher.assertSame(r3.getLastHeader("h1"), "h1", "v2"); builder.removeHeader(new BasicHeader("h1", "v2")); - assertThat(builder.getHeaders("h1"), HeadersMatcher.same(new BasicHeader("h1", "v1"))); - assertThat(builder.getHeaders(), HeadersMatcher.same( - new BasicHeader("h1", "v1"), new BasicHeader("h2", "v2"))); + HeadersMatcher.assertSame(builder.getHeaders("h1"), new BasicHeader("h1", "v1")); + HeadersMatcher.assertSame(builder.getHeaders(), + new BasicHeader("h1", "v1"), new BasicHeader("h2", "v2")); final SimpleHttpResponse r4 = builder.build(); - assertThat(r4.getHeaders("h1"), HeadersMatcher.same(new BasicHeader("h1", "v1"))); - assertThat(r4.getHeaders(), HeadersMatcher.same( - new BasicHeader("h1", "v1"), new BasicHeader("h2", "v2"))); + HeadersMatcher.assertSame(r4.getHeaders("h1"), new BasicHeader("h1", "v1")); + HeadersMatcher.assertSame(r4.getHeaders(), + new BasicHeader("h1", "v1"), new BasicHeader("h2", "v2")); builder.removeHeaders("h1"); - assertThat(builder.getHeaders("h1"), HeadersMatcher.same()); - assertThat(builder.getHeaders(), HeadersMatcher.same(new BasicHeader("h2", "v2"))); + HeadersMatcher.assertSame(builder.getHeaders("h1")); + HeadersMatcher.assertSame(builder.getHeaders(), new BasicHeader("h2", "v2")); final SimpleHttpResponse r5 = builder.build(); - assertThat(r5.getHeaders("h1"), HeadersMatcher.same()); - assertThat(r5.getHeaders(), HeadersMatcher.same(new BasicHeader("h2", "v2"))); + HeadersMatcher.assertSame(r5.getHeaders("h1")); + HeadersMatcher.assertSame(r5.getHeaders(), new BasicHeader("h2", "v2")); } @Test @@ -170,38 +167,38 @@ void testRequestBasics() throws Exception { builder.addHeader("h1", "v1"); builder.addHeader("h1", "v2"); builder.addHeader("h2", "v2"); - assertThat(builder.getHeaders(), HeadersMatcher.same( - new BasicHeader("h1", "v1"), new BasicHeader("h1", "v2"), new BasicHeader("h2", "v2"))); - assertThat(builder.getHeaders("h1"), HeadersMatcher.same( - new BasicHeader("h1", "v1"), new BasicHeader("h1", "v2"))); - assertThat(builder.getFirstHeader("h1"), HeaderMatcher.same("h1", "v1")); - assertThat(builder.getLastHeader("h1"), HeaderMatcher.same("h1", "v2")); + HeadersMatcher.assertSame(builder.getHeaders(), + new BasicHeader("h1", "v1"), new BasicHeader("h1", "v2"), new BasicHeader("h2", "v2")); + HeadersMatcher.assertSame(builder.getHeaders("h1"), + new BasicHeader("h1", "v1"), new BasicHeader("h1", "v2")); + HeaderMatcher.assertSame(builder.getFirstHeader("h1"), "h1", "v1"); + HeaderMatcher.assertSame(builder.getLastHeader("h1"), "h1", "v2"); final SimpleHttpRequest r4 = builder.build(); - assertThat(r4.getHeaders(), HeadersMatcher.same( - new BasicHeader("h1", "v1"), new BasicHeader("h1", "v2"), new BasicHeader("h2", "v2"))); - assertThat(r4.getHeaders("h1"), HeadersMatcher.same( - new BasicHeader("h1", "v1"), new BasicHeader("h1", "v2"))); - assertThat(r4.getFirstHeader("h1"), HeaderMatcher.same("h1", "v1")); - assertThat(r4.getLastHeader("h1"), HeaderMatcher.same("h1", "v2")); + HeadersMatcher.assertSame(r4.getHeaders(), + new BasicHeader("h1", "v1"), new BasicHeader("h1", "v2"), new BasicHeader("h2", "v2")); + HeadersMatcher.assertSame(r4.getHeaders("h1"), + new BasicHeader("h1", "v1"), new BasicHeader("h1", "v2")); + HeaderMatcher.assertSame(r4.getFirstHeader("h1"), "h1", "v1"); + HeaderMatcher.assertSame(r4.getLastHeader("h1"), "h1", "v2"); builder.removeHeader(new BasicHeader("h1", "v2")); - assertThat(builder.getHeaders("h1"), HeadersMatcher.same(new BasicHeader("h1", "v1"))); - assertThat(builder.getHeaders(), HeadersMatcher.same( - new BasicHeader("h1", "v1"), new BasicHeader("h2", "v2"))); + HeadersMatcher.assertSame(builder.getHeaders("h1"), new BasicHeader("h1", "v1")); + HeadersMatcher.assertSame(builder.getHeaders(), + new BasicHeader("h1", "v1"), new BasicHeader("h2", "v2")); final SimpleHttpRequest r5 = builder.build(); - assertThat(r5.getHeaders("h1"), HeadersMatcher.same(new BasicHeader("h1", "v1"))); - assertThat(r5.getHeaders(), HeadersMatcher.same( - new BasicHeader("h1", "v1"), new BasicHeader("h2", "v2"))); + HeadersMatcher.assertSame(r5.getHeaders("h1"), new BasicHeader("h1", "v1")); + HeadersMatcher.assertSame(r5.getHeaders(), + new BasicHeader("h1", "v1"), new BasicHeader("h2", "v2")); builder.removeHeaders("h1"); - assertThat(builder.getHeaders("h1"), HeadersMatcher.same()); - assertThat(builder.getHeaders(), HeadersMatcher.same(new BasicHeader("h2", "v2"))); + HeadersMatcher.assertSame(builder.getHeaders("h1")); + HeadersMatcher.assertSame(builder.getHeaders(), new BasicHeader("h2", "v2")); final SimpleHttpRequest r6 = builder.build(); - assertThat(r6.getHeaders("h1"), HeadersMatcher.same()); - assertThat(r6.getHeaders(), HeadersMatcher.same(new BasicHeader("h2", "v2"))); + HeadersMatcher.assertSame(r6.getHeaders("h1")); + HeadersMatcher.assertSame(r6.getHeaders(), new BasicHeader("h2", "v2")); } @Test @@ -215,8 +212,8 @@ void testResponseCopy() { final SimpleResponseBuilder builder = SimpleResponseBuilder.copy(response); Assertions.assertEquals(400, builder.getStatus()); Assertions.assertEquals(HttpVersion.HTTP_2, builder.getVersion()); - assertThat(builder.getHeaders(), HeadersMatcher.same( - new BasicHeader("h1", "v1"), new BasicHeader("h1", "v2"), new BasicHeader("h2", "v2"))); + HeadersMatcher.assertSame(builder.getHeaders(), + new BasicHeader("h1", "v1"), new BasicHeader("h1", "v2"), new BasicHeader("h2", "v2")); } @Test @@ -233,8 +230,8 @@ void testRequestCopy() { Assertions.assertEquals(new URIAuthority("host", 3456), builder.getAuthority()); Assertions.assertEquals("/stuff?blah", builder.getPath()); Assertions.assertEquals(HttpVersion.HTTP_2, builder.getVersion()); - assertThat(builder.getHeaders(), HeadersMatcher.same( - new BasicHeader("h1", "v1"), new BasicHeader("h1", "v2"), new BasicHeader("h2", "v2"))); + HeadersMatcher.assertSame(builder.getHeaders(), + new BasicHeader("h1", "v1"), new BasicHeader("h1", "v2"), new BasicHeader("h2", "v2")); } @Test @@ -247,11 +244,11 @@ void testGetParameters() { Assertions.assertEquals("https", builder.getScheme()); Assertions.assertEquals(new URIAuthority("host", 3456), builder.getAuthority()); Assertions.assertEquals("/stuff?p0=p0", builder.getPath()); - assertThat(builder.getParameters(), NameValuePairsMatcher.same( + NameValuePairsMatcher.assertSame(builder.getParameters(), new BasicNameValuePair("p1", "v1"), new BasicNameValuePair("p2", "v2"), - new BasicNameValuePair("p3", "v3"), new BasicNameValuePair("p3", "v3.1"))); + new BasicNameValuePair("p3", "v3"), new BasicNameValuePair("p3", "v3.1")); final SimpleHttpRequest request = builder.build(); - assertThat(request.getPath(), CoreMatchers.equalTo("/stuff?p0=p0&p1=v1&p2=v2&p3=v3&p3=v3.1")); + Assertions.assertEquals("/stuff?p0=p0&p1=v1&p2=v2&p3=v3&p3=v3.1", request.getPath()); Assertions.assertNull(request.getBody()); } @@ -265,16 +262,15 @@ void testPostParameters() { Assertions.assertEquals("https", builder.getScheme()); Assertions.assertEquals(new URIAuthority("host", 3456), builder.getAuthority()); Assertions.assertEquals("/stuff?p0=p0", builder.getPath()); - assertThat(builder.getParameters(), NameValuePairsMatcher.same( + NameValuePairsMatcher.assertSame(builder.getParameters(), new BasicNameValuePair("p1", "v1"), new BasicNameValuePair("p2", "v2"), - new BasicNameValuePair("p3", "v3"), new BasicNameValuePair("p3", "v3.1"))); + new BasicNameValuePair("p3", "v3"), new BasicNameValuePair("p3", "v3.1")); final SimpleHttpRequest request = builder.build(); - assertThat(request.getPath(), CoreMatchers.equalTo("/stuff?p0=p0")); + Assertions.assertEquals("/stuff?p0=p0", request.getPath()); Assertions.assertNotNull(request.getBody()); - assertThat(request.getBody().getContentType(), - ContentTypeMatcher.sameMimeType(ContentType.APPLICATION_FORM_URLENCODED)); - assertThat(request.getBody().getBodyText(), - CoreMatchers.equalTo("p1=v1&p2=v2&p3=v3&p3=v3.1")); + ContentTypeMatcher.assertSameMimeType(request.getBody().getContentType(), + ContentType.APPLICATION_FORM_URLENCODED); + Assertions.assertEquals("p1=v1&p2=v2&p3=v3&p3=v3.1", request.getBody().getBodyText()); } } diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/ContentCodingSupportTest.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/ContentCodingSupportTest.java index 24a5e72648..463f7219af 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/ContentCodingSupportTest.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/ContentCodingSupportTest.java @@ -26,12 +26,12 @@ */ package org.apache.hc.client5.http.impl; +import java.util.Arrays; import java.util.Set; import org.apache.hc.core5.http.EntityDetails; import org.apache.hc.core5.http.impl.BasicEntityDetails; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; class ContentCodingSupportTest { @@ -73,37 +73,32 @@ public Set getTrailerNames() { @Test void testNoEntity() { - MatcherAssert.assertThat( - ContentCodingSupport.parseContentCodecs(null), - Matchers.empty()); + Assertions.assertTrue(ContentCodingSupport.parseContentCodecs(null).isEmpty()); } @Test void testNotEncoded() { - MatcherAssert.assertThat(ContentCodingSupport.parseContentCodecs( - new BasicEntityDetails(-1, null)), - Matchers.empty()); + Assertions.assertTrue(ContentCodingSupport.parseContentCodecs( + new BasicEntityDetails(-1, null)).isEmpty()); } @Test void testNotEncodedNoise() { - MatcherAssert.assertThat(ContentCodingSupport.parseContentCodecs( - new MockEntityDetails(", ,, , ")), - Matchers.empty()); + Assertions.assertTrue(ContentCodingSupport.parseContentCodecs( + new MockEntityDetails(", ,, , ")).isEmpty()); } @Test void testIdentityEncoded() { - MatcherAssert.assertThat(ContentCodingSupport.parseContentCodecs( - new MockEntityDetails("identity,,,identity")), - Matchers.empty()); + Assertions.assertTrue(ContentCodingSupport.parseContentCodecs( + new MockEntityDetails("identity,,,identity")).isEmpty()); } @Test void testEncodedMultipleCodes() { - MatcherAssert.assertThat(ContentCodingSupport.parseContentCodecs( - new MockEntityDetails("This,,that, \"This and That\"")), - Matchers.contains("this", "that", "\"this and that\"")); + Assertions.assertEquals(Arrays.asList("this", "that", "\"this and that\""), + ContentCodingSupport.parseContentCodecs( + new MockEntityDetails("This,,that, \"This and That\""))); } } diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestAuthChallengeParser.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestAuthChallengeParser.java index cc525c77f9..d11964785c 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestAuthChallengeParser.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/auth/TestAuthChallengeParser.java @@ -26,11 +26,8 @@ */ package org.apache.hc.client5.http.impl.auth; -import static org.hamcrest.MatcherAssert.assertThat; - import java.util.List; -import org.apache.hc.client5.http.NameValuePairMatcher; import org.apache.hc.client5.http.auth.AuthChallenge; import org.apache.hc.client5.http.auth.ChallengeType; import org.apache.hc.client5.http.auth.StandardAuthScheme; @@ -38,7 +35,6 @@ import org.apache.hc.core5.http.ParseException; import org.apache.hc.core5.http.message.ParserCursor; import org.apache.hc.core5.util.CharArrayBuffer; -import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -57,7 +53,7 @@ void testParseTokenTerminatedByBlank() { final CharArrayBuffer buffer = new CharArrayBuffer(64); buffer.append("aaabbbbccc "); final ParserCursor cursor = new ParserCursor(0, buffer.length()); - assertThat(parser.parseToken(buffer, cursor), CoreMatchers.equalTo("aaabbbbccc")); + Assertions.assertEquals("aaabbbbccc", parser.parseToken(buffer, cursor)); } @Test @@ -65,7 +61,7 @@ void testParseTokenTerminatedByComma() { final CharArrayBuffer buffer = new CharArrayBuffer(64); buffer.append("aaabbbbccc, "); final ParserCursor cursor = new ParserCursor(0, buffer.length()); - assertThat(parser.parseToken(buffer, cursor), CoreMatchers.equalTo("aaabbbbccc")); + Assertions.assertEquals("aaabbbbccc", parser.parseToken(buffer, cursor)); } @Test @@ -73,7 +69,7 @@ void testParseTokenTerminatedByEndOfStream() { final CharArrayBuffer buffer = new CharArrayBuffer(64); buffer.append("aaabbbbccc"); final ParserCursor cursor = new ParserCursor(0, buffer.length()); - assertThat(parser.parseToken(buffer, cursor), CoreMatchers.equalTo("aaabbbbccc")); + Assertions.assertEquals("aaabbbbccc", parser.parseToken(buffer, cursor)); } @Test @@ -81,9 +77,9 @@ void testParsePaddedToken68() { final CharArrayBuffer buffer = new CharArrayBuffer(64); buffer.append("aaabbbbccc==== "); final ParserCursor cursor = new ParserCursor(0, buffer.length()); - assertThat(parser.parseToken(buffer, cursor), CoreMatchers.equalTo("aaabbbbccc====")); - assertThat(cursor.atEnd(), CoreMatchers.equalTo(false)); - assertThat(buffer.charAt(cursor.getPos()), CoreMatchers.equalTo(' ')); + Assertions.assertEquals("aaabbbbccc====", parser.parseToken(buffer, cursor)); + Assertions.assertFalse(cursor.atEnd()); + Assertions.assertEquals(' ', buffer.charAt(cursor.getPos())); } @Test @@ -91,8 +87,8 @@ void testParsePaddedToken68SingleEqual() { final CharArrayBuffer buffer = new CharArrayBuffer(64); buffer.append("aaabbbbccc="); final ParserCursor cursor = new ParserCursor(0, buffer.length()); - assertThat(parser.parseToken(buffer, cursor), CoreMatchers.equalTo("aaabbbbccc=")); - assertThat(cursor.atEnd(), CoreMatchers.equalTo(true)); + Assertions.assertEquals("aaabbbbccc=", parser.parseToken(buffer, cursor)); + Assertions.assertTrue(cursor.atEnd()); } @Test @@ -100,8 +96,8 @@ void testParsePaddedToken68MultipleEquals() { final CharArrayBuffer buffer = new CharArrayBuffer(16); buffer.append("aaabbbbccc======"); final ParserCursor cursor = new ParserCursor(0, buffer.length()); - assertThat(parser.parseToken(buffer, cursor), CoreMatchers.equalTo("aaabbbbccc======")); - assertThat(cursor.atEnd(), CoreMatchers.equalTo(true)); + Assertions.assertEquals("aaabbbbccc======", parser.parseToken(buffer, cursor)); + Assertions.assertTrue(cursor.atEnd()); } @Test @@ -109,9 +105,9 @@ void testParsePaddedToken68TerminatedByComma() { final CharArrayBuffer buffer = new CharArrayBuffer(64); buffer.append("aaabbbbccc====,"); final ParserCursor cursor = new ParserCursor(0, buffer.length()); - assertThat(parser.parseToken(buffer, cursor), CoreMatchers.equalTo("aaabbbbccc====")); - assertThat(cursor.atEnd(), CoreMatchers.equalTo(false)); - assertThat(buffer.charAt(cursor.getPos()), CoreMatchers.equalTo(',')); + Assertions.assertEquals("aaabbbbccc====", parser.parseToken(buffer, cursor)); + Assertions.assertFalse(cursor.atEnd()); + Assertions.assertEquals(',', buffer.charAt(cursor.getPos())); } @Test @@ -119,9 +115,9 @@ void testParseTokenTerminatedByParameter() { final CharArrayBuffer buffer = new CharArrayBuffer(64); buffer.append("aaabbbbccc=blah"); final ParserCursor cursor = new ParserCursor(0, buffer.length()); - assertThat(parser.parseToken(buffer, cursor), CoreMatchers.equalTo("aaabbbbccc")); - assertThat(cursor.atEnd(), CoreMatchers.equalTo(false)); - assertThat(buffer.charAt(cursor.getPos()), CoreMatchers.equalTo('=')); + Assertions.assertEquals("aaabbbbccc", parser.parseToken(buffer, cursor)); + Assertions.assertFalse(cursor.atEnd()); + Assertions.assertEquals('=', buffer.charAt(cursor.getPos())); } @Test @@ -138,7 +134,7 @@ void testParseBasicAuthChallenge() throws Exception { final List params = challenge1.getParams(); Assertions.assertNotNull(params); Assertions.assertEquals(1, params.size()); - assertThat(params.get(0), NameValuePairMatcher.equals("realm", "blah")); + assertNameValuePair(params.get(0), "realm", "blah"); } @Test @@ -155,7 +151,7 @@ void testParseAuthChallengeWithBlanks() throws Exception { final List params = challenge1.getParams(); Assertions.assertNotNull(params); Assertions.assertEquals(1, params.size()); - assertThat(params.get(0), NameValuePairMatcher.equals("realm", "blah")); + assertNameValuePair(params.get(0), "realm", "blah"); } @Test @@ -195,9 +191,9 @@ void testParseMultipleAuthChallengeWithParams() throws Exception { final List params1 = challenge1.getParams(); Assertions.assertNotNull(params1); Assertions.assertEquals(3, params1.size()); - assertThat(params1.get(0), NameValuePairMatcher.equals("realm", "blah")); - assertThat(params1.get(1), NameValuePairMatcher.equals("param1", "this")); - assertThat(params1.get(2), NameValuePairMatcher.equals("param2", "that")); + assertNameValuePair(params1.get(0), "realm", "blah"); + assertNameValuePair(params1.get(1), "param1", "this"); + assertNameValuePair(params1.get(2), "param2", "that"); final AuthChallenge challenge2 = challenges.get(1); Assertions.assertEquals(StandardAuthScheme.BASIC, challenge2.getSchemeName()); @@ -205,10 +201,10 @@ void testParseMultipleAuthChallengeWithParams() throws Exception { final List params2 = challenge2.getParams(); Assertions.assertNotNull(params2); Assertions.assertEquals(4, params2.size()); - assertThat(params2.get(0), NameValuePairMatcher.equals("realm", "\"yada\"")); - assertThat(params2.get(1), NameValuePairMatcher.equals("this", null)); - assertThat(params2.get(2), NameValuePairMatcher.equals("that", "")); - assertThat(params2.get(3), NameValuePairMatcher.equals("this-and-that", null)); + assertNameValuePair(params2.get(0), "realm", "\"yada\""); + assertNameValuePair(params2.get(1), "this", null); + assertNameValuePair(params2.get(2), "that", ""); + assertNameValuePair(params2.get(3), "this-and-that", null); } @Test @@ -227,8 +223,8 @@ void testParseMultipleAuthChallengeWithParamsContainingComma() throws Exception final List params1 = challenge1.getParams(); Assertions.assertNotNull(params1); Assertions.assertEquals(2, params1.size()); - assertThat(params1.get(0), NameValuePairMatcher.equals("realm", "blah")); - assertThat(params1.get(1), NameValuePairMatcher.equals("param1", "this, param2=that")); + assertNameValuePair(params1.get(0), "realm", "blah"); + assertNameValuePair(params1.get(1), "param1", "this, param2=that"); final AuthChallenge challenge2 = challenges.get(1); Assertions.assertEquals(StandardAuthScheme.BASIC, challenge2.getSchemeName()); @@ -236,7 +232,7 @@ void testParseMultipleAuthChallengeWithParamsContainingComma() throws Exception final List params2 = challenge2.getParams(); Assertions.assertNotNull(params2); Assertions.assertEquals(1, params2.size()); - assertThat(params2.get(0), NameValuePairMatcher.equals("realm", "\"yada,,,,\"")); + assertNameValuePair(params2.get(0), "realm", "\"yada,,,,\""); } @Test @@ -311,8 +307,8 @@ void testParseValidAuthChallenge2() throws Exception { final List params1 = challenge1.getParams(); Assertions.assertNotNull(params1); Assertions.assertEquals(2, params1.size()); - assertThat(params1.get(0), NameValuePairMatcher.equals("blah", null)); - assertThat(params1.get(1), NameValuePairMatcher.equals("blah", null)); + assertNameValuePair(params1.get(0), "blah", null); + assertNameValuePair(params1.get(1), "blah", null); } @Test @@ -324,23 +320,29 @@ void testParseParameterAndToken68AuthChallengeMix() throws Exception { Assertions.assertNotNull(challenges); Assertions.assertEquals(4, challenges.size()); final AuthChallenge challenge1 = challenges.get(0); - assertThat(challenge1.getSchemeName(), CoreMatchers.equalTo("scheme1")); - assertThat(challenge1.getValue(), CoreMatchers.equalTo("aaaa")); - assertThat(challenge1.getParams(), CoreMatchers.nullValue()); + Assertions.assertEquals("scheme1", challenge1.getSchemeName()); + Assertions.assertEquals("aaaa", challenge1.getValue()); + Assertions.assertNull(challenge1.getParams()); final AuthChallenge challenge2 = challenges.get(1); - assertThat(challenge2.getSchemeName(), CoreMatchers.equalTo("scheme2")); - assertThat(challenge2.getValue(), CoreMatchers.equalTo("aaaa==")); - assertThat(challenge2.getParams(), CoreMatchers.nullValue()); + Assertions.assertEquals("scheme2", challenge2.getSchemeName()); + Assertions.assertEquals("aaaa==", challenge2.getValue()); + Assertions.assertNull(challenge2.getParams()); final AuthChallenge challenge3 = challenges.get(2); - assertThat(challenge3.getSchemeName(), CoreMatchers.equalTo("scheme3")); - assertThat(challenge3.getValue(), CoreMatchers.nullValue()); - assertThat(challenge3.getParams(), CoreMatchers.notNullValue()); - assertThat(challenge3.getParams().size(), CoreMatchers.equalTo(1)); - assertThat(challenge3.getParams().get(0), NameValuePairMatcher.equals("aaaa", "aaaa")); + Assertions.assertEquals("scheme3", challenge3.getSchemeName()); + Assertions.assertNull(challenge3.getValue()); + Assertions.assertNotNull(challenge3.getParams()); + Assertions.assertEquals(1, challenge3.getParams().size()); + assertNameValuePair(challenge3.getParams().get(0), "aaaa", "aaaa"); final AuthChallenge challenge4 = challenges.get(3); - assertThat(challenge4.getSchemeName(), CoreMatchers.equalTo("scheme4")); - assertThat(challenge4.getValue(), CoreMatchers.equalTo("aaaa=")); - assertThat(challenge4.getParams(), CoreMatchers.nullValue()); + Assertions.assertEquals("scheme4", challenge4.getSchemeName()); + Assertions.assertEquals("aaaa=", challenge4.getValue()); + Assertions.assertNull(challenge4.getParams()); + } + + private static void assertNameValuePair(final NameValuePair pair, final String name, final String value) { + Assertions.assertNotNull(pair); + Assertions.assertEquals(name, pair.getName()); + Assertions.assertEquals(value, pair.getValue()); } } diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/routing/TestRoutingSupport.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/routing/TestRoutingSupport.java index da81aee845..4414262ea5 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/routing/TestRoutingSupport.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/routing/TestRoutingSupport.java @@ -27,8 +27,6 @@ package org.apache.hc.client5.http.impl.routing; -import static org.hamcrest.MatcherAssert.assertThat; - import java.net.InetAddress; import java.net.URI; @@ -39,7 +37,6 @@ import org.apache.hc.core5.http.ProtocolException; import org.apache.hc.core5.http.message.BasicHttpRequest; import org.apache.hc.core5.net.URIAuthority; -import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -49,11 +46,11 @@ class TestRoutingSupport { void testDetermineHost() throws Exception { final HttpRequest request1 = new BasicHttpRequest("GET", "/"); final HttpHost host1 = RoutingSupport.determineHost(request1); - assertThat(host1, CoreMatchers.nullValue()); + Assertions.assertNull(host1); final HttpRequest request2 = new BasicHttpRequest("GET", new URI("https://somehost:8443/")); final HttpHost host2 = RoutingSupport.determineHost(request2); - assertThat(host2, CoreMatchers.equalTo(new HttpHost("https", "somehost", 8443))); + Assertions.assertEquals(new HttpHost("https", "somehost", 8443), host2); } @Test diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestRequestUpgrade.java b/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestRequestUpgrade.java index 191841d90e..144f2bfff4 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestRequestUpgrade.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestRequestUpgrade.java @@ -36,7 +36,6 @@ import org.apache.hc.core5.http.HttpVersion; import org.apache.hc.core5.http.message.BasicHeader; import org.apache.hc.core5.http.message.BasicHttpRequest; -import org.hamcrest.MatcherAssert; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -57,22 +56,19 @@ void setUp() { void testUpgrade() throws Exception { final HttpRequest get = new BasicHttpRequest("GET", "/"); interceptor.process(get, null, context); - MatcherAssert.assertThat(get.getHeaders(), - HeadersMatcher.same( - new BasicHeader(HttpHeaders.UPGRADE, "TLS/1.2"), - new BasicHeader(HttpHeaders.CONNECTION, HttpHeaders.UPGRADE))); + HeadersMatcher.assertSame(get.getHeaders(), + new BasicHeader(HttpHeaders.UPGRADE, "TLS/1.2"), + new BasicHeader(HttpHeaders.CONNECTION, HttpHeaders.UPGRADE)); final HttpRequest options = new BasicHttpRequest("OPTIONS", "/"); interceptor.process(options, null, context); - MatcherAssert.assertThat(options.getHeaders(), - HeadersMatcher.same( - new BasicHeader(HttpHeaders.UPGRADE, "TLS/1.2"), - new BasicHeader(HttpHeaders.CONNECTION, HttpHeaders.UPGRADE))); + HeadersMatcher.assertSame(options.getHeaders(), + new BasicHeader(HttpHeaders.UPGRADE, "TLS/1.2"), + new BasicHeader(HttpHeaders.CONNECTION, HttpHeaders.UPGRADE)); final HttpRequest head = new BasicHttpRequest("HEAD", "/"); interceptor.process(head, null, context); - MatcherAssert.assertThat(head.getHeaders(), - HeadersMatcher.same( - new BasicHeader(HttpHeaders.UPGRADE, "TLS/1.2"), - new BasicHeader(HttpHeaders.CONNECTION, HttpHeaders.UPGRADE))); + HeadersMatcher.assertSame(head.getHeaders(), + new BasicHeader(HttpHeaders.UPGRADE, "TLS/1.2"), + new BasicHeader(HttpHeaders.CONNECTION, HttpHeaders.UPGRADE)); } @Test diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/ssl/TestDistinguishedNameParser.java b/httpclient5/src/test/java/org/apache/hc/client5/http/ssl/TestDistinguishedNameParser.java index fde4ae4f0a..b3b2e483ac 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/ssl/TestDistinguishedNameParser.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/ssl/TestDistinguishedNameParser.java @@ -27,13 +27,11 @@ package org.apache.hc.client5.http.ssl; -import static org.hamcrest.MatcherAssert.assertThat; - import java.util.Arrays; import org.apache.hc.core5.http.NameValuePair; import org.apache.hc.core5.http.message.BasicNameValuePair; -import org.hamcrest.CoreMatchers; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -51,92 +49,92 @@ void setup() { @Test void testParseBasic() { - assertThat(impl.parse("cn=blah, ou=yada, o=booh"), - CoreMatchers.equalTo(Arrays.asList( - new BasicNameValuePair("cn", "blah"), - new BasicNameValuePair("ou", "yada"), - new BasicNameValuePair("o", "booh")))); + Assertions.assertEquals(Arrays.asList( + new BasicNameValuePair("cn", "blah"), + new BasicNameValuePair("ou", "yada"), + new BasicNameValuePair("o", "booh")), + impl.parse("cn=blah, ou=yada, o=booh")); } @Test void testParseRepeatedElements() { - assertThat(impl.parse("cn=blah, cn=yada, cn=booh"), - CoreMatchers.equalTo(Arrays.asList( - new BasicNameValuePair("cn", "blah"), - new BasicNameValuePair("cn", "yada"), - new BasicNameValuePair("cn", "booh")))); + Assertions.assertEquals(Arrays.asList( + new BasicNameValuePair("cn", "blah"), + new BasicNameValuePair("cn", "yada"), + new BasicNameValuePair("cn", "booh")), + impl.parse("cn=blah, cn=yada, cn=booh")); } @Test void testParseBlanks() { - assertThat(impl.parse("c = pampa , cn = blah , ou = blah , o = blah"), - CoreMatchers.equalTo(Arrays.asList( - new BasicNameValuePair("c", "pampa"), - new BasicNameValuePair("cn", "blah"), - new BasicNameValuePair("ou", "blah"), - new BasicNameValuePair("o", "blah")))); + Assertions.assertEquals(Arrays.asList( + new BasicNameValuePair("c", "pampa"), + new BasicNameValuePair("cn", "blah"), + new BasicNameValuePair("ou", "blah"), + new BasicNameValuePair("o", "blah")), + impl.parse("c = pampa , cn = blah , ou = blah , o = blah")); } @Test void testParseQuotes() { - assertThat(impl.parse("cn=\"blah\", ou=yada, o=booh"), - CoreMatchers.equalTo(Arrays.asList( - new BasicNameValuePair("cn", "blah"), - new BasicNameValuePair("ou", "yada"), - new BasicNameValuePair("o", "booh")))); + Assertions.assertEquals(Arrays.asList( + new BasicNameValuePair("cn", "blah"), + new BasicNameValuePair("ou", "yada"), + new BasicNameValuePair("o", "booh")), + impl.parse("cn=\"blah\", ou=yada, o=booh")); } @Test void testParseQuotes2() { - assertThat(impl.parse("cn=\"blah blah\", ou=yada, o=booh"), - CoreMatchers.equalTo(Arrays.asList( - new BasicNameValuePair("cn", "blah blah"), - new BasicNameValuePair("ou", "yada"), - new BasicNameValuePair("o", "booh")))); + Assertions.assertEquals(Arrays.asList( + new BasicNameValuePair("cn", "blah blah"), + new BasicNameValuePair("ou", "yada"), + new BasicNameValuePair("o", "booh")), + impl.parse("cn=\"blah blah\", ou=yada, o=booh")); } @Test void testParseQuotes3() { - assertThat(impl.parse("cn=\"blah, blah\", ou=yada, o=booh"), - CoreMatchers.equalTo(Arrays.asList( - new BasicNameValuePair("cn", "blah, blah"), - new BasicNameValuePair("ou", "yada"), - new BasicNameValuePair("o", "booh")))); + Assertions.assertEquals(Arrays.asList( + new BasicNameValuePair("cn", "blah, blah"), + new BasicNameValuePair("ou", "yada"), + new BasicNameValuePair("o", "booh")), + impl.parse("cn=\"blah, blah\", ou=yada, o=booh")); } @Test void testParseEscape() { - assertThat(impl.parse("cn=blah\\, blah, ou=yada, o=booh"), - CoreMatchers.equalTo(Arrays.asList( - new BasicNameValuePair("cn", "blah, blah"), - new BasicNameValuePair("ou", "yada"), - new BasicNameValuePair("o", "booh")))); + Assertions.assertEquals(Arrays.asList( + new BasicNameValuePair("cn", "blah, blah"), + new BasicNameValuePair("ou", "yada"), + new BasicNameValuePair("o", "booh")), + impl.parse("cn=blah\\, blah, ou=yada, o=booh")); } @Test void testParseUnescapedEqual() { - assertThat(impl.parse("c = cn=uuh, cn=blah, ou=yada, o=booh"), - CoreMatchers.equalTo(Arrays.asList( - new BasicNameValuePair("c", "cn=uuh"), - new BasicNameValuePair("cn", "blah"), - new BasicNameValuePair("ou", "yada"), - new BasicNameValuePair("o", "booh")))); + Assertions.assertEquals(Arrays.asList( + new BasicNameValuePair("c", "cn=uuh"), + new BasicNameValuePair("cn", "blah"), + new BasicNameValuePair("ou", "yada"), + new BasicNameValuePair("o", "booh")), + impl.parse("c = cn=uuh, cn=blah, ou=yada, o=booh")); } @Test void testParseInvalid() { - assertThat(impl.parse("blah,blah"), - CoreMatchers.equalTo(Arrays.asList( - new BasicNameValuePair("blah", null), - new BasicNameValuePair("blah", null)))); + Assertions.assertEquals(Arrays.asList( + new BasicNameValuePair("blah", null), + new BasicNameValuePair("blah", null)), + impl.parse("blah,blah")); } @Test void testParseInvalid2() { - assertThat(impl.parse("cn,o=blah"), - CoreMatchers.equalTo(Arrays.asList( - new BasicNameValuePair("cn", null), - new BasicNameValuePair("o", "blah")))); + Assertions.assertEquals(Arrays.asList( + new BasicNameValuePair("cn", null), + new BasicNameValuePair("o", "blah")), + impl.parse("cn,o=blah")); } } diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestDnsUtils.java b/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestDnsUtils.java index 2e3f521cd8..e74970d3cb 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestDnsUtils.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestDnsUtils.java @@ -27,9 +27,7 @@ package org.apache.hc.client5.http.utils; -import static org.hamcrest.MatcherAssert.assertThat; - -import org.hamcrest.CoreMatchers; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; /** @@ -39,14 +37,14 @@ class TestDnsUtils { @Test void testNormalize() { - assertThat(DnsUtils.normalize(null), CoreMatchers.equalTo(null)); - assertThat(DnsUtils.normalize(""), CoreMatchers.equalTo("")); - assertThat(DnsUtils.normalize("blah"), CoreMatchers.equalTo("blah")); - assertThat(DnsUtils.normalize("BLAH"), CoreMatchers.equalTo("blah")); - assertThat(DnsUtils.normalize("blAh"), CoreMatchers.equalTo("blah")); - assertThat(DnsUtils.normalize("blaH"), CoreMatchers.equalTo("blah")); - assertThat(DnsUtils.normalize("blaH"), CoreMatchers.equalTo("blah")); - assertThat(DnsUtils.normalize("hac\u212A!!!"), CoreMatchers.equalTo("hac\u212A!!!")); + Assertions.assertEquals(null, DnsUtils.normalize(null)); + Assertions.assertEquals("", DnsUtils.normalize("")); + Assertions.assertEquals("blah", DnsUtils.normalize("blah")); + Assertions.assertEquals("blah", DnsUtils.normalize("BLAH")); + Assertions.assertEquals("blah", DnsUtils.normalize("blAh")); + Assertions.assertEquals("blah", DnsUtils.normalize("blaH")); + Assertions.assertEquals("blah", DnsUtils.normalize("blaH")); + Assertions.assertEquals("hac\u212A!!!", DnsUtils.normalize("hac\u212A!!!")); } } diff --git a/pom.xml b/pom.xml index b37bcdd27d..4a78148c94 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ 2.12.3 1.7.36 5.14.2 - 3.0 + 5.14.1 4.11.0 1 3.1.12 @@ -196,12 +196,6 @@ ${mockito.version} test - - org.hamcrest - hamcrest - ${hamcrest.version} - test - org.testcontainers testcontainers