Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8161 from izeye:clean-system-property

Browse Source 
* pr/8161:
  Clear system property in SpringApplicationTests
This commit is contained in:
Stephane Nicoll
2017-02-01 09:00:45 +01:00
parent 715f8d7436 cedc4cd9f4
commit eca61af8b1
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java
View File

@@ -130,21 +130,21 @@ public class SpringApplicationTests {
@After
public void reinstateHeadlessProperty() {
System.clearProperty("spring.main.banner-mode");
if (this.headlessProperty == null) {
System.clearProperty("java.awt.headless");
}
else {
System.setProperty("java.awt.headless", this.headlessProperty);
}
}
@After
public void close() {
public void cleanUp() {
if (this.context != null) {
this.context.close();
}
System.clearProperty("spring.main.banner-mode");
System.clearProperty(CachedIntrospectionResults.IGNORE_BEANINFO_PROPERTY_NAME);
}
@Test

5
spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java
View File

@@ -37,7 +37,6 @@ import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.slf4j.LoggerFactory;
import org.springframework.beans.CachedIntrospectionResults;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.context.config.ConfigFileApplicationListener.ConfigurationPropertySources;
@@ -98,14 +97,12 @@ public class ConfigFileApplicationListenerTests {
}
@After
public void cleanup() {
public void cleanUp() {
if (this.context != null) {
this.context.close();
}
System.clearProperty("the.property");
System.clearProperty("spring.config.location");
System.clearProperty("spring.main.banner-mode");
System.clearProperty(CachedIntrospectionResults.IGNORE_BEANINFO_PROPERTY_NAME);
}
@Test