From 71fd13cccf9056e8ad231d25d1201169466f2f0f Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 14 Feb 2023 10:34:57 +0100 Subject: [PATCH] Adopt to Mockito 5.1 changes. See #1424 --- .../core/JdbcAggregateTemplateUnitTests.java | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateTemplateUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateTemplateUnitTests.java index 2362db624..f7196622b 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateTemplateUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateTemplateUnitTests.java @@ -136,10 +136,10 @@ public class JdbcAggregateTemplateUnitTests { when(dataAccessStrategy.findAll(SampleEntity.class)).thenReturn(asList(alfred1, neumann1)); - when(callbacks.callback(any(Class.class), eq(alfred1), any())).thenReturn(alfred2); - when(callbacks.callback(any(Class.class), eq(alfred2), any())).thenReturn(alfred2); - when(callbacks.callback(any(Class.class), eq(neumann1), any())).thenReturn(neumann2); - when(callbacks.callback(any(Class.class), eq(neumann2), any())).thenReturn(neumann2); + when(callbacks.callback(any(Class.class), eq(alfred1), any(Object[].class))).thenReturn(alfred2); + when(callbacks.callback(any(Class.class), eq(alfred2), any(Object[].class))).thenReturn(alfred2); + when(callbacks.callback(any(Class.class), eq(neumann1), any(Object[].class))).thenReturn(neumann2); + when(callbacks.callback(any(Class.class), eq(neumann2), any(Object[].class))).thenReturn(neumann2); Iterable all = template.findAll(SampleEntity.class); @@ -160,10 +160,10 @@ public class JdbcAggregateTemplateUnitTests { when(dataAccessStrategy.findAll(SampleEntity.class, Sort.by("name"))).thenReturn(asList(alfred1, neumann1)); - when(callbacks.callback(any(Class.class), eq(alfred1), any())).thenReturn(alfred2); - when(callbacks.callback(any(Class.class), eq(alfred2), any())).thenReturn(alfred2); - when(callbacks.callback(any(Class.class), eq(neumann1), any())).thenReturn(neumann2); - when(callbacks.callback(any(Class.class), eq(neumann2), any())).thenReturn(neumann2); + when(callbacks.callback(any(Class.class), eq(alfred1), any(Object[].class))).thenReturn(alfred2); + when(callbacks.callback(any(Class.class), eq(alfred2), any(Object[].class))).thenReturn(alfred2); + when(callbacks.callback(any(Class.class), eq(neumann1), any(Object[].class))).thenReturn(neumann2); + when(callbacks.callback(any(Class.class), eq(neumann2), any(Object[].class))).thenReturn(neumann2); Iterable all = template.findAll(SampleEntity.class, Sort.by("name")); @@ -186,10 +186,10 @@ public class JdbcAggregateTemplateUnitTests { when(dataAccessStrategy.findAll(SampleEntity.class, PageRequest.of(0, 20))).thenReturn(asList(alfred1, neumann1)); - when(callbacks.callback(any(Class.class), eq(alfred1), any())).thenReturn(alfred2); - when(callbacks.callback(any(Class.class), eq(alfred2), any())).thenReturn(alfred2); - when(callbacks.callback(any(Class.class), eq(neumann1), any())).thenReturn(neumann2); - when(callbacks.callback(any(Class.class), eq(neumann2), any())).thenReturn(neumann2); + when(callbacks.callback(any(Class.class), eq(alfred1), any(Object[].class))).thenReturn(alfred2); + when(callbacks.callback(any(Class.class), eq(alfred2), any(Object[].class))).thenReturn(alfred2); + when(callbacks.callback(any(Class.class), eq(neumann1), any(Object[].class))).thenReturn(neumann2); + when(callbacks.callback(any(Class.class), eq(neumann2), any(Object[].class))).thenReturn(neumann2); Iterable all = template.findAll(SampleEntity.class, PageRequest.of(0, 20)); @@ -205,7 +205,8 @@ public class JdbcAggregateTemplateUnitTests { @AllArgsConstructor private static class SampleEntity { - @Column("id1") @Id private Long id; + @Column("id1") + @Id private Long id; private String name; }