Harmonize component scan in slice tests
This commit updates ConfigurationPropertiesScanRegistrar to apply the same component scan filters than the ones applied on standard classpath scanning. As a result, configuration properties scanning is automatically disabled in slice tests and can be included by an explicit import or a dedicated TypeFilter implementation if necessary. Closes gh-16659
This commit is contained in:
@@ -0,0 +1,41 @@
|
||||
/*
|
||||
* Copyright 2012-2019 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.boot.test.autoconfigure.web.client;
|
||||
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
import org.springframework.boot.context.properties.bind.DefaultValue;
|
||||
|
||||
/**
|
||||
* Example {@link ConfigurationProperties} used to test the use of configuration
|
||||
* properties scan with sliced test.
|
||||
*
|
||||
* @author Stephane Nicoll
|
||||
*/
|
||||
@ConfigurationProperties("example")
|
||||
public class ExampleProperties {
|
||||
|
||||
private final String name;
|
||||
|
||||
public ExampleProperties(@DefaultValue("test") String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return this.name;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -53,6 +53,12 @@ class RestClientTestNoComponentIntegrationTests {
|
||||
.isThrownBy(() -> this.applicationContext.getBean(ExampleRestClient.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
void examplePropertiesIsNotInjected() {
|
||||
assertThatExceptionOfType(NoSuchBeanDefinitionException.class)
|
||||
.isThrownBy(() -> this.applicationContext.getBean(ExampleProperties.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
void manuallyCreateBean() {
|
||||
ExampleRestClient client = new ExampleRestClient(this.restTemplateBuilder);
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
/*
|
||||
* Copyright 2012-2019 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.boot.test.autoconfigure.web.client;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
import org.springframework.context.ApplicationContext;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
/**
|
||||
* Tests for {@link RestClientTest @RestClientTest} with a {@link ConfigurationProperties}
|
||||
* annotated type.
|
||||
*
|
||||
* @author Stephane Nicoll
|
||||
*/
|
||||
@RestClientTest(components = ExampleProperties.class, properties = "example.name=Hello")
|
||||
class RestClientTestWithConfigurationPropertiesIntegrationTests {
|
||||
|
||||
@Autowired
|
||||
private ApplicationContext applicationContext;
|
||||
|
||||
@Test
|
||||
void configurationPropertiesCanBeAddedAsComponent() {
|
||||
assertThat(this.applicationContext.getBeansOfType(ExampleProperties.class).keySet())
|
||||
.containsOnly("example-org.springframework.boot.test.autoconfigure.web.client.ExampleProperties");
|
||||
assertThat(this.applicationContext.getBean(ExampleProperties.class).getName()).isEqualTo("Hello");
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user