forked from spring-projects/spring-boot
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Apply TestTypeExcludeFilter in regular applications
Add `ExcludeFilterApplicationContextInitializer` to register the `TestTypeExcludeFilter` for regular applications. Prior to this commit, the filter was only registered using the `ExcludeFilterContextCustomizerFactory` which meant that test components were filtered in tests but not when using `SpringApplication.from` with a test classpath. Fixes spring-projectsgh-35206
- Loading branch information
Showing
5 changed files
with
111 additions
and
1 deletion.
There are no files selected for viewing
37 changes: 37 additions & 0 deletions
37
.../springframework/boot/test/context/filter/ExcludeFilterApplicationContextInitializer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
/* | ||
* Copyright 2012-2023 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.context.filter; | ||
|
||
import org.springframework.boot.SpringApplication; | ||
import org.springframework.context.ApplicationContextInitializer; | ||
import org.springframework.context.ConfigurableApplicationContext; | ||
|
||
/** | ||
* {@link ApplicationContextInitializer} to register the {@link TestTypeExcludeFilter} for | ||
* when {@link SpringApplication#from} is being used with the test classpath. | ||
* | ||
* @author Phillip Webb | ||
*/ | ||
class ExcludeFilterApplicationContextInitializer | ||
implements ApplicationContextInitializer<ConfigurableApplicationContext> { | ||
|
||
@Override | ||
public void initialize(ConfigurableApplicationContext applicationContext) { | ||
TestTypeExcludeFilter.registerWith(applicationContext.getBeanFactory()); | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
58 changes: 58 additions & 0 deletions
58
...ngframework/boot/test/context/filter/ExcludeFilterApplicationContextInitializerTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
/* | ||
* Copyright 2012-2023 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.context.filter; | ||
|
||
import org.junit.jupiter.api.Test; | ||
|
||
import org.springframework.boot.SpringApplication; | ||
import org.springframework.boot.WebApplicationType; | ||
import org.springframework.boot.context.TypeExcludeFilter; | ||
import org.springframework.boot.test.context.TestConfiguration; | ||
import org.springframework.boot.test.context.assertj.AssertableApplicationContext; | ||
import org.springframework.context.annotation.ComponentScan; | ||
import org.springframework.context.annotation.ComponentScan.Filter; | ||
import org.springframework.context.annotation.FilterType; | ||
|
||
import static org.assertj.core.api.Assertions.assertThat; | ||
|
||
/** | ||
* Tests {@link ExcludeFilterApplicationContextInitializer}. | ||
* | ||
* @author Phillip Webb | ||
*/ | ||
class ExcludeFilterApplicationContextInitializerTests { | ||
|
||
@Test | ||
void testConfigurationIsExcluded() { | ||
SpringApplication application = new SpringApplication(TestApplication.class); | ||
application.setWebApplicationType(WebApplicationType.NONE); | ||
AssertableApplicationContext applicationContext = AssertableApplicationContext.get(() -> application.run()); | ||
assertThat(applicationContext).hasSingleBean(TestApplication.class); | ||
assertThat(applicationContext).doesNotHaveBean(ExcludedTestConfiguration.class); | ||
} | ||
|
||
@ComponentScan(excludeFilters = { @Filter(type = FilterType.CUSTOM, classes = TypeExcludeFilter.class) }) | ||
static class TestApplication { | ||
|
||
} | ||
|
||
@TestConfiguration(proxyBeanMethods = false) | ||
static class ExcludedTestConfiguration { | ||
|
||
} | ||
|
||
} |