Skip to content

Commit b5b89cf

Browse files
bnasslahsenbnasslahsen
committed
Tests review
1 parent 5c9d55e commit b5b89cf

File tree

18 files changed

+52
-36
lines changed

18 files changed

+52
-36
lines changed

‎springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/AbstractCommonTest.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,15 @@
1212
import org.springframework.beans.factory.annotation.Autowired;
1313
import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
1414
import org.springframework.test.context.ActiveProfiles;
15+
import org.springframework.test.context.TestPropertySource;
1516
import org.springframework.test.web.reactive.server.WebTestClient;
1617

1718
@AutoConfigureWebTestClient(timeout = "3600000")
1819
@ActiveProfiles("test")
20+
@TestPropertySource(properties={
21+
"spring.autoconfigure.exclude=org.springframework.cloud.function.web.flux.ReactorAutoConfiguration, org.springframework.cloud.function.web.source.FunctionExporterAutoConfiguration, org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration",
22+
"management.endpoints.enabled-by-default=false"
23+
})
1924
public abstract class AbstractCommonTest {
2025

2126
protected static final Logger LOGGER = LoggerFactory.getLogger(AbstractCommonTest.class);

‎springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/AbstractSpringDocActuatorTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
import javax.annotation.PostConstruct;
44

55
import org.springframework.boot.actuate.autoconfigure.web.server.LocalManagementPort;
6+
import org.springframework.test.context.TestPropertySource;
67
import org.springframework.web.reactive.function.client.WebClient;
78

9+
@TestPropertySource(properties={ "management.endpoints.enabled-by-default=true" })
810
public abstract class AbstractSpringDocActuatorTest extends AbstractCommonTest{
911

1012
@LocalManagementPort

‎springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/app146/SpringDocApp146Test.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
import org.springframework.boot.autoconfigure.SpringBootApplication;
2626
import org.springframework.boot.test.context.SpringBootTest;
27-
import org.springframework.cloud.function.web.flux.ReactorAutoConfiguration;
2827
import org.springframework.test.web.reactive.server.EntityExchangeResult;
2928

3029
import static org.skyscreamer.jsonassert.JSONAssert.assertEquals;
@@ -34,12 +33,12 @@
3433
properties = { "management.endpoints.web.exposure.include:*",
3534
"springdoc.show-actuator=true",
3635
"management.server.port=9096",
37-
"management.endpoints.web.exposure.exclude=functions",
36+
"management.endpoints.web.exposure.exclude=functions, shutdown",
3837
"management.server.base-path=/test",
3938
"management.endpoints.web.base-path=/application" })
4039
public class SpringDocApp146Test extends AbstractSpringDocActuatorTest {
4140

42-
@SpringBootApplication(exclude = {ReactorAutoConfiguration.class })
41+
@SpringBootApplication
4342
static class SpringDocTestApp {}
4443

4544
@Test

‎springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/app147/SpringDocApp147Test.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
import org.springframework.boot.autoconfigure.SpringBootApplication;
2626
import org.springframework.boot.test.context.SpringBootTest;
27-
import org.springframework.cloud.function.web.flux.ReactorAutoConfiguration;
2827
import org.springframework.test.web.reactive.server.EntityExchangeResult;
2928

3029
import static org.skyscreamer.jsonassert.JSONAssert.assertEquals;
@@ -33,13 +32,13 @@
3332
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
3433
properties = { "management.endpoints.web.exposure.include:*",
3534
"springdoc.show-actuator=true",
36-
"management.endpoints.web.exposure.exclude=functions",
35+
"management.endpoints.web.exposure.exclude=functions, shutdown",
3736
"management.server.port=9097",
3837
"management.server.base-path=/test",
3938
"management.endpoints.web.base-path=/application" })
4039
public class SpringDocApp147Test extends AbstractSpringDocActuatorTest {
4140

42-
@SpringBootApplication(exclude = { ReactorAutoConfiguration.class })
41+
@SpringBootApplication
4342
static class SpringDocTestApp {}
4443

4544

‎springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/app148/SpringDocApp148Test.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,22 @@
2424
import org.springframework.boot.autoconfigure.SpringBootApplication;
2525
import org.springframework.boot.test.context.SpringBootTest;
2626
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
27-
import org.springframework.cloud.function.web.flux.ReactorAutoConfiguration;
2827

2928
import static org.skyscreamer.jsonassert.JSONAssert.assertEquals;
3029

3130

3231
@SpringBootTest(webEnvironment = WebEnvironment.DEFINED_PORT,
3332
properties = { "management.endpoints.web.exposure.include:*",
3433
"springdoc.show-actuator=true",
35-
"management.endpoints.web.exposure.exclude=functions",
34+
"management.endpoints.web.exposure.exclude=functions, shutdown",
3635
"management.server.port=9098",
3736
"server.port=6666",
3837
"springdoc.use-management-port=true",
3938
"management.server.base-path=/test",
4039
"management.endpoints.web.base-path=/application" })
4140
public class SpringDocApp148Test extends AbstractSpringDocActuatorTest {
4241

43-
@SpringBootApplication(exclude = { ReactorAutoConfiguration.class })
42+
@SpringBootApplication
4443
static class SpringDocTestApp {}
4544

4645

‎springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/app154/SpringDocApp154Test.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,15 @@
2727
import test.org.springdoc.api.AbstractSpringDocFunctionTest;
2828

2929
import org.springframework.boot.autoconfigure.SpringBootApplication;
30+
import org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration;
31+
import org.springframework.cloud.function.web.mvc.ReactorAutoConfiguration;
32+
import org.springframework.cloud.function.web.source.FunctionExporterAutoConfiguration;
3033
import org.springframework.context.annotation.Bean;
3134
import org.springframework.context.annotation.ComponentScan;
35+
import org.springframework.context.annotation.Import;
3236
import org.springframework.test.context.TestPropertySource;
3337

38+
@Import({ ReactorAutoConfiguration.class, FunctionExporterAutoConfiguration.class, ContextFunctionCatalogAutoConfiguration.class })
3439
@TestPropertySource(properties = "spring.cloud.function.web.path=/toto")
3540
public class SpringDocApp154Test extends AbstractSpringDocFunctionTest {
3641

‎springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/app76/SpringDocApp76Test.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@
2929

3030
import org.springframework.test.context.TestPropertySource;
3131

32-
@TestPropertySource(properties = "springdoc.show-actuator=true")
32+
@TestPropertySource(properties = {
33+
"springdoc.show-actuator=true",
34+
"management.endpoints.enabled-by-default=true"
35+
})
3336
public class SpringDocApp76Test extends AbstractSpringDocTest {
3437

3538
public SpringDocApp76Test() {

‎springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/AbstractCommonTest.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,21 @@
66
import java.nio.file.Paths;
77

88
import nonapi.io.github.classgraph.utils.FileUtils;
9-
import org.slf4j.Logger;
10-
import org.slf4j.LoggerFactory;
119

1210
import org.springframework.beans.factory.annotation.Autowired;
1311
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
1412
import org.springframework.test.context.ActiveProfiles;
13+
import org.springframework.test.context.TestPropertySource;
1514
import org.springframework.test.web.servlet.MockMvc;
1615

1716
@AutoConfigureMockMvc
1817
@ActiveProfiles("test")
18+
@TestPropertySource(properties={
19+
"spring.autoconfigure.exclude=org.springframework.cloud.function.web.mvc.ReactorAutoConfiguration, org.springframework.cloud.function.web.source.FunctionExporterAutoConfiguration, org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration",
20+
"management.endpoints.enabled-by-default=false"
21+
})
1922
public abstract class AbstractCommonTest {
2023

21-
protected static final Logger LOGGER = LoggerFactory.getLogger(AbstractCommonTest.class);
22-
2324
@Autowired
2425
protected MockMvc mockMvc;
2526

‎springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/AbstractSpringDocActuatorTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55
import org.springframework.beans.factory.annotation.Autowired;
66
import org.springframework.boot.actuate.autoconfigure.web.server.LocalManagementPort;
77
import org.springframework.boot.web.client.RestTemplateBuilder;
8+
import org.springframework.test.context.TestPropertySource;
89
import org.springframework.web.client.RestTemplate;
910

11+
@TestPropertySource(properties={ "management.endpoints.enabled-by-default=true" })
1012
public abstract class AbstractSpringDocActuatorTest extends AbstractCommonTest{
1113

1214
@LocalManagementPort

‎springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app128/SpringDocApp128Test.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
* Tests Spring meta-annotations as method parameters
4343
*/
4444
@TestPropertySource(properties = { "springdoc.show-actuator=true",
45+
"management.endpoints.enabled-by-default=true",
4546
"management.endpoints.web.exposure.include = tenant" })
4647
public class SpringDocApp128Test extends AbstractSpringDocTest {
4748

0 commit comments

Comments
 (0)