Repository: logging-log4j2 Updated Branches: refs/heads/master 64ba81397 -> 82dd5e204
Use StatusLogger instead of ServletContext.log. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/82dd5e20 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/82dd5e20 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/82dd5e20 Branch: refs/heads/master Commit: 82dd5e2049b068bafe955307031af5691ac96a9c Parents: 64ba813 Author: Matt Sicker <[email protected]> Authored: Thu Sep 4 13:32:01 2014 -0500 Committer: Matt Sicker <[email protected]> Committed: Thu Sep 4 13:32:01 2014 -0500 ---------------------------------------------------------------------- .../web/Log4jServletContainerInitializer.java | 14 ++++++++---- .../log4j/web/Log4jServletContextListener.java | 9 ++++++-- .../logging/log4j/web/Log4jServletFilter.java | 10 +++++--- .../log4j/web/Log4jWebInitializerImpl.java | 18 ++++++++------- .../Log4jServletContainerInitializerTest.java | 22 ++++++------------ .../web/Log4jServletContextListenerTest.java | 14 +++++------- .../log4j/web/Log4jServletFilterTest.java | 17 +++++++------- .../log4j/web/Log4jWebInitializerImplTest.java | 24 +++++++------------- 8 files changed, 62 insertions(+), 66 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/82dd5e20/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jServletContainerInitializer.java ---------------------------------------------------------------------- diff --git a/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jServletContainerInitializer.java b/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jServletContainerInitializer.java index 2a2270f..034e074 100644 --- a/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jServletContainerInitializer.java +++ b/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jServletContainerInitializer.java @@ -18,13 +18,15 @@ package org.apache.logging.log4j.web; import java.util.EnumSet; import java.util.Set; - import javax.servlet.DispatcherType; import javax.servlet.FilterRegistration; import javax.servlet.ServletContainerInitializer; import javax.servlet.ServletContext; import javax.servlet.ServletException; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.status.StatusLogger; + /** * In a Servlet 3.0 or newer environment, this initializer is responsible for starting up Log4j logging before anything * else happens in application initialization. For consistency across all containers, if the effective Servlet major @@ -32,20 +34,22 @@ import javax.servlet.ServletException; */ public class Log4jServletContainerInitializer implements ServletContainerInitializer { + private static final Logger LOGGER = StatusLogger.getLogger(); + @Override public void onStartup(final Set<Class<?>> classes, final ServletContext servletContext) throws ServletException { if (servletContext.getMajorVersion() > 2 && servletContext.getEffectiveMajorVersion() > 2 && !"true".equalsIgnoreCase(servletContext.getInitParameter( Log4jWebSupport.IS_LOG4J_AUTO_INITIALIZATION_DISABLED ))) { - servletContext.log("Log4jServletContainerInitializer starting up Log4j in Servlet 3.0+ environment."); + LOGGER.debug("Log4jServletContainerInitializer starting up Log4j in Servlet 3.0+ environment."); final FilterRegistration.Dynamic filter = servletContext.addFilter("log4jServletFilter", Log4jServletFilter.class); if (filter == null) { - servletContext.log("WARNING: In a Servlet 3.0+ application, you should not define a " + - "log4jServletFilter in web.xml. Log4j 2 normally does this for you automatically. Log4j 2 " + - "web auto-initialization has been canceled."); + LOGGER.warn("WARNING: In a Servlet 3.0+ application, you should not define a " + + "log4jServletFilter in web.xml. Log4j 2 normally does this for you automatically. Log4j 2 " + + "web auto-initialization has been canceled."); return; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/82dd5e20/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jServletContextListener.java ---------------------------------------------------------------------- diff --git a/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jServletContextListener.java b/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jServletContextListener.java index d3ac474..4cf9022 100644 --- a/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jServletContextListener.java +++ b/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jServletContextListener.java @@ -20,6 +20,9 @@ import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.status.StatusLogger; + /** * In environments older than Servlet 3.0, this initializer is responsible for starting up Log4j logging before anything * else happens in application initialization. In all environments, this shuts down Log4j after the application shuts @@ -27,13 +30,15 @@ import javax.servlet.ServletContextListener; */ public class Log4jServletContextListener implements ServletContextListener { + private static final Logger LOGGER = StatusLogger.getLogger(); + private ServletContext servletContext; private Log4jWebLifeCycle initializer; @Override public void contextInitialized(final ServletContextEvent event) { this.servletContext = event.getServletContext(); - this.servletContext.log("Log4jServletContextListener ensuring that Log4j starts up properly."); + LOGGER.debug("Log4jServletContextListener ensuring that Log4j starts up properly."); this.initializer = Log4jWebInitializerImpl.getLog4jWebInitializer(this.servletContext); try { @@ -49,7 +54,7 @@ public class Log4jServletContextListener implements ServletContextListener { if (this.servletContext == null || this.initializer == null) { throw new IllegalStateException("Context destroyed before it was initialized."); } - this.servletContext.log("Log4jServletContextListener ensuring that Log4j shuts down properly."); + LOGGER.debug("Log4jServletContextListener ensuring that Log4j shuts down properly."); this.initializer.clearLoggerContext(); // the application is finished shutting down now this.initializer.stop(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/82dd5e20/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jServletFilter.java ---------------------------------------------------------------------- diff --git a/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jServletFilter.java b/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jServletFilter.java index c55804f..e9283a7 100644 --- a/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jServletFilter.java +++ b/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jServletFilter.java @@ -17,7 +17,6 @@ package org.apache.logging.log4j.web; import java.io.IOException; - import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; @@ -26,6 +25,9 @@ import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.status.StatusLogger; + /** * This is responsible for the following: * <ul> @@ -39,6 +41,8 @@ import javax.servlet.ServletResponse; */ public class Log4jServletFilter implements Filter { + private static final Logger LOGGER = StatusLogger.getLogger(); + static final String ALREADY_FILTERED_ATTRIBUTE = Log4jServletFilter.class.getName() + ".FILTERED"; private ServletContext servletContext; @@ -47,7 +51,7 @@ public class Log4jServletFilter implements Filter { @Override public void init(final FilterConfig filterConfig) throws ServletException { this.servletContext = filterConfig.getServletContext(); - this.servletContext.log("Log4jServletFilter initialized."); + LOGGER.debug("Log4jServletFilter initialized."); this.initializer = Log4jWebInitializerImpl.getLog4jWebInitializer(this.servletContext); this.initializer.clearLoggerContext(); // the application is mostly finished starting up now @@ -76,7 +80,7 @@ public class Log4jServletFilter implements Filter { if (this.servletContext == null || this.initializer == null) { throw new IllegalStateException("Filter destroyed before it was initialized."); } - this.servletContext.log("Log4jServletFilter destroyed."); + LOGGER.debug("Log4jServletFilter destroyed."); this.initializer.setLoggerContext(); // the application is just now starting to shut down } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/82dd5e20/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jWebInitializerImpl.java ---------------------------------------------------------------------- diff --git a/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jWebInitializerImpl.java b/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jWebInitializerImpl.java index 455b3ca..826ecd2 100644 --- a/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jWebInitializerImpl.java +++ b/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jWebInitializerImpl.java @@ -23,6 +23,7 @@ import java.util.concurrent.ConcurrentHashMap; import javax.servlet.ServletContext; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.AbstractLifeCycle; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.Configurator; @@ -37,12 +38,15 @@ import org.apache.logging.log4j.core.util.Loader; import org.apache.logging.log4j.core.util.NetUtils; import org.apache.logging.log4j.core.util.SetUtils; import org.apache.logging.log4j.spi.LoggerContextFactory; +import org.apache.logging.log4j.status.StatusLogger; /** * This class initializes and deinitializes Log4j no matter how the initialization occurs. */ final class Log4jWebInitializerImpl extends AbstractLifeCycle implements Log4jWebLifeCycle { + private static final Logger LOGGER = StatusLogger.getLogger(); + private static final long serialVersionUID = 1L; static { @@ -128,17 +132,15 @@ final class Log4jWebInitializerImpl extends AbstractLifeCycle implements Log4jWe } ContextAnchor.THREAD_CONTEXT.remove(); } else { - // won't it be amusing if the servlet container uses Log4j as its ServletContext logger? - this.servletContext.log("Potential problem: Selector is not an instance of NamedContextSelector."); + LOGGER.warn("Potential problem: Selector is not an instance of NamedContextSelector."); return; } } else { - this.servletContext.log("Potential problem: Factory is not an instance of Log4jContextFactory."); + LOGGER.warn("Potential problem: LoggerContextFactory is not an instance of Log4jContextFactory."); return; } this.loggerContext = context; - this.servletContext.log("Created logger context for [" + this.name + "] using [" + - context.getClass().getClassLoader() + "]."); + LOGGER.debug("Created logger context for [{}] using [{}].", this.name, context.getClass().getClassLoader()); } private void initializeNonJndi(final String location) { @@ -147,7 +149,7 @@ final class Log4jWebInitializerImpl extends AbstractLifeCycle implements Log4jWe } if (this.name == null && location == null) { - this.servletContext.log("No Log4j context configuration provided. This is very unusual."); + LOGGER.error("No Log4j context configuration provided. This is very unusual."); return; } @@ -190,7 +192,7 @@ final class Log4jWebInitializerImpl extends AbstractLifeCycle implements Log4jWe try { return FileUtils.getCorrectedFilePathUri(location); } catch (final Exception e) { - this.servletContext.log("Unable to convert configuration location [" + location + "] to a URI!", e); + LOGGER.error("Unable to convert configuration location [{}] to a URI", location, e); } } return null; @@ -206,7 +208,7 @@ final class Log4jWebInitializerImpl extends AbstractLifeCycle implements Log4jWe if (this.isStarted()) { this.setStopping(); if (this.loggerContext != null) { - this.servletContext.log("Removing LoggerContext for [" + this.name + "]."); + LOGGER.debug("Removing LoggerContext for [{}].", this.name); this.servletContext.removeAttribute(CONTEXT_ATTRIBUTE); if (this.namedContextSelector != null) { this.namedContextSelector.removeContext(this.name); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/82dd5e20/log4j-web/src/test/java/org/apache/logging/log4j/web/Log4jServletContainerInitializerTest.java ---------------------------------------------------------------------- diff --git a/log4j-web/src/test/java/org/apache/logging/log4j/web/Log4jServletContainerInitializerTest.java b/log4j-web/src/test/java/org/apache/logging/log4j/web/Log4jServletContainerInitializerTest.java index b11038f..2ea8531 100644 --- a/log4j-web/src/test/java/org/apache/logging/log4j/web/Log4jServletContainerInitializerTest.java +++ b/log4j-web/src/test/java/org/apache/logging/log4j/web/Log4jServletContainerInitializerTest.java @@ -18,7 +18,6 @@ package org.apache.logging.log4j.web; import java.util.EnumSet; import java.util.EventListener; - import javax.servlet.DispatcherType; import javax.servlet.Filter; import javax.servlet.FilterRegistration; @@ -30,8 +29,13 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import static org.easymock.EasyMock.*; - +import static org.easymock.EasyMock.capture; +import static org.easymock.EasyMock.createStrictMock; +import static org.easymock.EasyMock.eq; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.expectLastCall; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import static org.junit.Assert.*; public class Log4jServletContainerInitializerTest { @@ -107,8 +111,6 @@ public class Log4jServletContainerInitializerTest { expect(this.servletContext.getEffectiveMajorVersion()).andReturn(3); expect(this.servletContext.getInitParameter(Log4jWebSupport.IS_LOG4J_AUTO_INITIALIZATION_DISABLED)) .andReturn(null); - this.servletContext.log(anyObject(String.class)); - expectLastCall(); expect(this.servletContext.addFilter(eq("log4jServletFilter"), capture(filterCapture))).andReturn(registration); expect(this.servletContext.getAttribute(Log4jWebSupport.SUPPORT_ATTRIBUTE)).andReturn(this.initializer); this.initializer.start(); @@ -139,16 +141,12 @@ public class Log4jServletContainerInitializerTest { @Test public void testOnStartupCanceledDueToPreExistingFilter() throws Exception { final Capture<Class<? extends Filter>> filterCapture = new Capture<Class<? extends Filter>>(); - final Capture<String> logCapture = new Capture<String>(); expect(this.servletContext.getMajorVersion()).andReturn(3); expect(this.servletContext.getEffectiveMajorVersion()).andReturn(3); expect(this.servletContext.getInitParameter(Log4jWebSupport.IS_LOG4J_AUTO_INITIALIZATION_DISABLED)) .andReturn("false"); - this.servletContext.log(anyObject(String.class)); - expectLastCall(); expect(this.servletContext.addFilter(eq("log4jServletFilter"), capture(filterCapture))).andReturn(null); - this.servletContext.log(capture(logCapture)); replay(this.servletContext, this.initializer); @@ -156,10 +154,6 @@ public class Log4jServletContainerInitializerTest { assertNotNull("The filter should not be null.", filterCapture.getValue()); assertSame("The filter is not correct.", Log4jServletFilter.class, filterCapture.getValue()); - - assertNotNull("The second log message should not be null.", logCapture.getValue()); - assertTrue("The second log message (" + logCapture.getValue() + ") is not correct.", - logCapture.getValue().startsWith("WARNING: ")); } @Test @@ -173,8 +167,6 @@ public class Log4jServletContainerInitializerTest { expect(this.servletContext.getEffectiveMajorVersion()).andReturn(3); expect(this.servletContext.getInitParameter(Log4jWebSupport.IS_LOG4J_AUTO_INITIALIZATION_DISABLED)) .andReturn("balderdash"); - this.servletContext.log(anyObject(String.class)); - expectLastCall(); expect(this.servletContext.addFilter(eq("log4jServletFilter"), capture(filterCapture))).andReturn(registration); expect(this.servletContext.getAttribute(Log4jWebSupport.SUPPORT_ATTRIBUTE)).andReturn(this.initializer); this.initializer.start(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/82dd5e20/log4j-web/src/test/java/org/apache/logging/log4j/web/Log4jServletContextListenerTest.java ---------------------------------------------------------------------- diff --git a/log4j-web/src/test/java/org/apache/logging/log4j/web/Log4jServletContextListenerTest.java b/log4j-web/src/test/java/org/apache/logging/log4j/web/Log4jServletContextListenerTest.java index 7c374b1..068f93d 100644 --- a/log4j-web/src/test/java/org/apache/logging/log4j/web/Log4jServletContextListenerTest.java +++ b/log4j-web/src/test/java/org/apache/logging/log4j/web/Log4jServletContextListenerTest.java @@ -24,8 +24,12 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import static org.easymock.EasyMock.*; - +import static org.easymock.EasyMock.createStrictMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.expectLastCall; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.reset; +import static org.easymock.EasyMock.verify; import static org.junit.Assert.*; public class Log4jServletContextListenerTest { @@ -52,8 +56,6 @@ public class Log4jServletContextListenerTest { @Test public void testInitAndDestroy() throws Exception { expect(this.event.getServletContext()).andReturn(this.servletContext); - this.servletContext.log(anyObject(String.class)); - expectLastCall(); expect(this.servletContext.getAttribute(Log4jWebSupport.SUPPORT_ATTRIBUTE)).andReturn(this.initializer); this.initializer.start(); expectLastCall(); @@ -67,8 +69,6 @@ public class Log4jServletContextListenerTest { verify(this.event, this.servletContext, this.initializer); reset(this.event, this.servletContext, this.initializer); - this.servletContext.log(anyObject(String.class)); - expectLastCall(); this.initializer.clearLoggerContext(); expectLastCall(); this.initializer.stop(); @@ -82,8 +82,6 @@ public class Log4jServletContextListenerTest { @Test public void testInitFailure() throws Exception { expect(this.event.getServletContext()).andReturn(this.servletContext); - this.servletContext.log(anyObject(String.class)); - expectLastCall(); expect(this.servletContext.getAttribute(Log4jWebSupport.SUPPORT_ATTRIBUTE)).andReturn(this.initializer); this.initializer.start(); expectLastCall().andThrow(new IllegalStateException(Strings.EMPTY)); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/82dd5e20/log4j-web/src/test/java/org/apache/logging/log4j/web/Log4jServletFilterTest.java ---------------------------------------------------------------------- diff --git a/log4j-web/src/test/java/org/apache/logging/log4j/web/Log4jServletFilterTest.java b/log4j-web/src/test/java/org/apache/logging/log4j/web/Log4jServletFilterTest.java index 3f290ed..bf6a84f 100644 --- a/log4j-web/src/test/java/org/apache/logging/log4j/web/Log4jServletFilterTest.java +++ b/log4j-web/src/test/java/org/apache/logging/log4j/web/Log4jServletFilterTest.java @@ -26,7 +26,14 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import static org.easymock.EasyMock.*; +import static org.easymock.EasyMock.createStrictMock; +import static org.easymock.EasyMock.eq; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.expectLastCall; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.reset; +import static org.easymock.EasyMock.same; +import static org.easymock.EasyMock.verify; public class Log4jServletFilterTest { private FilterConfig filterConfig; @@ -52,8 +59,6 @@ public class Log4jServletFilterTest { @Test public void testInitAndDestroy() throws Exception { expect(this.filterConfig.getServletContext()).andReturn(this.servletContext); - this.servletContext.log(anyObject(String.class)); - expectLastCall(); expect(this.servletContext.getAttribute(Log4jWebSupport.SUPPORT_ATTRIBUTE)).andReturn(this.initializer); this.initializer.clearLoggerContext(); expectLastCall(); @@ -65,8 +70,6 @@ public class Log4jServletFilterTest { verify(this.filterConfig, this.servletContext, this.initializer); reset(this.filterConfig, this.servletContext, this.initializer); - this.servletContext.log(anyObject(String.class)); - expectLastCall(); this.initializer.setLoggerContext(); expectLastCall(); @@ -85,8 +88,6 @@ public class Log4jServletFilterTest { @Test public void testDoFilterFirstTime() throws Exception { expect(this.filterConfig.getServletContext()).andReturn(this.servletContext); - this.servletContext.log(anyObject(String.class)); - expectLastCall(); expect(this.servletContext.getAttribute(Log4jWebSupport.SUPPORT_ATTRIBUTE)).andReturn(this.initializer); this.initializer.clearLoggerContext(); expectLastCall(); @@ -122,8 +123,6 @@ public class Log4jServletFilterTest { @Test public void testDoFilterSecondTime() throws Exception { expect(this.filterConfig.getServletContext()).andReturn(this.servletContext); - this.servletContext.log(anyObject(String.class)); - expectLastCall(); expect(this.servletContext.getAttribute(Log4jWebSupport.SUPPORT_ATTRIBUTE)).andReturn(this.initializer); this.initializer.clearLoggerContext(); expectLastCall(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/82dd5e20/log4j-web/src/test/java/org/apache/logging/log4j/web/Log4jWebInitializerImplTest.java ---------------------------------------------------------------------- diff --git a/log4j-web/src/test/java/org/apache/logging/log4j/web/Log4jWebInitializerImplTest.java b/log4j-web/src/test/java/org/apache/logging/log4j/web/Log4jWebInitializerImplTest.java index 085752d..01d3d23 100644 --- a/log4j-web/src/test/java/org/apache/logging/log4j/web/Log4jWebInitializerImplTest.java +++ b/log4j-web/src/test/java/org/apache/logging/log4j/web/Log4jWebInitializerImplTest.java @@ -26,8 +26,14 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import static org.easymock.EasyMock.*; - +import static org.easymock.EasyMock.capture; +import static org.easymock.EasyMock.createStrictMock; +import static org.easymock.EasyMock.eq; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.expectLastCall; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.reset; +import static org.easymock.EasyMock.verify; import static org.junit.Assert.*; public class Log4jWebInitializerImplTest { @@ -140,8 +146,6 @@ public class Log4jWebInitializerImplTest { verify(this.servletContext); reset(this.servletContext); - this.servletContext.log(anyObject(String.class)); - expectLastCall(); this.servletContext.removeAttribute(Log4jWebSupport.CONTEXT_ATTRIBUTE); expectLastCall(); @@ -205,8 +209,6 @@ public class Log4jWebInitializerImplTest { verify(this.servletContext); reset(this.servletContext); - this.servletContext.log(anyObject(String.class)); - expectLastCall(); this.servletContext.removeAttribute(Log4jWebSupport.CONTEXT_ATTRIBUTE); expectLastCall(); @@ -260,8 +262,6 @@ public class Log4jWebInitializerImplTest { verify(this.servletContext); reset(this.servletContext); - this.servletContext.log(anyObject(String.class)); - expectLastCall(); this.servletContext.removeAttribute(Log4jWebSupport.CONTEXT_ATTRIBUTE); expectLastCall(); @@ -297,8 +297,6 @@ public class Log4jWebInitializerImplTest { verify(this.servletContext); reset(this.servletContext); - this.servletContext.log(anyObject(String.class)); - expectLastCall(); this.servletContext.removeAttribute(Log4jWebSupport.CONTEXT_ATTRIBUTE); expectLastCall(); @@ -341,8 +339,6 @@ public class Log4jWebInitializerImplTest { verify(this.servletContext); reset(this.servletContext); - this.servletContext.log(anyObject(String.class)); - expectLastCall(); this.servletContext.removeAttribute(Log4jWebSupport.CONTEXT_ATTRIBUTE); expectLastCall(); @@ -381,8 +377,6 @@ public class Log4jWebInitializerImplTest { expect(this.servletContext.getInitParameter(Log4jWebSupport.IS_LOG4J_CONTEXT_SELECTOR_NAMED)) .andReturn("true"); expect(this.servletContext.getResourcePaths("/WEB-INF/")).andReturn(null); - this.servletContext.log(anyObject(String.class)); - expectLastCall(); this.servletContext.setAttribute(eq(Log4jWebSupport.CONTEXT_ATTRIBUTE), capture(loggerContextCapture)); expectLastCall(); @@ -476,8 +470,6 @@ public class Log4jWebInitializerImplTest { verify(this.servletContext, runnable); reset(this.servletContext); - this.servletContext.log(anyObject(String.class)); - expectLastCall(); this.servletContext.removeAttribute(Log4jWebSupport.CONTEXT_ATTRIBUTE); expectLastCall();
