From 756894f5ccbdac94e6b03b807b848c9ef9e52908 Mon Sep 17 00:00:00 2001
From: izeye <izeye@naver.com>
Date: Fri, 9 Apr 2021 20:24:17 +0900
Subject: [PATCH] Fix MongoMetricsAutoConfigurationTests

---
 .../MongoMetricsAutoConfigurationTests.java   | 35 +++++++++++--------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/mongo/MongoMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/mongo/MongoMetricsAutoConfigurationTests.java
index a3d110258b9c..a4e44e9e96db 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/mongo/MongoMetricsAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/mongo/MongoMetricsAutoConfigurationTests.java
@@ -46,6 +46,7 @@
  * Tests for {@link MongoMetricsAutoConfiguration}.
  *
  * @author Chris Bono
+ * @author Johnny Lim
  */
 class MongoMetricsAutoConfigurationTests {
 
@@ -80,13 +81,13 @@ void whenThereIsAMeterRegistryThenMetricsConnectionPoolListenerIsAdded() {
 	@Test
 	void whenThereIsNoMeterRegistryThenNoMetricsCommandListenerIsAdded() {
 		this.contextRunner.withConfiguration(AutoConfigurations.of(MongoAutoConfiguration.class))
-				.run((context) -> assertThatMetricsCommandListenerNotAdded());
+				.run(assertThatMetricsCommandListenerNotAdded());
 	}
 
 	@Test
 	void whenThereIsNoMeterRegistryThenNoMetricsConnectionPoolListenerIsAdded() {
 		this.contextRunner.withConfiguration(AutoConfigurations.of(MongoAutoConfiguration.class))
-				.run((context) -> assertThatMetricsConnectionPoolListenerNotAdded());
+				.run(assertThatMetricsConnectionPoolListenerNotAdded());
 	}
 
 	@Test
@@ -114,44 +115,50 @@ void whenThereIsACustomMetricsConnectionPoolTagsProviderItIsUsed() {
 
 	@Test
 	void whenThereIsNoMongoClientSettingsOnClasspathThenNoMetricsCommandListenerIsAdded() {
-		this.contextRunner.withConfiguration(AutoConfigurations.of(MongoAutoConfiguration.class))
+		this.contextRunner.with(MetricsRun.simple())
+				.withConfiguration(AutoConfigurations.of(MongoAutoConfiguration.class))
 				.withClassLoader(new FilteredClassLoader(MongoClientSettings.class))
-				.run((context) -> assertThatMetricsCommandListenerNotAdded());
+				.run(assertThatMetricsCommandListenerNotAdded());
 	}
 
 	@Test
 	void whenThereIsNoMongoClientSettingsOnClasspathThenNoMetricsConnectionPoolListenerIsAdded() {
-		this.contextRunner.withConfiguration(AutoConfigurations.of(MongoAutoConfiguration.class))
+		this.contextRunner.with(MetricsRun.simple())
+				.withConfiguration(AutoConfigurations.of(MongoAutoConfiguration.class))
 				.withClassLoader(new FilteredClassLoader(MongoClientSettings.class))
-				.run((context) -> assertThatMetricsConnectionPoolListenerNotAdded());
+				.run(assertThatMetricsConnectionPoolListenerNotAdded());
 	}
 
 	@Test
 	void whenThereIsNoMongoMetricsCommandListenerOnClasspathThenNoMetricsCommandListenerIsAdded() {
-		this.contextRunner.withConfiguration(AutoConfigurations.of(MongoAutoConfiguration.class))
+		this.contextRunner.with(MetricsRun.simple())
+				.withConfiguration(AutoConfigurations.of(MongoAutoConfiguration.class))
 				.withClassLoader(new FilteredClassLoader(MongoMetricsCommandListener.class))
-				.run((context) -> assertThatMetricsCommandListenerNotAdded());
+				.run(assertThatMetricsCommandListenerNotAdded());
 	}
 
 	@Test
 	void whenThereIsNoMongoMetricsConnectionPoolListenerOnClasspathThenNoMetricsConnectionPoolListenerIsAdded() {
-		this.contextRunner.withConfiguration(AutoConfigurations.of(MongoAutoConfiguration.class))
+		this.contextRunner.with(MetricsRun.simple())
+				.withConfiguration(AutoConfigurations.of(MongoAutoConfiguration.class))
 				.withClassLoader(new FilteredClassLoader(MongoMetricsConnectionPoolListener.class))
-				.run((context) -> assertThatMetricsConnectionPoolListenerNotAdded());
+				.run(assertThatMetricsConnectionPoolListenerNotAdded());
 	}
 
 	@Test
 	void whenMetricsCommandListenerEnabledPropertyFalseThenNoMetricsCommandListenerIsAdded() {
-		this.contextRunner.withConfiguration(AutoConfigurations.of(MongoAutoConfiguration.class))
+		this.contextRunner.with(MetricsRun.simple())
+				.withConfiguration(AutoConfigurations.of(MongoAutoConfiguration.class))
 				.withPropertyValues("management.metrics.mongo.command.enabled:false")
-				.run((context) -> assertThatMetricsCommandListenerNotAdded());
+				.run(assertThatMetricsCommandListenerNotAdded());
 	}
 
 	@Test
 	void whenMetricsConnectionPoolListenerEnabledPropertyFalseThenNoMetricsConnectionPoolListenerIsAdded() {
-		this.contextRunner.withConfiguration(AutoConfigurations.of(MongoAutoConfiguration.class))
+		this.contextRunner.with(MetricsRun.simple())
+				.withConfiguration(AutoConfigurations.of(MongoAutoConfiguration.class))
 				.withPropertyValues("management.metrics.mongo.connectionpool.enabled:false")
-				.run((context) -> assertThatMetricsConnectionPoolListenerNotAdded());
+				.run(assertThatMetricsConnectionPoolListenerNotAdded());
 	}
 
 	private ContextConsumer<AssertableApplicationContext> assertThatMetricsCommandListenerNotAdded() {