diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateUnitTests.java index 3cbae4adf..2944a1d08 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateUnitTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateUnitTests.java @@ -51,7 +51,6 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoSettings; import org.mockito.quality.Strictness; - import org.springframework.beans.factory.annotation.Value; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationListener; @@ -122,16 +121,7 @@ import com.mongodb.client.MongoClient; import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoCursor; import com.mongodb.client.MongoDatabase; -import com.mongodb.client.model.CountOptions; -import com.mongodb.client.model.CreateCollectionOptions; -import com.mongodb.client.model.DeleteOptions; -import com.mongodb.client.model.FindOneAndDeleteOptions; -import com.mongodb.client.model.FindOneAndReplaceOptions; -import com.mongodb.client.model.FindOneAndUpdateOptions; -import com.mongodb.client.model.MapReduceAction; -import com.mongodb.client.model.ReplaceOptions; -import com.mongodb.client.model.TimeSeriesGranularity; -import com.mongodb.client.model.UpdateOptions; +import com.mongodb.client.model.*; import com.mongodb.client.result.DeleteResult; import com.mongodb.client.result.UpdateResult; @@ -2479,8 +2469,7 @@ public class MongoTemplateUnitTests extends MongoOperationsUnitTests { */ @Override protected MongoOperations getOperationsForExceptionHandling() { - MongoTemplate template = spy(this.template); - lenient().when(template.getDb()).thenThrow(new MongoException("Error!")); + when(template.getMongoDatabaseFactory().getMongoDatabase()).thenThrow(new MongoException("Error")); return template; } diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/SimpleReactiveMongoRepositoryUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/SimpleReactiveMongoRepositoryUnitTests.java index 0e66f2602..9a4341bf8 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/SimpleReactiveMongoRepositoryUnitTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/SimpleReactiveMongoRepositoryUnitTests.java @@ -28,7 +28,6 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; - import org.springframework.data.domain.Example; import org.springframework.data.domain.Sort; import org.springframework.data.mongodb.core.ReactiveMongoOperations; @@ -43,8 +42,6 @@ import org.springframework.data.mongodb.repository.query.MongoEntityInformation; class SimpleReactiveMongoRepositoryUnitTests { private SimpleReactiveMongoRepository repository; - @Mock Mono mono; - @Mock Flux flux; @Mock ReactiveMongoOperations mongoOperations; @Mock MongoEntityInformation entityInformation; @@ -56,7 +53,7 @@ class SimpleReactiveMongoRepositoryUnitTests { @Test // DATAMONGO-1854 void shouldAddDefaultCollationToCountForExampleIfPresent() { - when(mongoOperations.count(any(), any(), any())).thenReturn(mono); + when(mongoOperations.count(any(), any(), any())).thenReturn(Mono.empty()); Collation collation = Collation.of("en_US"); @@ -72,7 +69,7 @@ class SimpleReactiveMongoRepositoryUnitTests { @Test // DATAMONGO-1854 void shouldAddDefaultCollationToExistsForExampleIfPresent() { - when(mongoOperations.exists(any(), any(), any())).thenReturn(mono); + when(mongoOperations.exists(any(), any(), any())).thenReturn(Mono.empty()); Collation collation = Collation.of("en_US"); @@ -88,7 +85,7 @@ class SimpleReactiveMongoRepositoryUnitTests { @Test // DATAMONGO-1854 void shouldAddDefaultCollationToFindForExampleIfPresent() { - when(mongoOperations.find(any(), any(), any())).thenReturn(flux); + when(mongoOperations.find(any(), any(), any())).thenReturn(Flux.empty()); Collation collation = Collation.of("en_US"); @@ -104,7 +101,7 @@ class SimpleReactiveMongoRepositoryUnitTests { @Test // DATAMONGO-1854 void shouldAddDefaultCollationToFindWithSortForExampleIfPresent() { - when(mongoOperations.find(any(), any(), any())).thenReturn(flux); + when(mongoOperations.find(any(), any(), any())).thenReturn(Flux.empty()); Collation collation = Collation.of("en_US"); @@ -120,7 +117,8 @@ class SimpleReactiveMongoRepositoryUnitTests { @Test // DATAMONGO-1854 void shouldAddDefaultCollationToFindOneForExampleIfPresent() { - when(mongoOperations.find(any(), any(), any())).thenReturn(flux); + when(entityInformation.getCollectionName()).thenReturn("testdummy"); + doReturn(Flux.empty()).when(mongoOperations).find(any(Query.class), eq(TestDummy.class), eq("testdummy")); Collation collation = Collation.of("en_US");