Tests review

bnasslahsen · bnasslahsen · commit b5b89cf1510a · 2021-12-24T16:23:37.000+01:00
diff --git a/springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/AbstractCommonTest.java b/springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/AbstractCommonTest.java
@@ -12,10 +12,15 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.web.reactive.server.WebTestClient;
 
 @AutoConfigureWebTestClient(timeout = "3600000")
 @ActiveProfiles("test")
+@TestPropertySource(properties={
+		"spring.autoconfigure.exclude=org.springframework.cloud.function.web.flux.ReactorAutoConfiguration, org.springframework.cloud.function.web.source.FunctionExporterAutoConfiguration, org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration",
+		"management.endpoints.enabled-by-default=false"
+})
 public abstract class AbstractCommonTest {
 
 	protected static final Logger LOGGER = LoggerFactory.getLogger(AbstractCommonTest.class);
diff --git a/springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/AbstractSpringDocActuatorTest.java b/springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/AbstractSpringDocActuatorTest.java
@@ -3,8 +3,10 @@
 import javax.annotation.PostConstruct;
 
 import org.springframework.boot.actuate.autoconfigure.web.server.LocalManagementPort;
+import org.springframework.test.context.TestPropertySource;
 import org.springframework.web.reactive.function.client.WebClient;
 
+@TestPropertySource(properties={ "management.endpoints.enabled-by-default=true" })
 public abstract class AbstractSpringDocActuatorTest extends  AbstractCommonTest{
 
 	@LocalManagementPort
diff --git a/springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/app146/SpringDocApp146Test.java b/springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/app146/SpringDocApp146Test.java
@@ -24,7 +24,6 @@
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.function.web.flux.ReactorAutoConfiguration;
 import org.springframework.test.web.reactive.server.EntityExchangeResult;
 
 import static org.skyscreamer.jsonassert.JSONAssert.assertEquals;
@@ -34,12 +33,12 @@
 		properties = { "management.endpoints.web.exposure.include:*",
 				"springdoc.show-actuator=true",
 				"management.server.port=9096",
-				"management.endpoints.web.exposure.exclude=functions",
+				"management.endpoints.web.exposure.exclude=functions, shutdown",
 				"management.server.base-path=/test",
 				"management.endpoints.web.base-path=/application" })
 public class SpringDocApp146Test  extends AbstractSpringDocActuatorTest {
 
-	@SpringBootApplication(exclude = {ReactorAutoConfiguration.class })
+	@SpringBootApplication
 	static class SpringDocTestApp {}
 
 	@Test
diff --git a/springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/app147/SpringDocApp147Test.java b/springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/app147/SpringDocApp147Test.java
@@ -24,7 +24,6 @@
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.function.web.flux.ReactorAutoConfiguration;
 import org.springframework.test.web.reactive.server.EntityExchangeResult;
 
 import static org.skyscreamer.jsonassert.JSONAssert.assertEquals;
@@ -33,13 +32,13 @@
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
 		properties = { "management.endpoints.web.exposure.include:*",
 				"springdoc.show-actuator=true",
-				"management.endpoints.web.exposure.exclude=functions",
+				"management.endpoints.web.exposure.exclude=functions, shutdown",
 				"management.server.port=9097",
 				"management.server.base-path=/test",
 				"management.endpoints.web.base-path=/application" })
 public class SpringDocApp147Test extends AbstractSpringDocActuatorTest {
 
-	@SpringBootApplication(exclude = { ReactorAutoConfiguration.class })
+	@SpringBootApplication
 	static class SpringDocTestApp {}
 
 
diff --git a/springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/app148/SpringDocApp148Test.java b/springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/app148/SpringDocApp148Test.java
@@ -24,23 +24,22 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.cloud.function.web.flux.ReactorAutoConfiguration;
 
 import static org.skyscreamer.jsonassert.JSONAssert.assertEquals;
 
 
 @SpringBootTest(webEnvironment = WebEnvironment.DEFINED_PORT,
 		properties = { "management.endpoints.web.exposure.include:*",
 				"springdoc.show-actuator=true",
-				"management.endpoints.web.exposure.exclude=functions",
+				"management.endpoints.web.exposure.exclude=functions, shutdown",
 				"management.server.port=9098",
 				"server.port=6666",
 				"springdoc.use-management-port=true",
 				"management.server.base-path=/test",
 				"management.endpoints.web.base-path=/application" })
 public class SpringDocApp148Test  extends AbstractSpringDocActuatorTest {
 
-	@SpringBootApplication(exclude = { ReactorAutoConfiguration.class })
+	@SpringBootApplication
 	static class SpringDocTestApp {}
 
 
diff --git a/springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/app154/SpringDocApp154Test.java b/springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/app154/SpringDocApp154Test.java
@@ -27,10 +27,15 @@
 import test.org.springdoc.api.AbstractSpringDocFunctionTest;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration;
+import org.springframework.cloud.function.web.mvc.ReactorAutoConfiguration;
+import org.springframework.cloud.function.web.source.FunctionExporterAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Import;
 import org.springframework.test.context.TestPropertySource;
 
+@Import({ ReactorAutoConfiguration.class, FunctionExporterAutoConfiguration.class, ContextFunctionCatalogAutoConfiguration.class })
 @TestPropertySource(properties = "spring.cloud.function.web.path=/toto")
 public class SpringDocApp154Test extends AbstractSpringDocFunctionTest {
 
diff --git a/springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/app76/SpringDocApp76Test.java b/springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/app76/SpringDocApp76Test.java
@@ -29,7 +29,10 @@
 
 import org.springframework.test.context.TestPropertySource;
 
-@TestPropertySource(properties = "springdoc.show-actuator=true")
+@TestPropertySource(properties = {
+		"springdoc.show-actuator=true",
+		"management.endpoints.enabled-by-default=true"
+})
 public class SpringDocApp76Test extends AbstractSpringDocTest {
 
 	public SpringDocApp76Test() {
diff --git a/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/AbstractCommonTest.java b/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/AbstractCommonTest.java
@@ -6,20 +6,21 @@
 import java.nio.file.Paths;
 
 import nonapi.io.github.classgraph.utils.FileUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.web.servlet.MockMvc;
 
 @AutoConfigureMockMvc
 @ActiveProfiles("test")
+@TestPropertySource(properties={
+		"spring.autoconfigure.exclude=org.springframework.cloud.function.web.mvc.ReactorAutoConfiguration, org.springframework.cloud.function.web.source.FunctionExporterAutoConfiguration, org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration",
+		"management.endpoints.enabled-by-default=false"
+})
 public abstract class AbstractCommonTest {
 
-	protected static final Logger LOGGER = LoggerFactory.getLogger(AbstractCommonTest.class);
-
 	@Autowired
 	protected MockMvc mockMvc;
 
diff --git a/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/AbstractSpringDocActuatorTest.java b/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/AbstractSpringDocActuatorTest.java
@@ -5,8 +5,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.actuate.autoconfigure.web.server.LocalManagementPort;
 import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.test.context.TestPropertySource;
 import org.springframework.web.client.RestTemplate;
 
+@TestPropertySource(properties={ "management.endpoints.enabled-by-default=true" })
 public abstract class AbstractSpringDocActuatorTest extends  AbstractCommonTest{
 
 	@LocalManagementPort
diff --git a/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app128/SpringDocApp128Test.java b/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app128/SpringDocApp128Test.java
@@ -42,6 +42,7 @@
  * Tests Spring meta-annotations as method parameters
  */
 @TestPropertySource(properties = { "springdoc.show-actuator=true",
+		"management.endpoints.enabled-by-default=true",
 		"management.endpoints.web.exposure.include = tenant" })
 public class SpringDocApp128Test extends AbstractSpringDocTest {
 
diff --git a/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app143/SpringDocApp143Test.java b/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app143/SpringDocApp143Test.java
@@ -21,19 +21,18 @@
 import test.org.springdoc.api.AbstractSpringDocTest;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.function.web.mvc.ReactorAutoConfiguration;
 import org.springframework.test.context.TestPropertySource;
 
 /**
  * Test issue 907 fix.
  * Hidden controller showing up in swagger UI when springdoc.show-actuator is enabled
  */
-@TestPropertySource(properties = {
+@TestPropertySource(properties = {"management.endpoints.enabled-by-default=true",
 		"springdoc.show-actuator=true", "management.endpoints.web.exposure.exclude=functions"
 })
 public class SpringDocApp143Test extends AbstractSpringDocTest {
 
-	@SpringBootApplication(exclude = { ReactorAutoConfiguration.class })
+	@SpringBootApplication
 	static class SpringDocTestApp {}
 
 }
diff --git a/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app146/SpringDocApp146Test.java b/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app146/SpringDocApp146Test.java
@@ -24,7 +24,6 @@
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.function.web.mvc.ReactorAutoConfiguration;
 
 import static org.hamcrest.Matchers.is;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
@@ -37,13 +36,13 @@
 		properties = { "management.endpoints.web.exposure.include:*",
 				"springdoc.show-actuator=true",
 				"management.server.port=9096",
-				"management.endpoints.web.exposure.exclude=functions",
+				"management.endpoints.web.exposure.exclude=functions, shutdown",
 				"server.servlet.context-path=/sample",
 				"management.server.base-path=/test",
 				"management.endpoints.web.base-path=/application" })
 public class SpringDocApp146Test extends AbstractSpringDocActuatorTest {
 
-	@SpringBootApplication(exclude = { ReactorAutoConfiguration.class })
+	@SpringBootApplication
 	static class SpringDocTestApp {}
 
 
diff --git a/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app147/SpringDocApp147Test.java b/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app147/SpringDocApp147Test.java
@@ -24,7 +24,6 @@
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.function.web.mvc.ReactorAutoConfiguration;
 
 import static org.hamcrest.Matchers.is;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
@@ -37,13 +36,13 @@
 		properties = { "management.endpoints.web.exposure.include:*",
 				"springdoc.show-actuator=true",
 				"management.server.port=9097",
-				"management.endpoints.web.exposure.exclude=functions",
+				"management.endpoints.web.exposure.exclude=functions, shutdown",
 				"server.servlet.context-path=/sample",
 				"management.server.base-path=/test",
 				"management.endpoints.web.base-path=/application" })
 public class SpringDocApp147Test extends AbstractSpringDocActuatorTest {
 
-	@SpringBootApplication(exclude = { ReactorAutoConfiguration.class })
+	@SpringBootApplication
 	static class SpringDocTestApp {}
 
 	@Test
diff --git a/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app148/SpringDocApp148Test.java b/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app148/SpringDocApp148Test.java
@@ -24,7 +24,6 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.cloud.function.web.mvc.ReactorAutoConfiguration;
 
 import static org.skyscreamer.jsonassert.JSONAssert.assertEquals;
 
@@ -37,12 +36,12 @@
 				"server.servlet.context-path=/toto",
 				"springdoc.use-management-port=true",
 				"spring.mvc.servlet.path=/titi",
-				"management.endpoints.web.exposure.exclude=functions",
+				"management.endpoints.web.exposure.exclude=functions, shutdown",
 				"management.server.base-path=/test",
 				"management.endpoints.web.base-path=/application" })
 public class SpringDocApp148Test extends AbstractSpringDocActuatorTest {
 
-	@SpringBootApplication(exclude = { ReactorAutoConfiguration.class })
+	@SpringBootApplication
 	static class SpringDocTestApp {}
 
 
diff --git a/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app172/SpringDocApp172Test.java b/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app172/SpringDocApp172Test.java
@@ -35,7 +35,7 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-@TestPropertySource(properties = { "springdoc.show-actuator=true",
+@TestPropertySource(properties = { "springdoc.show-actuator=true", "management.endpoints.enabled-by-default=true",
 		"management.endpoints.web.exposure.include = tenant" })
 public class SpringDocApp172Test extends AbstractSpringDocTest {
 
diff --git a/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app174/SpringDocApp174Test.java b/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app174/SpringDocApp174Test.java
@@ -33,9 +33,14 @@
 import test.org.springdoc.api.AbstractSpringDocTest;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration;
+import org.springframework.cloud.function.web.mvc.ReactorAutoConfiguration;
+import org.springframework.cloud.function.web.source.FunctionExporterAutoConfiguration;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Import;
 import org.springframework.web.bind.annotation.RequestMethod;
 
+@Import({ ReactorAutoConfiguration.class, FunctionExporterAutoConfiguration.class, ContextFunctionCatalogAutoConfiguration.class })
 public class SpringDocApp174Test extends AbstractSpringDocTest {
 
 	@SpringBootApplication
@@ -52,17 +57,17 @@ public Function<String, String> uppercase() {
 
 		@Bean
 		@RouterOperations({
-				@RouterOperation(method = RequestMethod.GET, operation = @Operation(description = "Say hello GET", operationId = "lowercaseGET",tags = "positions",
-						responses = @ApiResponse(responseCode = "200", content = @Content(array = @ArraySchema(schema = @Schema (implementation = String.class)))))),
-				@RouterOperation(method =RequestMethod.POST, operation = @Operation(description = "Say hello POST", operationId = "lowercasePOST",tags = "positions",
-						responses = @ApiResponse(responseCode = "200", description = "new desc", content =  @Content(array = @ArraySchema(schema = @Schema (implementation = String.class))))))
+				@RouterOperation(method = RequestMethod.GET, operation = @Operation(description = "Say hello GET", operationId = "lowercaseGET", tags = "positions",
+						responses = @ApiResponse(responseCode = "200", content = @Content(array = @ArraySchema(schema = @Schema(implementation = String.class)))))),
+				@RouterOperation(method = RequestMethod.POST, operation = @Operation(description = "Say hello POST", operationId = "lowercasePOST", tags = "positions",
+						responses = @ApiResponse(responseCode = "200", description = "new desc", content = @Content(array = @ArraySchema(schema = @Schema(implementation = String.class))))))
 		})
 		public Function<Flux<String>, Flux<String>> lowercase() {
 			return flux -> flux.map(value -> value.toLowerCase());
 		}
 
 		@Bean(name = "titi")
-		@RouterOperation(operation = @Operation(description = "Say hello By Id", operationId = "hellome",tags = "persons",
+		@RouterOperation(operation = @Operation(description = "Say hello By Id", operationId = "hellome", tags = "persons",
 				responses = @ApiResponse(responseCode = "200", content = @Content(schema = @Schema(implementation = PersonDTO.class)))))
 		public Supplier<PersonDTO> helloSupplier() {
 			return () -> new PersonDTO();
@@ -75,10 +80,9 @@ public Consumer<PersonDTO> helloConsumer() {
 
 		@Bean
 		public Supplier<Flux<String>> words() {
-			return () -> Flux.fromArray(new String[] {"foo", "bar"});
+			return () -> Flux.fromArray(new String[] { "foo", "bar" });
 		}
 
 	}
 
-
 }
diff --git a/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app36/SpringDocApp36Test.java b/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app36/SpringDocApp36Test.java
@@ -32,7 +32,7 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @TestPropertySource(properties = {
-		"springdoc.show-actuator=true",
+		"springdoc.show-actuator=true", "management.endpoints.enabled-by-default=true",
 		"management.endpoints.web.exposure.include=*"})
 public class SpringDocApp36Test extends AbstractSpringDocTest {
 
diff --git a/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app68/SpringDocApp68Test.java b/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app68/SpringDocApp68Test.java
@@ -34,7 +34,7 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-@TestPropertySource(properties = "springdoc.show-actuator=true")
+@TestPropertySource(properties = { "management.endpoints.enabled-by-default=true", "springdoc.show-actuator=true" } )
 public class SpringDocApp68Test extends AbstractSpringDocTest {
 
 	public static String className;
