From 7a0e5a032d0e7e34545674103ac59a4fe047dce7 Mon Sep 17 00:00:00 2001 From: Madhura Bhave Date: Thu, 5 May 2022 11:55:44 -0700 Subject: [PATCH] Delete unused test configuration files These files were used by the legacy ConfigFileApplicationListener tests and are no longer needed --- .../resources/activeprofilerepro-ordered.yml | 11 --- .../activeprofilerepro-without-override.yml | 11 --- .../src/test/resources/activeprofilerepro.yml | 11 --- ...ation-activeprofilewithdifferentsubdoc.yml | 4 -- .../application-activeprofilewithsubdoc.yml | 2 - .../application-morespecific.properties | 2 - .../resources/application-simple.properties | 1 - .../resources/application-specific.properties | 1 - .../resources/applicationloop-loop.properties | 1 - .../test/resources/applicationloop.properties | 1 - .../resources/applicationmultiprofiles.yml | 6 -- .../src/test/resources/cascadingprofiles.yml | 67 ------------------- .../enableprofileviaapplicationproperties.yml | 3 - .../src/test/resources/profilenegation-b.yml | 2 - .../profilenegation-local-active-profiles.yml | 10 --- .../src/test/resources/profilenegation.yml | 4 -- .../specificfile-specificprofile.properties | 1 - .../test/resources/testnegatedprofiles.yml | 20 ------ .../test/resources/testprofileexpression.yml | 14 ---- .../test/resources/testprofilesdocument.yml | 14 ---- .../src/test/resources/testprofilesempty.yml | 14 ---- .../src/test/resources/testsetprofiles.yml | 11 --- 22 files changed, 211 deletions(-) delete mode 100644 spring-boot-project/spring-boot/src/test/resources/activeprofilerepro-ordered.yml delete mode 100644 spring-boot-project/spring-boot/src/test/resources/activeprofilerepro-without-override.yml delete mode 100644 spring-boot-project/spring-boot/src/test/resources/activeprofilerepro.yml delete mode 100644 spring-boot-project/spring-boot/src/test/resources/application-activeprofilewithdifferentsubdoc.yml delete mode 100644 spring-boot-project/spring-boot/src/test/resources/application-activeprofilewithsubdoc.yml delete mode 100644 spring-boot-project/spring-boot/src/test/resources/application-morespecific.properties delete mode 100644 spring-boot-project/spring-boot/src/test/resources/application-simple.properties delete mode 100644 spring-boot-project/spring-boot/src/test/resources/application-specific.properties delete mode 100644 spring-boot-project/spring-boot/src/test/resources/applicationloop-loop.properties delete mode 100644 spring-boot-project/spring-boot/src/test/resources/applicationloop.properties delete mode 100644 spring-boot-project/spring-boot/src/test/resources/applicationmultiprofiles.yml delete mode 100644 spring-boot-project/spring-boot/src/test/resources/cascadingprofiles.yml delete mode 100644 spring-boot-project/spring-boot/src/test/resources/enableprofileviaapplicationproperties.yml delete mode 100644 spring-boot-project/spring-boot/src/test/resources/profilenegation-b.yml delete mode 100644 spring-boot-project/spring-boot/src/test/resources/profilenegation-local-active-profiles.yml delete mode 100644 spring-boot-project/spring-boot/src/test/resources/profilenegation.yml delete mode 100644 spring-boot-project/spring-boot/src/test/resources/specificfile-specificprofile.properties delete mode 100644 spring-boot-project/spring-boot/src/test/resources/testnegatedprofiles.yml delete mode 100644 spring-boot-project/spring-boot/src/test/resources/testprofileexpression.yml delete mode 100644 spring-boot-project/spring-boot/src/test/resources/testprofilesdocument.yml delete mode 100644 spring-boot-project/spring-boot/src/test/resources/testprofilesempty.yml delete mode 100644 spring-boot-project/spring-boot/src/test/resources/testsetprofiles.yml diff --git a/spring-boot-project/spring-boot/src/test/resources/activeprofilerepro-ordered.yml b/spring-boot-project/spring-boot/src/test/resources/activeprofilerepro-ordered.yml deleted file mode 100644 index 76d3f1dc8a2..00000000000 --- a/spring-boot-project/spring-boot/src/test/resources/activeprofilerepro-ordered.yml +++ /dev/null @@ -1,11 +0,0 @@ -spring.profiles.active: A,B ---- -spring.profiles: A -version: A ---- -spring.profiles: B -version: B ---- -spring.profiles: C -version: C ---- diff --git a/spring-boot-project/spring-boot/src/test/resources/activeprofilerepro-without-override.yml b/spring-boot-project/spring-boot/src/test/resources/activeprofilerepro-without-override.yml deleted file mode 100644 index 2640af09e40..00000000000 --- a/spring-boot-project/spring-boot/src/test/resources/activeprofilerepro-without-override.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- ---- -spring.profiles: A -version: A ---- -spring.profiles: B -version: B ---- -spring.profiles: C -version: C ---- diff --git a/spring-boot-project/spring-boot/src/test/resources/activeprofilerepro.yml b/spring-boot-project/spring-boot/src/test/resources/activeprofilerepro.yml deleted file mode 100644 index 3871896a3b7..00000000000 --- a/spring-boot-project/spring-boot/src/test/resources/activeprofilerepro.yml +++ /dev/null @@ -1,11 +0,0 @@ -spring.profiles.active: B ---- -spring.profiles: A -version: A ---- -spring.profiles: B -version: B ---- -spring.profiles: C -version: C ---- diff --git a/spring-boot-project/spring-boot/src/test/resources/application-activeprofilewithdifferentsubdoc.yml b/spring-boot-project/spring-boot/src/test/resources/application-activeprofilewithdifferentsubdoc.yml deleted file mode 100644 index 934c8c0aa7e..00000000000 --- a/spring-boot-project/spring-boot/src/test/resources/application-activeprofilewithdifferentsubdoc.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -spring.profiles: activeprofilewithdifferentsubdoc2 -foobar: baz ---- diff --git a/spring-boot-project/spring-boot/src/test/resources/application-activeprofilewithsubdoc.yml b/spring-boot-project/spring-boot/src/test/resources/application-activeprofilewithsubdoc.yml deleted file mode 100644 index 0d1112894a1..00000000000 --- a/spring-boot-project/spring-boot/src/test/resources/application-activeprofilewithsubdoc.yml +++ /dev/null @@ -1,2 +0,0 @@ -spring.profiles: activeprofilewithsubdoc -foobar: baz diff --git a/spring-boot-project/spring-boot/src/test/resources/application-morespecific.properties b/spring-boot-project/spring-boot/src/test/resources/application-morespecific.properties deleted file mode 100644 index 65b26f856f4..00000000000 --- a/spring-boot-project/spring-boot/src/test/resources/application-morespecific.properties +++ /dev/null @@ -1,2 +0,0 @@ -spring.profiles.include=yetmorespecific -spring.profiles.active=missing diff --git a/spring-boot-project/spring-boot/src/test/resources/application-simple.properties b/spring-boot-project/spring-boot/src/test/resources/application-simple.properties deleted file mode 100644 index 228e3f38c3b..00000000000 --- a/spring-boot-project/spring-boot/src/test/resources/application-simple.properties +++ /dev/null @@ -1 +0,0 @@ -spring.profiles.active=other diff --git a/spring-boot-project/spring-boot/src/test/resources/application-specific.properties b/spring-boot-project/spring-boot/src/test/resources/application-specific.properties deleted file mode 100644 index 6fc460d83cc..00000000000 --- a/spring-boot-project/spring-boot/src/test/resources/application-specific.properties +++ /dev/null @@ -1 +0,0 @@ -spring.profiles.include=morespecific diff --git a/spring-boot-project/spring-boot/src/test/resources/applicationloop-loop.properties b/spring-boot-project/spring-boot/src/test/resources/applicationloop-loop.properties deleted file mode 100644 index 0602540b20b..00000000000 --- a/spring-boot-project/spring-boot/src/test/resources/applicationloop-loop.properties +++ /dev/null @@ -1 +0,0 @@ -spring.profiles.include=loop diff --git a/spring-boot-project/spring-boot/src/test/resources/applicationloop.properties b/spring-boot-project/spring-boot/src/test/resources/applicationloop.properties deleted file mode 100644 index 0602540b20b..00000000000 --- a/spring-boot-project/spring-boot/src/test/resources/applicationloop.properties +++ /dev/null @@ -1 +0,0 @@ -spring.profiles.include=loop diff --git a/spring-boot-project/spring-boot/src/test/resources/applicationmultiprofiles.yml b/spring-boot-project/spring-boot/src/test/resources/applicationmultiprofiles.yml deleted file mode 100644 index bf406504019..00000000000 --- a/spring-boot-project/spring-boot/src/test/resources/applicationmultiprofiles.yml +++ /dev/null @@ -1,6 +0,0 @@ -spring.profiles.active: test, another-test -message: default ---- -spring: - profiles: test,another-test -message: multiprofile diff --git a/spring-boot-project/spring-boot/src/test/resources/cascadingprofiles.yml b/spring-boot-project/spring-boot/src/test/resources/cascadingprofiles.yml deleted file mode 100644 index 084431b99df..00000000000 --- a/spring-boot-project/spring-boot/src/test/resources/cascadingprofiles.yml +++ /dev/null @@ -1,67 +0,0 @@ -spring: - profiles: - active: - - A - - B - ---- -spring.profiles: A - -spring: - profiles: - include: - - C - - E -version: A - ---- -spring.profiles: B - -spring: - profiles: - include: - - D - - E -version: B - ---- -spring.profiles: C - -version: C - - ---- -spring.profiles: D - -version: D - - ---- -spring.profiles: E - -version: E - ---- -spring.profiles: "!A" - -not-a: true - ---- -spring.profiles: "!B" - -not-b: true - ---- -spring.profiles: "!C" - -not-c: true - ---- -spring.profiles: "!D" - -not-d: true - ---- -spring.profiles: "!E" - -not-e: true diff --git a/spring-boot-project/spring-boot/src/test/resources/enableprofileviaapplicationproperties.yml b/spring-boot-project/spring-boot/src/test/resources/enableprofileviaapplicationproperties.yml deleted file mode 100644 index 2e88b34de44..00000000000 --- a/spring-boot-project/spring-boot/src/test/resources/enableprofileviaapplicationproperties.yml +++ /dev/null @@ -1,3 +0,0 @@ -spring: - profiles: - include: a diff --git a/spring-boot-project/spring-boot/src/test/resources/profilenegation-b.yml b/spring-boot-project/spring-boot/src/test/resources/profilenegation-b.yml deleted file mode 100644 index 8781ad8416f..00000000000 --- a/spring-boot-project/spring-boot/src/test/resources/profilenegation-b.yml +++ /dev/null @@ -1,2 +0,0 @@ -version: NOT A - diff --git a/spring-boot-project/spring-boot/src/test/resources/profilenegation-local-active-profiles.yml b/spring-boot-project/spring-boot/src/test/resources/profilenegation-local-active-profiles.yml deleted file mode 100644 index 3e6db956eec..00000000000 --- a/spring-boot-project/spring-boot/src/test/resources/profilenegation-local-active-profiles.yml +++ /dev/null @@ -1,10 +0,0 @@ -spring: - profiles: - active: - - B ---- - -spring.profiles: "!A" - -version: NOT A - diff --git a/spring-boot-project/spring-boot/src/test/resources/profilenegation.yml b/spring-boot-project/spring-boot/src/test/resources/profilenegation.yml deleted file mode 100644 index 31c3d646959..00000000000 --- a/spring-boot-project/spring-boot/src/test/resources/profilenegation.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -spring.profiles: "!A" - -version: NOT A diff --git a/spring-boot-project/spring-boot/src/test/resources/specificfile-specificprofile.properties b/spring-boot-project/spring-boot/src/test/resources/specificfile-specificprofile.properties deleted file mode 100644 index e5e37d38597..00000000000 --- a/spring-boot-project/spring-boot/src/test/resources/specificfile-specificprofile.properties +++ /dev/null @@ -1 +0,0 @@ -my.property=fromspecificpropertiesfile diff --git a/spring-boot-project/spring-boot/src/test/resources/testnegatedprofiles.yml b/spring-boot-project/spring-boot/src/test/resources/testnegatedprofiles.yml deleted file mode 100644 index 79e1a4367d0..00000000000 --- a/spring-boot-project/spring-boot/src/test/resources/testnegatedprofiles.yml +++ /dev/null @@ -1,20 +0,0 @@ ---- -my: - property: fromyamlfile - other: notempty ---- -spring: - profiles: dev -my: - property: fromdevprofile ---- -spring: - profiles: other -my: - property: fromotherprofile ---- -spring: - profiles: "!other" -my: - property: fromnototherprofile - notother: foo diff --git a/spring-boot-project/spring-boot/src/test/resources/testprofileexpression.yml b/spring-boot-project/spring-boot/src/test/resources/testprofileexpression.yml deleted file mode 100644 index d43f9b0523f..00000000000 --- a/spring-boot-project/spring-boot/src/test/resources/testprofileexpression.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -my: - property: fromyamlfile ---- -spring: - profiles: dev & other -my: - property: devandother ---- -spring: - profiles: (dev | other) & another -my: - property: devorotherandanother ---- diff --git a/spring-boot-project/spring-boot/src/test/resources/testprofilesdocument.yml b/spring-boot-project/spring-boot/src/test/resources/testprofilesdocument.yml deleted file mode 100644 index f74b31e0780..00000000000 --- a/spring-boot-project/spring-boot/src/test/resources/testprofilesdocument.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -my: - property: fromyamlfile - other: notempty ---- -spring: - profiles: thedefault -my: - property: fromdefaultprofile ---- -spring: - profiles: other -my: - property: fromotherprofile diff --git a/spring-boot-project/spring-boot/src/test/resources/testprofilesempty.yml b/spring-boot-project/spring-boot/src/test/resources/testprofilesempty.yml deleted file mode 100644 index 40990865fb6..00000000000 --- a/spring-boot-project/spring-boot/src/test/resources/testprofilesempty.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -my: - property: fromyamlfile - other: notempty ---- -spring: - profiles: -my: - property: fromemptyprofile ---- -spring: - profiles: other -my: - property: fromotherprofile diff --git a/spring-boot-project/spring-boot/src/test/resources/testsetprofiles.yml b/spring-boot-project/spring-boot/src/test/resources/testsetprofiles.yml deleted file mode 100644 index 48c5f02a84c..00000000000 --- a/spring-boot-project/spring-boot/src/test/resources/testsetprofiles.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -spring: - profiles: - active: dev -my: - property: fromyamlfile ---- -spring: - profiles: dev -my: - property: fromdevprofile