Skip to content

Commit 322ef00

Browse files
mp911deschauder
authored andcommitted
Adopt to Mockito 5.1 changes.
Closes #1424
1 parent 2372b0d commit 322ef00

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateTemplateUnitTests.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public void callbackOnSave() {
103103
SampleEntity second = new SampleEntity(23L, "Alfred E.");
104104
SampleEntity third = new SampleEntity(23L, "Neumann");
105105

106-
when(callbacks.callback(any(Class.class), any(), any())).thenReturn(second, third);
106+
when(callbacks.callback(any(Class.class), any(), any(Object[].class))).thenReturn(second, third);
107107

108108
SampleEntity last = template.save(first);
109109

@@ -121,7 +121,7 @@ public void doesNotEmitEvents() {
121121
SampleEntity second = new SampleEntity(23L, "Alfred E.");
122122
SampleEntity third = new SampleEntity(23L, "Neumann");
123123

124-
when(callbacks.callback(any(Class.class), any(), any())).thenReturn(second, third);
124+
when(callbacks.callback(any(Class.class), any(), any(Object[].class))).thenReturn(second, third);
125125

126126
template.setEntityLifecycleEventsEnabled(false);
127127
template.save(first);
@@ -133,7 +133,7 @@ public void doesNotEmitEvents() {
133133
void savePreparesInstanceWithInitialVersion_onInsert() {
134134

135135
EntityWithVersion entity = new EntityWithVersion(1L);
136-
when(callbacks.callback(any(), any(), any())).thenReturn(entity, entity);
136+
when(callbacks.callback(any(), any(), any(Object[].class))).thenReturn(entity, entity);
137137

138138
template.save(entity);
139139

@@ -148,7 +148,7 @@ void savePreparesInstanceWithInitialVersion_onInsert() {
148148
void savePreparesInstanceWithInitialVersion_onInsert_whenVersionPropertyIsImmutable() {
149149

150150
EntityWithImmutableVersion entity = new EntityWithImmutableVersion(1L, null);
151-
when(callbacks.callback(any(), any(), any())).thenReturn(entity, entity);
151+
when(callbacks.callback(any(), any(), any(Object[].class))).thenReturn(entity, entity);
152152

153153
template.save(entity);
154154

@@ -163,7 +163,7 @@ void savePreparesInstanceWithInitialVersion_onInsert_whenVersionPropertyIsImmuta
163163
void savePreparesInstanceWithInitialVersion_onInsert_whenVersionPropertyIsPrimitiveType() {
164164

165165
EntityWithPrimitiveVersion entity = new EntityWithPrimitiveVersion(1L);
166-
when(callbacks.callback(any(), any(), any())).thenReturn(entity, entity);
166+
when(callbacks.callback(any(), any(), any(Object[].class))).thenReturn(entity, entity);
167167

168168
template.save(entity);
169169

@@ -178,7 +178,7 @@ void savePreparesInstanceWithInitialVersion_onInsert_whenVersionPropertyIsPrimit
178178
void savePreparesInstanceWithInitialVersion_onInsert__whenVersionPropertyIsImmutableAndPrimitiveType() {
179179

180180
EntityWithImmutablePrimitiveVersion entity = new EntityWithImmutablePrimitiveVersion(1L, 0L);
181-
when(callbacks.callback(any(), any(), any())).thenReturn(entity, entity);
181+
when(callbacks.callback(any(), any(), any(Object[].class))).thenReturn(entity, entity);
182182

183183
template.save(entity);
184184

@@ -196,7 +196,7 @@ void savePreparesChangeWithPreviousVersion_onUpdate() {
196196
when(dataAccessStrategy.updateWithVersion(any(), any(), any())).thenReturn(true);
197197
EntityWithVersion entity = new EntityWithVersion(1L);
198198
entity.setVersion(1L);
199-
when(callbacks.callback(any(), any(), any())).thenReturn(entity, entity);
199+
when(callbacks.callback(any(), any(), any(Object[].class))).thenReturn(entity, entity);
200200

201201
template.save(entity);
202202

@@ -213,7 +213,7 @@ void savePreparesInstanceWithNextVersion_onUpdate() {
213213
when(dataAccessStrategy.updateWithVersion(any(), any(), any())).thenReturn(true);
214214
EntityWithVersion entity = new EntityWithVersion(1L);
215215
entity.setVersion(1L);
216-
when(callbacks.callback(any(), any(), any())).thenReturn(entity, entity);
216+
when(callbacks.callback(any(), any(), any(Object[].class))).thenReturn(entity, entity);
217217

218218
template.save(entity);
219219

@@ -229,7 +229,7 @@ void savePreparesInstanceWithNextVersion_onUpdate_whenVersionPropertyIsImmutable
229229

230230
when(dataAccessStrategy.updateWithVersion(any(), any(), any())).thenReturn(true);
231231
EntityWithImmutableVersion entity = new EntityWithImmutableVersion(1L, 1L);
232-
when(callbacks.callback(any(), any(), any())).thenReturn(entity, entity);
232+
when(callbacks.callback(any(), any(), any(Object[].class))).thenReturn(entity, entity);
233233

234234
template.save(entity);
235235

@@ -243,7 +243,7 @@ void savePreparesInstanceWithNextVersion_onUpdate_whenVersionPropertyIsImmutable
243243
void deletePreparesChangeWithPreviousVersion_onDeleteByInstance() {
244244

245245
EntityWithImmutableVersion entity = new EntityWithImmutableVersion(1L, 1L);
246-
when(callbacks.callback(any(), any(), any())).thenReturn(entity, entity);
246+
when(callbacks.callback(any(), any(), any(Object[].class))).thenReturn(entity, entity);
247247

248248
template.delete(entity);
249249

@@ -279,8 +279,8 @@ public void callbackOnLoadSorted() {
279279

280280
when(dataAccessStrategy.findAll(SampleEntity.class, Sort.by("name"))).thenReturn(asList(alfred1, neumann1));
281281

282-
when(callbacks.callback(any(Class.class), eq(alfred1), any())).thenReturn(alfred2);
283-
when(callbacks.callback(any(Class.class), eq(neumann1), any())).thenReturn(neumann2);
282+
when(callbacks.callback(any(Class.class), eq(alfred1), any(Object[].class))).thenReturn(alfred2);
283+
when(callbacks.callback(any(Class.class), eq(neumann1), any(Object[].class))).thenReturn(neumann2);
284284

285285
Iterable<SampleEntity> all = template.findAll(SampleEntity.class, Sort.by("name"));
286286

@@ -301,8 +301,8 @@ public void callbackOnLoadPaged() {
301301

302302
when(dataAccessStrategy.findAll(SampleEntity.class, PageRequest.of(0, 20))).thenReturn(asList(alfred1, neumann1));
303303

304-
when(callbacks.callback(any(Class.class), eq(alfred1), any())).thenReturn(alfred2);
305-
when(callbacks.callback(any(Class.class), eq(neumann1), any())).thenReturn(neumann2);
304+
when(callbacks.callback(any(Class.class), eq(alfred1), any(Object[].class))).thenReturn(alfred2);
305+
when(callbacks.callback(any(Class.class), eq(neumann1), any(Object[].class))).thenReturn(neumann2);
306306

307307
Iterable<SampleEntity> all = template.findAll(SampleEntity.class, PageRequest.of(0, 20));
308308

0 commit comments

Comments
 (0)