From 31e33f59e08a2a156ab6ab39c9481ac41ae7e6f7 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Tue, 17 Feb 2015 11:48:57 +0000
Subject: [PATCH] OPENDJ-1769 Adds file filters for copyright test
---
opendj-copyright-maven-plugin/src/test/java/org/forgerock/maven/UpdateCopyrightTestCase.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/opendj-copyright-maven-plugin/src/test/java/org/forgerock/maven/UpdateCopyrightTestCase.java b/opendj-copyright-maven-plugin/src/test/java/org/forgerock/maven/UpdateCopyrightTestCase.java
index 0c282cb..a085178 100644
--- a/opendj-copyright-maven-plugin/src/test/java/org/forgerock/maven/UpdateCopyrightTestCase.java
+++ b/opendj-copyright-maven-plugin/src/test/java/org/forgerock/maven/UpdateCopyrightTestCase.java
@@ -30,6 +30,7 @@
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
+import java.io.FilenameFilter;
import java.util.Calendar;
import java.util.LinkedList;
import java.util.List;
@@ -55,11 +56,14 @@
@AfterTest
public void deleteTempFiles() {
+ FilenameFilter tmpFilter = new FilenameFilter() {
+ public boolean accept(File directory, String fileName) {
+ return fileName.endsWith(".tmp");
+ }
+ };
for (String testFolder : TEST_FOLDERS) {
- for (File file : new File(RESOURCE_DIR, testFolder).listFiles()) {
- if (file.getPath().endsWith(".tmp")) {
- file.delete();
- }
+ for (File file : new File(RESOURCE_DIR, testFolder).listFiles(tmpFilter)) {
+ file.delete();
}
}
}
@@ -84,11 +88,14 @@
String copyrightStartToken, String copyrightEndToken) throws Exception {
List<String> testFilePaths = new LinkedList<String>();
List<String> updatedTestFilePaths = new LinkedList<String>();
- File[] changedFiles = new File(RESOURCE_DIR, testCaseFolderPath).listFiles();
- for (File file : changedFiles) {
- if (file.getPath().endsWith(".tmp")) {
- continue;
+ FilenameFilter txtFilter = new FilenameFilter() {
+ public boolean accept(File directory, String fileName) {
+ return fileName.endsWith(".txt");
}
+ };
+ File[] changedFiles = new File(RESOURCE_DIR, testCaseFolderPath).listFiles(txtFilter);
+
+ for (File file : changedFiles) {
testFilePaths.add(file.getAbsolutePath());
updatedTestFilePaths.add(file.getPath() + ".tmp");
}
--
Gitblit v1.10.0