From 112edce71131da1bfdc00bcc289fa13b1f53323c Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Wed, 23 Mar 2011 10:21:41 +0000
Subject: [PATCH] [LMS-2142] ignore directories when comparing sizes
SVN: 20463
---
.../server/LocalDataSetFileOperationsExcecutor.java | 12 ++++++------
.../standard/DataSetFileOperationsManagerTest.java | 5 ++---
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/LocalDataSetFileOperationsExcecutor.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/LocalDataSetFileOperationsExcecutor.java
index 9ebfe9c9f51..c4f7db70e33 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/LocalDataSetFileOperationsExcecutor.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/LocalDataSetFileOperationsExcecutor.java
@@ -17,6 +17,7 @@
package ch.systemsx.cisd.openbis.dss.generic.server;
import java.io.File;
+import java.io.FileFilter;
import java.io.IOException;
import java.util.LinkedHashMap;
import java.util.List;
@@ -61,15 +62,14 @@ public final class LocalDataSetFileOperationsExcecutor implements IDataSetFileOp
{
if (destination.isDirectory())
{
- List<File> dataSetFiles = FileUtilities.listFilesAndDirectories(dataSet, true);
- List<File> destinationFiles =
- FileUtilities.listFilesAndDirectories(destination, true);
+ FileFilter nullFilter = null;
+ List<File> storeFiles = FileUtilities.listFiles(dataSet, nullFilter, true);
+ List<File> destFiles = FileUtilities.listFiles(destination, nullFilter, true);
Map<String, Long> dataSetFileSizesByPaths =
- FolderFileSizesReportGenerator.extractSizesByPaths(dataSetFiles, dataSet);
+ FolderFileSizesReportGenerator.extractSizesByPaths(storeFiles, dataSet);
Map<String, Long> destinationFileSizesByPaths =
- FolderFileSizesReportGenerator.extractSizesByPaths(destinationFiles,
- destination);
+ FolderFileSizesReportGenerator.extractSizesByPaths(destFiles, destination);
String inconsistenciesReport =
FolderFileSizesReportGenerator.findInconsistencies(dataSetFileSizesByPaths,
destinationFileSizesByPaths);
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetFileOperationsManagerTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetFileOperationsManagerTest.java
index ac72a88af42..b4ec9acb1d3 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetFileOperationsManagerTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetFileOperationsManagerTest.java
@@ -414,9 +414,7 @@ public class DataSetFileOperationsManagerTest extends AbstractFileSystemTestCase
// delete second file from destination
FileUtilities.delete(ds1ArchivedDataFile2);
boolStatus = dataSetCopier.isPresentInDestination(ds1Location, ds1);
- // TODO ignore dirs
assertFalse(boolStatus, "Inconsistencies:\n"
- + "'original' - different file sizes; store: 136, destination: 102\n"
+ "'original/data1_1.txt' - different file sizes; store: 14, destination: 28\n"
+ "'original/data1_2.txt' - exists in store but is missing in destination\n");
@@ -609,7 +607,8 @@ public class DataSetFileOperationsManagerTest extends AbstractFileSystemTestCase
context.assertIsSatisfied();
}
- @Test(groups="broken") // FIXME
+ @Test(groups = "broken")
+ // FIXME
public void testRemoteViaSshIsPresentInDestination()
{
Properties properties = createRemoteViaSshDestinationProperties();
--
GitLab