Skip to content

Commit 5f5b059

Browse files
committed
Adopt to Mockito 5.1 changes.
Closes #4290
1 parent c8c3136 commit 5f5b059

File tree

2 files changed

+8
-21
lines changed

2 files changed

+8
-21
lines changed

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateUnitTests.java

+2-13
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
import org.mockito.Mockito;
5252
import org.mockito.junit.jupiter.MockitoSettings;
5353
import org.mockito.quality.Strictness;
54-
5554
import org.springframework.beans.factory.annotation.Value;
5655
import org.springframework.context.ApplicationContext;
5756
import org.springframework.context.ApplicationListener;
@@ -122,16 +121,7 @@
122121
import com.mongodb.client.MongoCollection;
123122
import com.mongodb.client.MongoCursor;
124123
import com.mongodb.client.MongoDatabase;
125-
import com.mongodb.client.model.CountOptions;
126-
import com.mongodb.client.model.CreateCollectionOptions;
127-
import com.mongodb.client.model.DeleteOptions;
128-
import com.mongodb.client.model.FindOneAndDeleteOptions;
129-
import com.mongodb.client.model.FindOneAndReplaceOptions;
130-
import com.mongodb.client.model.FindOneAndUpdateOptions;
131-
import com.mongodb.client.model.MapReduceAction;
132-
import com.mongodb.client.model.ReplaceOptions;
133-
import com.mongodb.client.model.TimeSeriesGranularity;
134-
import com.mongodb.client.model.UpdateOptions;
124+
import com.mongodb.client.model.*;
135125
import com.mongodb.client.result.DeleteResult;
136126
import com.mongodb.client.result.UpdateResult;
137127

@@ -2479,8 +2469,7 @@ private MongoTemplate mockOutGetDb() {
24792469
*/
24802470
@Override
24812471
protected MongoOperations getOperationsForExceptionHandling() {
2482-
MongoTemplate template = spy(this.template);
2483-
lenient().when(template.getDb()).thenThrow(new MongoException("Error!"));
2472+
when(template.getMongoDatabaseFactory().getMongoDatabase()).thenThrow(new MongoException("Error"));
24842473
return template;
24852474
}
24862475

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/SimpleReactiveMongoRepositoryUnitTests.java

+6-8
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import org.mockito.ArgumentCaptor;
2929
import org.mockito.Mock;
3030
import org.mockito.junit.jupiter.MockitoExtension;
31-
3231
import org.springframework.data.domain.Example;
3332
import org.springframework.data.domain.Sort;
3433
import org.springframework.data.mongodb.core.ReactiveMongoOperations;
@@ -43,8 +42,6 @@
4342
class SimpleReactiveMongoRepositoryUnitTests {
4443

4544
private SimpleReactiveMongoRepository<Object, String> repository;
46-
@Mock Mono mono;
47-
@Mock Flux flux;
4845
@Mock ReactiveMongoOperations mongoOperations;
4946
@Mock MongoEntityInformation<Object, String> entityInformation;
5047

@@ -56,7 +53,7 @@ void setUp() {
5653
@Test // DATAMONGO-1854
5754
void shouldAddDefaultCollationToCountForExampleIfPresent() {
5855

59-
when(mongoOperations.count(any(), any(), any())).thenReturn(mono);
56+
when(mongoOperations.count(any(), any(), any())).thenReturn(Mono.empty());
6057

6158
Collation collation = Collation.of("en_US");
6259

@@ -72,7 +69,7 @@ void shouldAddDefaultCollationToCountForExampleIfPresent() {
7269
@Test // DATAMONGO-1854
7370
void shouldAddDefaultCollationToExistsForExampleIfPresent() {
7471

75-
when(mongoOperations.exists(any(), any(), any())).thenReturn(mono);
72+
when(mongoOperations.exists(any(), any(), any())).thenReturn(Mono.empty());
7673

7774
Collation collation = Collation.of("en_US");
7875

@@ -88,7 +85,7 @@ void shouldAddDefaultCollationToExistsForExampleIfPresent() {
8885
@Test // DATAMONGO-1854
8986
void shouldAddDefaultCollationToFindForExampleIfPresent() {
9087

91-
when(mongoOperations.find(any(), any(), any())).thenReturn(flux);
88+
when(mongoOperations.find(any(), any(), any())).thenReturn(Flux.empty());
9289

9390
Collation collation = Collation.of("en_US");
9491

@@ -104,7 +101,7 @@ void shouldAddDefaultCollationToFindForExampleIfPresent() {
104101
@Test // DATAMONGO-1854
105102
void shouldAddDefaultCollationToFindWithSortForExampleIfPresent() {
106103

107-
when(mongoOperations.find(any(), any(), any())).thenReturn(flux);
104+
when(mongoOperations.find(any(), any(), any())).thenReturn(Flux.empty());
108105

109106
Collation collation = Collation.of("en_US");
110107

@@ -120,7 +117,8 @@ void shouldAddDefaultCollationToFindWithSortForExampleIfPresent() {
120117
@Test // DATAMONGO-1854
121118
void shouldAddDefaultCollationToFindOneForExampleIfPresent() {
122119

123-
when(mongoOperations.find(any(), any(), any())).thenReturn(flux);
120+
when(entityInformation.getCollectionName()).thenReturn("testdummy");
121+
doReturn(Flux.empty()).when(mongoOperations).find(any(Query.class), eq(TestDummy.class), eq("testdummy"));
124122

125123
Collation collation = Collation.of("en_US");
126124

0 commit comments

Comments
 (0)