You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2014/05/21 08:36:41 UTC
svn commit: r1596490 - in /logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender: JSONCompleteFileAppenderTest.java RandomAccessFileAppenderTests.java

Author: mattsicker
Date: Wed May 21 06:36:40 2014
New Revision: 1596490

URL: http://svn.apache.org/r1596490
Log:
Convert to RuleChains.

Modified:
    logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/JSONCompleteFileAppenderTest.java
    logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppenderTests.java

Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/JSONCompleteFileAppenderTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/JSONCompleteFileAppenderTest.java?rev=1596490&r1=1596489&r2=1596490&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/JSONCompleteFileAppenderTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/JSONCompleteFileAppenderTest.java Wed May 21 06:36:40 2014
@@ -25,6 +25,7 @@ import org.apache.logging.log4j.junit.Cl
 import org.apache.logging.log4j.junit.InitialLoggerContext;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.RuleChain;
 
 import static org.junit.Assert.*;
 
@@ -35,11 +36,11 @@ public class JSONCompleteFileAppenderTes
 
     private final File logFile = new File("target", "JSONCompleteFileAppenderTest.log");
 
-    @Rule
-    public InitialLoggerContext init = new InitialLoggerContext("JSONCompleteFileAppenderTest.xml");
+    private final InitialLoggerContext init = new InitialLoggerContext("JSONCompleteFileAppenderTest.xml");
+    private final CleanFiles files = new CleanFiles(logFile);
 
     @Rule
-    public CleanFiles files = new CleanFiles(logFile);
+    public RuleChain chain = RuleChain.outerRule(files).around(init);
 
     @Test
     public void testFlushAtEndOfBatch() throws Exception {

Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppenderTests.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppenderTests.java?rev=1596490&r1=1596489&r2=1596490&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppenderTests.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppenderTests.java Wed May 21 06:36:40 2014
@@ -28,6 +28,7 @@ import org.apache.logging.log4j.junit.In
 import org.hamcrest.Matcher;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.RuleChain;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
@@ -53,11 +54,11 @@ public class RandomAccessFileAppenderTes
         );
     }
 
-    @Rule
-    public InitialLoggerContext init;
+    private InitialLoggerContext init;
+    private CleanFiles files;
 
     @Rule
-    public CleanFiles files;
+    public RuleChain chain = RuleChain.outerRule(files).around(init);
 
     private final File logFile;
     private final boolean locationEnabled;