From 7cf98d15f25a2d24f6c4ed68b4dc260a0cba3812 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@gopivotal.com>
Date: Wed, 6 Nov 2013 13:53:16 +0000
Subject: [PATCH] Tidy up log tests

Bamboo doesn't seem to be causing issues now, so assume
[Fixes #52871199] [bs-176] -Djava.util.logging.config.file
is passed to log4j as a file name?
---
 .../org/springframework/boot/TestUtils.java   |  2 +-
 ...ingApplicationContextInitializerTests.java | 56 +++----------------
 2 files changed, 10 insertions(+), 48 deletions(-)

diff --git a/spring-boot/src/test/java/org/springframework/boot/TestUtils.java b/spring-boot/src/test/java/org/springframework/boot/TestUtils.java
index dc5f3e1724..fb7e496459 100644
--- a/spring-boot/src/test/java/org/springframework/boot/TestUtils.java
+++ b/spring-boot/src/test/java/org/springframework/boot/TestUtils.java
@@ -36,7 +36,7 @@ public abstract class TestUtils {
 			int index = pair.indexOf(":");
 			String key = pair.substring(0, index > 0 ? index : pair.length());
 			String value = index > 0 ? pair.substring(index + 1) : "";
-			map.put(key, value);
+			map.put(key.trim(), value.trim());
 		}
 		context.getEnvironment().getPropertySources()
 				.addFirst(new MapPropertySource("test", map));
diff --git a/spring-boot/src/test/java/org/springframework/boot/context/initializer/LoggingApplicationContextInitializerTests.java b/spring-boot/src/test/java/org/springframework/boot/context/initializer/LoggingApplicationContextInitializerTests.java
index b689476cda..9229926bf3 100644
--- a/spring-boot/src/test/java/org/springframework/boot/context/initializer/LoggingApplicationContextInitializerTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/initializer/LoggingApplicationContextInitializerTests.java
@@ -29,10 +29,10 @@ import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.springframework.boot.OutputCapture;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.TestUtils;
 import org.springframework.boot.logging.LogLevel;
 import org.springframework.boot.logging.java.JavaLoggingSystem;
 import org.springframework.context.support.GenericApplicationContext;
-import org.springframework.core.env.PropertySource;
 
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.not;
@@ -90,16 +90,8 @@ public class LoggingApplicationContextInitializerTests {
 
 	@Test
 	public void testOverrideConfigLocation() {
-		this.context.getEnvironment().getPropertySources()
-				.addFirst(new PropertySource<String>("manual") {
-					@Override
-					public Object getProperty(String name) {
-						if ("logging.config".equals(name)) {
-							return "classpath:logback-nondefault.xml";
-						}
-						return null;
-					}
-				});
+		TestUtils.addEnviroment(this.context,
+				"logging.config: classpath:logback-nondefault.xml");
 		this.initializer.initialize(this.context);
 		this.logger.info("Hello world");
 		String output = this.outputCapture.toString().trim();
@@ -110,35 +102,16 @@ public class LoggingApplicationContextInitializerTests {
 
 	@Test
 	public void testOverrideConfigDoesNotExist() throws Exception {
-		this.context.getEnvironment().getPropertySources()
-				.addFirst(new PropertySource<String>("manual") {
-					@Override
-					public Object getProperty(String name) {
-						if ("logging.config".equals(name)) {
-							return "doesnotexist.xml";
-						}
-						return null;
-					}
-				});
+		TestUtils.addEnviroment(this.context, "logging.config: doesnotexist.xml");
 		this.initializer.initialize(this.context);
 		// Should not throw
 	}
 
 	@Test
 	public void testAddLogFileProperty() {
-		this.context.getEnvironment().getPropertySources()
-				.addFirst(new PropertySource<String>("manual") {
-					@Override
-					public Object getProperty(String name) {
-						if ("logging.config".equals(name)) {
-							return "classpath:logback-nondefault.xml";
-						}
-						if ("logging.file".equals(name)) {
-							return "foo.log";
-						}
-						return null;
-					}
-				});
+		TestUtils.addEnviroment(this.context,
+				"logging.config: classpath:logback-nondefault.xml",
+				"logging.file: foo.log");
 		this.initializer.initialize(this.context);
 		Log logger = LogFactory.getLog(LoggingApplicationContextInitializerTests.class);
 		logger.info("Hello world");
@@ -148,19 +121,8 @@ public class LoggingApplicationContextInitializerTests {
 
 	@Test
 	public void testAddLogPathProperty() {
-		this.context.getEnvironment().getPropertySources()
-				.addFirst(new PropertySource<String>("manual") {
-					@Override
-					public Object getProperty(String name) {
-						if ("logging.config".equals(name)) {
-							return "classpath:logback-nondefault.xml";
-						}
-						if ("logging.path".equals(name)) {
-							return "foo/";
-						}
-						return null;
-					}
-				});
+		TestUtils.addEnviroment(this.context,
+				"logging.config: classpath:logback-nondefault.xml", "logging.path: foo/");
 		this.initializer.initialize(this.context);
 		Log logger = LogFactory.getLog(LoggingApplicationContextInitializerTests.class);
 		logger.info("Hello world");