You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2016/09/25 22:44:25 UTC
logging-log4j2 git commit: Make sure test files are not in the source
directlry
Repository: logging-log4j2
Updated Branches:
refs/heads/master ac8ba111e -> 0fc0bb4c3
Make sure test files are not in the source directlry
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/0fc0bb4c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/0fc0bb4c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/0fc0bb4c
Branch: refs/heads/master
Commit: 0fc0bb4c39f890745ff618ab1874a487cef2f720
Parents: ac8ba11
Author: Ralph Goers <rg...@nextiva.com>
Authored: Sun Sep 25 15:44:10 2016 -0700
Committer: Ralph Goers <rg...@nextiva.com>
Committed: Sun Sep 25 15:44:10 2016 -0700
----------------------------------------------------------------------
.../config/Log4j1ConfigurationFactoryTest.java | 22 ++++++++++++++------
.../src/main/conf/log4j.properties | 4 ++--
.../log4j-DailyRollingFileAppender.properties | 2 +-
...4j-RollingFileAppender-with-props.properties | 2 +-
.../log4j-RollingFileAppender.properties | 2 +-
5 files changed, 21 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0fc0bb4c/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java
index d9fc6e0..9d9a294 100644
--- a/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java
+++ b/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java
@@ -21,9 +21,13 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import java.io.File;
import java.net.URISyntaxException;
import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
import org.apache.log4j.layout.Log4j1XmlLayout;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.core.Appender;
@@ -142,24 +146,26 @@ public class Log4j1ConfigurationFactoryTest {
@Test
public void testRollingFileAppender() throws Exception {
- testRollingFileAppender("config-1.2/log4j-RollingFileAppender.properties", "RFA", "./hadoop.log.%i");
+ testRollingFileAppender("config-1.2/log4j-RollingFileAppender.properties", "RFA", "target/hadoop.log.%i");
}
@Test
public void testDailyRollingFileAppender() throws Exception {
- testDailyRollingFileAppender("config-1.2/log4j-DailyRollingFileAppender.properties", "DRFA", "./hadoop.log%d{.yyyy-MM-dd}");
+ testDailyRollingFileAppender("config-1.2/log4j-DailyRollingFileAppender.properties", "DRFA", "target/hadoop.log%d{.yyyy-MM-dd}");
}
@Test
public void testRollingFileAppenderWithProperties() throws Exception {
- testRollingFileAppender("config-1.2/log4j-RollingFileAppender-with-props.properties", "RFA", "./hadoop.log.%i");
+ testRollingFileAppender("config-1.2/log4j-RollingFileAppender-with-props.properties", "RFA", "target/hadoop.log.%i");
}
@Test
public void testSystemProperties1() throws Exception {
final Configuration configuration = getConfiguration("config-1.2/log4j-system-properties-1.properties");
final RollingFileAppender appender = configuration.getAppender("RFA");
- assertEquals(System.getProperty("java.io.tmpdir") + "/hadoop.log", appender.getFileName());
+ String tempFileName = System.getProperty("java.io.tmpdir") + "/hadoop.log";
+ System.out.println("expected: " + tempFileName + " Actual: " + appender.getFileName());
+ assertEquals(tempFileName, appender.getFileName());
}
@Test
@@ -167,6 +173,10 @@ public class Log4j1ConfigurationFactoryTest {
final Configuration configuration = getConfiguration("config-1.2/log4j-system-properties-2.properties");
final RollingFileAppender appender = configuration.getAppender("RFA");
assertEquals("${java.io.tmpdir}/hadoop.log", appender.getFileName());
+ Path path = new File(appender.getFileName()).toPath();
+ Files.deleteIfExists(path);
+ path = new File("${java.io.tmpdir}").toPath();
+ Files.deleteIfExists(path);
}
private void testRollingFileAppender(final String configResource, final String name, final String filePattern) throws URISyntaxException {
@@ -176,7 +186,7 @@ public class Log4j1ConfigurationFactoryTest {
assertEquals(name, appender.getName());
assertTrue(appender.getClass().getName(), appender instanceof RollingFileAppender);
final RollingFileAppender rfa = (RollingFileAppender) appender;
- assertEquals("./hadoop.log", rfa.getFileName());
+ assertEquals("target/hadoop.log", rfa.getFileName());
assertEquals(filePattern, rfa.getFilePattern());
final TriggeringPolicy triggeringPolicy = rfa.getTriggeringPolicy();
assertNotNull(triggeringPolicy);
@@ -203,7 +213,7 @@ public class Log4j1ConfigurationFactoryTest {
assertEquals(name, appender.getName());
assertTrue(appender.getClass().getName(), appender instanceof RollingFileAppender);
final RollingFileAppender rfa = (RollingFileAppender) appender;
- assertEquals("./hadoop.log", rfa.getFileName());
+ assertEquals("target/hadoop.log", rfa.getFileName());
assertEquals(filePattern, rfa.getFilePattern());
final TriggeringPolicy triggeringPolicy = rfa.getTriggeringPolicy();
assertNotNull(triggeringPolicy);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0fc0bb4c/log4j-1.2-api/src/test/resources/config-1.2/hadoop/hadoop-common-project/hadoop-common/src/main/conf/log4j.properties
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/src/test/resources/config-1.2/hadoop/hadoop-common-project/hadoop-common/src/main/conf/log4j.properties b/log4j-1.2-api/src/test/resources/config-1.2/hadoop/hadoop-common-project/hadoop-common/src/main/conf/log4j.properties
index b8c84e7..b08514c 100644
--- a/log4j-1.2-api/src/test/resources/config-1.2/hadoop/hadoop-common-project/hadoop-common/src/main/conf/log4j.properties
+++ b/log4j-1.2-api/src/test/resources/config-1.2/hadoop/hadoop-common-project/hadoop-common/src/main/conf/log4j.properties
@@ -16,7 +16,7 @@
# Define some default values that can be overridden by system properties
hadoop.root.logger=INFO,console
-hadoop.log.dir=.
+hadoop.log.dir=target
hadoop.log.file=hadoop.log
# Define the root logger to the system property "hadoop.root.logger".
@@ -217,7 +217,7 @@ log4j.appender.EventCounter=org.apache.hadoop.log.metrics.EventCounter
# Use following logger to send summary to separate file defined by
# hadoop.mapreduce.jobsummary.log.file :
# hadoop.mapreduce.jobsummary.logger=INFO,JSA
-#
+#
hadoop.mapreduce.jobsummary.logger=${hadoop.root.logger}
hadoop.mapreduce.jobsummary.log.file=hadoop-mapreduce.jobsummary.log
hadoop.mapreduce.jobsummary.log.maxfilesize=256MB
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0fc0bb4c/log4j-1.2-api/src/test/resources/config-1.2/log4j-DailyRollingFileAppender.properties
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/src/test/resources/config-1.2/log4j-DailyRollingFileAppender.properties b/log4j-1.2-api/src/test/resources/config-1.2/log4j-DailyRollingFileAppender.properties
index ccadbc8..123a51d 100644
--- a/log4j-1.2-api/src/test/resources/config-1.2/log4j-DailyRollingFileAppender.properties
+++ b/log4j-1.2-api/src/test/resources/config-1.2/log4j-DailyRollingFileAppender.properties
@@ -3,7 +3,7 @@
# Log4J 1.2 Configuration.
#
-hadoop.log.dir=.
+hadoop.log.dir=target
hadoop.log.file=hadoop.log
log4j.rootLogger=TRACE, DRFA
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0fc0bb4c/log4j-1.2-api/src/test/resources/config-1.2/log4j-RollingFileAppender-with-props.properties
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/src/test/resources/config-1.2/log4j-RollingFileAppender-with-props.properties b/log4j-1.2-api/src/test/resources/config-1.2/log4j-RollingFileAppender-with-props.properties
index 26fd391..b664bb8 100644
--- a/log4j-1.2-api/src/test/resources/config-1.2/log4j-RollingFileAppender-with-props.properties
+++ b/log4j-1.2-api/src/test/resources/config-1.2/log4j-RollingFileAppender-with-props.properties
@@ -3,7 +3,7 @@
# Log4J 1.2 Configuration.
#
-hadoop.log.dir=.
+hadoop.log.dir=target
hadoop.log.file=hadoop.log
log4j.rootLogger=TRACE, RFA
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0fc0bb4c/log4j-1.2-api/src/test/resources/config-1.2/log4j-RollingFileAppender.properties
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/src/test/resources/config-1.2/log4j-RollingFileAppender.properties b/log4j-1.2-api/src/test/resources/config-1.2/log4j-RollingFileAppender.properties
index d18c39a..55234ba 100644
--- a/log4j-1.2-api/src/test/resources/config-1.2/log4j-RollingFileAppender.properties
+++ b/log4j-1.2-api/src/test/resources/config-1.2/log4j-RollingFileAppender.properties
@@ -9,7 +9,7 @@ log4j.rootLogger=TRACE, RFA
# Rolling File Appender - cap space usage at 5gb.
#
log4j.appender.RFA=org.apache.log4j.RollingFileAppender
-log4j.appender.RFA.File=./hadoop.log
+log4j.appender.RFA.File=target/hadoop.log
log4j.appender.RFA.MaxFileSize=256MB
log4j.appender.RFA.MaxBackupIndex=20