Skip to content

Commit 4f3b89e

Browse files
committed
Adapt MethodParameterTests to AssertJ usage on master
See gh-23352
1 parent 8ef557d commit 4f3b89e

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

spring-core/src/test/java/org/springframework/core/MethodParameterTests.java

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -154,11 +154,11 @@ public void genericConstructorParameterInInnerClass() throws Exception {
154154
public void multipleResolveParameterTypeCalls() throws Exception {
155155
Method method = ArrayList.class.getMethod("get", int.class);
156156
MethodParameter methodParameter = MethodParameter.forExecutable(method, -1);
157-
assertEquals(Object.class, methodParameter.getParameterType());
157+
assertThat(methodParameter.getParameterType()).isEqualTo(Object.class);
158158
GenericTypeResolver.resolveParameterType(methodParameter, StringList.class);
159-
assertEquals(String.class, methodParameter.getParameterType());
159+
assertThat(methodParameter.getParameterType()).isEqualTo(String.class);
160160
GenericTypeResolver.resolveParameterType(methodParameter, IntegerList.class);
161-
assertEquals(Integer.class, methodParameter.getParameterType());
161+
assertThat(methodParameter.getParameterType()).isEqualTo(Integer.class);
162162
}
163163

164164
@Test
@@ -167,9 +167,8 @@ public void equalsAndHashCodeConsidersContainingClass() throws Exception {
167167
MethodParameter m1 = MethodParameter.forExecutable(method, -1);
168168
MethodParameter m2 = MethodParameter.forExecutable(method, -1);
169169
MethodParameter m3 = MethodParameter.forExecutable(method, -1).nested();
170-
assertEquals(m1, m2);
171-
assertNotEquals(m1, m3);
172-
assertEquals(m1.hashCode(), m2.hashCode());
170+
assertThat(m1).isEqualTo(m2).isNotEqualTo(m3);
171+
assertThat(m1.hashCode()).isEqualTo(m2.hashCode());
173172
}
174173

175174
@Test
@@ -182,10 +181,8 @@ public void equalsAndHashCodeConsidersNesting() throws Exception {
182181
MethodParameter m3 = MethodParameter.forExecutable(method, -1);
183182
GenericTypeResolver.resolveParameterType(m3, IntegerList.class);
184183
MethodParameter m4 = MethodParameter.forExecutable(method, -1);
185-
assertEquals(m1, m2);
186-
assertNotEquals(m1, m3);
187-
assertNotEquals(m1, m4);
188-
assertEquals(m1.hashCode(), m2.hashCode());
184+
assertThat(m1).isEqualTo(m2).isNotEqualTo(m3).isNotEqualTo(m4);
185+
assertThat(m1.hashCode()).isEqualTo(m2.hashCode());
189186
}
190187

191188

0 commit comments

Comments
 (0)