From da7d543305a252611310d0f9778142c6c02c8d21 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Fri, 7 Mar 2014 09:51:19 +0000 Subject: [PATCH] Remove assumption in test about /tmp location --- .../boot/logging/LoggingApplicationListenerTests.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/spring-boot/src/test/java/org/springframework/boot/logging/LoggingApplicationListenerTests.java b/spring-boot/src/test/java/org/springframework/boot/logging/LoggingApplicationListenerTests.java index db0cb42866..9650b1f798 100644 --- a/spring-boot/src/test/java/org/springframework/boot/logging/LoggingApplicationListenerTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/logging/LoggingApplicationListenerTests.java @@ -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