From 83d3b508a88bba5693b44c3352142633e8959bac Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 8 Jul 2013 20:27:40 -0700 Subject: [PATCH] Revert "@Ignore logging tests that fail on CI" This reverts commit 2630aa732ff0ae6df7562af708850aa86ad1cf0f. --- .../bootstrap/logging/JavaLoggerConfigurerTests.java | 3 --- .../logging/LoggingApplicationContextInitializerTests.java | 3 --- 2 files changed, 6 deletions(-) diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/JavaLoggerConfigurerTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/JavaLoggerConfigurerTests.java index 41fc098abd..4bfca9712c 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/JavaLoggerConfigurerTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/JavaLoggerConfigurerTests.java @@ -26,7 +26,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import static org.junit.Assert.assertTrue; @@ -63,9 +62,7 @@ public class JavaLoggerConfigurerTests { } @Test - @Ignore public void testDefaultConfigLocation() throws Exception { - // FIXME Fails on CI JavaLoggerConfigurer.initLogging("classpath:logging-nondefault.properties"); Log logger = LogFactory.getLog(JavaLoggerConfigurerTests.class); logger.info("Hello world"); diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/LoggingApplicationContextInitializerTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/LoggingApplicationContextInitializerTests.java index 4872038a5f..b913f760e0 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/LoggingApplicationContextInitializerTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/LoggingApplicationContextInitializerTests.java @@ -25,7 +25,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.springframework.bootstrap.context.initializer.LoggingApplicationContextInitializer; import org.springframework.context.support.GenericApplicationContext; @@ -69,9 +68,7 @@ public class LoggingApplicationContextInitializerTests { } @Test - @Ignore public void testDefaultConfigLocation() { - // FIXME Fails on CI GenericApplicationContext context = new GenericApplicationContext(); this.initializer.initialize(context); Log logger = LogFactory.getLog(LoggingApplicationContextInitializerTests.class);