Close clients created during tests.

christophstrobl · mp911de · commit 1119a4a0a68a · 2022-08-23T09:53:32.000+02:00
See #3817 Original pull request: #3987.
diff --git a/spring-data-mongodb/src/test/java/ConfigClassInDefaultPackage.java b/spring-data-mongodb/src/test/java/ConfigClassInDefaultPackage.java
@@ -19,18 +19,18 @@
 import java.util.Set;
 
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration;
 
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoClients;
+import org.springframework.data.mongodb.test.util.MongoClientClosingTestConfiguration;
 
 /**
  * Sample configuration class in default package.
  *
  * @author Oliver Gierke
  */
 @Configuration
-public class ConfigClassInDefaultPackage extends AbstractMongoClientConfiguration {
+public class ConfigClassInDefaultPackage extends MongoClientClosingTestConfiguration {
 
 	/*
 	 * (non-Javadoc)
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AbstractIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AbstractIntegrationTests.java
@@ -29,6 +29,7 @@
 import org.springframework.dao.DataAccessException;
 import org.springframework.data.mongodb.core.CollectionCallback;
 import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.data.mongodb.test.util.MongoClientClosingTestConfiguration;
 import org.springframework.data.mongodb.test.util.MongoTestUtils;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
@@ -45,7 +46,7 @@
 public abstract class AbstractIntegrationTests {
 
 	@Configuration
-	static class TestConfig extends AbstractMongoClientConfiguration {
+	static class TestConfig extends MongoClientClosingTestConfiguration {
 
 		@Override
 		protected String getDatabaseName() {
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AbstractMongoConfigurationUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AbstractMongoConfigurationUnitTests.java
@@ -27,6 +27,7 @@
 
 import org.junit.jupiter.api.Test;
 
+import org.mockito.Mockito;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -158,7 +159,7 @@ protected String getDatabaseName() {
 
 		@Override
 		public MongoClient mongoClient() {
-			return MongoClients.create();
+			return Mockito.mock(MongoClient.class);
 		}
 
 		@Override
@@ -186,7 +187,7 @@ protected String getDatabaseName() {
 
 		@Override
 		public MongoClient mongoClient() {
-			return MongoClients.create();
+			return Mockito.mock(MongoClient.class);
 		}
 
 		@Override
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AbstractReactiveMongoConfigurationUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AbstractReactiveMongoConfigurationUnitTests.java
@@ -158,7 +158,7 @@ protected String getDatabaseName() {
 
 		@Override
 		public MongoClient reactiveMongoClient() {
-			return MongoTestUtils.reactiveClient();
+			return Mockito.mock(MongoClient.class);
 		}
 
 		@Override
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AuditingViaJavaConfigRepositoriesTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AuditingViaJavaConfigRepositoriesTests.java
@@ -49,6 +49,7 @@
 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;
 import org.springframework.test.context.ContextConfiguration;
@@ -233,7 +234,7 @@ static class SimpleConfigWithRepositories extends SimpleConfig {}
 
 	@Configuration
 	@EnableMongoAuditing
-	static class SimpleConfig extends AbstractMongoClientConfiguration {
+	static class SimpleConfig extends MongoClientClosingTestConfiguration {
 
 		@Override
 		public MongoClient mongoClient() {
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoDbFactoryParserIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoDbFactoryParserIntegrationTests.java
@@ -19,7 +19,6 @@
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.ConstructorArgumentValues;
 import org.springframework.beans.factory.config.ConstructorArgumentValues.ValueHolder;
@@ -74,6 +73,7 @@ public void parsesWriteConcern() {
 
 		ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("namespace/db-factory-bean.xml");
 		assertWriteConcern(ctx, WriteConcern.ACKNOWLEDGED);
+		ctx.close();
 	}
 
 	@Test // DATAMONGO-2199
@@ -82,6 +82,7 @@ public void parsesCustomWriteConcern() {
 		ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(
 				"namespace/db-factory-bean-custom-write-concern.xml");
 		assertWriteConcern(ctx, new WriteConcern("rack1"));
+		ctx.close();
 	}
 
 	@Test // DATAMONGO-331
@@ -90,10 +91,10 @@ public void readsReplicasWriteConcernCorrectly() {
 		AbstractApplicationContext ctx = new ClassPathXmlApplicationContext(
 				"namespace/db-factory-bean-custom-write-concern.xml");
 		MongoDatabaseFactory factory = ctx.getBean("second", MongoDatabaseFactory.class);
-		MongoDatabase db = factory.getMongoDatabase();
+		ctx.close();
 
+		MongoDatabase db = factory.getMongoDatabase();
 		assertThat(db.getWriteConcern()).isEqualTo(WriteConcern.W2);
-		ctx.close();
 	}
 
 	// This test will fail since equals in WriteConcern uses == for _w and not .equals
@@ -127,6 +128,8 @@ public void setsUpMongoDbFactoryUsingAMongoUriWithoutCredentials() {
 		MongoDatabaseFactory dbFactory = factory.getBean("mongoDbFactory", MongoDatabaseFactory.class);
 		MongoDatabase db = dbFactory.getMongoDatabase();
 		assertThat(db.getName()).isEqualTo("database");
+
+		factory.destroyBean(dbFactory);
 	}
 
 	@Test // DATAMONGO-1218
@@ -171,6 +174,8 @@ public void usesConnectionStringToCreateClientClient() {
 		ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("namespace/db-factory-bean.xml");
 
 		MongoDatabaseFactory dbFactory = ctx.getBean("with-connection-string", MongoDatabaseFactory.class);
+		ctx.close();
+
 		assertThat(dbFactory).isInstanceOf(SimpleMongoClientDatabaseFactory.class);
 		assertThat(ReflectionTestUtils.getField(dbFactory, "mongoClient"))
 				.isInstanceOf(com.mongodb.client.MongoClient.class);
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/ReactiveAuditingTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/ReactiveAuditingTests.java
@@ -21,6 +21,7 @@
 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;
@@ -75,7 +76,7 @@ class ReactiveAuditingTests {
 	@EnableReactiveMongoAuditing
 	@EnableReactiveMongoRepositories(basePackageClasses = ReactiveAuditingTests.class, considerNestedRepositories = true,
 			includeFilters = @Filter(type = FilterType.ASSIGNABLE_TYPE, classes = ReactiveAuditablePersonRepository.class))
-	static class Config extends AbstractReactiveMongoConfiguration {
+	static class Config extends ReactiveMongoClientClosingTestConfiguration {
 
 		@Override
 		protected String getDatabaseName() {
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateTests.java
@@ -64,6 +64,7 @@
 import org.springframework.data.mapping.MappingException;
 import org.springframework.data.mongodb.InvalidMongoDbApiUsageException;
 import org.springframework.data.mongodb.MongoDatabaseFactory;
+import org.springframework.data.mongodb.core.BulkOperations.BulkMode;
 import org.springframework.data.mongodb.core.convert.LazyLoadingProxy;
 import org.springframework.data.mongodb.core.geo.GeoJsonPoint;
 import org.springframework.data.mongodb.core.index.Index;
@@ -3580,7 +3581,7 @@ public void removeShouldConsiderLimit() {
 				.mapToObj(i -> new Sample("id-" + i, i % 2 == 0 ? "stark" : "lannister")) //
 				.collect(Collectors.toList());
 
-		template.insertAll(samples);
+		template.bulkOps(BulkMode.UNORDERED, Sample.class).insert(samples).execute();
 
 		DeleteResult wr = template.remove(query(where("field").is("lannister")).limit(25), Sample.class);
 
@@ -3595,7 +3596,7 @@ public void removeShouldConsiderSkipAndSort() {
 				.mapToObj(i -> new Sample("id-" + i, i % 2 == 0 ? "stark" : "lannister")) //
 				.collect(Collectors.toList());
 
-		template.insertAll(samples);
+		template.bulkOps(BulkMode.UNORDERED, Sample.class).insert(samples).execute();
 
 		DeleteResult wr = template.remove(new Query().skip(25).with(Sort.by("field")), Sample.class);
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/AbstractGeoSpatialTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/AbstractGeoSpatialTests.java
@@ -37,13 +37,13 @@
 import org.springframework.data.geo.Metrics;
 import org.springframework.data.geo.Point;
 import org.springframework.data.geo.Polygon;
-import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration;
 import org.springframework.data.mongodb.core.BulkOperations.BulkMode;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.TestEntities;
 import org.springframework.data.mongodb.core.Venue;
 import org.springframework.data.mongodb.core.query.NearQuery;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.test.util.MongoClientClosingTestConfiguration;
 import org.springframework.data.mongodb.test.util.MongoTestUtils;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -60,7 +60,7 @@
 public abstract class AbstractGeoSpatialTests {
 
 	@Configuration
-	static class TestConfig extends AbstractMongoClientConfiguration {
+	static class TestConfig extends MongoClientClosingTestConfiguration {
 
 		@Override
 		protected String getDatabaseName() {
@@ -111,10 +111,7 @@ protected void removeVenues() {
 	}
 
 	protected void addVenues() {
-
-
 		template.bulkOps(BulkMode.UNORDERED, Venue.class).insert(TestEntities.geolocation().newYork()).execute();
-//		template.insertAll(TestEntities.geolocation().newYork());
 	}
 
 	@Test
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/GeoIndexedAppConfig.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/GeoIndexedAppConfig.java
@@ -19,13 +19,13 @@
 import java.util.Set;
 
 import org.springframework.context.annotation.Bean;
-import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration;
 import org.springframework.data.mongodb.core.mapping.event.LoggingEventListener;
+import org.springframework.data.mongodb.test.util.MongoClientClosingTestConfiguration;
 import org.springframework.data.mongodb.test.util.MongoTestUtils;
 
 import com.mongodb.client.MongoClient;
 
-public class GeoIndexedAppConfig extends AbstractMongoClientConfiguration {
+public class GeoIndexedAppConfig extends MongoClientClosingTestConfiguration {
 
 	public static String GEO_DB = "database";
 	public static String GEO_COLLECTION = "geolocation";
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/ApplicationContextEventTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/ApplicationContextEventTests.java
@@ -34,6 +34,7 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import org.springframework.context.ApplicationContext;
+import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.MongoTemplate;
@@ -72,7 +73,7 @@ public class ApplicationContextEventTests {
 
 	static @Client MongoClient mongoClient;
 
-	private ApplicationContext applicationContext;
+	private ConfigurableApplicationContext applicationContext;
 	private MongoTemplate template;
 	private SimpleMappingEventListener listener;
 
@@ -89,7 +90,9 @@ public void setUp() {
 
 	@AfterEach
 	public void cleanUp() {
+
 		cleanDb();
+		applicationContext.close();
 	}
 
 	private void cleanDb() {
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/ApplicationContextEventTestsAppConfig.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/ApplicationContextEventTestsAppConfig.java
@@ -17,13 +17,13 @@
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration;
+import org.springframework.data.mongodb.test.util.MongoClientClosingTestConfiguration;
 import org.springframework.data.mongodb.test.util.MongoTestUtils;
 
 import com.mongodb.client.MongoClient;
 
 @Configuration
-public class ApplicationContextEventTestsAppConfig extends AbstractMongoClientConfiguration {
+public class ApplicationContextEventTestsAppConfig extends MongoClientClosingTestConfiguration {
 
 	@Override
 	public String getDatabaseName() {
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/schema/ReactiveMongoJsonSchemaTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/schema/ReactiveMongoJsonSchemaTests.java
@@ -18,6 +18,7 @@
 import static org.springframework.data.mongodb.test.util.Assertions.*;
 
 import lombok.Data;
+import org.springframework.data.mongodb.test.util.ReactiveMongoClientClosingTestConfiguration;
 import reactor.test.StepVerifier;
 
 import java.time.Duration;
@@ -32,7 +33,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.dao.DataRetrievalFailureException;
-import org.springframework.data.mongodb.config.AbstractReactiveMongoConfiguration;
 import org.springframework.data.mongodb.core.CollectionOptions;
 import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
 import org.springframework.data.mongodb.core.convert.MongoJsonSchemaMapper;
@@ -56,7 +56,7 @@ public class ReactiveMongoJsonSchemaTests {
 	static @Client MongoClient mongoClient;
 
 	@Configuration
-	static class Config extends AbstractReactiveMongoConfiguration {
+	static class Config extends ReactiveMongoClientClosingTestConfiguration {
 
 		@Override
 		public MongoClient reactiveMongoClient() {
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/performance/PerformanceTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/performance/PerformanceTests.java
@@ -93,7 +93,10 @@ public void setUp() throws Exception {
 		factory.afterPropertiesSet();
 
 		this.repository = factory.getObject();
+	}
 
+	void afterEach() {
+		mongo.close();
 	}
 
 	@Test
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/performance/ReactivePerformanceTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/performance/ReactivePerformanceTests.java
@@ -28,9 +28,9 @@
 
 import org.bson.Document;
 import org.bson.types.ObjectId;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-
 import org.springframework.core.Constants;
 import org.springframework.data.annotation.PersistenceConstructor;
 import org.springframework.data.mongodb.core.ReactiveMongoOperations;
@@ -41,7 +41,6 @@
 import org.springframework.data.mongodb.core.convert.DbRefResolverCallback;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
-import org.springframework.data.mongodb.core.convert.ReferenceLoader;
 import org.springframework.data.mongodb.core.convert.ReferenceLookupDelegate;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
@@ -136,6 +135,11 @@ public List<Document> bulkFetch(List<DBRef> dbRefs) {
 		repository = factory.getRepository(ReactivePersonRepository.class);
 	}
 
+	@AfterEach
+	void afterEach() {
+		mongo.close();
+	}
+
 	@Test // DATAMONGO-1444
 	public void writeWithWriteConcerns() {
 		executeWithWriteConcerns((constantName, concern) -> {
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/AbstractPersonRepositoryIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/AbstractPersonRepositoryIntegrationTests.java
@@ -59,6 +59,7 @@
 import org.springframework.data.geo.Metrics;
 import org.springframework.data.geo.Point;
 import org.springframework.data.geo.Polygon;
+import org.springframework.data.mongodb.core.BulkOperations.BulkMode;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.aggregation.AggregationResults;
 import org.springframework.data.mongodb.core.geo.GeoJsonPoint;
@@ -929,7 +930,7 @@ void sliceShouldTraverseElementsWithoutSkippingOnes() {
 			persons.add(new Person(String.format("%03d", i), "ln" + 1, 100));
 		}
 
-		repository.saveAll(persons);
+		operations.bulkOps(BulkMode.UNORDERED, Person.class).insert(persons).execute();
 
 		Slice<Person> slice = repository.findByAgeGreaterThan(50, PageRequest.of(0, 20, Direction.ASC, "firstname"));
 		assertThat(slice).containsExactlyElementsOf(persons.subList(0, 20));
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/ReactiveMongoRepositoryTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/ReactiveMongoRepositoryTests.java
@@ -55,7 +55,6 @@
 import org.springframework.data.geo.GeoResult;
 import org.springframework.data.geo.Metrics;
 import org.springframework.data.geo.Point;
-import org.springframework.data.mongodb.config.AbstractReactiveMongoConfiguration;
 import org.springframework.data.mongodb.core.CollectionOptions;
 import org.springframework.data.mongodb.core.ReactiveMongoOperations;
 import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
@@ -71,6 +70,7 @@
 import org.springframework.data.querydsl.ReactiveQuerydslPredicateExecutor;
 import org.springframework.data.repository.Repository;
 import org.springframework.data.repository.query.ReactiveQueryMethodEvaluationContextProvider;
+import org.springframework.data.mongodb.test.util.ReactiveMongoClientClosingTestConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import com.mongodb.reactivestreams.client.MongoClient;
@@ -98,7 +98,7 @@ class ReactiveMongoRepositoryTests {
 	private QPerson person = QPerson.person;
 
 	@Configuration
-	static class Config extends AbstractReactiveMongoConfiguration {
+	static class Config extends ReactiveMongoClientClosingTestConfiguration {
 
 		@Bean
 		@Override
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/ReactiveMongoRepositoriesRegistrarIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/ReactiveMongoRepositoriesRegistrarIntegrationTests.java
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/ReactiveQuerydslMongoPredicateExecutorTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/ReactiveQuerydslMongoPredicateExecutorTests.java
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/SimpleMongoRepositoryVersionedEntityTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/SimpleMongoRepositoryVersionedEntityTests.java
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/SimpleReactiveMongoRepositoryVersionedEntityTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/SimpleReactiveMongoRepositoryVersionedEntityTests.java
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoClientClosingTestConfiguration.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoClientClosingTestConfiguration.java
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/ReactiveMongoClientClosingTestConfiguration.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/ReactiveMongoClientClosingTestConfiguration.java

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ protected String getDatabaseName() {`
`158`	`158`
`159`	`159`	`@Override`
`160`	`160`	`public MongoClient reactiveMongoClient() {`
`161`		`- return MongoTestUtils.reactiveClient();`
	`161`	`+ return Mockito.mock(MongoClient.class);`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`@Override`