Repository: logging-log4j2 Updated Branches: refs/heads/master 083a4ebc5 -> 1f1491d46
Refactor cleaner classes. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/1f1491d4 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/1f1491d4 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/1f1491d4 Branch: refs/heads/master Commit: 1f1491d468807d8254957308b2cfeb6131df5744 Parents: 083a4eb Author: Gary Gregory <[email protected]> Authored: Tue Jun 28 12:43:27 2016 -0700 Committer: Gary Gregory <[email protected]> Committed: Tue Jun 28 12:43:27 2016 -0700 ---------------------------------------------------------------------- .../junit/AbstractExternalFileResources.java | 39 ++++++++++++++++++++ .../apache/logging/log4j/junit/CleanFiles.java | 37 +++++-------------- .../logging/log4j/junit/CleanFolders.java | 33 ++++------------- 3 files changed, 57 insertions(+), 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f1491d4/log4j-core/src/test/java/org/apache/logging/log4j/junit/AbstractExternalFileResources.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/junit/AbstractExternalFileResources.java b/log4j-core/src/test/java/org/apache/logging/log4j/junit/AbstractExternalFileResources.java new file mode 100644 index 0000000..f8df4c7 --- /dev/null +++ b/log4j-core/src/test/java/org/apache/logging/log4j/junit/AbstractExternalFileResources.java @@ -0,0 +1,39 @@ +package org.apache.logging.log4j.junit; + +import java.io.File; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.junit.rules.ExternalResource; + +public abstract class AbstractExternalFileResources extends ExternalResource { + + private final List<File> files; + + public AbstractExternalFileResources(final File... files) { + this.files = Arrays.asList(files); + } + + public AbstractExternalFileResources(final String... fileNames) { + this.files = new ArrayList<>(fileNames.length); + for (final String fileName : fileNames) { + this.files.add(new File(fileName)); + } + } + + public List<File> getFiles() { + return files; + } + + @Override + public String toString() { + final StringBuilder builder = new StringBuilder(); + builder.append(getClass().getSimpleName()); + builder.append(" ["); + builder.append(files); + builder.append("]"); + return builder.toString(); + } + +} http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f1491d4/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFiles.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFiles.java b/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFiles.java index 07f7cd7..83ffd25 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFiles.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFiles.java @@ -21,32 +21,28 @@ import static org.junit.Assert.fail; import java.io.File; import java.io.IOException; import java.nio.file.Files; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import org.junit.rules.ExternalResource; /** * A JUnit test rule to automatically delete files after a test is run. */ -public class CleanFiles extends ExternalResource { +public class CleanFiles extends AbstractExternalFileResources { private static final int MAX_TRIES = 10; - private final List<File> files; - + public CleanFiles(final File... files) { - this.files = Arrays.asList(files); + super(files); } public CleanFiles(final String... fileNames) { - this.files = new ArrayList<>(fileNames.length); - for (final String fileName : fileNames) { - this.files.add(new File(fileName)); - } + super(fileNames); } + @Override + protected void after() { + this.clean(); + } + private void clean() { - for (final File file : files) { + for (final File file : getFiles()) { for (int i = 0; i < MAX_TRIES; i++) { try { Files.deleteIfExists(file.toPath()); @@ -61,17 +57,4 @@ public class CleanFiles extends ExternalResource { } } - @Override - protected void after() { - this.clean(); - } - - @Override - public String toString() { - final StringBuilder builder = new StringBuilder(); - builder.append("CleanFiles ["); - builder.append(files); - builder.append("]"); - return builder.toString(); - } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f1491d4/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFolders.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFolders.java b/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFolders.java index 92cda0c..d224b76 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFolders.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFolders.java @@ -21,42 +21,33 @@ import java.io.IOException; import java.nio.file.DirectoryStream; import java.nio.file.Files; import java.nio.file.Path; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import org.junit.rules.ExternalResource; /** * A JUnit test rule to automatically delete folders before and after a test is run. */ -public class CleanFolders extends ExternalResource { +public class CleanFolders extends AbstractExternalFileResources { private static final int MAX_TRIES = 10; - private final List<File> folders; - public CleanFolders(final File... files) { - this.folders = Arrays.asList(files); + public CleanFolders(final File... folders) { + super(folders); } - public CleanFolders(final String... fileNames) { - this.folders = new ArrayList<>(fileNames.length); - for (final String fileName : fileNames) { - this.folders.add(new File(fileName)); - } + public CleanFolders(final String... folderNames) { + super(folderNames); } @Override - protected void before() { + protected void after() { this.clean(); } @Override - protected void after() { + protected void before() { this.clean(); } private void clean() { - for (final File folder : folders) { + for (final File folder : getFiles()) { for (int i = 0; i < MAX_TRIES; i++) { final Path targetPath = folder.toPath(); if (Files.exists(targetPath)) { @@ -75,12 +66,4 @@ public class CleanFolders extends ExternalResource { } } - @Override - public String toString() { - final StringBuilder builder = new StringBuilder(); - builder.append("CleanFolders ["); - builder.append(folders); - builder.append("]"); - return builder.toString(); - } }
