From 039df1d96dde43ec98361deef954c25ef6af630d Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 11 Jan 2021 12:04:14 -0800 Subject: [PATCH] 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 --- ...onfigDataEnvironmentPostProcessorIntegrationTests.java | 8 +++++++- ...lude-profiles-in-profile-specific-document.properties} | 0 ...lude-profiles-in-profile-specific-file-test.properties | 1 + ...n-include-profiles-in-profile-specific-file.properties | 1 + 4 files changed, 9 insertions(+), 1 deletion(-) rename spring-boot-project/spring-boot/src/test/resources/{application-include-profiles-in-profile-specific.properties => application-include-profiles-in-profile-specific-document.properties} (100%) create mode 100644 spring-boot-project/spring-boot/src/test/resources/application-include-profiles-in-profile-specific-file-test.properties create mode 100644 spring-boot-project/spring-boot/src/test/resources/application-include-profiles-in-profile-specific-file.properties diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessorIntegrationTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessorIntegrationTests.java index b27a920fc3d2..f9fab256442e 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessorIntegrationTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessorIntegrationTests.java @@ -630,8 +630,14 @@ void runWhenHasIncludedProfilesWithPlaceholderActivatesProfiles() { @Test 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 - .run("--spring.config.location=classpath:application-include-profiles-in-profile-specific.properties")); + .run("--spring.config.name=application-include-profiles-in-profile-specific-document")); } @Test diff --git a/spring-boot-project/spring-boot/src/test/resources/application-include-profiles-in-profile-specific.properties b/spring-boot-project/spring-boot/src/test/resources/application-include-profiles-in-profile-specific-document.properties similarity index 100% rename from spring-boot-project/spring-boot/src/test/resources/application-include-profiles-in-profile-specific.properties rename to spring-boot-project/spring-boot/src/test/resources/application-include-profiles-in-profile-specific-document.properties diff --git a/spring-boot-project/spring-boot/src/test/resources/application-include-profiles-in-profile-specific-file-test.properties b/spring-boot-project/spring-boot/src/test/resources/application-include-profiles-in-profile-specific-file-test.properties new file mode 100644 index 000000000000..70251f9e7f05 --- /dev/null +++ b/spring-boot-project/spring-boot/src/test/resources/application-include-profiles-in-profile-specific-file-test.properties @@ -0,0 +1 @@ +spring.profiles.include=p2 diff --git a/spring-boot-project/spring-boot/src/test/resources/application-include-profiles-in-profile-specific-file.properties b/spring-boot-project/spring-boot/src/test/resources/application-include-profiles-in-profile-specific-file.properties new file mode 100644 index 000000000000..f841722a2f15 --- /dev/null +++ b/spring-boot-project/spring-boot/src/test/resources/application-include-profiles-in-profile-specific-file.properties @@ -0,0 +1 @@ +spring.profiles.active=test