root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Add Runnable variant of TestPropertyValues.applyToSystemProperties 

Closes gh-31303
This commit is contained in:
Phillip Webb 2022-06-08 19:13:52 -07:00
parent 11184aae8d
commit e8f9386594
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/util/TestPropertyValues.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2021 the original author or authors.
* Copyright 2012-2022 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.
@ -165,7 +165,20 @@ public final class TestPropertyValues {
/**
* Add the properties to the {@link System#getProperties() system properties} for the
* duration of the {@code call}, restoring previous values when the call completes.
* duration of the {@code action}, restoring previous values when it completes.
* @param action the action to take
* @since 3.0.0
*/
public void applyToSystemProperties(Runnable action) {
applyToSystemProperties(() -> {
action.run();
return null;
});
}
/**
* Add the properties to the {@link System#getProperties() system properties} for the
* duration of the {@code call}, restoring previous values when it completes.
* @param <T> the result type
* @param call the call to make
* @return the result of the call

10
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/util/TestPropertyValuesTests.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2020 the original author or authors.
* Copyright 2012-2022 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.
@ -141,13 +141,19 @@ class TestPropertyValuesTests {
}
@Test
void applyToSystemPropertiesShouldSetSystemProperties() {
void applyToSystemPropertiesWithCallableShouldSetSystemProperties() {
TestPropertyValues.of("foo=bar").applyToSystemProperties(() -> {
assertThat(System.getProperty("foo")).isEqualTo("bar");
return null;
});
}
@Test
void applyToSystemPropertiesWithRunnableShouldSetSystemProperties() {
TestPropertyValues.of("foo=bar")
.applyToSystemProperties(() -> assertThat(System.getProperty("foo")).isEqualTo("bar"));
}
@Test
void applyToSystemPropertiesShouldRestoreSystemProperties() {
System.setProperty("foo", "bar1");