You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by mi...@apache.org on 2016/06/13 09:34:23 UTC
[27/33] logging-log4j2 git commit: Fix unit tests
Fix unit tests
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/20f552e1
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/20f552e1
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/20f552e1
Branch: refs/heads/LOG4J2-1395
Commit: 20f552e1bdeebc8a6d731967915bdc7d2578e598
Parents: d625f88
Author: Ralph Goers <rg...@nextiva.com>
Authored: Sat Jun 11 23:04:52 2016 -0700
Committer: Ralph Goers <rg...@nextiva.com>
Committed: Sat Jun 11 23:06:39 2016 -0700
----------------------------------------------------------------------
.../RandomRollingAppenderOnStartupTest.java | 15 ++++++-----
.../rolling/RollingAppenderOnStartupTest.java | 28 ++++++++++++++++----
2 files changed, 31 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/20f552e1/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RandomRollingAppenderOnStartupTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RandomRollingAppenderOnStartupTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RandomRollingAppenderOnStartupTest.java
index 013e4c6..b9232db 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RandomRollingAppenderOnStartupTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RandomRollingAppenderOnStartupTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertTrue;
@RunWith(Parameterized.class)
public class RandomRollingAppenderOnStartupTest {
- private static final String DIR = "target/rolling1";
+ private static final String DIR = "target/onStartup";
private final String fileExtension;
@@ -73,11 +73,11 @@ public class RandomRollingAppenderOnStartupTest {
@BeforeClass
public static void beforeClass() throws Exception {
if (Files.exists(Paths.get("target/onStartup"))) {
- try (DirectoryStream<Path> directoryStream = Files.newDirectoryStream(Paths.get("target/onStartup"))) {
+ try (DirectoryStream<Path> directoryStream = Files.newDirectoryStream(Paths.get(DIR))) {
for (Path path : directoryStream) {
Files.delete(path);
}
- Files.delete(Paths.get("target/onStartup"));
+ Files.delete(Paths.get(DIR));
}
}
}
@@ -85,22 +85,23 @@ public class RandomRollingAppenderOnStartupTest {
@AfterClass
public static void afterClass() throws Exception {
long size = 0;
- try (DirectoryStream<Path> directoryStream = Files.newDirectoryStream(Paths.get("target/onStartup"))) {
+ try (DirectoryStream<Path> directoryStream = Files.newDirectoryStream(Paths.get(DIR))) {
for (Path path : directoryStream) {
if (size == 0) {
size = Files.size(path);
} else {
- assertTrue(size == Files.size(path));
+ long fileSize = Files.size(path);
+ assertTrue("Expected size: " + size + " Size of " + path.getFileName() + ": " + fileSize,
+ size == fileSize);
}
Files.delete(path);
}
- Files.delete(Paths.get("target/onStartup"));
+ Files.delete(Paths.get(DIR));
}
}
@Test
public void testAppender() throws Exception {
- System.out.println("Pass " + counter++);
for (int i = 0; i < 100; ++i) {
logger.debug("This is test message number " + i);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/20f552e1/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderOnStartupTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderOnStartupTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderOnStartupTest.java
index 215f3a7..f06056d 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderOnStartupTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderOnStartupTest.java
@@ -26,6 +26,7 @@ import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.junit.LoggerContextRule;
import org.junit.AfterClass;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -35,7 +36,10 @@ import static org.apache.logging.log4j.hamcrest.Descriptors.that;
import static org.apache.logging.log4j.hamcrest.FileMatchers.hasName;
import static org.hamcrest.Matchers.endsWith;
import static org.hamcrest.Matchers.hasItemInArray;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
/**
*
@@ -43,7 +47,7 @@ import static org.junit.Assert.*;
@RunWith(Parameterized.class)
public class RollingAppenderOnStartupTest {
- private static final String DIR = "target/rolling1";
+ private static final String DIR = "target/onStartup";
private final String fileExtension;
@@ -71,15 +75,29 @@ public class RollingAppenderOnStartupTest {
this.logger = this.init.getLogger(RollingAppenderOnStartupTest.class.getName());
}
+ @BeforeClass
+ public static void beforeClass() throws Exception {
+ if (Files.exists(Paths.get("target/onStartup"))) {
+ try (DirectoryStream<Path> directoryStream = Files.newDirectoryStream(Paths.get(DIR))) {
+ for (Path path : directoryStream) {
+ Files.delete(path);
+ }
+ Files.delete(Paths.get(DIR));
+ }
+ }
+ }
+
@AfterClass
public static void afterClass() throws Exception {
long size = 0;
- try (DirectoryStream<Path> directoryStream = Files.newDirectoryStream(Paths.get("target/onStartup"))) {
+ try (DirectoryStream<Path> directoryStream = Files.newDirectoryStream(Paths.get(DIR))) {
for (Path path : directoryStream) {
if (size == 0) {
- size = Files.size(path); // remember size of first non-empty file
+ size = Files.size(path);
} else {
- assertEquals("Size of " + path, size, Files.size(path));
+ long fileSize = Files.size(path);
+ assertTrue("Expected size: " + size + " Size of " + path.getFileName() + ": " + fileSize,
+ size == fileSize);
}
Files.delete(path);
}