Return-Path: 
 <log4j-dev-return-40055-apmail-logging-log4j-dev-archive=logging.apache.org@logging.apache.org>
X-Original-To: apmail-logging-log4j-dev-archive@www.apache.org
Delivered-To: apmail-logging-log4j-dev-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 2C73918444
	for <apmail-logging-log4j-dev-archive@www.apache.org>;
 Sat, 20 Feb 2016 04:27:06 +0000 (UTC)
Received: (qmail 76023 invoked by uid 500); 20 Feb 2016 04:27:06 -0000
Delivered-To: apmail-logging-log4j-dev-archive@logging.apache.org
Received: (qmail 75972 invoked by uid 500); 20 Feb 2016 04:27:06 -0000
Mailing-List: contact log4j-dev-help@logging.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:log4j-dev-unsubscribe@logging.apache.org>
List-Help: <mailto:log4j-dev-help@logging.apache.org>
List-Post: <mailto:log4j-dev@logging.apache.org>
List-Id: "Log4J Developers List" <log4j-dev.logging.apache.org>
Reply-To: "Log4J Developers List" <log4j-dev@logging.apache.org>
Delivered-To: mailing list log4j-dev@logging.apache.org
Received: (qmail 75962 invoked by uid 99); 20 Feb 2016 04:27:05 -0000
Received: from pnap-us-west-generic-nat.apache.org (HELO
 spamd1-us-west.apache.org) (209.188.14.142)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 20 Feb 2016 04:27:05 +0000
Received: from localhost (localhost [127.0.0.1])
	by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org)
 with ESMTP id 74EB5C1AA4
	for <log4j-dev@logging.apache.org>; Sat, 20 Feb 2016 04:27:05 +0000 (UTC)
X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org
X-Spam-Flag: NO
X-Spam-Score: 1.179
X-Spam-Level: *
X-Spam-Status: No, score=1.179 tagged_above=-999 required=6.31
	tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
	HTML_MESSAGE=2, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01,
	RCVD_IN_MSPIKE_WL=-0.01, SPF_PASS=-0.001] autolearn=disabled
Authentication-Results: spamd1-us-west.apache.org (amavisd-new);
	dkim=pass (2048-bit key) header.d=gmail.com
Received: from mx2-lw-us.apache.org ([10.40.0.8])
	by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new,
 port 10024)
	with ESMTP id RJtoObS9WP8z for <log4j-dev@logging.apache.org>;
	Sat, 20 Feb 2016 04:27:02 +0000 (UTC)
Received: from mail-ob0-f174.google.com (mail-ob0-f174.google.com
 [209.85.214.174])
	by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with ESMTPS
 id 4D76B5F21F
	for <log4j-dev@logging.apache.org>; Sat, 20 Feb 2016 04:27:02 +0000 (UTC)
Received: by mail-ob0-f174.google.com with SMTP id xk3so127717278obc.2
        for <log4j-dev@logging.apache.org>;
 Fri, 19 Feb 2016 20:27:02 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20120113;
        h=mime-version:in-reply-to:references:date:message-id:subject:from:to
         :content-type;
        bh=Yw6/Vid1dBrqPn5/KAHaLQQpLLGvQCbGoTCHbp6zxMM=;
        b=e2iBO8HLsOpYT0fEM77zLurAWgDcoQFXxaCb2OeqONiGLOAGd0fBAe804tiVoFHdIJ
         3lcT9e6wzVxqQUqZicKh+aED1nh+MWVyWd91QD7BnJ0HHAVaUGKxahZgJFwOvQiYxvYx
         C31NbRar3krkVjCIc/7shTHV30keUe37wm1lq5EiCmT/pCWdhM2tqCIzGh37n9zhtR2y
         6h+verTdhOU9X7rbdQ9S+xkU0YpsE4DUFMcMS5pRnZpeuHcRDAw8PXMVd9FHF/yenAS4
         I5IVHZn6KmH1r6ZakdIQ4S/lYcjOF/WmzTqyMnnJewxWcAQq4JEb6XujYEW37mwPZ2Og
         kGXQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20130820;
        h=x-gm-message-state:mime-version:in-reply-to:references:date
         :message-id:subject:from:to:content-type;
        bh=Yw6/Vid1dBrqPn5/KAHaLQQpLLGvQCbGoTCHbp6zxMM=;
        b=TisRYUQ8Vv8xa93I+BiSZes3iHaF7+r+zsZtySouT3v3DnfGXC4dnu0QecdNipR3Qg
         nnOSpNY7x/yl6lsrbaea1ZP3isMOdf3hznjgntHChX0WxFKZs2MMCyCJxfPauVEB68wL
         pbhFfUttJ8erYwWQ1uR9Xk+Gd8sPszn/F+4qD9SG++JMZeIfbCbaQGnISGDPkcJqTPYV
         KdALR1Mkn3eMOfA8NTnsjnwVXsL1y3Adm5yM/cYzQqfmM+s3Nbyg8cHSksqBcmofd5lJ
         2oLILfdyvX9t2gf/ipbT7kAqBFiMzduwneC/kvA+5I45l0D3llxRw1mTTMhQpkdVHXbc
         6Cxw==
X-Gm-Message-State: 
 AG10YOSyZa6OrefvL+ceujtZOvpCoK1zBpQHlhOKU19m5MLY5+QuEpZcZfoNkmBxer+1OYoCZZiyZxOka+1TcQ==
MIME-Version: 1.0
X-Received: by 10.182.131.194 with SMTP id oo2mr14307754obb.84.1455942421695;
 Fri, 19 Feb 2016 20:27:01 -0800 (PST)
Received: by 10.157.46.42 with HTTP; Fri, 19 Feb 2016 20:27:01 -0800 (PST)
In-Reply-To: <9b0df77b5a004cd99d5d42e8b93fc205@git.apache.org>
References: <9b0df77b5a004cd99d5d42e8b93fc205@git.apache.org>
Date: Fri, 19 Feb 2016 20:27:01 -0800
Message-ID: 
 <CACZkXPxuJ6OW71vNOC=t_mE0TxU78arnHYa9wFqDNUNZGh+efQ@mail.gmail.com>
Subject: Fwd: logging-log4j2 git commit: Update tests to use
 LoggerContextRule.
From: Gary Gregory <garydgregory@gmail.com>
To: Log4J Developers List <log4j-dev@logging.apache.org>
Content-Type: multipart/alternative; boundary=089e01634b8adbd690052c2c02a4

--089e01634b8adbd690052c2c02a4
Content-Type: text/plain; charset=UTF-8

Nice clean up Matt.

Gary
---------- Forwarded message ----------
From: <mattsicker@apache.org>
Date: Fri, Feb 19, 2016 at 8:14 PM
Subject: logging-log4j2 git commit: Update tests to use LoggerContextRule.
To: commits@logging.apache.org


Repository: logging-log4j2
Updated Branches:
  refs/heads/master 6e54d7160 -> a8c8fa727


Update tests to use LoggerContextRule.


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit:
http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a8c8fa72
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a8c8fa72
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a8c8fa72

Branch: refs/heads/master
Commit: a8c8fa727000d3baa77c680a0ffa544b0d9084b6
Parents: 6e54d71
Author: Matt Sicker <boards@gmail.com>
Authored: Fri Feb 19 22:14:49 2016 -0600
Committer: Matt Sicker <boards@gmail.com>
Committed: Fri Feb 19 22:15:10 2016 -0600

----------------------------------------------------------------------
 .../logging/log4j/taglib/CatchingTagTest.java   | 43 +++++---------------
 .../logging/log4j/taglib/EntryTagTest.java      | 36 ++++------------
 .../logging/log4j/taglib/ExitTagTest.java       | 36 ++++------------
 .../logging/log4j/taglib/IfEnabledTagTest.java  | 26 +++---------
 .../taglib/LoggingMessageTagSupportTest.java    | 38 ++++-------------
 5 files changed, 39 insertions(+), 140 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8c8fa72/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/CatchingTagTest.java
----------------------------------------------------------------------
diff --git
a/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/CatchingTagTest.java
b/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/CatchingTagTest.java
index 006252d..a84bc80 100644
---
a/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/CatchingTagTest.java
+++
b/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/CatchingTagTest.java
@@ -16,50 +16,30 @@
  */
 package org.apache.logging.log4j.taglib;

-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
 import java.util.List;
-
 import javax.servlet.jsp.tagext.Tag;

 import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.core.Appender;
-import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.core.config.ConfigurationFactory;
-import org.apache.logging.log4j.status.StatusLogger;
+import org.apache.logging.log4j.junit.LoggerContextRule;
 import org.apache.logging.log4j.test.appender.ListAppender;
-import org.junit.AfterClass;
 import org.junit.Before;
-import org.junit.BeforeClass;
+import org.junit.ClassRule;
 import org.junit.Test;
 import org.springframework.mock.web.MockPageContext;

+import static org.junit.Assert.*;
+
 /**
  *
  */
 public class CatchingTagTest {
     private static final String CONFIG = "log4j-test1.xml";

-    @BeforeClass
-    public static void setUpClass() {
-
System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY,
CONFIG);
-        final LoggerContext context = LoggerContext.getContext(false);
-        context.getConfiguration();
-    }
-
-    @AfterClass
-    public static void cleanUpClass() {
-
System.clearProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY);
-        final LoggerContext context = LoggerContext.getContext(false);
-        context.reconfigure();
-        StatusLogger.getLogger().reset();
-    }
+    @ClassRule
+    public static LoggerContextRule context = new
LoggerContextRule(CONFIG);

-    private final Logger logger =
LogManager.getLogger("LoggingMessageTagSupportTestLogger");
+    private final Logger logger =
context.getLogger("LoggingMessageTagSupportTestLogger");
     private CatchingTag tag;

     @Before
@@ -96,11 +76,8 @@ public class CatchingTagTest {
     }

     private void verify(final String expected) {
-        final LoggerContext ctx = LoggerContext.getContext(false);
-        final Appender listApp =
ctx.getConfiguration().getAppender("List");
-        assertNotNull("Missing Appender", listApp);
-        assertTrue("Not a ListAppender", listApp instanceof ListAppender);
-        final List<String> events = ((ListAppender) listApp).getMessages();
+        final ListAppender listApp = context.getListAppender("List");
+        final List<String> events = listApp.getMessages();
         try
         {
             assertEquals("Incorrect number of messages.", 1,
events.size());
@@ -108,7 +85,7 @@ public class CatchingTagTest {
         }
         finally
         {
-            ((ListAppender) listApp).clear();
+            listApp.clear();
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8c8fa72/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/EntryTagTest.java
----------------------------------------------------------------------
diff --git
a/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/EntryTagTest.java
b/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/EntryTagTest.java
index 2bc34ce..26681e8 100644
---
a/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/EntryTagTest.java
+++
b/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/EntryTagTest.java
@@ -19,16 +19,11 @@ package org.apache.logging.log4j.taglib;
 import java.util.List;
 import javax.servlet.jsp.tagext.Tag;

-import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.core.Appender;
-import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.core.config.ConfigurationFactory;
-import org.apache.logging.log4j.status.StatusLogger;
+import org.apache.logging.log4j.junit.LoggerContextRule;
 import org.apache.logging.log4j.test.appender.ListAppender;
-import org.junit.AfterClass;
 import org.junit.Before;
-import org.junit.BeforeClass;
+import org.junit.ClassRule;
 import org.junit.Test;
 import org.springframework.mock.web.MockPageContext;

@@ -40,22 +35,10 @@ import static org.junit.Assert.*;
 public class EntryTagTest {
     private static final String CONFIG = "log4j-test1.xml";

-    @BeforeClass
-    public static void setUpClass() {
-
System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY,
CONFIG);
-        final LoggerContext context = LoggerContext.getContext(false);
-        context.getConfiguration();
-    }
-
-    @AfterClass
-    public static void cleanUpClass() {
-
System.clearProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY);
-        final LoggerContext context = LoggerContext.getContext(false);
-        context.reconfigure();
-        StatusLogger.getLogger().reset();
-    }
+    @ClassRule
+    public static LoggerContextRule context = new
LoggerContextRule(CONFIG);

-    private final Logger logger =
LogManager.getLogger("LoggingMessageTagSupportTestLogger");
+    private final Logger logger =
context.getLogger("LoggingMessageTagSupportTestLogger");
     private EntryTag tag;

     @Before
@@ -81,11 +64,8 @@ public class EntryTagTest {
     }

     private void verify(final String expected) {
-        final LoggerContext ctx = LoggerContext.getContext(false);
-        final Appender listApp =
ctx.getConfiguration().getAppender("List");
-        assertNotNull("Missing Appender", listApp);
-        assertTrue("Not a ListAppender", listApp instanceof ListAppender);
-        final List<String> events = ((ListAppender) listApp).getMessages();
+        final ListAppender listApp = context.getListAppender("List");
+        final List<String> events = listApp.getMessages();
         try
         {
             assertEquals("Incorrect number of messages.", 1,
events.size());
@@ -93,7 +73,7 @@ public class EntryTagTest {
         }
         finally
         {
-            ((ListAppender) listApp).clear();
+            listApp.clear();
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8c8fa72/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/ExitTagTest.java
----------------------------------------------------------------------
diff --git
a/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/ExitTagTest.java
b/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/ExitTagTest.java
index 015601b..3e5ab22 100644
---
a/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/ExitTagTest.java
+++
b/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/ExitTagTest.java
@@ -19,16 +19,11 @@ package org.apache.logging.log4j.taglib;
 import java.util.List;
 import javax.servlet.jsp.tagext.Tag;

-import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.core.Appender;
-import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.core.config.ConfigurationFactory;
-import org.apache.logging.log4j.status.StatusLogger;
+import org.apache.logging.log4j.junit.LoggerContextRule;
 import org.apache.logging.log4j.test.appender.ListAppender;
-import org.junit.AfterClass;
 import org.junit.Before;
-import org.junit.BeforeClass;
+import org.junit.ClassRule;
 import org.junit.Test;
 import org.springframework.mock.web.MockPageContext;

@@ -40,22 +35,10 @@ import static org.junit.Assert.*;
 public class ExitTagTest {
     private static final String CONFIG = "log4j-test1.xml";

-    @BeforeClass
-    public static void setUpClass() {
-
System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY,
CONFIG);
-        final LoggerContext context = LoggerContext.getContext(false);
-        context.getConfiguration();
-    }
-
-    @AfterClass
-    public static void cleanUpClass() {
-
System.clearProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY);
-        final LoggerContext context = LoggerContext.getContext(false);
-        context.reconfigure();
-        StatusLogger.getLogger().reset();
-    }
+    @ClassRule
+    public static LoggerContextRule context = new
LoggerContextRule(CONFIG);

-    private final Logger logger =
LogManager.getLogger("LoggingMessageTagSupportTestLogger");
+    private final Logger logger =
context.getLogger("LoggingMessageTagSupportTestLogger");
     private ExitTag tag;

     @Before
@@ -88,11 +71,8 @@ public class ExitTagTest {
     }

     private void verify(final String expected) {
-        final LoggerContext ctx = LoggerContext.getContext(false);
-        final Appender listApp =
ctx.getConfiguration().getAppender("List");
-        assertNotNull("Missing Appender", listApp);
-        assertTrue("Not a ListAppender", listApp instanceof ListAppender);
-        final List<String> events = ((ListAppender) listApp).getMessages();
+        final ListAppender listApp = context.getListAppender("List");
+        final List<String> events = listApp.getMessages();
         try
         {
             assertEquals("Incorrect number of messages.", 1,
events.size());
@@ -100,7 +80,7 @@ public class ExitTagTest {
         }
         finally
         {
-            ((ListAppender) listApp).clear();
+            listApp.clear();
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8c8fa72/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/IfEnabledTagTest.java
----------------------------------------------------------------------
diff --git
a/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/IfEnabledTagTest.java
b/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/IfEnabledTagTest.java
index 0d9c085..9596c5b 100644
---
a/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/IfEnabledTagTest.java
+++
b/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/IfEnabledTagTest.java
@@ -19,15 +19,11 @@ package org.apache.logging.log4j.taglib;
 import javax.servlet.jsp.tagext.Tag;

 import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.MarkerManager;
-import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.core.config.ConfigurationFactory;
-import org.apache.logging.log4j.status.StatusLogger;
-import org.junit.AfterClass;
+import org.apache.logging.log4j.junit.LoggerContextRule;
 import org.junit.Before;
-import org.junit.BeforeClass;
+import org.junit.ClassRule;
 import org.junit.Test;
 import org.springframework.mock.web.MockPageContext;

@@ -39,22 +35,10 @@ import static org.junit.Assert.*;
 public class IfEnabledTagTest {
     private static final String CONFIG = "log4j-test1.xml";

-    @BeforeClass
-    public static void setUpClass() {
-
System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY,
CONFIG);
-        final LoggerContext context = LoggerContext.getContext(false);
-        context.getConfiguration();
-    }
-
-    @AfterClass
-    public static void cleanUpClass() {
-
System.clearProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY);
-        final LoggerContext context = LoggerContext.getContext(false);
-        context.reconfigure();
-        StatusLogger.getLogger().reset();
-    }
+    @ClassRule
+    public static LoggerContextRule context = new
LoggerContextRule(CONFIG);

-    private final Logger logger = LogManager.getLogger("IfEnabledTagTest");
+    private final Logger logger = context.getLogger("IfEnabledTagTest");
     private IfEnabledTag tag;

     @Before

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8c8fa72/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/LoggingMessageTagSupportTest.java
----------------------------------------------------------------------
diff --git
a/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/LoggingMessageTagSupportTest.java
b/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/LoggingMessageTagSupportTest.java
index 342b2da..26aa46c 100644
---
a/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/LoggingMessageTagSupportTest.java
+++
b/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/LoggingMessageTagSupportTest.java
@@ -19,21 +19,15 @@ package org.apache.logging.log4j.taglib;
 import java.io.Writer;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
-
 import javax.servlet.jsp.tagext.BodyTag;
 import javax.servlet.jsp.tagext.Tag;

 import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.MarkerManager;
-import org.apache.logging.log4j.core.Appender;
-import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.core.config.ConfigurationFactory;
-import org.apache.logging.log4j.status.StatusLogger;
+import org.apache.logging.log4j.junit.LoggerContextRule;
 import org.apache.logging.log4j.test.appender.ListAppender;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.junit.ClassRule;
 import org.junit.Test;
 import org.springframework.mock.web.MockBodyContent;
 import org.springframework.mock.web.MockPageContext;
@@ -46,22 +40,10 @@ import static org.junit.Assert.*;
 public class LoggingMessageTagSupportTest {
     private static final String CONFIG = "log4j-test1.xml";

-    @BeforeClass
-    public static void setUpClass() {
-
System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY,
CONFIG);
-        final LoggerContext context = LoggerContext.getContext(false);
-        context.getConfiguration();
-    }
-
-    @AfterClass
-    public static void cleanUpClass() {
-
System.clearProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY);
-        final LoggerContext context = LoggerContext.getContext(false);
-        context.reconfigure();
-        StatusLogger.getLogger().reset();
-    }
+    @ClassRule
+    public static LoggerContextRule context = new
LoggerContextRule(CONFIG);

-    private final Logger logger =
LogManager.getLogger("LoggingMessageTagSupportTestLogger");
+    private final Logger logger =
context.getLogger("LoggingMessageTagSupportTestLogger");
     private LoggingMessageTagSupport tag;

     private void setUp(final Level level) {
@@ -294,13 +276,9 @@ public class LoggingMessageTagSupportTest {
                 "This is another test");
     }

-    @SuppressWarnings("unchecked")
     private void verify(final String expected) {
-        final LoggerContext ctx = LoggerContext.getContext(false);
-        final Appender listApp =
ctx.getConfiguration().getAppender("List");
-        assertNotNull("Missing Appender", listApp);
-        assertTrue("Not a ListAppender", listApp instanceof ListAppender);
-        final List<String> events = ((ListAppender) listApp).getMessages();
+        final ListAppender listApp = context.getListAppender("List");
+        final List<String> events = listApp.getMessages();
         try
         {
             assertEquals("Incorrect number of messages.", 1,
events.size());
@@ -308,7 +286,7 @@ public class LoggingMessageTagSupportTest {
         }
         finally
         {
-            ((ListAppender) listApp).clear();
+            listApp.clear();
         }
     }





-- 
E-Mail: garydgregory@gmail.com | ggregory@apache.org
Java Persistence with Hibernate, Second Edition
<http://www.manning.com/bauer3/>
JUnit in Action, Second Edition <http://www.manning.com/tahchiev/>
Spring Batch in Action <http://www.manning.com/templier/>
Blog: http://garygregory.wordpress.com
Home: http://garygregory.com/
Tweet! http://twitter.com/GaryGregory

--089e01634b8adbd690052c2c02a4
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr">Nice clean up Matt.=C2=A0<div><br></div><div>Gary<br><div =
class=3D"gmail_quote">---------- Forwarded message ----------<br>From: <b c=
lass=3D"gmail_sendername"></b> <span dir=3D"ltr">&lt;<a href=3D"mailto:matt=
sicker@apache.org">mattsicker@apache.org</a>&gt;</span><br>Date: Fri, Feb 1=
9, 2016 at 8:14 PM<br>Subject: logging-log4j2 git commit: Update tests to u=
se LoggerContextRule.<br>To: <a href=3D"mailto:commits@logging.apache.org">=
commits@logging.apache.org</a><br><br><br>Repository: logging-log4j2<br>
Updated Branches:<br>
=C2=A0 refs/heads/master 6e54d7160 -&gt; a8c8fa727<br>
<br>
<br>
Update tests to use LoggerContextRule.<br>
<br>
<br>
Project: <a href=3D"http://git-wip-us.apache.org/repos/asf/logging-log4j2/r=
epo" rel=3D"noreferrer" target=3D"_blank">http://git-wip-us.apache.org/repo=
s/asf/logging-log4j2/repo</a><br>
Commit: <a href=3D"http://git-wip-us.apache.org/repos/asf/logging-log4j2/co=
mmit/a8c8fa72" rel=3D"noreferrer" target=3D"_blank">http://git-wip-us.apach=
e.org/repos/asf/logging-log4j2/commit/a8c8fa72</a><br>
Tree: <a href=3D"http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree=
/a8c8fa72" rel=3D"noreferrer" target=3D"_blank">http://git-wip-us.apache.or=
g/repos/asf/logging-log4j2/tree/a8c8fa72</a><br>
Diff: <a href=3D"http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff=
/a8c8fa72" rel=3D"noreferrer" target=3D"_blank">http://git-wip-us.apache.or=
g/repos/asf/logging-log4j2/diff/a8c8fa72</a><br>
<br>
Branch: refs/heads/master<br>
Commit: a8c8fa727000d3baa77c680a0ffa544b0d9084b6<br>
Parents: 6e54d71<br>
Author: Matt Sicker &lt;<a href=3D"mailto:boards@gmail.com">boards@gmail.co=
m</a>&gt;<br>
Authored: Fri Feb 19 22:14:49 2016 -0600<br>
Committer: Matt Sicker &lt;<a href=3D"mailto:boards@gmail.com">boards@gmail=
.com</a>&gt;<br>
Committed: Fri Feb 19 22:15:10 2016 -0600<br>
<br>
----------------------------------------------------------------------<br>
=C2=A0.../logging/log4j/taglib/CatchingTagTest.java=C2=A0 =C2=A0| 43 +++++-=
--------------<br>
=C2=A0.../logging/log4j/taglib/EntryTagTest.java=C2=A0 =C2=A0 =C2=A0 | 36 +=
+++------------<br>
=C2=A0.../logging/log4j/taglib/ExitTagTest.java=C2=A0 =C2=A0 =C2=A0 =C2=A0|=
 36 ++++------------<br>
=C2=A0.../logging/log4j/taglib/IfEnabledTagTest.java=C2=A0 | 26 +++--------=
-<br>
=C2=A0.../taglib/LoggingMessageTagSupportTest.java=C2=A0 =C2=A0 | 38 ++++--=
-----------<br>
=C2=A05 files changed, 39 insertions(+), 140 deletions(-)<br>
----------------------------------------------------------------------<br>
<br>
<br>
<a href=3D"http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8c8f=
a72/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/CatchingTagT=
est.java" rel=3D"noreferrer" target=3D"_blank">http://git-wip-us.apache.org=
/repos/asf/logging-log4j2/blob/a8c8fa72/log4j-taglib/src/test/java/org/apac=
he/logging/log4j/taglib/CatchingTagTest.java</a><br>
----------------------------------------------------------------------<br>
diff --git a/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/Cat=
chingTagTest.java b/log4j-taglib/src/test/java/org/apache/logging/log4j/tag=
lib/CatchingTagTest.java<br>
index 006252d..a84bc80 100644<br>
--- a/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/CatchingTa=
gTest.java<br>
+++ b/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/CatchingTa=
gTest.java<br>
@@ -16,50 +16,30 @@<br>
=C2=A0 */<br>
=C2=A0package org.apache.logging.log4j.taglib;<br>
<br>
-import static org.junit.Assert.assertEquals;<br>
-import static org.junit.Assert.assertNotNull;<br>
-import static org.junit.Assert.assertTrue;<br>
-<br>
=C2=A0import java.util.List;<br>
-<br>
=C2=A0import javax.servlet.jsp.tagext.Tag;<br>
<br>
=C2=A0import org.apache.logging.log4j.Level;<br>
-import org.apache.logging.log4j.LogManager;<br>
=C2=A0import org.apache.logging.log4j.Logger;<br>
-import org.apache.logging.log4j.core.Appender;<br>
-import org.apache.logging.log4j.core.LoggerContext;<br>
-import org.apache.logging.log4j.core.config.ConfigurationFactory;<br>
-import org.apache.logging.log4j.status.StatusLogger;<br>
+import org.apache.logging.log4j.junit.LoggerContextRule;<br>
=C2=A0import org.apache.logging.log4j.test.appender.ListAppender;<br>
-import org.junit.AfterClass;<br>
=C2=A0import org.junit.Before;<br>
-import org.junit.BeforeClass;<br>
+import org.junit.ClassRule;<br>
=C2=A0import org.junit.Test;<br>
=C2=A0import org.springframework.mock.web.MockPageContext;<br>
<br>
+import static org.junit.Assert.*;<br>
+<br>
=C2=A0/**<br>
=C2=A0 *<br>
=C2=A0 */<br>
=C2=A0public class CatchingTagTest {<br>
=C2=A0 =C2=A0 =C2=A0private static final String CONFIG =3D &quot;log4j-test=
1.xml&quot;;<br>
<br>
-=C2=A0 =C2=A0 @BeforeClass<br>
-=C2=A0 =C2=A0 public static void setUpClass() {<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 System.setProperty(ConfigurationFactory.CONFIG=
URATION_FILE_PROPERTY, CONFIG);<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 final LoggerContext context =3D LoggerContext.=
getContext(false);<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 context.getConfiguration();<br>
-=C2=A0 =C2=A0 }<br>
-<br>
-=C2=A0 =C2=A0 @AfterClass<br>
-=C2=A0 =C2=A0 public static void cleanUpClass() {<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 System.clearProperty(ConfigurationFactory.CONF=
IGURATION_FILE_PROPERTY);<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 final LoggerContext context =3D LoggerContext.=
getContext(false);<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 context.reconfigure();<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 StatusLogger.getLogger().reset();<br>
-=C2=A0 =C2=A0 }<br>
+=C2=A0 =C2=A0 @ClassRule<br>
+=C2=A0 =C2=A0 public static LoggerContextRule context =3D new LoggerContex=
tRule(CONFIG);<br>
<br>
-=C2=A0 =C2=A0 private final Logger logger =3D LogManager.getLogger(&quot;L=
oggingMessageTagSupportTestLogger&quot;);<br>
+=C2=A0 =C2=A0 private final Logger logger =3D context.getLogger(&quot;Logg=
ingMessageTagSupportTestLogger&quot;);<br>
=C2=A0 =C2=A0 =C2=A0private CatchingTag tag;<br>
<br>
=C2=A0 =C2=A0 =C2=A0@Before<br>
@@ -96,11 +76,8 @@ public class CatchingTagTest {<br>
=C2=A0 =C2=A0 =C2=A0}<br>
<br>
=C2=A0 =C2=A0 =C2=A0private void verify(final String expected) {<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 final LoggerContext ctx =3D LoggerContext.getC=
ontext(false);<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 final Appender listApp =3D ctx.getConfiguratio=
n().getAppender(&quot;List&quot;);<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 assertNotNull(&quot;Missing Appender&quot;, li=
stApp);<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 assertTrue(&quot;Not a ListAppender&quot;, lis=
tApp instanceof ListAppender);<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 final List&lt;String&gt; events =3D ((ListAppe=
nder) listApp).getMessages();<br>
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 final ListAppender listApp =3D context.getList=
Appender(&quot;List&quot;);<br>
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 final List&lt;String&gt; events =3D listApp.ge=
tMessages();<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0try<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0{<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0assertEquals(&quot;Incorrec=
t number of messages.&quot;, 1, events.size());<br>
@@ -108,7 +85,7 @@ public class CatchingTagTest {<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0finally<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0{<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ((ListAppender) listApp).clear()=
;<br>
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 listApp.clear();<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}<br>
=C2=A0 =C2=A0 =C2=A0}<br>
=C2=A0}<br>
<br>
<a href=3D"http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8c8f=
a72/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/EntryTagTest=
.java" rel=3D"noreferrer" target=3D"_blank">http://git-wip-us.apache.org/re=
pos/asf/logging-log4j2/blob/a8c8fa72/log4j-taglib/src/test/java/org/apache/=
logging/log4j/taglib/EntryTagTest.java</a><br>
----------------------------------------------------------------------<br>
diff --git a/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/Ent=
ryTagTest.java b/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib=
/EntryTagTest.java<br>
index 2bc34ce..26681e8 100644<br>
--- a/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/EntryTagTe=
st.java<br>
+++ b/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/EntryTagTe=
st.java<br>
@@ -19,16 +19,11 @@ package org.apache.logging.log4j.taglib;<br>
=C2=A0import java.util.List;<br>
=C2=A0import javax.servlet.jsp.tagext.Tag;<br>
<br>
-import org.apache.logging.log4j.LogManager;<br>
=C2=A0import org.apache.logging.log4j.Logger;<br>
-import org.apache.logging.log4j.core.Appender;<br>
-import org.apache.logging.log4j.core.LoggerContext;<br>
-import org.apache.logging.log4j.core.config.ConfigurationFactory;<br>
-import org.apache.logging.log4j.status.StatusLogger;<br>
+import org.apache.logging.log4j.junit.LoggerContextRule;<br>
=C2=A0import org.apache.logging.log4j.test.appender.ListAppender;<br>
-import org.junit.AfterClass;<br>
=C2=A0import org.junit.Before;<br>
-import org.junit.BeforeClass;<br>
+import org.junit.ClassRule;<br>
=C2=A0import org.junit.Test;<br>
=C2=A0import org.springframework.mock.web.MockPageContext;<br>
<br>
@@ -40,22 +35,10 @@ import static org.junit.Assert.*;<br>
=C2=A0public class EntryTagTest {<br>
=C2=A0 =C2=A0 =C2=A0private static final String CONFIG =3D &quot;log4j-test=
1.xml&quot;;<br>
<br>
-=C2=A0 =C2=A0 @BeforeClass<br>
-=C2=A0 =C2=A0 public static void setUpClass() {<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 System.setProperty(ConfigurationFactory.CONFIG=
URATION_FILE_PROPERTY, CONFIG);<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 final LoggerContext context =3D LoggerContext.=
getContext(false);<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 context.getConfiguration();<br>
-=C2=A0 =C2=A0 }<br>
-<br>
-=C2=A0 =C2=A0 @AfterClass<br>
-=C2=A0 =C2=A0 public static void cleanUpClass() {<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 System.clearProperty(ConfigurationFactory.CONF=
IGURATION_FILE_PROPERTY);<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 final LoggerContext context =3D LoggerContext.=
getContext(false);<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 context.reconfigure();<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 StatusLogger.getLogger().reset();<br>
-=C2=A0 =C2=A0 }<br>
+=C2=A0 =C2=A0 @ClassRule<br>
+=C2=A0 =C2=A0 public static LoggerContextRule context =3D new LoggerContex=
tRule(CONFIG);<br>
<br>
-=C2=A0 =C2=A0 private final Logger logger =3D LogManager.getLogger(&quot;L=
oggingMessageTagSupportTestLogger&quot;);<br>
+=C2=A0 =C2=A0 private final Logger logger =3D context.getLogger(&quot;Logg=
ingMessageTagSupportTestLogger&quot;);<br>
=C2=A0 =C2=A0 =C2=A0private EntryTag tag;<br>
<br>
=C2=A0 =C2=A0 =C2=A0@Before<br>
@@ -81,11 +64,8 @@ public class EntryTagTest {<br>
=C2=A0 =C2=A0 =C2=A0}<br>
<br>
=C2=A0 =C2=A0 =C2=A0private void verify(final String expected) {<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 final LoggerContext ctx =3D LoggerContext.getC=
ontext(false);<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 final Appender listApp =3D ctx.getConfiguratio=
n().getAppender(&quot;List&quot;);<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 assertNotNull(&quot;Missing Appender&quot;, li=
stApp);<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 assertTrue(&quot;Not a ListAppender&quot;, lis=
tApp instanceof ListAppender);<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 final List&lt;String&gt; events =3D ((ListAppe=
nder) listApp).getMessages();<br>
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 final ListAppender listApp =3D context.getList=
Appender(&quot;List&quot;);<br>
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 final List&lt;String&gt; events =3D listApp.ge=
tMessages();<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0try<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0{<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0assertEquals(&quot;Incorrec=
t number of messages.&quot;, 1, events.size());<br>
@@ -93,7 +73,7 @@ public class EntryTagTest {<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0finally<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0{<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ((ListAppender) listApp).clear()=
;<br>
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 listApp.clear();<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}<br>
=C2=A0 =C2=A0 =C2=A0}<br>
=C2=A0}<br>
<br>
<a href=3D"http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8c8f=
a72/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/ExitTagTest.=
java" rel=3D"noreferrer" target=3D"_blank">http://git-wip-us.apache.org/rep=
os/asf/logging-log4j2/blob/a8c8fa72/log4j-taglib/src/test/java/org/apache/l=
ogging/log4j/taglib/ExitTagTest.java</a><br>
----------------------------------------------------------------------<br>
diff --git a/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/Exi=
tTagTest.java b/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/=
ExitTagTest.java<br>
index 015601b..3e5ab22 100644<br>
--- a/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/ExitTagTes=
t.java<br>
+++ b/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/ExitTagTes=
t.java<br>
@@ -19,16 +19,11 @@ package org.apache.logging.log4j.taglib;<br>
=C2=A0import java.util.List;<br>
=C2=A0import javax.servlet.jsp.tagext.Tag;<br>
<br>
-import org.apache.logging.log4j.LogManager;<br>
=C2=A0import org.apache.logging.log4j.Logger;<br>
-import org.apache.logging.log4j.core.Appender;<br>
-import org.apache.logging.log4j.core.LoggerContext;<br>
-import org.apache.logging.log4j.core.config.ConfigurationFactory;<br>
-import org.apache.logging.log4j.status.StatusLogger;<br>
+import org.apache.logging.log4j.junit.LoggerContextRule;<br>
=C2=A0import org.apache.logging.log4j.test.appender.ListAppender;<br>
-import org.junit.AfterClass;<br>
=C2=A0import org.junit.Before;<br>
-import org.junit.BeforeClass;<br>
+import org.junit.ClassRule;<br>
=C2=A0import org.junit.Test;<br>
=C2=A0import org.springframework.mock.web.MockPageContext;<br>
<br>
@@ -40,22 +35,10 @@ import static org.junit.Assert.*;<br>
=C2=A0public class ExitTagTest {<br>
=C2=A0 =C2=A0 =C2=A0private static final String CONFIG =3D &quot;log4j-test=
1.xml&quot;;<br>
<br>
-=C2=A0 =C2=A0 @BeforeClass<br>
-=C2=A0 =C2=A0 public static void setUpClass() {<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 System.setProperty(ConfigurationFactory.CONFIG=
URATION_FILE_PROPERTY, CONFIG);<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 final LoggerContext context =3D LoggerContext.=
getContext(false);<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 context.getConfiguration();<br>
-=C2=A0 =C2=A0 }<br>
-<br>
-=C2=A0 =C2=A0 @AfterClass<br>
-=C2=A0 =C2=A0 public static void cleanUpClass() {<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 System.clearProperty(ConfigurationFactory.CONF=
IGURATION_FILE_PROPERTY);<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 final LoggerContext context =3D LoggerContext.=
getContext(false);<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 context.reconfigure();<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 StatusLogger.getLogger().reset();<br>
-=C2=A0 =C2=A0 }<br>
+=C2=A0 =C2=A0 @ClassRule<br>
+=C2=A0 =C2=A0 public static LoggerContextRule context =3D new LoggerContex=
tRule(CONFIG);<br>
<br>
-=C2=A0 =C2=A0 private final Logger logger =3D LogManager.getLogger(&quot;L=
oggingMessageTagSupportTestLogger&quot;);<br>
+=C2=A0 =C2=A0 private final Logger logger =3D context.getLogger(&quot;Logg=
ingMessageTagSupportTestLogger&quot;);<br>
=C2=A0 =C2=A0 =C2=A0private ExitTag tag;<br>
<br>
=C2=A0 =C2=A0 =C2=A0@Before<br>
@@ -88,11 +71,8 @@ public class ExitTagTest {<br>
=C2=A0 =C2=A0 =C2=A0}<br>
<br>
=C2=A0 =C2=A0 =C2=A0private void verify(final String expected) {<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 final LoggerContext ctx =3D LoggerContext.getC=
ontext(false);<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 final Appender listApp =3D ctx.getConfiguratio=
n().getAppender(&quot;List&quot;);<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 assertNotNull(&quot;Missing Appender&quot;, li=
stApp);<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 assertTrue(&quot;Not a ListAppender&quot;, lis=
tApp instanceof ListAppender);<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 final List&lt;String&gt; events =3D ((ListAppe=
nder) listApp).getMessages();<br>
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 final ListAppender listApp =3D context.getList=
Appender(&quot;List&quot;);<br>
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 final List&lt;String&gt; events =3D listApp.ge=
tMessages();<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0try<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0{<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0assertEquals(&quot;Incorrec=
t number of messages.&quot;, 1, events.size());<br>
@@ -100,7 +80,7 @@ public class ExitTagTest {<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0finally<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0{<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ((ListAppender) listApp).clear()=
;<br>
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 listApp.clear();<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}<br>
=C2=A0 =C2=A0 =C2=A0}<br>
=C2=A0}<br>
<br>
<a href=3D"http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8c8f=
a72/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/IfEnabledTag=
Test.java" rel=3D"noreferrer" target=3D"_blank">http://git-wip-us.apache.or=
g/repos/asf/logging-log4j2/blob/a8c8fa72/log4j-taglib/src/test/java/org/apa=
che/logging/log4j/taglib/IfEnabledTagTest.java</a><br>
----------------------------------------------------------------------<br>
diff --git a/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/IfE=
nabledTagTest.java b/log4j-taglib/src/test/java/org/apache/logging/log4j/ta=
glib/IfEnabledTagTest.java<br>
index 0d9c085..9596c5b 100644<br>
--- a/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/IfEnabledT=
agTest.java<br>
+++ b/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/IfEnabledT=
agTest.java<br>
@@ -19,15 +19,11 @@ package org.apache.logging.log4j.taglib;<br>
=C2=A0import javax.servlet.jsp.tagext.Tag;<br>
<br>
=C2=A0import org.apache.logging.log4j.Level;<br>
-import org.apache.logging.log4j.LogManager;<br>
=C2=A0import org.apache.logging.log4j.Logger;<br>
=C2=A0import org.apache.logging.log4j.MarkerManager;<br>
-import org.apache.logging.log4j.core.LoggerContext;<br>
-import org.apache.logging.log4j.core.config.ConfigurationFactory;<br>
-import org.apache.logging.log4j.status.StatusLogger;<br>
-import org.junit.AfterClass;<br>
+import org.apache.logging.log4j.junit.LoggerContextRule;<br>
=C2=A0import org.junit.Before;<br>
-import org.junit.BeforeClass;<br>
+import org.junit.ClassRule;<br>
=C2=A0import org.junit.Test;<br>
=C2=A0import org.springframework.mock.web.MockPageContext;<br>
<br>
@@ -39,22 +35,10 @@ import static org.junit.Assert.*;<br>
=C2=A0public class IfEnabledTagTest {<br>
=C2=A0 =C2=A0 =C2=A0private static final String CONFIG =3D &quot;log4j-test=
1.xml&quot;;<br>
<br>
-=C2=A0 =C2=A0 @BeforeClass<br>
-=C2=A0 =C2=A0 public static void setUpClass() {<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 System.setProperty(ConfigurationFactory.CONFIG=
URATION_FILE_PROPERTY, CONFIG);<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 final LoggerContext context =3D LoggerContext.=
getContext(false);<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 context.getConfiguration();<br>
-=C2=A0 =C2=A0 }<br>
-<br>
-=C2=A0 =C2=A0 @AfterClass<br>
-=C2=A0 =C2=A0 public static void cleanUpClass() {<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 System.clearProperty(ConfigurationFactory.CONF=
IGURATION_FILE_PROPERTY);<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 final LoggerContext context =3D LoggerContext.=
getContext(false);<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 context.reconfigure();<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 StatusLogger.getLogger().reset();<br>
-=C2=A0 =C2=A0 }<br>
+=C2=A0 =C2=A0 @ClassRule<br>
+=C2=A0 =C2=A0 public static LoggerContextRule context =3D new LoggerContex=
tRule(CONFIG);<br>
<br>
-=C2=A0 =C2=A0 private final Logger logger =3D LogManager.getLogger(&quot;I=
fEnabledTagTest&quot;);<br>
+=C2=A0 =C2=A0 private final Logger logger =3D context.getLogger(&quot;IfEn=
abledTagTest&quot;);<br>
=C2=A0 =C2=A0 =C2=A0private IfEnabledTag tag;<br>
<br>
=C2=A0 =C2=A0 =C2=A0@Before<br>
<br>
<a href=3D"http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a8c8f=
a72/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/LoggingMessa=
geTagSupportTest.java" rel=3D"noreferrer" target=3D"_blank">http://git-wip-=
us.apache.org/repos/asf/logging-log4j2/blob/a8c8fa72/log4j-taglib/src/test/=
java/org/apache/logging/log4j/taglib/LoggingMessageTagSupportTest.java</a><=
br>
----------------------------------------------------------------------<br>
diff --git a/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/Log=
gingMessageTagSupportTest.java b/log4j-taglib/src/test/java/org/apache/logg=
ing/log4j/taglib/LoggingMessageTagSupportTest.java<br>
index 342b2da..26aa46c 100644<br>
--- a/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/LoggingMes=
sageTagSupportTest.java<br>
+++ b/log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/LoggingMes=
sageTagSupportTest.java<br>
@@ -19,21 +19,15 @@ package org.apache.logging.log4j.taglib;<br>
=C2=A0import java.io.Writer;<br>
=C2=A0import java.util.List;<br>
=C2=A0import java.util.concurrent.TimeUnit;<br>
-<br>
=C2=A0import javax.servlet.jsp.tagext.BodyTag;<br>
=C2=A0import javax.servlet.jsp.tagext.Tag;<br>
<br>
=C2=A0import org.apache.logging.log4j.Level;<br>
-import org.apache.logging.log4j.LogManager;<br>
=C2=A0import org.apache.logging.log4j.Logger;<br>
=C2=A0import org.apache.logging.log4j.MarkerManager;<br>
-import org.apache.logging.log4j.core.Appender;<br>
-import org.apache.logging.log4j.core.LoggerContext;<br>
-import org.apache.logging.log4j.core.config.ConfigurationFactory;<br>
-import org.apache.logging.log4j.status.StatusLogger;<br>
+import org.apache.logging.log4j.junit.LoggerContextRule;<br>
=C2=A0import org.apache.logging.log4j.test.appender.ListAppender;<br>
-import org.junit.AfterClass;<br>
-import org.junit.BeforeClass;<br>
+import org.junit.ClassRule;<br>
=C2=A0import org.junit.Test;<br>
=C2=A0import org.springframework.mock.web.MockBodyContent;<br>
=C2=A0import org.springframework.mock.web.MockPageContext;<br>
@@ -46,22 +40,10 @@ import static org.junit.Assert.*;<br>
=C2=A0public class LoggingMessageTagSupportTest {<br>
=C2=A0 =C2=A0 =C2=A0private static final String CONFIG =3D &quot;log4j-test=
1.xml&quot;;<br>
<br>
-=C2=A0 =C2=A0 @BeforeClass<br>
-=C2=A0 =C2=A0 public static void setUpClass() {<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 System.setProperty(ConfigurationFactory.CONFIG=
URATION_FILE_PROPERTY, CONFIG);<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 final LoggerContext context =3D LoggerContext.=
getContext(false);<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 context.getConfiguration();<br>
-=C2=A0 =C2=A0 }<br>
-<br>
-=C2=A0 =C2=A0 @AfterClass<br>
-=C2=A0 =C2=A0 public static void cleanUpClass() {<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 System.clearProperty(ConfigurationFactory.CONF=
IGURATION_FILE_PROPERTY);<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 final LoggerContext context =3D LoggerContext.=
getContext(false);<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 context.reconfigure();<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 StatusLogger.getLogger().reset();<br>
-=C2=A0 =C2=A0 }<br>
+=C2=A0 =C2=A0 @ClassRule<br>
+=C2=A0 =C2=A0 public static LoggerContextRule context =3D new LoggerContex=
tRule(CONFIG);<br>
<br>
-=C2=A0 =C2=A0 private final Logger logger =3D LogManager.getLogger(&quot;L=
oggingMessageTagSupportTestLogger&quot;);<br>
+=C2=A0 =C2=A0 private final Logger logger =3D context.getLogger(&quot;Logg=
ingMessageTagSupportTestLogger&quot;);<br>
=C2=A0 =C2=A0 =C2=A0private LoggingMessageTagSupport tag;<br>
<br>
=C2=A0 =C2=A0 =C2=A0private void setUp(final Level level) {<br>
@@ -294,13 +276,9 @@ public class LoggingMessageTagSupportTest {<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&quot;This is=
 another test&quot;);<br>
=C2=A0 =C2=A0 =C2=A0}<br>
<br>
-=C2=A0 =C2=A0 @SuppressWarnings(&quot;unchecked&quot;)<br>
=C2=A0 =C2=A0 =C2=A0private void verify(final String expected) {<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 final LoggerContext ctx =3D LoggerContext.getC=
ontext(false);<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 final Appender listApp =3D ctx.getConfiguratio=
n().getAppender(&quot;List&quot;);<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 assertNotNull(&quot;Missing Appender&quot;, li=
stApp);<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 assertTrue(&quot;Not a ListAppender&quot;, lis=
tApp instanceof ListAppender);<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 final List&lt;String&gt; events =3D ((ListAppe=
nder) listApp).getMessages();<br>
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 final ListAppender listApp =3D context.getList=
Appender(&quot;List&quot;);<br>
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 final List&lt;String&gt; events =3D listApp.ge=
tMessages();<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0try<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0{<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0assertEquals(&quot;Incorrec=
t number of messages.&quot;, 1, events.size());<br>
@@ -308,7 +286,7 @@ public class LoggingMessageTagSupportTest {<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0finally<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0{<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ((ListAppender) listApp).clear()=
;<br>
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 listApp.clear();<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}<br>
=C2=A0 =C2=A0 =C2=A0}<br>
<br>
<br>
</div><br><br clear=3D"all"><div><br></div>-- <br><div class=3D"gmail_signa=
ture"><div dir=3D"ltr">E-Mail: <a href=3D"mailto:garydgregory@gmail.com" ta=
rget=3D"_blank">garydgregory@gmail.com</a> | <a href=3D"mailto:ggregory@apa=
che.org" target=3D"_blank">ggregory@apache.org </a><br><a href=3D"http://ww=
w.manning.com/bauer3/" target=3D"_blank">Java Persistence with Hibernate, S=
econd Edition</a><br><a href=3D"http://www.manning.com/tahchiev/" target=3D=
"_blank">JUnit in Action, Second Edition</a><br><a href=3D"http://www.manni=
ng.com/templier/" target=3D"_blank">Spring Batch in Action</a><br>Blog: <a =
href=3D"http://garygregory.wordpress.com/" target=3D"_blank">http://garygre=
gory.wordpress.com</a> <br>Home: <a href=3D"http://garygregory.com/" target=
=3D"_blank">http://garygregory.com/</a><br>Tweet! <a href=3D"http://twitter=
.com/GaryGregory" target=3D"_blank">http://twitter.com/GaryGregory</a></div=
></div>
</div></div>

--089e01634b8adbd690052c2c02a4--