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

Remove assumption in test about /tmp location

Browse Source
This commit is contained in:
Dave Syer
2014-03-07 09:51:19 +00:00
parent 8168e8a327
commit da7d543305
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-boot/src/test/java/org/springframework/boot/logging/LoggingApplicationListenerTests.java
View File

@@ -72,7 +72,7 @@ public class LoggingApplicationListenerTests {
this.initializer.onApplicationEvent(new ApplicationStartedEvent(
new SpringApplication(), NO_ARGS));
new File("target/foo.log").delete();
new File("/tmp/spring.log").delete();
new File(tmpDir() + "/spring.log").delete();
}
@After
@@ -85,6 +85,10 @@ public class LoggingApplicationListenerTests {
}
}
private String tmpDir() {
return this.context.getEnvironment().resolvePlaceholders("${java.io.tmpdir}");
}
@Test
public void baseConfigLocation() {
this.initializer.initialize(this.context.getEnvironment(),
@@ -93,7 +97,7 @@ public class LoggingApplicationListenerTests {
String output = this.outputCapture.toString().trim();
assertTrue("Wrong output:\n" + output, output.contains("Hello world"));
assertFalse("Wrong output:\n" + output, output.contains("???"));
assertTrue(new File("/tmp/spring.log").exists());
assertTrue(new File(tmpDir() + "/spring.log").exists());
}
@Test
@@ -106,7 +110,8 @@ public class LoggingApplicationListenerTests {
String output = this.outputCapture.toString().trim();
assertTrue("Wrong output:\n" + output, output.contains("Hello world"));
assertFalse("Wrong output:\n" + output, output.contains("???"));
assertTrue("Wrong output:\n" + output, output.startsWith("/tmp/spring.log"));
assertTrue("Wrong output:\n" + output,
output.startsWith(tmpDir() + "/spring.log"));
}
@Test