GitHub-Spring
/
spring-data-mongodb
mirror of https://github.com/spring-projects/spring-data-mongodb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Polishing. 

Simplify tests by using JUnit's meta-annotation pickup of ExtendWith. Hide extensions.

See: #5013
Original pull request: #5014
pull/5016/head
Mark Paluch 5 months ago
parent
d43d6b062e
commit
925e3cdcad
No known key found for this signature in database
GPG Key ID: 55BC6374BAA9D973
74 changed files with 158 additions and 251 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/ReactiveTransactionIntegrationTests.java
  2. 4
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AuditingViaJavaConfigRepositoriesTests.java
  3. 15
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/ReactiveAuditingTests.java
  4. 4
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ClientSessionTests.java
  5. 6
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultBulkOperationsIntegrationTests.java
  6. 10
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultIndexOperationsIntegrationTests.java
  7. 12
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultReactiveBulkOperationsTests.java
  8. 4
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultReactiveIndexOperationsTests.java
  9. 3
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultScriptOperationsTests.java
  10. 3
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ExecutableFindOperationSupportTests.java
  11. 4
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ExecutableRemoveOperationSupportTests.java
  12. 4
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ExecutableUpdateOperationSupportTests.java
  13. 46
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/JsonSchemaQueryTests.java
  14. 4
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateCollationTests.java
  15. 4
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateDbRefTests.java
  16. 5
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateDocumentReferenceTests.java
  17. 4
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateFieldProjectionTests.java
  18. 6
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateReplaceTests.java
  19. 5
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateScrollTests.java
  20. 5
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateTests.java
  21. 4
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateTransactionTests.java
  22. 4
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateUnwrappedTests.java
  23. 8
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateUpdateTests.java
  24. 4
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateValidationTests.java
  25. 5
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateViewTests.java
  26. 4
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/NoExplicitIdTests.java
  27. 4
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/QueryByExampleTests.java
  28. 4
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveChangeStreamOperationSupportTests.java
  29. 3
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveClientSessionTests.java
  30. 4
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveFindOperationSupportTests.java
  31. 4
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateCollationTests.java
  32. 6
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateIndexTests.java
  33. 7
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateReplaceTests.java
  34. 5
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateScrollTests.java
  35. 4
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateTests.java
  36. 5
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateTransactionTests.java
  37. 5
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateUpdateTests.java
  38. 5
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateViewTests.java
  39. 11
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveRemoveOperationSupportTests.java
  40. 12
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveUpdateOperationSupportTests.java
  41. 4
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SessionBoundMongoTemplateTests.java
  42. 4
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationTests.java
  43. 4
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/SetWindowFieldsOperationTests.java
  44. 3
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/auditing/MongoTemplateAuditingTests.java
  45. 3
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/auditing/ReactiveMongoTemplateAuditingTests.java
  46. 6
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterTests.java
  47. 4
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MongoConvertersIntegrationTests.java
  48. 3
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/encryption/MongoQueryableEncryptionCollectionCreationTests.java
  49. 9
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/encryption/RangeEncryptionTests.java
  50. 4
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/GeoJsonTests.java
  51. 4
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/IndexingIntegrationTests.java
  52. 4
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/TextIndexTests.java
  53. 10
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/VectorIndexIntegrationTests.java
  54. 4
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MappingTests.java
  55. 4
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/ApplicationContextEventTests.java
  56. 4
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/ChangeStreamTests.java
  57. 5
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/DefaultMessageListenerContainerTests.java
  58. 4
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/TailableCursorTests.java
  59. 4
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/CriteriaTests.java
  60. 4
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/TextQueryTests.java
  61. 4
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/schema/MongoJsonSchemaTests.java
  62. 4
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/schema/ReactiveMongoJsonSchemaTests.java
  63. 4
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/ComplexIdRepositoryIntegrationTests.java
  64. 4
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/MongoRepositoryTextSearchIntegrationTests.java
  65. 4
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonRepositoryTransactionalTests.java
  66. 3
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/VersionedPersonRepositoryIntegrationTests.java
  67. 4
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/MongoRepositoryContributorTests.java
  68. 4
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/MongoRepositoryContributorUnitTests.java
  69. 4
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/MongoRepositoryMetadataTests.java
  70. 5
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/SimpleMongoRepositoryTests.java
  71. 6
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/EnableIfVectorSearchAvailable.java
  72. 6
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoClientExtension.java
  73. 4
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoServerCondition.java
  74. 2
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoTemplateExtension.java

4
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/ReactiveTransactionIntegrationTests.java
Unescape View File

@ -33,8 +33,8 @@ import org.junit.jupiter.api.BeforeAll; @@ -33,8 +33,8 @@ import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junitpioneer.jupiter.SetSystemProperty;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@ -47,7 +47,6 @@ import org.springframework.data.mongodb.core.query.Query; @@ -47,7 +47,6 @@ import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.test.util.Client;
import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
import org.springframework.data.mongodb.test.util.EnableIfReplicaSetAvailable;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import org.springframework.data.mongodb.test.util.MongoTestUtils;
import org.springframework.transaction.TransactionSystemException;
import org.springframework.transaction.annotation.EnableTransactionManagement;
@ -67,7 +66,6 @@ import com.mongodb.reactivestreams.client.MongoClient; @@ -67,7 +66,6 @@ import com.mongodb.reactivestreams.client.MongoClient;
* @author Christoph Strobl
* @author Yan Kardziyaka
*/
@ExtendWith(MongoClientExtension.class)
@EnableIfMongoServerVersion(isGreaterThanEqual = "4.0")
@EnableIfReplicaSetAvailable
@DisabledIfSystemProperty(named = "user.name", matches = "jenkins")

4
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AuditingViaJavaConfigRepositoriesTests.java
Unescape View File

@ -29,6 +29,7 @@ import java.util.function.Function; @@ -29,6 +29,7 @@ import java.util.function.Function;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
@ -48,7 +49,6 @@ import org.springframework.data.mongodb.core.mapping.event.ReactiveAuditingEntit @@ -48,7 +49,6 @@ import org.springframework.data.mongodb.core.mapping.event.ReactiveAuditingEntit
import org.springframework.data.mongodb.repository.MongoRepository;
import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
import org.springframework.data.mongodb.test.util.Client;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import org.springframework.data.mongodb.test.util.MongoClientClosingTestConfiguration;
import org.springframework.data.mongodb.test.util.MongoTestUtils;
import org.springframework.stereotype.Repository;
@ -65,7 +65,7 @@ import com.mongodb.client.MongoClient; @@ -65,7 +65,7 @@ import com.mongodb.client.MongoClient;
* @author Oliver Gierke
* @author Mark Paluch
*/
@ExtendWith({ MongoClientExtension.class, SpringExtension.class })
@ExtendWith({ SpringExtension.class })
@ContextConfiguration
class AuditingViaJavaConfigRepositoriesTests {

15
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/ReactiveAuditingTests.java
Unescape View File

@ -17,12 +17,6 @@ package org.springframework.data.mongodb.config; @@ -17,12 +17,6 @@ package org.springframework.data.mongodb.config;
import static org.assertj.core.api.Assertions.*;
import org.springframework.core.ResolvableType;
import org.springframework.data.mapping.callback.EntityCallback;
import org.springframework.data.mongodb.core.mapping.event.AuditingEntityCallback;
import org.springframework.data.mongodb.core.mapping.event.ReactiveAuditingEntityCallback;
import org.springframework.data.mongodb.test.util.ReactiveMongoClientClosingTestConfiguration;
import org.springframework.test.util.ReflectionTestUtils;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;
@ -42,18 +36,23 @@ import org.springframework.context.annotation.Bean; @@ -42,18 +36,23 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan.Filter;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.FilterType;
import org.springframework.core.ResolvableType;
import org.springframework.data.annotation.Version;
import org.springframework.data.domain.ReactiveAuditorAware;
import org.springframework.data.mapping.callback.EntityCallback;
import org.springframework.data.mongodb.core.AuditablePerson;
import org.springframework.data.mongodb.core.ReactiveMongoOperations;
import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
import org.springframework.data.mongodb.core.mapping.event.AuditingEntityCallback;
import org.springframework.data.mongodb.core.mapping.event.ReactiveAuditingEntityCallback;
import org.springframework.data.mongodb.repository.ReactiveMongoRepository;
import org.springframework.data.mongodb.repository.config.EnableReactiveMongoRepositories;
import org.springframework.data.mongodb.test.util.Client;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import org.springframework.data.mongodb.test.util.ReactiveMongoClientClosingTestConfiguration;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.test.util.ReflectionTestUtils;
import com.mongodb.reactivestreams.client.MongoClient;
@ -62,7 +61,7 @@ import com.mongodb.reactivestreams.client.MongoClient; @@ -62,7 +61,7 @@ import com.mongodb.reactivestreams.client.MongoClient;
*
* @author Mark Paluch
*/
@ExtendWith({ MongoClientExtension.class, SpringExtension.class })
@ExtendWith({ SpringExtension.class })
@ContextConfiguration
class ReactiveAuditingTests {

4
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ClientSessionTests.java
Unescape View File

@ -24,14 +24,13 @@ import java.util.Objects; @@ -24,14 +24,13 @@ import java.util.Objects;
import org.bson.Document;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.data.annotation.Id;
import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
import org.springframework.data.mongodb.core.mapping.DBRef;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
import org.springframework.data.mongodb.test.util.EnableIfReplicaSetAvailable;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import org.springframework.data.mongodb.test.util.MongoTestUtils;
import org.springframework.data.mongodb.test.util.ReplSetClient;
import org.springframework.test.util.ReflectionTestUtils;
@ -46,7 +45,6 @@ import com.mongodb.client.MongoClient; @@ -46,7 +45,6 @@ import com.mongodb.client.MongoClient;
* @author Christoph Strobl
* @author Mark Paluch
*/
@ExtendWith({ MongoClientExtension.class })
@EnableIfReplicaSetAvailable
@EnableIfMongoServerVersion(isGreaterThanEqual = "4.0")
class ClientSessionTests {

6
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultBulkOperationsIntegrationTests.java
Unescape View File

@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
package org.springframework.data.mongodb.core;
import static org.assertj.core.api.Assertions.*;
import static org.springframework.data.domain.Sort.Direction.DESC;
import static org.springframework.data.domain.Sort.Direction.*;
import java.util.ArrayList;
import java.util.Arrays;
@ -27,10 +27,10 @@ import java.util.stream.Stream; @@ -27,10 +27,10 @@ import java.util.stream.Stream;
import org.bson.Document;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
import org.springframework.data.domain.Sort;
import org.springframework.data.mongodb.BulkOperationException;
import org.springframework.data.mongodb.core.BulkOperations.BulkMode;
@ -45,7 +45,6 @@ import org.springframework.data.mongodb.core.query.Query; @@ -45,7 +45,6 @@ import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.core.query.Update;
import org.springframework.data.mongodb.core.query.UpdateDefinition;
import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
import org.springframework.data.mongodb.test.util.MongoTestTemplate;
import org.springframework.data.mongodb.test.util.Template;
import org.springframework.data.util.Pair;
@ -63,7 +62,6 @@ import com.mongodb.client.MongoCollection; @@ -63,7 +62,6 @@ import com.mongodb.client.MongoCollection;
* @author Christoph Strobl
* @author Minsu Kim
*/
@ExtendWith(MongoTemplateExtension.class)
public class DefaultBulkOperationsIntegrationTests {
static final String COLLECTION_NAME = "bulk_ops";

10
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultIndexOperationsIntegrationTests.java
Unescape View File

@ -15,15 +15,15 @@ @@ -15,15 +15,15 @@
*/
package org.springframework.data.mongodb.core;
import static org.springframework.data.mongodb.core.index.PartialIndexFilter.of;
import static org.springframework.data.mongodb.core.query.Criteria.where;
import static org.springframework.data.mongodb.test.util.Assertions.assertThat;
import static org.springframework.data.mongodb.core.index.PartialIndexFilter.*;
import static org.springframework.data.mongodb.core.query.Criteria.*;
import static org.springframework.data.mongodb.test.util.Assertions.*;
import org.bson.BsonDocument;
import org.bson.Document;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.data.domain.Sort.Direction;
import org.springframework.data.mongodb.core.index.Index;
import org.springframework.data.mongodb.core.index.IndexDefinition;
@ -32,7 +32,6 @@ import org.springframework.data.mongodb.core.index.IndexOperations; @@ -32,7 +32,6 @@ import org.springframework.data.mongodb.core.index.IndexOperations;
import org.springframework.data.mongodb.core.mapping.Field;
import org.springframework.data.mongodb.core.query.Collation;
import org.springframework.data.mongodb.core.query.Collation.CaseFirst;
import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
import org.springframework.data.mongodb.test.util.MongoTestTemplate;
import org.springframework.data.mongodb.test.util.Template;
import org.springframework.util.ObjectUtils;
@ -47,7 +46,6 @@ import com.mongodb.client.model.IndexOptions; @@ -47,7 +46,6 @@ import com.mongodb.client.model.IndexOptions;
* @author Oliver Gierke
* @author Mark Paluch
*/
@ExtendWith(MongoTemplateExtension.class)
public class DefaultIndexOperationsIntegrationTests {
static final String COLLECTION_NAME = "default-index-operations-tests";

12
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultReactiveBulkOperationsTests.java
Unescape View File

@ -16,11 +16,8 @@ @@ -16,11 +16,8 @@
package org.springframework.data.mongodb.core;
import static org.assertj.core.api.Assertions.*;
import static org.springframework.data.domain.Sort.Direction.DESC;
import static org.springframework.data.domain.Sort.Direction.*;
import org.springframework.data.domain.Sort;
import org.springframework.data.mongodb.core.mapping.Field;
import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
import reactor.core.publisher.Flux;
import reactor.test.StepVerifier;
@ -32,21 +29,23 @@ import java.util.stream.Stream; @@ -32,21 +29,23 @@ import java.util.stream.Stream;
import org.bson.Document;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.EnumSource;
import org.junit.jupiter.params.provider.MethodSource;
import org.springframework.dao.DuplicateKeyException;
import org.springframework.data.domain.Sort;
import org.springframework.data.mongodb.core.BulkOperations.BulkMode;
import org.springframework.data.mongodb.core.DefaultReactiveBulkOperations.ReactiveBulkOperationContext;
import org.springframework.data.mongodb.core.convert.QueryMapper;
import org.springframework.data.mongodb.core.convert.UpdateMapper;
import org.springframework.data.mongodb.core.mapping.Field;
import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.core.query.Update;
import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
import org.springframework.data.mongodb.test.util.ReactiveMongoTestTemplate;
import org.springframework.data.mongodb.test.util.Template;
@ -59,7 +58,6 @@ import com.mongodb.bulk.BulkWriteResult; @@ -59,7 +58,6 @@ import com.mongodb.bulk.BulkWriteResult;
*
* @author Christoph Strobl
*/
@ExtendWith(MongoTemplateExtension.class)
class DefaultReactiveBulkOperationsTests {
static final String COLLECTION_NAME = "reactive-bulk-ops";

4
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultReactiveIndexOperationsTests.java
Unescape View File

@ -26,7 +26,7 @@ import java.util.function.Predicate; @@ -26,7 +26,7 @@ import java.util.function.Predicate;
import org.bson.Document;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.data.domain.Sort.Direction;
import org.springframework.data.mongodb.core.convert.QueryMapper;
import org.springframework.data.mongodb.core.index.Index;
@ -35,7 +35,6 @@ import org.springframework.data.mongodb.core.index.IndexInfo; @@ -35,7 +35,6 @@ import org.springframework.data.mongodb.core.index.IndexInfo;
import org.springframework.data.mongodb.core.mapping.Field;
import org.springframework.data.mongodb.core.query.Collation;
import org.springframework.data.mongodb.core.query.Collation.CaseFirst;
import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
import org.springframework.data.mongodb.test.util.ReactiveMongoTestTemplate;
import org.springframework.data.mongodb.test.util.Template;
@ -47,7 +46,6 @@ import com.mongodb.reactivestreams.client.MongoCollection; @@ -47,7 +46,6 @@ import com.mongodb.reactivestreams.client.MongoCollection;
* @author Mark Paluch
* @author Mathieu Ouellet
*/
@ExtendWith(MongoTemplateExtension.class)
public class DefaultReactiveIndexOperationsTests {
@Template(initialEntitySet = DefaultIndexOperationsIntegrationTestsSample.class) //

3
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultScriptOperationsTests.java
Unescape View File

@ -33,7 +33,6 @@ import org.springframework.data.mongodb.core.script.ExecutableMongoScript; @@ -33,7 +33,6 @@ import org.springframework.data.mongodb.core.script.ExecutableMongoScript;
import org.springframework.data.mongodb.core.script.NamedMongoScript;
import org.springframework.data.mongodb.test.util.Client;
import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit.jupiter.SpringExtension;
@ -46,7 +45,7 @@ import com.mongodb.client.MongoClient; @@ -46,7 +45,7 @@ import com.mongodb.client.MongoClient;
* @author Oliver Gierke
* @since 1.7
*/
@ExtendWith({ MongoClientExtension.class, SpringExtension.class })
@ExtendWith({ SpringExtension.class })
@EnableIfMongoServerVersion(isLessThan = "4.1.0")
@ContextConfiguration
public class DefaultScriptOperationsTests {

3
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ExecutableFindOperationSupportTests.java
Unescape View File

@ -48,7 +48,6 @@ import org.springframework.data.mongodb.core.mapping.Field; @@ -48,7 +48,6 @@ import org.springframework.data.mongodb.core.mapping.Field;
import org.springframework.data.mongodb.core.query.BasicQuery;
import org.springframework.data.mongodb.core.query.NearQuery;
import org.springframework.data.mongodb.test.util.DirtiesStateExtension;
import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
import org.springframework.data.mongodb.test.util.MongoTestTemplate;
import org.springframework.data.mongodb.test.util.Template;
@ -58,7 +57,7 @@ import org.springframework.data.mongodb.test.util.Template; @@ -58,7 +57,7 @@ import org.springframework.data.mongodb.test.util.Template;
* @author Christoph Strobl
* @author Mark Paluch
*/
@ExtendWith({ MongoTemplateExtension.class, DirtiesStateExtension.class })
@ExtendWith({ DirtiesStateExtension.class })
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
class ExecutableFindOperationSupportTests implements StateFunctions {

4
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ExecutableRemoveOperationSupportTests.java
Unescape View File

@ -25,10 +25,9 @@ import java.util.Optional; @@ -25,10 +25,9 @@ import java.util.Optional;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.data.annotation.Id;
import org.springframework.data.mongodb.core.mapping.Field;
import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
import org.springframework.data.mongodb.test.util.MongoTestTemplate;
import org.springframework.data.mongodb.test.util.Template;
@ -40,7 +39,6 @@ import com.mongodb.client.result.DeleteResult; @@ -40,7 +39,6 @@ import com.mongodb.client.result.DeleteResult;
* @author Christoph Strobl
* @author Mark Paluch
*/
@ExtendWith(MongoTemplateExtension.class)
class ExecutableRemoveOperationSupportTests {
private static final String STAR_WARS = "star-wars";

4
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ExecutableUpdateOperationSupportTests.java
Unescape View File

@ -25,12 +25,11 @@ import java.util.Optional; @@ -25,12 +25,11 @@ import java.util.Optional;
import org.bson.BsonString;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.data.annotation.Id;
import org.springframework.data.mongodb.core.mapping.Field;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.core.query.Update;
import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
import org.springframework.data.mongodb.test.util.MongoTestTemplate;
import org.springframework.data.mongodb.test.util.Template;
@ -42,7 +41,6 @@ import com.mongodb.client.result.UpdateResult; @@ -42,7 +41,6 @@ import com.mongodb.client.result.UpdateResult;
* @author Christoph Strobl
* @author Mark Paluch
*/
@ExtendWith(MongoTemplateExtension.class)
class ExecutableUpdateOperationSupportTests {
private static final String STAR_WARS = "star-wars";

46
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/JsonSchemaQueryTests.java
Unescape View File

@ -27,14 +27,13 @@ import java.util.Objects; @@ -27,14 +27,13 @@ import java.util.Objects;
import org.bson.Document;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.data.annotation.Id;
import org.springframework.data.mongodb.core.mapping.Field;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.schema.JsonSchemaProperty;
import org.springframework.data.mongodb.core.schema.MongoJsonSchema;
import org.springframework.data.mongodb.test.util.Client;
import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
import org.springframework.data.mongodb.test.util.MongoTestTemplate;
import org.springframework.data.mongodb.test.util.Template;
@ -42,20 +41,19 @@ import org.springframework.data.mongodb.test.util.Template; @@ -42,20 +41,19 @@ import org.springframework.data.mongodb.test.util.Template;
* @author Christoph Strobl
* @author Mark Paluch
*/
@ExtendWith(MongoTemplateExtension.class)
public class JsonSchemaQueryTests {
public static final String DATABASE_NAME = "json-schema-query-tests";
private static final String DATABASE_NAME = "json-schema-query-tests";
static @Client com.mongodb.reactivestreams.client.MongoClient reactiveClient;
private static @Client com.mongodb.reactivestreams.client.MongoClient reactiveClient;
@Template(database = DATABASE_NAME, initialEntitySet = Person.class) //
static MongoTestTemplate template;
private static MongoTestTemplate template;
Person jellyBelly, roseSpringHeart, kazmardBoombub;
private Person jellyBelly, roseSpringHeart, kazmardBoombub;
@BeforeEach
public void setUp() {
void setUp() {
template.flush();
@ -90,7 +88,7 @@ public class JsonSchemaQueryTests { @@ -90,7 +88,7 @@ public class JsonSchemaQueryTests {
}
@Test // DATAMONGO-1835
public void createsWorkingSchema() {
void createsWorkingSchema() {
try {
template.dropCollection("person_schema");
@ -102,7 +100,7 @@ public class JsonSchemaQueryTests { @@ -102,7 +100,7 @@ public class JsonSchemaQueryTests {
}
@Test // DATAMONGO-1835
public void queriesBooleanType() {
void queriesBooleanType() {
MongoJsonSchema schema = MongoJsonSchema.builder().properties(JsonSchemaProperty.bool("alive")).build();
@ -111,7 +109,7 @@ public class JsonSchemaQueryTests { @@ -111,7 +109,7 @@ public class JsonSchemaQueryTests {
}
@Test // DATAMONGO-1835
public void findsDocumentsWithRequiredFieldsCorrectly() {
void findsDocumentsWithRequiredFieldsCorrectly() {
MongoJsonSchema schema = MongoJsonSchema.builder().required("address").build();
@ -120,7 +118,7 @@ public class JsonSchemaQueryTests { @@ -120,7 +118,7 @@ public class JsonSchemaQueryTests {
}
@Test // DATAMONGO-1835
public void findsDocumentsWithRequiredFieldsReactively() {
void findsDocumentsWithRequiredFieldsReactively() {
MongoJsonSchema schema = MongoJsonSchema.builder().required("address").build();
@ -130,7 +128,7 @@ public class JsonSchemaQueryTests { @@ -130,7 +128,7 @@ public class JsonSchemaQueryTests {
}
@Test // DATAMONGO-1835
public void findsDocumentsWithBsonFieldTypesCorrectly() {
void findsDocumentsWithBsonFieldTypesCorrectly() {
MongoJsonSchema schema = MongoJsonSchema.builder().property(int32("value")).build();
@ -139,7 +137,7 @@ public class JsonSchemaQueryTests { @@ -139,7 +137,7 @@ public class JsonSchemaQueryTests {
}
@Test // DATAMONGO-1835
public void findsDocumentsWithJsonFieldTypesCorrectly() {
void findsDocumentsWithJsonFieldTypesCorrectly() {
MongoJsonSchema schema = MongoJsonSchema.builder().property(number("value")).build();
@ -148,7 +146,7 @@ public class JsonSchemaQueryTests { @@ -148,7 +146,7 @@ public class JsonSchemaQueryTests {
}
@Test // DATAMONGO-1835
public void combineSchemaWithOtherCriteria() {
void combineSchemaWithOtherCriteria() {
MongoJsonSchema schema = MongoJsonSchema.builder().property(number("value")).build();
@ -158,7 +156,7 @@ public class JsonSchemaQueryTests { @@ -158,7 +156,7 @@ public class JsonSchemaQueryTests {
}
@Test // DATAMONGO-1835
public void usesMappedFieldNameForRequiredProperties() {
void usesMappedFieldNameForRequiredProperties() {
MongoJsonSchema schema = MongoJsonSchema.builder().required("name").build();
@ -167,7 +165,7 @@ public class JsonSchemaQueryTests { @@ -167,7 +165,7 @@ public class JsonSchemaQueryTests {
}
@Test // DATAMONGO-1835
public void usesMappedFieldNameForProperties() {
void usesMappedFieldNameForProperties() {
MongoJsonSchema schema = MongoJsonSchema.builder().property(string("name").matching("^R.*")).build();
@ -176,7 +174,7 @@ public class JsonSchemaQueryTests { @@ -176,7 +174,7 @@ public class JsonSchemaQueryTests {
}
@Test // DATAMONGO-1835
public void mapsNestedFieldName() {
void mapsNestedFieldName() {
MongoJsonSchema schema = MongoJsonSchema.builder() //
.required("address") //
@ -187,7 +185,7 @@ public class JsonSchemaQueryTests { @@ -187,7 +185,7 @@ public class JsonSchemaQueryTests {
}
@Test // DATAMONGO-1835
public void mapsEnumValuesCorrectly() {
void mapsEnumValuesCorrectly() {
MongoJsonSchema schema = MongoJsonSchema.builder()
.property(untyped("gender").possibleValues(Gender.PIXY, Gender.GOBLIN)).build();
@ -197,19 +195,19 @@ public class JsonSchemaQueryTests { @@ -197,19 +195,19 @@ public class JsonSchemaQueryTests {
}
@Test // DATAMONGO-1835
public void useTypeOperatorOnFieldLevel() {
void useTypeOperatorOnFieldLevel() {
assertThat(template.find(query(where("value").type(Type.intType())), Person.class)).containsExactly(jellyBelly);
}
@Test // DATAMONGO-1835
public void useTypeOperatorWithMultipleTypesOnFieldLevel() {
void useTypeOperatorWithMultipleTypesOnFieldLevel() {
assertThat(template.find(query(where("value").type(Type.intType(), Type.stringType())), Person.class))
.containsExactlyInAnyOrder(jellyBelly, kazmardBoombub);
}
@Test // DATAMONGO-1835
public void findsWithSchemaReturningRawDocument() {
void findsWithSchemaReturningRawDocument() {
MongoJsonSchema schema = MongoJsonSchema.builder().required("address").build();
@ -237,7 +235,7 @@ public class JsonSchemaQueryTests { @@ -237,7 +235,7 @@ public class JsonSchemaQueryTests {
return this.name;
}
public Gender getGender() {
Gender getGender() {
return this.gender;
}
@ -249,7 +247,7 @@ public class JsonSchemaQueryTests { @@ -249,7 +247,7 @@ public class JsonSchemaQueryTests {
return this.value;
}
public boolean isAlive() {
boolean isAlive() {
return this.alive;
}

4
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateCollationTests.java
Unescape View File

@ -26,6 +26,7 @@ import org.bson.Document; @@ -26,6 +26,7 @@ import org.bson.Document;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration;
@ -33,7 +34,6 @@ import org.springframework.data.mongodb.core.query.Collation; @@ -33,7 +34,6 @@ import org.springframework.data.mongodb.core.query.Collation;
import org.springframework.data.mongodb.core.query.Collation.Alternate;
import org.springframework.data.mongodb.core.query.Collation.ComparisonLevel;
import org.springframework.data.mongodb.test.util.Client;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import com.mongodb.client.MongoClient;
@ -42,7 +42,7 @@ import com.mongodb.client.MongoClient; @@ -42,7 +42,7 @@ import com.mongodb.client.MongoClient;
* @author Christoph Strobl
* @author Mark Paluch
*/
@ExtendWith({ MongoClientExtension.class, SpringExtension.class })
@ExtendWith({ SpringExtension.class })
public class MongoTemplateCollationTests {
public static final String COLLECTION_NAME = "collation-1";

4
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateDbRefTests.java
Unescape View File

@ -27,7 +27,7 @@ import java.util.Objects; @@ -27,7 +27,7 @@ import java.util.Objects;
import org.bson.types.ObjectId;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.data.annotation.Id;
import org.springframework.data.mongodb.core.convert.LazyLoadingProxy;
import org.springframework.data.mongodb.core.convert.LazyLoadingTestUtils;
@ -35,7 +35,6 @@ import org.springframework.data.mongodb.core.mapping.DBRef; @@ -35,7 +35,6 @@ import org.springframework.data.mongodb.core.mapping.DBRef;
import org.springframework.data.mongodb.core.mapping.Document;
import org.springframework.data.mongodb.core.mapping.MongoId;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
import org.springframework.data.mongodb.test.util.MongoTestTemplate;
import org.springframework.data.mongodb.test.util.Template;
@ -47,7 +46,6 @@ import com.mongodb.client.model.Filters; @@ -47,7 +46,6 @@ import com.mongodb.client.model.Filters;
*
* @author Christoph Strobl
*/
@ExtendWith(MongoTemplateExtension.class)
public class MongoTemplateDbRefTests {
@Template(database = "mongo-template-dbref-tests",

5
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateDocumentReferenceTests.java
Unescape View File

@ -33,7 +33,7 @@ import org.jspecify.annotations.Nullable; @@ -33,7 +33,7 @@ import org.jspecify.annotations.Nullable;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.core.convert.converter.Converter;
import org.springframework.data.annotation.Id;
import org.springframework.data.annotation.ReadOnlyProperty;
@ -47,7 +47,6 @@ import org.springframework.data.mongodb.core.mapping.FieldType; @@ -47,7 +47,6 @@ import org.springframework.data.mongodb.core.mapping.FieldType;
import org.springframework.data.mongodb.core.mapping.MongoId;
import org.springframework.data.mongodb.core.query.Update;
import org.springframework.data.mongodb.test.util.Client;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import org.springframework.data.mongodb.test.util.MongoTestTemplate;
import com.mongodb.client.MongoClient;
@ -59,7 +58,7 @@ import com.mongodb.client.model.Filters; @@ -59,7 +58,7 @@ import com.mongodb.client.model.Filters;
* @author Christoph Strobl
* @author Julia Lee
*/
@ExtendWith(MongoClientExtension.class)
public class MongoTemplateDocumentReferenceTests {
public static final String DB_NAME = "document-reference-tests";

4
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateFieldProjectionTests.java
Unescape View File

@ -23,7 +23,7 @@ import java.util.function.Consumer; @@ -23,7 +23,7 @@ import java.util.function.Consumer;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.data.annotation.Id;
import org.springframework.data.mongodb.MongoExpression;
import org.springframework.data.mongodb.core.aggregation.AggregationSpELExpression;
@ -33,7 +33,6 @@ import org.springframework.data.mongodb.core.mapping.Unwrapped; @@ -33,7 +33,6 @@ import org.springframework.data.mongodb.core.mapping.Unwrapped;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
import org.springframework.data.mongodb.test.util.MongoTestTemplate;
import org.springframework.data.mongodb.test.util.Template;
@ -44,7 +43,6 @@ import org.springframework.data.mongodb.test.util.Template; @@ -44,7 +43,6 @@ import org.springframework.data.mongodb.test.util.Template;
* @author Mark Paluch
* @author Giacomo Baso
*/
@ExtendWith(MongoTemplateExtension.class)
@EnableIfMongoServerVersion(isGreaterThanEqual = "4.4")
class MongoTemplateFieldProjectionTests {

6
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateReplaceTests.java
Unescape View File

@ -32,16 +32,14 @@ import org.bson.Document; @@ -32,16 +32,14 @@ import org.bson.Document;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.dao.DataIntegrityViolationException;
import org.springframework.data.domain.Sort;
import org.springframework.data.domain.Sort.Direction;
import org.springframework.data.mongodb.core.aggregation.AggregationUpdate;
import org.springframework.data.mongodb.core.mapping.Field;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.test.util.Client;
import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import com.mongodb.client.MongoClient;
import com.mongodb.client.MongoCollection;
@ -51,7 +49,7 @@ import com.mongodb.client.result.UpdateResult; @@ -51,7 +49,7 @@ import com.mongodb.client.result.UpdateResult;
/**
* @author Christoph Strobl
*/
@ExtendWith(MongoClientExtension.class)
public class MongoTemplateReplaceTests {
static final String DB_NAME = "mongo-template-replace-tests";

5
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateScrollTests.java
Unescape View File

@ -29,10 +29,10 @@ import org.bson.Document; @@ -29,10 +29,10 @@ import org.bson.Document;
import org.jspecify.annotations.Nullable;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.support.GenericApplicationContext;
import org.springframework.data.annotation.PersistenceCreator;
@ -46,7 +46,6 @@ import org.springframework.data.mongodb.core.MongoTemplateTests.PersonWithIdProp @@ -46,7 +46,6 @@ import org.springframework.data.mongodb.core.MongoTemplateTests.PersonWithIdProp
import org.springframework.data.mongodb.core.mapping.Field;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.test.util.Client;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import org.springframework.data.mongodb.test.util.MongoTestTemplate;
import org.springframework.util.ObjectUtils;
@ -58,7 +57,7 @@ import com.mongodb.client.MongoClient; @@ -58,7 +57,7 @@ import com.mongodb.client.MongoClient;
* @author Mark Paluch
* @author Christoph Strobl
*/
@ExtendWith(MongoClientExtension.class)
class MongoTemplateScrollTests {
static @Client MongoClient client;

5
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateTests.java
Unescape View File

@ -34,12 +34,11 @@ import java.util.stream.Collectors; @@ -34,12 +34,11 @@ import java.util.stream.Collectors;
import java.util.stream.IntStream;
import java.util.stream.Stream;
import org.bson.Document;
import org.bson.types.ObjectId;
import org.jspecify.annotations.Nullable;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.support.GenericApplicationContext;
import org.springframework.core.convert.converter.Converter;
@ -88,7 +87,6 @@ import org.springframework.data.mongodb.core.query.Query; @@ -88,7 +87,6 @@ import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.core.query.Update;
import org.springframework.data.mongodb.test.util.Client;
import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import org.springframework.data.mongodb.test.util.MongoTestTemplate;
import org.springframework.data.mongodb.test.util.MongoTestUtils;
import org.springframework.data.mongodb.test.util.MongoVersion;
@ -129,7 +127,6 @@ import com.mongodb.client.result.UpdateResult; @@ -129,7 +127,6 @@ import com.mongodb.client.result.UpdateResult;
* @author Jakub Zurawa
* @author Florian Lüdiger
*/
@ExtendWith(MongoClientExtension.class)
public class MongoTemplateTests {
public static final String DB_NAME = "mongo-template-tests";

4
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateTransactionTests.java
Unescape View File

@ -33,6 +33,7 @@ import org.junit.jupiter.api.BeforeEach; @@ -33,6 +33,7 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junitpioneer.jupiter.SetSystemProperty;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@ -49,7 +50,6 @@ import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration; @@ -49,7 +50,6 @@ import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration;
import org.springframework.data.mongodb.test.util.AfterTransactionAssertion;
import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
import org.springframework.data.mongodb.test.util.EnableIfReplicaSetAvailable;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import org.springframework.data.mongodb.test.util.ReplSetClient;
import org.springframework.test.annotation.Rollback;
import org.springframework.test.context.ContextConfiguration;
@ -74,7 +74,7 @@ import com.mongodb.client.model.Filters; @@ -74,7 +74,7 @@ import com.mongodb.client.model.Filters;
* @author Yan Kardziyaka
* @currentRead Shadow's Edge - Brent Weeks
*/
@ExtendWith({ MongoClientExtension.class, SpringExtension.class })
@ExtendWith({ SpringExtension.class })
@EnableIfReplicaSetAvailable
@EnableIfMongoServerVersion(isGreaterThanEqual = "4.0")
@ContextConfiguration

4
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateUnwrappedTests.java
Unescape View File

@ -24,11 +24,10 @@ import java.util.List; @@ -24,11 +24,10 @@ import java.util.List;
import java.util.Objects;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.data.mongodb.core.mapping.Field;
import org.springframework.data.mongodb.core.mapping.Unwrapped;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
import org.springframework.data.mongodb.test.util.Template;
/**
@ -36,7 +35,6 @@ import org.springframework.data.mongodb.test.util.Template; @@ -36,7 +35,6 @@ import org.springframework.data.mongodb.test.util.Template;
*
* @author Christoph Strobl
*/
@ExtendWith(MongoTemplateExtension.class)
class MongoTemplateUnwrappedTests {
private static @Template MongoTemplate template;

8
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateUpdateTests.java
Unescape View File

@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
*/
package org.springframework.data.mongodb.core;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.*;
import java.util.ArrayList;
import java.util.Arrays;
@ -24,13 +24,12 @@ import java.util.List; @@ -24,13 +24,12 @@ import java.util.List;
import java.util.Objects;
import java.util.stream.Stream;
import com.mongodb.client.result.UpdateResult;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
import org.springframework.data.annotation.Id;
import org.springframework.data.annotation.Version;
import org.springframework.data.domain.Sort;
@ -47,16 +46,15 @@ import org.springframework.data.mongodb.core.query.Query; @@ -47,16 +46,15 @@ import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.core.query.Update;
import org.springframework.data.mongodb.core.query.UpdateDefinition;
import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
import org.springframework.data.mongodb.test.util.MongoTestTemplate;
import org.springframework.data.mongodb.test.util.Template;
import com.mongodb.client.MongoCollection;
import com.mongodb.client.result.UpdateResult;
/**
* @author Christoph Strobl
*/
@ExtendWith({ MongoTemplateExtension.class })
class MongoTemplateUpdateTests {
@Template(initialEntitySet = { Score.class, Versioned.class, Book.class }) //

4
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateValidationTests.java
Unescape View File

@ -29,6 +29,7 @@ import org.jspecify.annotations.Nullable; @@ -29,6 +29,7 @@ import org.jspecify.annotations.Nullable;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.dao.DataIntegrityViolationException;
@ -39,7 +40,6 @@ import org.springframework.data.mongodb.core.mapping.Field; @@ -39,7 +40,6 @@ import org.springframework.data.mongodb.core.mapping.Field;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.schema.MongoJsonSchema;
import org.springframework.data.mongodb.test.util.Client;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import com.mongodb.client.MongoClient;
@ -56,7 +56,7 @@ import com.mongodb.client.model.ValidationLevel; @@ -56,7 +56,7 @@ import com.mongodb.client.model.ValidationLevel;
* @author Christoph Strobl
* @author Julia Lee
*/
@ExtendWith({ MongoClientExtension.class, SpringExtension.class })
@ExtendWith({ SpringExtension.class })
public class MongoTemplateValidationTests {
static final String COLLECTION_NAME = "validation-1";

5
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateViewTests.java
Unescape View File

@ -27,13 +27,12 @@ import org.bson.Document; @@ -27,13 +27,12 @@ import org.bson.Document;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.data.mongodb.core.aggregation.AggregationPipeline;
import org.springframework.data.mongodb.core.mapping.Field;
import org.springframework.data.mongodb.core.query.Collation;
import org.springframework.data.mongodb.test.util.Client;
import org.springframework.data.mongodb.test.util.CollectionInfo;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import org.springframework.data.mongodb.test.util.MongoTestUtils;
import com.mongodb.client.MongoClient;
@ -43,7 +42,7 @@ import com.mongodb.client.MongoClient; @@ -43,7 +42,7 @@ import com.mongodb.client.MongoClient;
*
* @author Christoph Strobl
*/
@ExtendWith(MongoClientExtension.class)
public class MongoTemplateViewTests {
static @Client MongoClient client;

4
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/NoExplicitIdTests.java
Unescape View File

@ -27,6 +27,7 @@ import java.util.Set; @@ -27,6 +27,7 @@ import java.util.Set;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.ComponentScan.Filter;
import org.springframework.context.annotation.Configuration;
@ -35,7 +36,6 @@ import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration; @@ -35,7 +36,6 @@ import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration;
import org.springframework.data.mongodb.repository.MongoRepository;
import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
import org.springframework.data.mongodb.test.util.Client;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit.jupiter.SpringExtension;
@ -47,7 +47,7 @@ import com.mongodb.client.MongoClient; @@ -47,7 +47,7 @@ import com.mongodb.client.MongoClient;
* @author Christoph Strobl
* @author Mark Paluch
*/
@ExtendWith({ MongoClientExtension.class, SpringExtension.class })
@ExtendWith({ SpringExtension.class })
@ContextConfiguration
public class NoExplicitIdTests {

4
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/QueryByExampleTests.java
Unescape View File

@ -22,7 +22,7 @@ import java.util.Objects; @@ -22,7 +22,7 @@ import java.util.Objects;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.data.annotation.Id;
import org.springframework.data.domain.Example;
import org.springframework.data.domain.ExampleMatcher;
@ -31,7 +31,6 @@ import org.springframework.data.mongodb.core.mapping.Field; @@ -31,7 +31,6 @@ import org.springframework.data.mongodb.core.mapping.Field;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.core.query.UntypedExampleMatcher;
import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
import org.springframework.data.mongodb.test.util.MongoTestTemplate;
import org.springframework.data.mongodb.test.util.Template;
@ -42,7 +41,6 @@ import org.springframework.data.mongodb.test.util.Template; @@ -42,7 +41,6 @@ import org.springframework.data.mongodb.test.util.Template;
* @author Mark Paluch
* @author Oliver Gierke
*/
@ExtendWith(MongoTemplateExtension.class)
public class QueryByExampleTests {
@Template(initialEntitySet = Person.class) //

4
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveChangeStreamOperationSupportTests.java
Unescape View File

@ -31,11 +31,9 @@ import org.bson.Document; @@ -31,11 +31,9 @@ import org.bson.Document;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
import org.springframework.data.mongodb.test.util.EnableIfReplicaSetAvailable;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import org.springframework.data.mongodb.test.util.MongoTestUtils;
import org.springframework.data.mongodb.test.util.ReplSetClient;
@ -47,7 +45,7 @@ import com.mongodb.reactivestreams.client.MongoClient; @@ -47,7 +45,7 @@ import com.mongodb.reactivestreams.client.MongoClient;
* @author Christoph Strobl
* @currentRead Dawn Cook - The Decoy Princess
*/
@ExtendWith(MongoClientExtension.class)
@EnableIfReplicaSetAvailable
public class ReactiveChangeStreamOperationSupportTests {

3
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveClientSessionTests.java
Unescape View File

@ -28,12 +28,10 @@ import java.util.function.Supplier; @@ -28,12 +28,10 @@ import java.util.function.Supplier;
import org.bson.Document;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.test.util.Client;
import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
import org.springframework.data.mongodb.test.util.EnableIfReplicaSetAvailable;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import org.springframework.data.mongodb.test.util.MongoTestUtils;
import com.mongodb.ClientSessionOptions;
@ -45,7 +43,6 @@ import com.mongodb.reactivestreams.client.MongoClient; @@ -45,7 +43,6 @@ import com.mongodb.reactivestreams.client.MongoClient;
* @author Mark Paluch
* @currentRead Beyond the Shadows - Brent Weeks
*/
@ExtendWith(MongoClientExtension.class)
@EnableIfReplicaSetAvailable
public class ReactiveClientSessionTests {

4
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveFindOperationSupportTests.java
Unescape View File

@ -38,6 +38,7 @@ import org.bson.Document; @@ -38,6 +38,7 @@ import org.bson.Document;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.dao.IncorrectResultSizeDataAccessException;
import org.springframework.dao.InvalidDataAccessApiUsageException;
@ -51,7 +52,6 @@ import org.springframework.data.mongodb.core.query.Criteria; @@ -51,7 +52,6 @@ import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.NearQuery;
import org.springframework.data.mongodb.test.util.Client;
import org.springframework.data.mongodb.test.util.DirtiesStateExtension;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import com.mongodb.client.MongoClient;
@ -62,7 +62,7 @@ import com.mongodb.client.MongoClient; @@ -62,7 +62,7 @@ import com.mongodb.client.MongoClient;
* @author Christoph Strobl
* @author Juergen Zimmermann
*/
@ExtendWith({ MongoClientExtension.class, DirtiesStateExtension.class })
@ExtendWith({ DirtiesStateExtension.class })
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
class ReactiveFindOperationSupportTests implements StateFunctions {

4
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateCollationTests.java
Unescape View File

@ -29,12 +29,12 @@ import org.bson.Document; @@ -29,12 +29,12 @@ import org.bson.Document;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.mongodb.config.AbstractReactiveMongoConfiguration;
import org.springframework.data.mongodb.core.query.Collation;
import org.springframework.data.mongodb.test.util.Client;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit.jupiter.SpringExtension;
@ -44,7 +44,7 @@ import com.mongodb.reactivestreams.client.MongoClient; @@ -44,7 +44,7 @@ import com.mongodb.reactivestreams.client.MongoClient;
* @author Mark Paluch
* @author Christoph Strobl
*/
@ExtendWith({ MongoClientExtension.class, SpringExtension.class })
@ExtendWith({ SpringExtension.class })
@ContextConfiguration
public class ReactiveMongoTemplateCollationTests {

6
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateIndexTests.java
Unescape View File

@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
*/
package org.springframework.data.mongodb.core;
import static org.assertj.core.data.Index.*;
import static org.assertj.core.data.Index.atIndex;
import static org.springframework.data.mongodb.test.util.Assertions.*;
@ -29,8 +30,8 @@ import java.util.concurrent.TimeUnit; @@ -29,8 +30,8 @@ import java.util.concurrent.TimeUnit;
import org.bson.Document;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junitpioneer.jupiter.RepeatFailedTest;
import org.springframework.dao.DataIntegrityViolationException;
import org.springframework.data.annotation.Id;
import org.springframework.data.domain.Sort.Direction;
@ -42,7 +43,6 @@ import org.springframework.data.mongodb.core.index.IndexInfo; @@ -42,7 +43,6 @@ import org.springframework.data.mongodb.core.index.IndexInfo;
import org.springframework.data.mongodb.core.index.Indexed;
import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
import org.springframework.data.mongodb.test.util.Client;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import org.springframework.data.mongodb.test.util.MongoTestUtils;
import com.mongodb.client.model.IndexOptions;
@ -56,7 +56,7 @@ import com.mongodb.reactivestreams.client.MongoCollection; @@ -56,7 +56,7 @@ import com.mongodb.reactivestreams.client.MongoCollection;
* @author Christoph Strobl
* @author Mathieu Ouellet
*/
@ExtendWith(MongoClientExtension.class)
public class ReactiveMongoTemplateIndexTests {
private static @Client MongoClient client;

7
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateReplaceTests.java
Unescape View File

@ -20,7 +20,6 @@ import static org.springframework.data.mongodb.core.ReplaceOptions.*; @@ -20,7 +20,6 @@ import static org.springframework.data.mongodb.core.ReplaceOptions.*;
import static org.springframework.data.mongodb.core.query.Criteria.*;
import static org.springframework.data.mongodb.core.query.Query.*;
import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;
@ -35,15 +34,15 @@ import org.bson.Document; @@ -35,15 +34,15 @@ import org.bson.Document;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.reactivestreams.Publisher;
import org.springframework.dao.DataIntegrityViolationException;
import org.springframework.data.domain.Sort;
import org.springframework.data.domain.Sort.Direction;
import org.springframework.data.mongodb.core.mapping.Field;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.test.util.Client;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
import com.mongodb.client.model.Filters;
import com.mongodb.client.result.UpdateResult;
@ -53,7 +52,7 @@ import com.mongodb.reactivestreams.client.MongoCollection; @@ -53,7 +52,7 @@ import com.mongodb.reactivestreams.client.MongoCollection;
/**
* @author Christoph Strobl
*/
@ExtendWith(MongoClientExtension.class)
public class ReactiveMongoTemplateReplaceTests {
static final String DB_NAME = "mongo-template-replace-tests";

5
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateScrollTests.java
Unescape View File

@ -28,10 +28,10 @@ import java.util.stream.Stream; @@ -28,10 +28,10 @@ import java.util.stream.Stream;
import org.bson.Document;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.support.GenericApplicationContext;
import org.springframework.data.domain.ScrollPosition;
@ -40,7 +40,6 @@ import org.springframework.data.domain.Window; @@ -40,7 +40,6 @@ import org.springframework.data.domain.Window;
import org.springframework.data.mongodb.core.mapping.Field;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.test.util.Client;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import org.springframework.data.mongodb.test.util.ReactiveMongoTestTemplate;
import com.mongodb.reactivestreams.client.MongoClient;
@ -51,7 +50,7 @@ import com.mongodb.reactivestreams.client.MongoClient; @@ -51,7 +50,7 @@ import com.mongodb.reactivestreams.client.MongoClient;
* @author Mark Paluch
* @author Christoph Strobl
*/
@ExtendWith(MongoClientExtension.class)
class ReactiveMongoTemplateScrollTests {
static @Client MongoClient client;

4
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateTests.java
Unescape View File

@ -47,7 +47,6 @@ import org.bson.types.ObjectId; @@ -47,7 +47,6 @@ import org.bson.types.ObjectId;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.support.GenericApplicationContext;
@ -79,8 +78,6 @@ import org.springframework.data.mongodb.core.query.Update; @@ -79,8 +78,6 @@ import org.springframework.data.mongodb.core.query.Update;
import org.springframework.data.mongodb.test.util.Client;
import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
import org.springframework.data.mongodb.test.util.EnableIfReplicaSetAvailable;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import org.springframework.data.mongodb.test.util.MongoServerCondition;
import org.springframework.data.mongodb.test.util.ReactiveMongoTestTemplate;
import com.mongodb.WriteConcern;
@ -93,7 +90,6 @@ import com.mongodb.reactivestreams.client.MongoCollection; @@ -93,7 +90,6 @@ import com.mongodb.reactivestreams.client.MongoCollection;
* @author Mark Paluch
* @author Christoph Strobl
*/
@ExtendWith({ MongoClientExtension.class, MongoServerCondition.class })
public class ReactiveMongoTemplateTests {
private static final String DB_NAME = "reactive-mongo-template-tests";

5
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateTransactionTests.java
Unescape View File

@ -28,15 +28,14 @@ import java.util.stream.Collectors; @@ -28,15 +28,14 @@ import java.util.stream.Collectors;
import org.bson.Document;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.reactivestreams.Publisher;
import org.springframework.data.domain.Sort;
import org.springframework.data.mongodb.ReactiveMongoTransactionManager;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.test.util.Client;
import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
import org.springframework.data.mongodb.test.util.EnableIfReplicaSetAvailable;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import org.springframework.data.mongodb.test.util.MongoTestUtils;
import org.springframework.transaction.ReactiveTransaction;
import org.springframework.transaction.reactive.TransactionCallback;
@ -55,7 +54,7 @@ import com.mongodb.reactivestreams.client.MongoClient; @@ -55,7 +54,7 @@ import com.mongodb.reactivestreams.client.MongoClient;
* @author Mathieu Ouellet
* @currentRead The Core - Peter V. Brett
*/
@ExtendWith(MongoClientExtension.class)
@EnableIfReplicaSetAvailable
@EnableIfMongoServerVersion(isGreaterThanEqual = "4.0")
public class ReactiveMongoTemplateTransactionTests {

5
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateUpdateTests.java
Unescape View File

@ -30,10 +30,10 @@ import java.util.stream.Stream; @@ -30,10 +30,10 @@ import java.util.stream.Stream;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
import org.springframework.data.annotation.Id;
import org.springframework.data.annotation.Version;
import org.springframework.data.domain.Sort;
@ -50,7 +50,6 @@ import org.springframework.data.mongodb.core.query.Update; @@ -50,7 +50,6 @@ import org.springframework.data.mongodb.core.query.Update;
import org.springframework.data.mongodb.core.query.UpdateDefinition;
import org.springframework.data.mongodb.test.util.Client;
import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import org.springframework.data.mongodb.test.util.MongoTestUtils;
import com.mongodb.reactivestreams.client.MongoClient;
@ -59,7 +58,7 @@ import com.mongodb.reactivestreams.client.MongoCollection; @@ -59,7 +58,7 @@ import com.mongodb.reactivestreams.client.MongoCollection;
/**
* @author Christoph Strobl
*/
@ExtendWith(MongoClientExtension.class)
@EnableIfMongoServerVersion(isGreaterThanEqual = "4.2")
public class ReactiveMongoTemplateUpdateTests {

5
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateViewTests.java
Unescape View File

@ -29,13 +29,12 @@ import org.bson.Document; @@ -29,13 +29,12 @@ import org.bson.Document;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.data.mongodb.core.aggregation.AggregationPipeline;
import org.springframework.data.mongodb.core.mapping.Field;
import org.springframework.data.mongodb.core.query.Collation;
import org.springframework.data.mongodb.test.util.Client;
import org.springframework.data.mongodb.test.util.CollectionInfo;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import org.springframework.data.mongodb.test.util.MongoTestUtils;
import com.mongodb.reactivestreams.client.MongoClient;
@ -43,7 +42,7 @@ import com.mongodb.reactivestreams.client.MongoClient; @@ -43,7 +42,7 @@ import com.mongodb.reactivestreams.client.MongoClient;
/**
* @author Christoph Strobl
*/
@ExtendWith(MongoClientExtension.class)
public class ReactiveMongoTemplateViewTests {
static @Client com.mongodb.client.MongoClient client;

11
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveRemoveOperationSupportTests.java
Unescape View File

@ -15,9 +15,9 @@ @@ -15,9 +15,9 @@
*/
package org.springframework.data.mongodb.core;
import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.data.mongodb.core.query.Criteria.where;
import static org.springframework.data.mongodb.core.query.Query.query;
import static org.assertj.core.api.Assertions.*;
import static org.springframework.data.mongodb.core.query.Criteria.*;
import static org.springframework.data.mongodb.core.query.Query.*;
import reactor.test.StepVerifier;
@ -26,11 +26,10 @@ import java.util.Optional; @@ -26,11 +26,10 @@ import java.util.Optional;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.data.annotation.Id;
import org.springframework.data.mongodb.core.mapping.Field;
import org.springframework.data.mongodb.test.util.Client;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import com.mongodb.client.MongoClient;
@ -39,7 +38,7 @@ import com.mongodb.client.MongoClient; @@ -39,7 +38,7 @@ import com.mongodb.client.MongoClient;
*
* @author Mark Paluch
*/
@ExtendWith(MongoClientExtension.class)
class ReactiveRemoveOperationSupportTests {
private static final String STAR_WARS = "star-wars";

12
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveUpdateOperationSupportTests.java
Unescape View File

@ -15,10 +15,9 @@ @@ -15,10 +15,9 @@
*/
package org.springframework.data.mongodb.core;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.springframework.data.mongodb.core.query.Criteria.where;
import static org.springframework.data.mongodb.core.query.Query.query;
import static org.assertj.core.api.Assertions.*;
import static org.springframework.data.mongodb.core.query.Criteria.*;
import static org.springframework.data.mongodb.core.query.Query.*;
import reactor.test.StepVerifier;
@ -28,13 +27,12 @@ import java.util.Optional; @@ -28,13 +27,12 @@ import java.util.Optional;
import org.bson.BsonString;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.data.annotation.Id;
import org.springframework.data.mongodb.core.mapping.Field;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.core.query.Update;
import org.springframework.data.mongodb.test.util.Client;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import com.mongodb.client.MongoClient;
@ -43,7 +41,7 @@ import com.mongodb.client.MongoClient; @@ -43,7 +41,7 @@ import com.mongodb.client.MongoClient;
*
* @author Mark Paluch
*/
@ExtendWith(MongoClientExtension.class)
class ReactiveUpdateOperationSupportTests {
private static final String STAR_WARS = "star-wars";

4
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SessionBoundMongoTemplateTests.java
Unescape View File

@ -37,8 +37,8 @@ import org.bson.Document; @@ -37,8 +37,8 @@ import org.bson.Document;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mockito;
import org.springframework.aop.Advisor;
import org.springframework.aop.framework.Advised;
import org.springframework.dao.DataAccessException;
@ -60,7 +60,6 @@ import org.springframework.data.mongodb.core.mapping.DBRef; @@ -60,7 +60,6 @@ import org.springframework.data.mongodb.core.mapping.DBRef;
import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.test.util.EnableIfReplicaSetAvailable;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import org.springframework.data.mongodb.test.util.MongoVersion;
import org.springframework.data.mongodb.test.util.ReplSetClient;
import org.springframework.test.util.ReflectionTestUtils;
@ -76,7 +75,6 @@ import com.mongodb.client.MongoDatabase; @@ -76,7 +75,6 @@ import com.mongodb.client.MongoDatabase;
*
* @author Christoph Strobl
*/
@ExtendWith(MongoClientExtension.class)
@EnableIfReplicaSetAvailable
public class SessionBoundMongoTemplateTests {

4
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationTests.java
Unescape View File

@ -46,7 +46,7 @@ import org.bson.Document; @@ -46,7 +46,7 @@ import org.bson.Document;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.core.io.ClassPathResource;
import org.springframework.data.annotation.Id;
import org.springframework.data.domain.Sort;
@ -71,7 +71,6 @@ import org.springframework.data.mongodb.core.query.NearQuery; @@ -71,7 +71,6 @@ import org.springframework.data.mongodb.core.query.NearQuery;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.repository.Person;
import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
import org.springframework.data.mongodb.test.util.MongoTestTemplate;
import org.springframework.data.mongodb.test.util.MongoVersion;
import org.springframework.data.mongodb.test.util.Template;
@ -94,7 +93,6 @@ import com.mongodb.client.MongoCollection; @@ -94,7 +93,6 @@ import com.mongodb.client.MongoCollection;
* @author Sangyong Choi
* @author Julia Lee
*/
@ExtendWith(MongoTemplateExtension.class)
public class AggregationTests {
private static final String INPUT_COLLECTION = "aggregation_test_collection";

4
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/SetWindowFieldsOperationTests.java
Unescape View File

@ -24,7 +24,7 @@ import java.util.List; @@ -24,7 +24,7 @@ import java.util.List;
import org.bson.Document;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.data.annotation.Id;
import org.springframework.data.domain.Sort;
import org.springframework.data.domain.Sort.Direction;
@ -32,7 +32,6 @@ import org.springframework.data.mongodb.core.aggregation.DateOperators.Year; @@ -32,7 +32,6 @@ import org.springframework.data.mongodb.core.aggregation.DateOperators.Year;
import org.springframework.data.mongodb.core.aggregation.SetWindowFieldsOperation.Windows;
import org.springframework.data.mongodb.core.mapping.Field;
import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
import org.springframework.data.mongodb.test.util.MongoTestTemplate;
import org.springframework.data.mongodb.test.util.Template;
@ -41,7 +40,6 @@ import org.springframework.data.mongodb.test.util.Template; @@ -41,7 +40,6 @@ import org.springframework.data.mongodb.test.util.Template;
*
* @author Christoph Strobl
*/
@ExtendWith(MongoTemplateExtension.class)
@EnableIfMongoServerVersion(isGreaterThanEqual = "5.0")
class SetWindowFieldsOperationTests {

3
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/auditing/MongoTemplateAuditingTests.java
Unescape View File

@ -39,7 +39,6 @@ import org.springframework.data.mongodb.core.MongoTemplate; @@ -39,7 +39,6 @@ import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.test.util.Client;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import com.mongodb.client.MongoClient;
@ -47,7 +46,7 @@ import com.mongodb.client.MongoClient; @@ -47,7 +46,7 @@ import com.mongodb.client.MongoClient;
/**
* @author Christoph Strobl
*/
@ExtendWith({ MongoClientExtension.class, SpringExtension.class })
@ExtendWith({ SpringExtension.class })
public class MongoTemplateAuditingTests {
static @Client MongoClient mongoClient;

3
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/auditing/ReactiveMongoTemplateAuditingTests.java
Unescape View File

@ -44,7 +44,6 @@ import org.springframework.data.mongodb.core.mapping.Document; @@ -44,7 +44,6 @@ import org.springframework.data.mongodb.core.mapping.Document;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.test.util.Client;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import org.springframework.data.mongodb.test.util.MongoTestUtils;
import org.springframework.test.context.junit.jupiter.SpringExtension;
@ -56,7 +55,7 @@ import com.mongodb.reactivestreams.client.MongoClient; @@ -56,7 +55,7 @@ import com.mongodb.reactivestreams.client.MongoClient;
* @author Christoph Strobl
* @author Mark Paluch
*/
@ExtendWith({ MongoClientExtension.class, SpringExtension.class })
@ExtendWith(SpringExtension.class)
class ReactiveMongoTemplateAuditingTests {
static final String DB_NAME = "mongo-template-audit-tests";

6
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterTests.java
Unescape View File

@ -27,7 +27,6 @@ import java.time.ZoneId; @@ -27,7 +27,6 @@ import java.time.ZoneId;
import java.time.temporal.ChronoUnit;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@ -36,7 +35,7 @@ import java.util.Set; @@ -36,7 +35,7 @@ import java.util.Set;
import org.bson.Document;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.data.annotation.Id;
import org.springframework.data.mongodb.MongoDatabaseFactory;
import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory;
@ -44,7 +43,6 @@ import org.springframework.data.mongodb.core.convert.MongoCustomConversions.Mong @@ -44,7 +43,6 @@ import org.springframework.data.mongodb.core.convert.MongoCustomConversions.Mong
import org.springframework.data.mongodb.core.mapping.DBRef;
import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
import org.springframework.data.mongodb.test.util.Client;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import com.mongodb.client.MongoClient;
import com.mongodb.client.MongoCollection;
@ -55,7 +53,7 @@ import com.mongodb.client.MongoDatabase; @@ -55,7 +53,7 @@ import com.mongodb.client.MongoDatabase;
*
* @author Christoph Strobl
*/
@ExtendWith(MongoClientExtension.class)
public class MappingMongoConverterTests {
private static final String DATABASE = "mapping-converter-tests";

4
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MongoConvertersIntegrationTests.java
Unescape View File

@ -28,14 +28,13 @@ import org.bson.types.Binary; @@ -28,14 +28,13 @@ import org.bson.types.Binary;
import org.bson.types.ObjectId;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.data.annotation.Id;
import org.springframework.data.domain.Vector;
import org.springframework.data.mongodb.core.mapping.Document;
import org.springframework.data.mongodb.core.mapping.MongoVector;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
import org.springframework.data.mongodb.test.util.MongoTestTemplate;
import org.springframework.data.mongodb.test.util.Template;
import org.springframework.util.ObjectUtils;
@ -47,7 +46,6 @@ import org.springframework.util.ObjectUtils; @@ -47,7 +46,6 @@ import org.springframework.util.ObjectUtils;
* @author Christoph Strobl
* @author Mark Paluch
*/
@ExtendWith(MongoTemplateExtension.class)
public class MongoConvertersIntegrationTests {
static final String COLLECTION = "converter-tests";

3
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/encryption/MongoQueryableEncryptionCollectionCreationTests.java
Unescape View File

@ -42,7 +42,6 @@ import org.springframework.data.mongodb.core.schema.MongoJsonSchema; @@ -42,7 +42,6 @@ import org.springframework.data.mongodb.core.schema.MongoJsonSchema;
import org.springframework.data.mongodb.test.util.Client;
import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
import org.springframework.data.mongodb.test.util.EnableIfReplicaSetAvailable;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit.jupiter.SpringExtension;
@ -53,7 +52,7 @@ import com.mongodb.client.MongoClient; @@ -53,7 +52,7 @@ import com.mongodb.client.MongoClient;
*
* @author Christoph Strobl
*/
@ExtendWith({ MongoClientExtension.class, SpringExtension.class })
@ExtendWith({ SpringExtension.class })
@EnableIfMongoServerVersion(isGreaterThanEqual = "8.0")
@EnableIfReplicaSetAvailable
@ContextConfiguration

9
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/encryption/RangeEncryptionTests.java
Unescape View File

@ -15,9 +15,8 @@ @@ -15,9 +15,8 @@
*/
package org.springframework.data.mongodb.core.encryption;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.springframework.data.mongodb.core.query.Criteria.where;
import static org.assertj.core.api.Assertions.*;
import static org.springframework.data.mongodb.core.query.Criteria.*;
import java.security.SecureRandom;
import java.util.LinkedHashMap;
@ -37,6 +36,7 @@ import org.junit.jupiter.api.AfterEach; @@ -37,6 +36,7 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
@ -59,7 +59,6 @@ import org.springframework.data.mongodb.core.query.Update; @@ -59,7 +59,6 @@ import org.springframework.data.mongodb.core.query.Update;
import org.springframework.data.mongodb.core.schema.MongoJsonSchema;
import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
import org.springframework.data.mongodb.test.util.EnableIfReplicaSetAvailable;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import org.springframework.data.mongodb.util.MongoClientVersion;
import org.springframework.data.util.Lazy;
import org.springframework.test.context.ContextConfiguration;
@ -90,7 +89,7 @@ import com.mongodb.client.vault.ClientEncryptions; @@ -90,7 +89,7 @@ import com.mongodb.client.vault.ClientEncryptions;
* @author Ross Lawley
* @author Christoph Strobl
*/
@ExtendWith({ MongoClientExtension.class, SpringExtension.class })
@ExtendWith({ SpringExtension.class })
@EnableIfMongoServerVersion(isGreaterThanEqual = "8.0")
@EnableIfReplicaSetAvailable
@ContextConfiguration(classes = RangeEncryptionTests.EncryptionConfig.class)

4
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/GeoJsonTests.java
Unescape View File

@ -29,6 +29,7 @@ import org.junit.jupiter.api.AfterEach; @@ -29,6 +29,7 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.dao.DataAccessException;
@ -49,7 +50,6 @@ import org.springframework.data.mongodb.core.query.NearQuery; @@ -49,7 +50,6 @@ import org.springframework.data.mongodb.core.query.NearQuery;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.test.util.BasicDbListBuilder;
import org.springframework.data.mongodb.test.util.Client;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit.jupiter.SpringExtension;
@ -62,7 +62,7 @@ import com.mongodb.client.MongoCollection; @@ -62,7 +62,7 @@ import com.mongodb.client.MongoCollection;
* @author Mark Paluch
* @author Ivan Volzhev
*/
@ExtendWith({ MongoClientExtension.class, SpringExtension.class })
@ExtendWith({ SpringExtension.class })
@ContextConfiguration
public class GeoJsonTests {

4
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/IndexingIntegrationTests.java
Unescape View File

@ -31,6 +31,7 @@ import java.util.Set; @@ -31,6 +31,7 @@ import java.util.Set;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.Bean;
@ -48,7 +49,6 @@ import org.springframework.data.mongodb.core.mapping.MongoMappingContext; @@ -48,7 +49,6 @@ import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
import org.springframework.data.mongodb.core.mapping.TimeSeries;
import org.springframework.data.mongodb.test.util.Client;
import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit.jupiter.SpringExtension;
@ -64,7 +64,7 @@ import com.mongodb.client.MongoClient; @@ -64,7 +64,7 @@ import com.mongodb.client.MongoClient;
* @author Mark Paluch
* @author Ben Foster
*/
@ExtendWith({ MongoClientExtension.class, SpringExtension.class })
@ExtendWith({ SpringExtension.class })
@ContextConfiguration
public class IndexingIntegrationTests {

4
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/TextIndexTests.java
Unescape View File

@ -21,13 +21,12 @@ import java.util.List; @@ -21,13 +21,12 @@ import java.util.List;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.data.domain.Sort.Direction;
import org.springframework.data.mongodb.core.CollectionOptions;
import org.springframework.data.mongodb.core.mapping.Document;
import org.springframework.data.mongodb.core.mapping.Language;
import org.springframework.data.mongodb.core.query.Collation;
import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
import org.springframework.data.mongodb.test.util.MongoTestTemplate;
import org.springframework.data.mongodb.test.util.Template;
@ -35,7 +34,6 @@ import org.springframework.data.mongodb.test.util.Template; @@ -35,7 +34,6 @@ import org.springframework.data.mongodb.test.util.Template;
* @author Christoph Strobl
* @author Mark Paluch
*/
@ExtendWith(MongoTemplateExtension.class)
public class TextIndexTests {
@Template(initialEntitySet = TextIndexedDocumentRoot.class)

10
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/VectorIndexIntegrationTests.java
Unescape View File

@ -15,8 +15,9 @@ @@ -15,8 +15,9 @@
*/
package org.springframework.data.mongodb.core.index;
import static org.assertj.core.api.Assertions.assertThatRuntimeException;
import static org.awaitility.Awaitility.await;
import static org.assertj.core.api.Assertions.*;
import static org.awaitility.Awaitility.*;
import static org.springframework.data.mongodb.test.util.Assertions.*;
import static org.springframework.data.mongodb.test.util.Assertions.assertThat;
import java.time.Duration;
@ -27,17 +28,17 @@ import org.jspecify.annotations.Nullable; @@ -27,17 +28,17 @@ import org.jspecify.annotations.Nullable;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
import org.springframework.data.annotation.Id;
import org.springframework.data.mongodb.core.index.VectorIndex.SimilarityFunction;
import org.springframework.data.mongodb.core.mapping.Field;
import org.springframework.data.mongodb.test.util.AtlasContainer;
import org.springframework.data.mongodb.test.util.EnableIfVectorSearchAvailable;
import org.springframework.data.mongodb.test.util.MongoServerCondition;
import org.springframework.data.mongodb.test.util.MongoTestTemplate;
import org.springframework.data.mongodb.test.util.MongoTestUtils;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
@ -50,7 +51,6 @@ import com.mongodb.client.AggregateIterable; @@ -50,7 +51,6 @@ import com.mongodb.client.AggregateIterable;
* @author Christoph Strobl
* @author Mark Paluch
*/
@ExtendWith(MongoServerCondition.class)
@Testcontainers(disabledWithoutDocker = true)
class VectorIndexIntegrationTests {

4
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MappingTests.java
Unescape View File

@ -31,7 +31,7 @@ import org.bson.Document; @@ -31,7 +31,7 @@ import org.bson.Document;
import org.bson.types.ObjectId;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.dao.DataAccessException;
import org.springframework.dao.DuplicateKeyException;
import org.springframework.data.annotation.Id;
@ -46,7 +46,6 @@ import org.springframework.data.mongodb.core.convert.NoOpDbRefResolver; @@ -46,7 +46,6 @@ import org.springframework.data.mongodb.core.convert.NoOpDbRefResolver;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.test.util.Client;
import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
import org.springframework.data.mongodb.test.util.MongoTestTemplate;
import org.springframework.data.mongodb.test.util.Template;
@ -60,7 +59,6 @@ import com.mongodb.client.MongoCollection; @@ -60,7 +59,6 @@ import com.mongodb.client.MongoCollection;
* @author Thomas Darimont
* @author Mark Paluch
*/
@ExtendWith(MongoTemplateExtension.class)
public class MappingTests {
static final String DB_NAME = "mapping-tests";

4
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/ApplicationContextEventTests.java
Unescape View File

@ -28,7 +28,7 @@ import java.util.Map; @@ -28,7 +28,7 @@ import java.util.Map;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.data.annotation.Id;
@ -42,7 +42,6 @@ import org.springframework.data.mongodb.repository.query.MongoEntityInformation; @@ -42,7 +42,6 @@ import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
import org.springframework.data.mongodb.repository.support.MongoRepositoryFactory;
import org.springframework.data.mongodb.repository.support.QuerydslMongoPredicateExecutor;
import org.springframework.data.mongodb.test.util.Client;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import org.springframework.test.annotation.DirtiesContext;
import com.mongodb.WriteConcern;
@ -57,7 +56,6 @@ import com.mongodb.client.MongoDatabase; @@ -57,7 +56,6 @@ import com.mongodb.client.MongoDatabase;
* @author Jordi Llach
* @author Mark Paluch
*/
@ExtendWith({ MongoClientExtension.class })
public class ApplicationContextEventTests {
private static final String COLLECTION_NAME = "personPojoStringId";

4
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/ChangeStreamTests.java
Unescape View File

@ -38,8 +38,8 @@ import org.junit.jupiter.api.BeforeAll; @@ -38,8 +38,8 @@ import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junitpioneer.jupiter.RepeatFailedTest;
import org.springframework.data.annotation.Id;
import org.springframework.data.mongodb.core.ChangeStreamOptions;
import org.springframework.data.mongodb.core.CollectionOptions;
@ -51,7 +51,6 @@ import org.springframework.data.mongodb.core.query.Criteria; @@ -51,7 +51,6 @@ import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Update;
import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
import org.springframework.data.mongodb.test.util.EnableIfReplicaSetAvailable;
import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
import org.springframework.data.mongodb.test.util.MongoTestTemplate;
import org.springframework.data.mongodb.test.util.MongoVersion;
import org.springframework.data.mongodb.test.util.Template;
@ -68,7 +67,6 @@ import com.mongodb.client.model.changestream.FullDocumentBeforeChange; @@ -68,7 +67,6 @@ import com.mongodb.client.model.changestream.FullDocumentBeforeChange;
* @author Mark Paluch
* @author Myroslav Kosinskyi
*/
@ExtendWith({ MongoTemplateExtension.class })
@EnableIfReplicaSetAvailable
class ChangeStreamTests {

5
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/DefaultMessageListenerContainerTests.java
Unescape View File

@ -28,7 +28,7 @@ import java.util.stream.Collectors; @@ -28,7 +28,7 @@ import java.util.stream.Collectors;
import org.bson.Document;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.core.task.SimpleAsyncTaskExecutor;
import org.springframework.dao.DataAccessException;
import org.springframework.data.annotation.Id;
@ -40,8 +40,6 @@ import org.springframework.data.mongodb.core.messaging.SubscriptionRequest.Reque @@ -40,8 +40,6 @@ import org.springframework.data.mongodb.core.messaging.SubscriptionRequest.Reque
import org.springframework.data.mongodb.test.util.Client;
import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
import org.springframework.data.mongodb.test.util.EnableIfReplicaSetAvailable;
import org.springframework.data.mongodb.test.util.MongoServerCondition;
import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
import org.springframework.data.mongodb.test.util.MongoTestUtils;
import org.springframework.data.mongodb.test.util.Template;
import org.springframework.util.ErrorHandler;
@ -56,7 +54,6 @@ import com.mongodb.client.model.changestream.ChangeStreamDocument; @@ -56,7 +54,6 @@ import com.mongodb.client.model.changestream.ChangeStreamDocument;
*
* @author Christoph Strobl
*/
@ExtendWith({ MongoTemplateExtension.class, MongoServerCondition.class })
public class DefaultMessageListenerContainerTests {
static final String DATABASE_NAME = "change-stream-events";

4
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/TailableCursorTests.java
Unescape View File

@ -31,7 +31,7 @@ import org.junit.jupiter.api.AfterEach; @@ -31,7 +31,7 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.data.annotation.Id;
import org.springframework.data.mongodb.core.CollectionOptions;
import org.springframework.data.mongodb.core.MongoTemplate;
@ -39,7 +39,6 @@ import org.springframework.data.mongodb.core.mapping.Field; @@ -39,7 +39,6 @@ import org.springframework.data.mongodb.core.mapping.Field;
import org.springframework.data.mongodb.core.messaging.Message.MessageProperties;
import org.springframework.data.mongodb.core.messaging.TailableCursorRequest.TailableCursorRequestOptions;
import org.springframework.data.mongodb.test.util.Client;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import com.mongodb.client.MongoClient;
@ -50,7 +49,6 @@ import com.mongodb.client.MongoClient; @@ -50,7 +49,6 @@ import com.mongodb.client.MongoClient;
* @author Christoph Strobl
* @author Mark Paluch
*/
@ExtendWith({ MongoClientExtension.class })
public class TailableCursorTests {
static final String COLLECTION_NAME = "user";

4
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/CriteriaTests.java
Unescape View File

@ -25,9 +25,8 @@ import java.util.Base64; @@ -25,9 +25,8 @@ import java.util.Base64;
import org.bson.types.Binary;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.data.annotation.Id;
import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
import org.springframework.data.mongodb.test.util.MongoTestTemplate;
import org.springframework.data.mongodb.test.util.Template;
@ -37,7 +36,6 @@ import org.springframework.data.mongodb.test.util.Template; @@ -37,7 +36,6 @@ import org.springframework.data.mongodb.test.util.Template;
* @author Christoph Strobl
* @author Andreas Zink
*/
@ExtendWith(MongoTemplateExtension.class)
class CriteriaTests {
@Template(initialEntitySet = { DocumentWithBitmask.class }) //

4
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/TextQueryTests.java
Unescape View File

@ -24,7 +24,7 @@ import org.bson.Document; @@ -24,7 +24,7 @@ import org.bson.Document;
import org.jspecify.annotations.Nullable;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.data.annotation.Id;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.mongodb.core.index.IndexDefinition;
@ -33,7 +33,6 @@ import org.springframework.data.mongodb.core.mapping.Field; @@ -33,7 +33,6 @@ import org.springframework.data.mongodb.core.mapping.Field;
import org.springframework.data.mongodb.core.mapping.Language;
import org.springframework.data.mongodb.core.mapping.TextScore;
import org.springframework.data.mongodb.core.query.TextQueryTests.FullTextDoc.FullTextDocBuilder;
import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
import org.springframework.data.mongodb.test.util.MongoTestTemplate;
import org.springframework.data.mongodb.test.util.Template;
@ -41,7 +40,6 @@ import org.springframework.data.mongodb.test.util.Template; @@ -41,7 +40,6 @@ import org.springframework.data.mongodb.test.util.Template;
* @author Christoph Strobl
* @author Mark Paluch
*/
@ExtendWith(MongoTemplateExtension.class)
public class TextQueryTests {
private static final FullTextDoc BAKE = new FullTextDocBuilder().headline("bake").build();

4
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/schema/MongoJsonSchemaTests.java
Unescape View File

@ -24,6 +24,7 @@ import org.bson.Document; @@ -24,6 +24,7 @@ import org.bson.Document;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration;
@ -33,7 +34,6 @@ import org.springframework.data.mongodb.core.convert.MongoJsonSchemaMapper; @@ -33,7 +34,6 @@ import org.springframework.data.mongodb.core.convert.MongoJsonSchemaMapper;
import org.springframework.data.mongodb.core.mapping.Field;
import org.springframework.data.mongodb.core.validation.Validator;
import org.springframework.data.mongodb.test.util.Client;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit.jupiter.SpringExtension;
@ -49,7 +49,7 @@ import com.mongodb.client.model.ValidationOptions; @@ -49,7 +49,7 @@ import com.mongodb.client.model.ValidationOptions;
*
* @author Christoph Strobl
*/
@ExtendWith({ MongoClientExtension.class, SpringExtension.class })
@ExtendWith({ SpringExtension.class })
@ContextConfiguration
public class MongoJsonSchemaTests {

4
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/schema/ReactiveMongoJsonSchemaTests.java
Unescape View File

@ -28,6 +28,7 @@ import org.bson.Document; @@ -28,6 +28,7 @@ import org.bson.Document;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.dao.DataRetrievalFailureException;
@ -36,7 +37,6 @@ import org.springframework.data.mongodb.core.ReactiveMongoTemplate; @@ -36,7 +37,6 @@ import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
import org.springframework.data.mongodb.core.convert.MongoJsonSchemaMapper;
import org.springframework.data.mongodb.core.mapping.Field;
import org.springframework.data.mongodb.test.util.Client;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import org.springframework.data.mongodb.test.util.ReactiveMongoClientClosingTestConfiguration;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit.jupiter.SpringExtension;
@ -48,7 +48,7 @@ import com.mongodb.reactivestreams.client.MongoClient; @@ -48,7 +48,7 @@ import com.mongodb.reactivestreams.client.MongoClient;
*
* @author Mark Paluch
*/
@ExtendWith({ MongoClientExtension.class, SpringExtension.class })
@ExtendWith({ SpringExtension.class })
@ContextConfiguration
public class ReactiveMongoJsonSchemaTests {

4
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/ComplexIdRepositoryIntegrationTests.java
Unescape View File

@ -26,6 +26,7 @@ import java.util.Set; @@ -26,6 +26,7 @@ import java.util.Set;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.ComponentScan.Filter;
import org.springframework.context.annotation.Configuration;
@ -34,7 +35,6 @@ import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration; @@ -34,7 +35,6 @@ import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
import org.springframework.data.mongodb.test.util.Client;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import com.mongodb.client.MongoClient;
@ -44,7 +44,7 @@ import com.mongodb.client.MongoClient; @@ -44,7 +44,7 @@ import com.mongodb.client.MongoClient;
* @author Oliver Gierke
* @author Mark Paluch
*/
@ExtendWith({ MongoClientExtension.class, SpringExtension.class })
@ExtendWith({ SpringExtension.class })
public class ComplexIdRepositoryIntegrationTests {
static @Client MongoClient mongoClient;

4
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/MongoRepositoryTextSearchIntegrationTests.java
Unescape View File

@ -24,7 +24,7 @@ import org.jspecify.annotations.Nullable; @@ -24,7 +24,7 @@ import org.jspecify.annotations.Nullable;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.data.annotation.Id;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
@ -36,7 +36,6 @@ import org.springframework.data.mongodb.core.index.TextIndexed; @@ -36,7 +36,6 @@ import org.springframework.data.mongodb.core.index.TextIndexed;
import org.springframework.data.mongodb.core.mapping.TextScore;
import org.springframework.data.mongodb.core.query.TextCriteria;
import org.springframework.data.mongodb.repository.support.MongoRepositoryFactory;
import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
import org.springframework.data.mongodb.test.util.MongoTestTemplate;
import org.springframework.data.mongodb.test.util.Template;
import org.springframework.util.ObjectUtils;
@ -48,7 +47,6 @@ import org.springframework.util.ObjectUtils; @@ -48,7 +47,6 @@ import org.springframework.util.ObjectUtils;
* @author Oliver Gierke
* @author Mark Paluch
*/
@ExtendWith(MongoTemplateExtension.class)
class MongoRepositoryTextSearchIntegrationTests {
private static final FullTextDocument PASSENGER_57 = new FullTextDocument("1", "Passenger 57",

4
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonRepositoryTransactionalTests.java
Unescape View File

@ -31,6 +31,7 @@ import org.jspecify.annotations.Nullable; @@ -31,6 +31,7 @@ import org.jspecify.annotations.Nullable;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan.Filter;
@ -45,7 +46,6 @@ import org.springframework.data.mongodb.repository.config.EnableMongoRepositorie @@ -45,7 +46,6 @@ import org.springframework.data.mongodb.repository.config.EnableMongoRepositorie
import org.springframework.data.mongodb.test.util.AfterTransactionAssertion;
import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
import org.springframework.data.mongodb.test.util.EnableIfReplicaSetAvailable;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import org.springframework.data.mongodb.test.util.ReplSetClient;
import org.springframework.test.annotation.Rollback;
import org.springframework.test.context.junit.jupiter.SpringExtension;
@ -63,7 +63,7 @@ import com.mongodb.client.model.Filters; @@ -63,7 +63,7 @@ import com.mongodb.client.model.Filters;
* @author Christoph Strobl
* @currentRead Shadow's Edge - Brent Weeks
*/
@ExtendWith({ MongoClientExtension.class, SpringExtension.class })
@ExtendWith({ SpringExtension.class })
@EnableIfReplicaSetAvailable
@EnableIfMongoServerVersion(isGreaterThanEqual = "4.0")
@Transactional(transactionManager = "txManager")

3
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/VersionedPersonRepositoryIntegrationTests.java
Unescape View File

@ -32,7 +32,6 @@ import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration; @@ -32,7 +32,6 @@ import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
import org.springframework.data.mongodb.test.util.Client;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import org.springframework.data.mongodb.test.util.MongoTestUtils;
import org.springframework.data.repository.CrudRepository;
import org.springframework.test.context.ContextConfiguration;
@ -45,7 +44,7 @@ import com.mongodb.client.MongoClient; @@ -45,7 +44,7 @@ import com.mongodb.client.MongoClient;
*
* @author Christoph Strobl
*/
@ExtendWith({ MongoClientExtension.class, SpringExtension.class })
@ExtendWith({ SpringExtension.class })
@ContextConfiguration
class VersionedPersonRepositoryIntegrationTests {

4
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/MongoRepositoryContributorTests.java
Unescape View File

@ -29,7 +29,6 @@ import java.util.Optional; @@ -29,7 +29,6 @@ import java.util.Optional;
import org.bson.Document;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
@ -47,7 +46,6 @@ import org.springframework.data.mongodb.core.MongoOperations; @@ -47,7 +46,6 @@ import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.aggregation.AggregationResults;
import org.springframework.data.mongodb.test.util.Client;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import org.springframework.data.mongodb.test.util.MongoTestUtils;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
import org.springframework.util.StringUtils;
@ -60,7 +58,7 @@ import com.mongodb.client.MongoClient; @@ -60,7 +58,7 @@ import com.mongodb.client.MongoClient;
* @author Christoph Strobl
* @author Mark Paluch
*/
@ExtendWith(MongoClientExtension.class)
@SpringJUnitConfig(classes = MongoRepositoryContributorTests.MongoRepositoryContributorConfiguration.class)
class MongoRepositoryContributorTests {

4
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/MongoRepositoryContributorUnitTests.java
Unescape View File

@ -25,7 +25,6 @@ import java.io.IOException; @@ -25,7 +25,6 @@ import java.io.IOException;
import java.nio.charset.StandardCharsets;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.aot.generate.GeneratedFiles;
import org.springframework.aot.test.generate.TestGenerationContext;
@ -36,7 +35,6 @@ import org.springframework.core.io.InputStreamResource; @@ -36,7 +35,6 @@ import org.springframework.core.io.InputStreamResource;
import org.springframework.core.io.InputStreamSource;
import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.data.mongodb.repository.Meta;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import org.springframework.data.repository.CrudRepository;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
@ -45,7 +43,7 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; @@ -45,7 +43,7 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
*
* @author Mark Paluch
*/
@ExtendWith(MongoClientExtension.class)
@SpringJUnitConfig(classes = MongoRepositoryContributorUnitTests.MongoRepositoryContributorConfiguration.class)
class MongoRepositoryContributorUnitTests {

4
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/MongoRepositoryMetadataTests.java
Unescape View File

@ -27,7 +27,6 @@ import java.util.List; @@ -27,7 +27,6 @@ import java.util.List;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
@ -36,7 +35,6 @@ import org.springframework.context.support.AbstractApplicationContext; @@ -36,7 +35,6 @@ import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.core.io.Resource;
import org.springframework.core.io.UrlResource;
import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.data.mongodb.test.util.MongoClientExtension;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
/**
@ -44,7 +42,7 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; @@ -44,7 +42,7 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
*
* @author Mark Paluch
*/
@ExtendWith(MongoClientExtension.class)
@SpringJUnitConfig(classes = MongoRepositoryMetadataTests.MongoRepositoryContributorConfiguration.class)
class MongoRepositoryMetadataTests {

5
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/SimpleMongoRepositoryTests.java
Unescape View File

@ -32,6 +32,7 @@ import org.junit.jupiter.api.BeforeEach; @@ -32,6 +32,7 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.dao.IncorrectResultSizeDataAccessException;
import org.springframework.data.domain.Example;
import org.springframework.data.domain.ExampleMatcher;
@ -53,8 +54,6 @@ import org.springframework.data.mongodb.repository.query.MongoEntityInformation; @@ -53,8 +54,6 @@ import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
import org.springframework.data.mongodb.test.util.DirtiesStateExtension;
import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
import org.springframework.data.mongodb.test.util.EnableIfReplicaSetAvailable;
import org.springframework.data.mongodb.test.util.MongoServerCondition;
import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
import org.springframework.data.mongodb.test.util.MongoTestTemplate;
import org.springframework.data.mongodb.test.util.Template;
import org.springframework.data.repository.query.FluentQuery;
@ -68,7 +67,7 @@ import org.springframework.transaction.support.TransactionTemplate; @@ -68,7 +67,7 @@ import org.springframework.transaction.support.TransactionTemplate;
* @author Mark Paluch
* @author Jens Schauder
*/
@ExtendWith({ MongoTemplateExtension.class, MongoServerCondition.class, DirtiesStateExtension.class })
@ExtendWith({ DirtiesStateExtension.class })
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
class SimpleMongoRepositoryTests implements StateFunctions {

6
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/EnableIfVectorSearchAvailable.java
Unescape View File

@ -29,9 +29,11 @@ import org.junit.jupiter.api.extension.ExtendWith; @@ -29,9 +29,11 @@ import org.junit.jupiter.api.extension.ExtendWith;
* server available. This means that not only the mongodb instance needs to have a
* {@literal searchIndexManagementHostAndPort} configured, but also that the search index sever is actually up and
* running, responding to a {@literal $listSearchIndexes} aggregation.
*
* <p>
* Using this annotation will wait up to {@code 60 seconds} for the search index to become available.
*
* @author Christoph Strobl
* @since 5.0
* @since 4.5.3
* @see Tag
*/
@Target({ ElementType.METHOD })

6
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoClientExtension.java
Unescape View File

@ -47,7 +47,7 @@ import com.mongodb.client.MongoClient; @@ -47,7 +47,7 @@ import com.mongodb.client.MongoClient;
* @see Client
* @see ReplSetClient
*/
public class MongoClientExtension implements Extension, BeforeAllCallback, AfterAllCallback, ParameterResolver {
class MongoClientExtension implements Extension, BeforeAllCallback, AfterAllCallback, ParameterResolver {
private static final Log LOGGER = LogFactory.getLog(MongoClientExtension.class);
@ -157,7 +157,7 @@ public class MongoClientExtension implements Extension, BeforeAllCallback, After @@ -157,7 +157,7 @@ public class MongoClientExtension implements Extension, BeforeAllCallback, After
return getMongoClient(parameterType, extensionContext, replSet);
}
static class SyncClientHolder implements Store.CloseableResource {
static class SyncClientHolder implements AutoCloseable {
final MongoClient client;
@ -175,7 +175,7 @@ public class MongoClientExtension implements Extension, BeforeAllCallback, After @@ -175,7 +175,7 @@ public class MongoClientExtension implements Extension, BeforeAllCallback, After
}
}
static class ReactiveClientHolder implements Store.CloseableResource {
static class ReactiveClientHolder implements AutoCloseable {
final com.mongodb.reactivestreams.client.MongoClient client;

4
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoServerCondition.java
Unescape View File

@ -34,7 +34,7 @@ import com.mongodb.client.MongoClient; @@ -34,7 +34,7 @@ import com.mongodb.client.MongoClient;
/**
* @author Christoph Strobl
*/
public class MongoServerCondition implements ExecutionCondition {
class MongoServerCondition implements ExecutionCondition {
private static final Namespace NAMESPACE = Namespace.create("mongodb", "server");
@ -52,9 +52,11 @@ public class MongoServerCondition implements ExecutionCondition { @@ -52,9 +52,11 @@ public class MongoServerCondition implements ExecutionCondition {
}
if (context.getTags().contains("vector-search")) {
if (!atlasEnvironment(context)) {
return ConditionEvaluationResult.disabled("Disabled for servers not supporting Vector Search.");
}
if (!isSearchIndexAvailable(context)) {
return ConditionEvaluationResult.disabled("Search index unavailable.");
}

2
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoTemplateExtension.java
Unescape View File

@ -45,7 +45,7 @@ import org.springframework.util.ClassUtils; @@ -45,7 +45,7 @@ import org.springframework.util.ClassUtils;
* @see MongoTestTemplate
* @see ReactiveMongoTestTemplate
*/
public class MongoTemplateExtension extends MongoClientExtension implements TestInstancePostProcessor {
class MongoTemplateExtension extends MongoClientExtension implements TestInstancePostProcessor {
private static final String DEFAULT_DATABASE = "database";

Write Preview
Loading…
Cancel
Save