Browse Source

Test spring.profiles.include in profile file

Add a test to ensure that `spring.profiles.include` is not silently
ignored when used in a profile-specific file.

See gh-24733
pull/24986/head
Phillip Webb 5 years ago
parent
commit
039df1d96d
  1. 8
      spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessorIntegrationTests.java
  2. 0
      spring-boot-project/spring-boot/src/test/resources/application-include-profiles-in-profile-specific-document.properties
  3. 1
      spring-boot-project/spring-boot/src/test/resources/application-include-profiles-in-profile-specific-file-test.properties
  4. 1
      spring-boot-project/spring-boot/src/test/resources/application-include-profiles-in-profile-specific-file.properties

8
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessorIntegrationTests.java

@ -630,8 +630,14 @@ class ConfigDataEnvironmentPostProcessorIntegrationTests {
@Test @Test
void runWhenHasIncludedProfilesWithProfileSpecificDocumentThrowsException() { void runWhenHasIncludedProfilesWithProfileSpecificDocumentThrowsException() {
assertThatExceptionOfType(InactiveConfigDataAccessException.class).isThrownBy(() -> this.application.run(
"--spring.config.location=classpath:application-include-profiles-in-profile-specific-document.properties"));
}
@Test
void runWhenHasIncludedProfilesWithProfileSpecificFileThrowsException() {
assertThatExceptionOfType(InactiveConfigDataAccessException.class).isThrownBy(() -> this.application assertThatExceptionOfType(InactiveConfigDataAccessException.class).isThrownBy(() -> this.application
.run("--spring.config.location=classpath:application-include-profiles-in-profile-specific.properties")); .run("--spring.config.name=application-include-profiles-in-profile-specific-document"));
} }
@Test @Test

0
spring-boot-project/spring-boot/src/test/resources/application-include-profiles-in-profile-specific.properties → spring-boot-project/spring-boot/src/test/resources/application-include-profiles-in-profile-specific-document.properties

1
spring-boot-project/spring-boot/src/test/resources/application-include-profiles-in-profile-specific-file-test.properties

@ -0,0 +1 @@
spring.profiles.include=p2

1
spring-boot-project/spring-boot/src/test/resources/application-include-profiles-in-profile-specific-file.properties

@ -0,0 +1 @@
spring.profiles.active=test
Loading…
Cancel
Save