Remove obsolete testing framework

OpenFeign · Dec 11, 2023 · c3eb0bf · c3eb0bf
1 parent 97f78b2
commit c3eb0bf
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 86 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -57,12 +57,6 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest</artifactId>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>

diff --git a/core/src/test/java/feign/AsyncFeignTest.java b/core/src/test/java/feign/AsyncFeignTest.java
@@ -67,7 +67,6 @@
 import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.jupiter.params.provider.ValueSource;
 import org.junit.rules.ExpectedException;
 
 public class AsyncFeignTest {
@@ -671,7 +670,7 @@ public void whenReturnTypeIsResponseNoErrorHandling() throws Throwable {
 
   @Ignore("FIXME random test failures when building on ubuntu, need to investigate further")
   // @ParameterizedTest
-  @ValueSource(ints = {1, 5, 10, 100, 1000})
+  // @ValueSource(ints = {1, 5, 10, 100, 1000})
   public void cancelRetry(final int expectedTryCount) throws Throwable {
     // Arrange
     final CompletableFuture<Boolean> maximumTryCompleted = new CompletableFuture<>();

diff --git a/core/src/test/java/feign/FeignTest.java b/core/src/test/java/feign/FeignTest.java
@@ -50,7 +50,6 @@
 import static feign.assertj.MockWebServerAssertions.assertThat;
 import static java.util.Collections.emptyList;
 import static junit.framework.TestCase.assertNotNull;
-import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThatExceptionOfType;
 import static org.assertj.core.data.MapEntry.entry;

diff --git a/dropwizard-metrics4/pom.xml b/dropwizard-metrics4/pom.xml
@@ -44,11 +44,6 @@
       <artifactId>metrics-core</artifactId>
       <version>4.2.22</version>
     </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>feign-micrometer</artifactId>

diff --git a/dropwizard-metrics4/src/test/java/feign/metrics4/Metrics4CapabilityTest.java b/dropwizard-metrics4/src/test/java/feign/metrics4/Metrics4CapabilityTest.java
@@ -13,18 +13,15 @@
  */
 package feign.metrics4;
 
-import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.containsString;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.Map.Entry;
 import com.codahale.metrics.Metered;
 import com.codahale.metrics.Metric;
 import com.codahale.metrics.MetricRegistry;
 import feign.Capability;
 import feign.Util;
 import feign.micrometer.AbstractMetricsTestBase;
-import java.util.Arrays;
-import java.util.Map;
-import java.util.Map.Entry;
-import org.hamcrest.Matcher;
 
 public class Metrics4CapabilityTest
     extends AbstractMetricsTestBase<MetricRegistry, String, Metric> {
@@ -46,9 +43,8 @@ protected Map<String, Metric> getFeignMetrics() {
 
   @Override
   protected boolean doesMetricIdIncludeClient(String metricId) {
-    Matcher<String> containsBase = containsString("feign.micrometer.AbstractMetricsTestBase$");
-    Matcher<String> containsSource = containsString("Source");
-    return allOf(containsBase, containsSource).matches(metricId);
+    return metricId.contains("feign.micrometer.AbstractMetricsTestBase$")
+        && metricId.contains("Source");
   }
 
   @Override

diff --git a/dropwizard-metrics5/pom.xml b/dropwizard-metrics5/pom.xml
@@ -44,11 +44,6 @@
       <artifactId>metrics-core</artifactId>
       <version>5.0.0</version>
     </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>feign-micrometer</artifactId>

diff --git a/dropwizard-metrics5/src/test/java/feign/metrics5/Metrics5CapabilityTest.java b/dropwizard-metrics5/src/test/java/feign/metrics5/Metrics5CapabilityTest.java
@@ -13,9 +13,6 @@
  */
 package feign.metrics5;
 
-import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.hasEntry;
 import feign.Capability;
 import feign.Util;
 import feign.micrometer.AbstractMetricsTestBase;
@@ -49,20 +46,20 @@ protected Map<MetricName, Metric> getFeignMetrics() {
   @Override
   protected boolean doesMetricIdIncludeClient(MetricName metricId) {
     String tag = metricId.getTags().get("client");
-    Matcher<String> containsBase = containsString("feign.micrometer.AbstractMetricsTestBase$");
-    Matcher<String> containsSource = containsString("Source");
-    return allOf(containsBase, containsSource).matches(tag);
+    return tag.contains("feign.micrometer.AbstractMetricsTestBase$") && tag.contains("Source");
   }
 
   @Override
   protected boolean doesMetricIncludeVerb(MetricName metricId, String verb) {
-    return hasEntry("method", verb).matches(metricId.getTags());
+    String entry = metricId.getTags().get("method");
+    return entry != null && entry.equals(verb);
   }
 
   @Override
   protected boolean doesMetricIncludeHost(MetricName metricId) {
     // hostname is null due to feign-mock shortfalls
-    return hasEntry("host", null).matches(metricId.getTags());
+    String entry = metricId.getTags().get("host");
+    return entry == null;
   }
 
   @Override

diff --git a/jaxrs2/pom.xml b/jaxrs2/pom.xml
@@ -99,10 +99,5 @@
       <artifactId>mockwebserver</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/json/pom.xml b/json/pom.xml
@@ -40,11 +40,6 @@
       <groupId>org.json</groupId>
       <artifactId>json</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>

diff --git a/micrometer/pom.xml b/micrometer/pom.xml
@@ -57,11 +57,6 @@
       <version>${micrometer.version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>feign-okhttp</artifactId>

diff --git a/mock/pom.xml b/mock/pom.xml
@@ -42,11 +42,6 @@
       <artifactId>feign-gson</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
 </project>
diff --git a/mock/src/test/java/feign/mock/RequestKeyTest.java b/mock/src/test/java/feign/mock/RequestKeyTest.java
@@ -14,9 +14,6 @@
 package feign.mock;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hamcrest.Matchers.both;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.MatcherAssert.assertThat;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Collection;
@@ -146,17 +143,15 @@ public void equalsExtendedExtra() {
   @Test
   public void testToString() throws Exception {
     assertThat(requestKey.toString()).startsWith("Request [GET a: ");
-    assertThat(requestKey.toString(),
-        both(containsString(" with my-header=[val] ")).and(containsString(" UTF-16]")));
+    assertThat(requestKey.toString()).contains(" with my-header=[val] ", " UTF-16]");
   }
 
   @Test
   public void testToStringSimple() throws Exception {
     requestKey = RequestKey.builder(HttpMethod.GET, "a").build();
 
     assertThat(requestKey.toString()).startsWith("Request [GET a: ");
-    assertThat(requestKey.toString(),
-        both(containsString(" without ")).and(containsString(" no charset")));
+    assertThat(requestKey.toString()).contains(" without ", " no charset");
   }
 
 }

diff --git a/pom.xml b/pom.xml
@@ -91,11 +91,9 @@
     <slf4j.version>2.0.9</slf4j.version>
     <json.version>20231013</json.version>
 
-    <junit.version>4.13.2</junit.version>
     <junit5.version>5.10.1</junit5.version>
     <jackson.version>2.16.0</jackson.version>
     <assertj.version>3.24.2</assertj.version>
-    <hamcrest.version>2.2</hamcrest.version>
     <mockito.version>5.7.0</mockito.version>
 
     <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
@@ -287,11 +285,6 @@
         <scope>test</scope>
       </dependency>
 
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>${junit.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
@@ -300,12 +293,6 @@
         <scope>import</scope>
       </dependency>
 
-      <dependency>
-        <groupId>org.hamcrest</groupId>
-        <artifactId>hamcrest</artifactId>
-        <version>${hamcrest.version}</version>
-      </dependency>
-
       <dependency>
         <groupId>com.google.code.gson</groupId>
         <artifactId>gson</artifactId>
@@ -391,14 +378,13 @@
 
   <dependencies>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
       <scope>test</scope>
     </dependency>
-
     <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-params</artifactId>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
       <scope>test</scope>
     </dependency>
 

diff --git a/spring4/pom.xml b/spring4/pom.xml
@@ -55,11 +55,6 @@
       <artifactId>feign-jackson</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
 </project>