|
4 | 4 | import static org.junit.jupiter.api.Assertions.*; |
5 | 5 |
|
6 | 6 | import org.junit.jupiter.api.Test; |
7 | | -import org.mockito.Mockito; |
8 | 7 | import org.springframework.boot.autoconfigure.AutoConfigurations; |
9 | | -import org.springframework.boot.restclient.autoconfigure.RestClientSsl; |
10 | 8 | import org.springframework.boot.test.context.assertj.AssertableApplicationContext; |
11 | 9 | import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext; |
12 | 10 | import org.springframework.boot.test.context.runner.ApplicationContextRunner; |
13 | 11 | import org.springframework.boot.test.context.runner.ContextConsumer; |
14 | 12 | import org.springframework.boot.test.context.runner.WebApplicationContextRunner; |
15 | | -import org.springframework.context.annotation.Bean; |
16 | | -import org.springframework.web.client.RestClient; |
17 | 13 |
|
18 | 14 | import com._4point.aem.fluentforms.api.output.OutputService; |
19 | 15 | import com._4point.aem.fluentforms.spring.AemProxyAfSubmission.AfSubmissionHandler; |
|
30 | 26 | */ |
31 | 27 | class JerseyAutoConfigurationTest { |
32 | 28 |
|
33 | | - /** |
34 | | - * This class provides mock versions of beans that would normally be provided by Spring Boot in a real application. We |
35 | | - * only need to mock out the RestClient.Builder and RestClientSsl beans because those are the only Spring Boot provided |
36 | | - * beans that our AutoConfigurations depend on. |
37 | | - * |
38 | | - * In theory, we should not need to provide these however spring-boot-starter-jersey brings in spring-boot-restclient |
39 | | - * on to the test classpath which, in turn, triggers the inclusion of the fluent-forms springRestClientFactory which |
40 | | - * requires the mocks. |
41 | | - */ |
42 | | - private static class SpringBootMocks { |
43 | | - @Bean RestClient.Builder mockRestClientBuilder() { return Mockito.mock(RestClient.Builder.class, Mockito.RETURNS_DEEP_STUBS); } |
44 | | - @Bean private RestClientSsl mockRestClientSsl() { return Mockito.mock(RestClientSsl.class); } |
45 | | - } |
46 | | - |
47 | | - private static final AutoConfigurations AUTO_CONFIG = AutoConfigurations.of(FluentFormsJerseyAutoConfiguration.class, AemProxyJerseyAutoConfiguration.class, FluentFormsAutoConfiguration.class, SpringBootMocks.class); |
| 29 | + private static final AutoConfigurations AUTO_CONFIG = AutoConfigurations.of(FluentFormsJerseyAutoConfiguration.class, AemProxyJerseyAutoConfiguration.class, FluentFormsAutoConfiguration.class); |
48 | 30 |
|
49 | | - private static final AutoConfigurations LOCAL_SUBMIT_CONFIG = AutoConfigurations.of(FluentFormsJerseyAutoConfiguration.class, AemProxyJerseyAutoConfiguration.class, FluentFormsAutoConfiguration.class, DummyLocalSubmitHandler.class, SpringBootMocks.class); |
| 31 | + private static final AutoConfigurations LOCAL_SUBMIT_CONFIG = AutoConfigurations.of(FluentFormsJerseyAutoConfiguration.class, AemProxyJerseyAutoConfiguration.class, FluentFormsAutoConfiguration.class, DummyLocalSubmitHandler.class); |
50 | 32 |
|
51 | | - private static final AutoConfigurations ALTERNATE_PROXY_CONFIG = AutoConfigurations.of(DummyProxyImplementation.class, FluentFormsJerseyAutoConfiguration.class, AemProxyJerseyAutoConfiguration.class, FluentFormsAutoConfiguration.class, SpringBootMocks.class); |
| 33 | + private static final AutoConfigurations ALTERNATE_PROXY_CONFIG = AutoConfigurations.of(DummyProxyImplementation.class, FluentFormsJerseyAutoConfiguration.class, AemProxyJerseyAutoConfiguration.class, FluentFormsAutoConfiguration.class); |
52 | 34 |
|
53 | 35 | // Tests to make sure that only the FluentFormsLibraries are loaded in a non-web application. |
54 | 36 | private static final ContextConsumer<? super AssertableApplicationContext> FF_LIBRARIES_ONLY = (context) -> { |
|
0 commit comments