Remove deprecated method. (OpenFeign#1545)

myifeng · liqf7 · velo · web-flow · commit 057caadf0db9 · 2022-01-17T22:06:59.000Z
* Remove deprecated method.
Replace JUnit ExpectedException with assertThrows.
Replace JUnit Assert.assertThat with TestCase.assertEquals.
Fix assertEquals parameter position.

* Fix license

* format code

* Replace JUnit assertThat with Hamcrest.

* Replace TestCase.assertEquals with Assert.assertEquals

Co-authored-by: liqf7 &lt;liqf7@lenovo.com&gt;
Co-authored-by: Marvin Froeder &lt;velo@users.noreply.github.com&gt;
diff --git a/core/src/test/java/feign/CapabilityTest.java b/core/src/test/java/feign/CapabilityTest.java
@@ -14,7 +14,7 @@
 package feign;
 
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import org.hamcrest.CoreMatchers;
 import org.junit.Test;
 import java.io.IOException;
diff --git a/core/src/test/java/feign/EmptyTargetTest.java b/core/src/test/java/feign/EmptyTargetTest.java
@@ -14,18 +14,15 @@
 package feign;
 
 import feign.Request.HttpMethod;
-import org.junit.Rule;
+import feign.Target.EmptyTarget;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import java.net.URI;
-import feign.Target.EmptyTarget;
 import static feign.assertj.FeignAssertions.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
 
 public class EmptyTargetTest {
 
-  @Rule
-  public final ExpectedException thrown = ExpectedException.none();
-
   @Test
   public void whenNameNotSupplied() {
     assertThat(EmptyTarget.create(UriInterface.class))
@@ -46,11 +43,11 @@ public void toString_withName() {
 
   @Test
   public void mustApplyToAbsoluteUrl() {
-    thrown.expect(UnsupportedOperationException.class);
-    thrown.expectMessage("Request with non-absolute URL not supported with empty target");
-
-    EmptyTarget.create(UriInterface.class)
-        .apply(new RequestTemplate().method(HttpMethod.GET).uri("/relative"));
+    UnsupportedOperationException exception = assertThrows(UnsupportedOperationException.class,
+        () -> EmptyTarget.create(UriInterface.class)
+            .apply(new RequestTemplate().method(HttpMethod.GET).uri("/relative")));
+    assertEquals("Request with non-absolute URL not supported with empty target",
+        exception.getMessage());
   }
 
   interface UriInterface {
diff --git a/core/src/test/java/feign/template/HeaderTemplateTest.java b/core/src/test/java/feign/template/HeaderTemplateTest.java
@@ -13,38 +13,36 @@
  */
 package feign.template;
 
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+import org.junit.Test;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Map;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
 
 public class HeaderTemplateTest {
 
-  @Rule
-  public ExpectedException exception = ExpectedException.none();
-
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void it_should_throw_exception_when_name_is_null() {
-    HeaderTemplate.create(null, Collections.singletonList("test"));
-    exception.expectMessage("name is required.");
+    IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+        () -> HeaderTemplate.create(null, Collections.singletonList("test")));
+    assertEquals("name is required.", exception.getMessage());
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void it_should_throw_exception_when_name_is_empty() {
-    HeaderTemplate.create("", Collections.singletonList("test"));
-    exception.expectMessage("name is required.");
+    IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+        () -> HeaderTemplate.create("", Collections.singletonList("test")));
+    assertEquals("name is required.", exception.getMessage());
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void it_should_throw_exception_when_value_is_null() {
-    HeaderTemplate.create("test", null);
-    exception.expectMessage("values are required");
+    IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+        () -> HeaderTemplate.create("test", null));
+    assertEquals("values are required", exception.getMessage());
   }
 
   @Test
@@ -111,9 +109,8 @@ public void append_should_preserve_order() {
   public void it_should_support_http_date() {
     HeaderTemplate headerTemplate =
         HeaderTemplate.create("Expires", Collections.singletonList("{expires}"));
-    assertEquals(
+    assertEquals("Wed, 4 Jul 2001 12:08:56 -0700",
         headerTemplate.expand(
-            Collections.singletonMap("expires", "Wed, 4 Jul 2001 12:08:56 -0700")),
-        "Wed, 4 Jul 2001 12:08:56 -0700");
+            Collections.singletonMap("expires", "Wed, 4 Jul 2001 12:08:56 -0700")));
   }
 }
diff --git a/example-github/src/test/java/feign/example/github/GitHubExampleIT.java b/example-github/src/test/java/feign/example/github/GitHubExampleIT.java
@@ -13,7 +13,7 @@
  */
 package feign.example.github;
 
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import org.apache.commons.exec.CommandLine;
 import org.apache.commons.exec.DefaultExecutor;
 import org.hamcrest.CoreMatchers;
diff --git a/example-wikipedia/src/test/java/feign/example/wikipedia/WikipediaExampleIT.java b/example-wikipedia/src/test/java/feign/example/wikipedia/WikipediaExampleIT.java
@@ -13,7 +13,7 @@
  */
 package feign.example.wikipedia;
 
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import org.apache.commons.exec.CommandLine;
 import org.apache.commons.exec.DefaultExecutor;
 import org.hamcrest.CoreMatchers;
diff --git a/mock/src/test/java/feign/mock/MockTargetTest.java b/mock/src/test/java/feign/mock/MockTargetTest.java
@@ -14,7 +14,7 @@
 package feign.mock;
 
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/mock/src/test/java/feign/mock/RequestKeyTest.java b/mock/src/test/java/feign/mock/RequestKeyTest.java
@@ -19,7 +19,7 @@
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.startsWith;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/ribbon/src/test/java/feign/ribbon/RibbonClientTest.java b/ribbon/src/test/java/feign/ribbon/RibbonClientTest.java
@@ -19,7 +19,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import java.io.IOException;
