Adapt MethodParameterTests to AssertJ usage on master

See spring-projectsgh-23352
pierDipi · Jul 30, 2019 · 4f3b89e · 4f3b89e
1 parent 8ef557d
commit 4f3b89e
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/spring-core/src/test/java/org/springframework/core/MethodParameterTests.java b/spring-core/src/test/java/org/springframework/core/MethodParameterTests.java
@@ -154,11 +154,11 @@ public void genericConstructorParameterInInnerClass() throws Exception {
 	public void multipleResolveParameterTypeCalls() throws Exception {
 		Method method = ArrayList.class.getMethod("get", int.class);
 		MethodParameter methodParameter = MethodParameter.forExecutable(method, -1);
-		assertEquals(Object.class, methodParameter.getParameterType());
+		assertThat(methodParameter.getParameterType()).isEqualTo(Object.class);
 		GenericTypeResolver.resolveParameterType(methodParameter, StringList.class);
-		assertEquals(String.class, methodParameter.getParameterType());
+		assertThat(methodParameter.getParameterType()).isEqualTo(String.class);
 		GenericTypeResolver.resolveParameterType(methodParameter, IntegerList.class);
-		assertEquals(Integer.class, methodParameter.getParameterType());
+		assertThat(methodParameter.getParameterType()).isEqualTo(Integer.class);
 	}
 
 	@Test
@@ -167,9 +167,8 @@ public void equalsAndHashCodeConsidersContainingClass() throws Exception {
 		MethodParameter m1 = MethodParameter.forExecutable(method, -1);
 		MethodParameter m2 = MethodParameter.forExecutable(method, -1);
 		MethodParameter m3 = MethodParameter.forExecutable(method, -1).nested();
-		assertEquals(m1, m2);
-		assertNotEquals(m1, m3);
-		assertEquals(m1.hashCode(), m2.hashCode());
+		assertThat(m1).isEqualTo(m2).isNotEqualTo(m3);
+		assertThat(m1.hashCode()).isEqualTo(m2.hashCode());
 	}
 
 	@Test
@@ -182,10 +181,8 @@ public void equalsAndHashCodeConsidersNesting() throws Exception {
 		MethodParameter m3 = MethodParameter.forExecutable(method, -1);
 		GenericTypeResolver.resolveParameterType(m3, IntegerList.class);
 		MethodParameter m4 = MethodParameter.forExecutable(method, -1);
-		assertEquals(m1, m2);
-		assertNotEquals(m1, m3);
-		assertNotEquals(m1, m4);
-		assertEquals(m1.hashCode(), m2.hashCode());
+		assertThat(m1).isEqualTo(m2).isNotEqualTo(m3).isNotEqualTo(m4);
+		assertThat(m1.hashCode()).isEqualTo(m2.hashCode());
 	}