From b833c618d977884a255acc7b87b82424e6c8747f Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 3 Sep 2014 12:03:05 +0000
Subject: [PATCH] SSDM-802: Bug fiexd for microscopy test: Remove .svn folders
from test data.
SVN: 32402
---
.../systemtests/AbstractImageDropboxTestCase.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/AbstractImageDropboxTestCase.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/AbstractImageDropboxTestCase.java
index 58b9f465174..2f891adc9f2 100644
--- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/AbstractImageDropboxTestCase.java
+++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/AbstractImageDropboxTestCase.java
@@ -17,6 +17,7 @@
package ch.systemsx.cisd.openbis.screening.systemtests;
import java.io.File;
+import java.io.FileFilter;
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
@@ -39,6 +40,15 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ExperimentIdentifi
*/
public abstract class AbstractImageDropboxTestCase extends AbstractScreeningSystemTestCase
{
+ private static final FileFilter SVN_FILTER = new FileFilter()
+ {
+ @Override
+ public boolean accept(File pathname)
+ {
+ return pathname.getName().equals(".svn") == false;
+ }
+ };
+
protected ImageChecker imageChecker;
@BeforeTest
@@ -70,7 +80,7 @@ public abstract class AbstractImageDropboxTestCase extends AbstractScreeningSyst
{
File destination = new File(workingDirectory, "test-data");
destination.mkdirs();
- FileUtils.copyDirectory(new File(getTestDataFolder(), getDataFolderToDrop()), destination);
+ FileUtils.copyDirectory(new File(getTestDataFolder(), getDataFolderToDrop()), destination, SVN_FILTER);
return destination;
}
--
GitLab