10 Commits (a93255553991bad937576e4a89ceb2010ca9d816)

Author	SHA1	Message	Date
Vedran Pavic	95e0d6c0f7	Update smoke tests to avoid conflicts with NAME environment variable ... This commit updates several smoke tests in order to avoid conflicts with NAME environment variable that is present in WSL and causes project build to fail. Previous attempt to fix this in 7da42d71 was incomplete. See gh-31267	2 years ago
Andy Wilkinson	f6d24dc1a8	Fix typos ... See gh-30773	3 years ago
Andy Wilkinson	8f1b8622ba	Ensure that webEnvironment=NONE creates non-web context ... Previously, if spring.main.web-application-type was configured in application.properties to servlet or reactive, setting webEnvironment=NONE on @SpringBootTest would not work correctly and a servlet or reactive web application context would be created based on the value of spring.main.web-application-type. This commit updates the test context bootstapper to set spring.main.web-application-type to none when webEnvironment has been set to none. This is done in the merged context configuration's property source properties which are applied to the environment in a high-precedence test property source that will override configuration in application.properties. Closes gh-29695	3 years ago
Andy Wilkinson	4bcb7e2f77	Prevent ActiveProfilesTests from binding to 8080 ... Due to gh-29695, smoketest.profile.ActiveProfilesTests starts a web server bound to the default port (8080) despite the test setting `webEnvironment` to `NONE`. This commit works around the problem by running the tests with server.port set to zero. Closes gh-30086	3 years ago
Phillip Webb	3f7bf7d34f	Modify SpringApplication Environment rather than setting it ... Update `SpringBootContextLoader` so that when possible the `SpringApplication` remains in control of creating the `Environment` instance. Prior to this commit, we would always create the `Environment` in the `SpringBootContextLoader` and then call `setEnvironment` on the `SpringApplication`. This meant that the `ApplicationEnvironment` classes were not used and that `isCustomEnvironment` was set to `true` so no conversion was applied. With the updated code, an `ApplicationListener` is used to mutate the `Environment` instance and add the required test property sources. Fixes gh-29169	3 years ago
Phillip Webb	eb6b48fff0	Use side-effect free environment with tests rather than converting ... Refine the logic introduced in 64270eca to use a side-effect free Environment implementation rather than converting the Environment early. Early conversion can cause condition evaluation issues if `src/test/resources/application.properties` files are bound to the `SpringApplication`. Specifically the `spring.main.web-application-type` property can change the `Environment` type which must happen before conditions are evaluated. Fixes gh-29169	3 years ago
Madhura Bhave	64270eca51	Convert environment used by SpringBootTestContextLoader ... This commit aligns `SpringBootTest`s to also use `ApplicationEnvironment` instead of `StandardEnvironment`. This prevents the side-effect of active profiles from `@ActiveProfiles` from being added to the environment when doGetActiveProfiles is called. In this case, calling `addActiveProfiles()` in the environment post processor would result in `@ActiveProfiles` being added to the environment first, resulting in the wrong order. The additional call to `setActiveProfiles()` is also not necessary when using ApplicationEnvironment because that call was put in place to prevent the side-effect which `ApplicationEnvironment` does not have. Fixes gh-28530	3 years ago
Phillip Webb	3352024b1c	Provide ConfigFileApplicationListener replacement ... Deprecate `ConfigFileApplicationListener` and provide a replacement mechanism that supports arbitrary config data imports. This commit updates the following areas: - Extract `EnvironmentPostProcessor` invocation logic from the `ConfigFileApplicationListener` to new dedicated listener. Also providing support for `Log` injection. - Extract `RandomPropertySource` adding logic from the `ConfigFileApplicationListener` to a dedicated class. - Migrate to the recently introduced `DefaultPropertiesPropertySource` class when moving the defaultProperties `PropertySource` - Replace processing logic with a phased approach to ensure that profile enablement happens in a distinct phase and that profiles can no longer be activated on an ad-hoc basis. - Provide a more predictable and logical import order for processing `application.properties` and `application.yml` files. - Add support for a `spring.config.import` property which can be used to import additional config data. Also provide a pluggable API allowing third-parties to resolve and load locations themselves. - Add `spring.config.activate.on-profile` support which replaces the existing `spring.profiles` property. - Add `spring.config.activate.on-cloud-platform` support which allows a config data document to be active only on a given cloud platform. - Support a `spring.config.use-legacy-processing` property allowing the previous processing logic to be used. Closes gh-22497 Co-authored-by: Madhura Bhave <mbhave@vmware.com>	4 years ago
Phillip Webb	c3816bfe7b	Polish output capture names	5 years ago
Madhura Bhave	d9466f5659	Move smoke tests under spring-boot-test ... See gh-17393	5 years ago