Polish "Register health / reflection only if BindableService beans exist"

Adjusts the previous commit autoconfig tests:

- renames test methods for consistency
- check for default beans created

Signed-off-by: Chris Bono <[email protected]>

Author: onobc

spring-grpc-spring-boot-autoconfigure/src/test/java/org/springframework/grpc/autoconfigure/server/GrpcServerReflectionAutoConfigurationTests.java

@@ -31,7 +31,7 @@
  * @author Chris Bono
  * @author Andrey Litvitski
  */
-public class GrpcServerReflectionAutoConfigurationTests {
+class GrpcServerReflectionAutoConfigurationTests {
 
 	private ApplicationContextRunner contextRunner() {
 		return new ApplicationContextRunner()
@@ -41,38 +41,37 @@ private ApplicationContextRunner contextRunner() {
 	}
 
 	@Test
-	void whenNoBindableServiceDefinedDoesNotAutoConfigureBean() {
+	void whenAutoConfigurationIsNotSkippedThenCreatesReflectionServiceBean() {
+		this.contextRunner().run((context -> assertThat(context).hasBean("serverReflection")));
+	}
+
+	@Test
+	void whenNoBindableServiceDefinedThenAutoConfigurationIsSkipped() {
 		new ApplicationContextRunner()
 			.withConfiguration(AutoConfigurations.of(GrpcServerReflectionAutoConfiguration.class))
 			.run((context) -> assertThat(context).doesNotHaveBean(GrpcServerReflectionAutoConfiguration.class));
 	}
 
 	@Test
-	void whenReflectionEnabledFlagNotPresentThenCreateDefaultBean() {
-		this.contextRunner().run((context -> assertThat(context).hasBean("serverReflection")));
+	void whenReflectionEnabledPropertyNotSetThenAutoConfigurationIsNotSkipped() {
+		this.contextRunner()
+			.run((context) -> assertThat(context).hasSingleBean(GrpcServerReflectionAutoConfiguration.class));
 	}
 
 	@Test
-	void whenReflectionEnabledThenCreateBean() {
+	void whenReflectionEnabledPropertySetTrueThenAutoConfigurationIsNotSkipped() {
 		this.contextRunner()
 			.withPropertyValues("spring.grpc.server.reflection.enabled=true")
 			.run((context) -> assertThat(context).hasSingleBean(GrpcServerReflectionAutoConfiguration.class));
 	}
 
 	@Test
-	void whenReflectionDisabledThenSkipBeanCreation() {
+	void whenReflectionEnabledPropertySetFalseThenAutoConfigurationIsSkipped() {
 		this.contextRunner()
 			.withPropertyValues("spring.grpc.server.reflection.enabled=false")
 			.run((context) -> assertThat(context).doesNotHaveBean(GrpcServerReflectionAutoConfiguration.class));
 	}
 
-	@Test
-	void whenServerEnabledPropertySetFalseThenAutoConfigurationIsSkipped() {
-		this.contextRunner()
-			.withPropertyValues("spring.grpc.server.enabled=false")
-			.run((context) -> assertThat(context).doesNotHaveBean(GrpcServerReflectionAutoConfiguration.class));
-	}
-
 	@Test
 	void whenServerEnabledPropertyNotSetThenAutoConfigurationIsNotSkipped() {
 		this.contextRunner()
@@ -86,4 +85,11 @@ void whenServerEnabledPropertySetTrueThenAutoConfigurationIsNotSkipped() {
 			.run((context) -> assertThat(context).hasSingleBean(GrpcServerReflectionAutoConfiguration.class));
 	}
 
+	@Test
+	void whenServerEnabledPropertySetFalseThenAutoConfigurationIsSkipped() {
+		this.contextRunner()
+			.withPropertyValues("spring.grpc.server.enabled=false")
+			.run((context) -> assertThat(context).doesNotHaveBean(GrpcServerReflectionAutoConfiguration.class));
+	}
+
 }

spring-grpc-spring-boot-autoconfigure/src/test/java/org/springframework/grpc/autoconfigure/server/health/GrpcServerHealthAutoConfigurationTests.java

@@ -60,6 +60,13 @@ private ApplicationContextRunner contextRunner() {
 			.withBean(BindableService.class, Mockito::mock);
 	}
 
+	@Test
+	void whenAutoConfigurationIsNotSkippedThenCreatesDefaultBeans() {
+		this.contextRunner()
+			.run((context -> assertThat(context).hasSingleBean(HealthStatusManager.class)
+				.hasBean("grpcHealthService")));
+	}
+
 	@Test
 	void whenNoBindableServiceDefinedDoesNotAutoConfigureBean() {
 		new ApplicationContextRunner().withConfiguration(AutoConfigurations.of(GrpcServerHealthAutoConfiguration.class))