From f1fe81ecfd0f79907b4c389b84d8496b9fcbdba4 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Mon, 3 Nov 2014 09:53:52 +0000
Subject: [PATCH] SSDM-1081: More tests in MultiDatasetARchiverTest.
SVN: 32701
---
.../archiver/MultiDatasetArchiver.java | 2 +-
.../archiver/MultiDatasetArchiverTest.java | 375 +++++++++++++++++-
2 files changed, 363 insertions(+), 14 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDatasetArchiver.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDatasetArchiver.java
index 7fb1d566ebe..71d5d8119eb 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDatasetArchiver.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDatasetArchiver.java
@@ -353,7 +353,7 @@ public class MultiDatasetArchiver extends AbstractArchiverProcessingPlugin
return dataSetInArchiveDB != null;
}
- public IMultiDataSetFileOperationsManager getFileOperations()
+ @Private IMultiDataSetFileOperationsManager getFileOperations()
{
if (fileOperations == null)
{
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDatasetArchiverTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDatasetArchiverTest.java
index 7a8d733c557..208b1c9d2e7 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDatasetArchiverTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDatasetArchiverTest.java
@@ -18,31 +18,47 @@ package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver;
import static ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver.MultiDataSetFileOperationsManager.FINAL_DESTINATION_KEY;
import static ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver.MultiDataSetFileOperationsManager.STAGING_DESTINATION_KEY;
+import static ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver.MultiDatasetArchiver.MAXIMUM_CONTAINER_SIZE_IN_BYTES;
import static ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver.MultiDatasetArchiver.MINIMUM_CONTAINER_SIZE_IN_BYTES;
+import java.io.BufferedReader;
import java.io.File;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
import java.util.Properties;
+import javassist.bytecode.analysis.MultiArrayType;
+
import org.apache.log4j.Level;
import org.jmock.Expectations;
import org.jmock.Mockery;
import org.springframework.beans.factory.BeanFactory;
+import org.testng.ITestResult;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import ch.rinn.restrictions.Friend;
+import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
import ch.systemsx.cisd.base.tests.AbstractFileSystemTestCase;
+import ch.systemsx.cisd.common.exceptions.Status;
import ch.systemsx.cisd.common.filesystem.FileUtilities;
import ch.systemsx.cisd.common.logging.BufferedAppender;
+import ch.systemsx.cisd.common.time.TimingParameters;
+import ch.systemsx.cisd.openbis.common.io.hierarchical_content.TarBasedHierarchicalContent;
+import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchicalContentNode;
import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.MockDataSetDirectoryProvider;
import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver.dataaccess.IMultiDatasetArchiverDBTransaction;
import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver.dataaccess.MultiDataSetArchiverContainerDTO;
import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver.dataaccess.MultiDataSetArchiverDataSetDTO;
import ch.systemsx.cisd.openbis.dss.generic.shared.ArchiverTaskContext;
+import ch.systemsx.cisd.openbis.dss.generic.shared.IDataSetDeleter;
import ch.systemsx.cisd.openbis.dss.generic.shared.IDataSetDirectoryProvider;
import ch.systemsx.cisd.openbis.dss.generic.shared.IDataSetStatusUpdater;
import ch.systemsx.cisd.openbis.dss.generic.shared.IDataStoreServiceInternal;
@@ -190,17 +206,27 @@ public class MultiDatasetArchiverTest extends AbstractFileSystemTestCase
private IMultiDatasetArchiverDBTransaction transaction;
+ private IMultiDataSetFileOperationsManager fileManager;
+
public MockMultiDatasetArchiver(Properties properties, File storeRoot,
IEncapsulatedOpenBISService openBISService, IShareIdManager shareIdManager,
- IDataSetStatusUpdater statusUpdater, IMultiDatasetArchiverDBTransaction transaction)
+ IDataSetStatusUpdater statusUpdater, IMultiDatasetArchiverDBTransaction transaction,
+ IMultiDataSetFileOperationsManager fileManager)
{
super(properties, storeRoot);
this.transaction = transaction;
+ this.fileManager = fileManager;
setService(openBISService);
setShareIdManager(shareIdManager);
setStatusUpdater(statusUpdater);
}
+ @Override
+ IMultiDataSetFileOperationsManager getFileOperations()
+ {
+ return fileManager == null ? super.getFileOperations() : fileManager;
+ }
+
@Override
IMultiDatasetArchiverDBTransaction getTransaction()
{
@@ -250,6 +276,10 @@ public class MultiDatasetArchiverTest extends AbstractFileSystemTestCase
private Experiment experiment;
+ private IMultiDataSetFileOperationsManager fileOperations;
+
+ private IDataSetDeleter dataSetDeleter;
+
@BeforeMethod
public void setUpTestEnvironment()
{
@@ -265,8 +295,10 @@ public class MultiDatasetArchiverTest extends AbstractFileSystemTestCase
openBISService = ServiceProviderTestWrapper.mock(context, IEncapsulatedOpenBISService.class);
dssService = ServiceProviderTestWrapper.mock(context, IDataStoreServiceInternal.class);
hierarchicalContentProvider = new SimpleFileContentProvider(share);
- ServiceProviderTestWrapper.addMock(context, IHierarchicalContentProvider.class,
+ ServiceProviderTestWrapper.addMock(context, IHierarchicalContentProvider.class,
hierarchicalContentProvider);
+ fileOperations = context.mock(IMultiDataSetFileOperationsManager.class);
+ dataSetDeleter = context.mock(IDataSetDeleter.class);
statusUpdater = new RecordingStatusUpdater();
staging = new File(workingDirectory, "staging");
staging.mkdirs();
@@ -288,6 +320,9 @@ public class MultiDatasetArchiverTest extends AbstractFileSystemTestCase
allowing(dssService).getDataSetDirectoryProvider();
will(returnValue(directoryProvider));
+ allowing(dssService).getDataSetDeleter();
+ will(returnValue(dataSetDeleter));
+
allowing(openBISService).tryGetExperiment(ExperimentIdentifierFactory.parse(EXPERIMENT_IDENTIFIER));
will(returnValue(experiment));
}
@@ -295,14 +330,57 @@ public class MultiDatasetArchiverTest extends AbstractFileSystemTestCase
}
@AfterMethod
- public void checkMockExpectations()
+ public void checkMockExpectations(ITestResult result)
{
+ if (result.getStatus() == ITestResult.FAILURE)
+ {
+ String logContent = logRecorder.getLogContent();
+ fail(result.getName() + " failed. Log content:\n" + logContent);
+ }
logRecorder.reset();
// To following line of code should also be called at the end of each test method.
// Otherwise one does not known which test failed.
context.assertIsSatisfied();
+
ServiceProviderTestWrapper.restoreApplicationContext();
}
+
+ @Test
+ public void testArchiveDataSetsWhichAreTooSmall()
+ {
+ prepareUpdateShareIdAndSize(ds1, 10);
+ prepareUpdateShareIdAndSize(ds2, 20);
+ properties.setProperty(MINIMUM_CONTAINER_SIZE_IN_BYTES, "35");
+
+ MultiDatasetArchiver archiver = createArchiver(null);
+ ProcessingStatus status = archiver.archive(Arrays.asList(ds1, ds2), archiverContext, false);
+
+ assertEquals("[ERROR: \"Set of data sets specified for archiving is too small (30 bytes) "
+ + "to be archived with multi dataset archiver because minimum size is 35 bytes.\"]",
+ status.getErrorStatuses().toString());
+ assertEquals("[ds1, ds2]: AVAILABLE false\n", statusUpdater.toString());
+ assertEquals("Containers:\nData sets:\ncomitted: false, rolledBack: true, closed: true", transaction.toString());
+ context.assertIsSatisfied();
+ }
+
+ @Test
+ public void testArchiveDataSetsWhichAreTooBig()
+ {
+ prepareUpdateShareIdAndSize(ds1, 10);
+ prepareUpdateShareIdAndSize(ds2, 20);
+ properties.setProperty(MINIMUM_CONTAINER_SIZE_IN_BYTES, "25");
+ properties.setProperty(MAXIMUM_CONTAINER_SIZE_IN_BYTES, "27");
+
+ MultiDatasetArchiver archiver = createArchiver(null);
+ ProcessingStatus status = archiver.archive(Arrays.asList(ds1, ds2), archiverContext, false);
+
+ assertEquals("[ERROR: \"Set of data sets specified for archiving is too big (30 bytes) "
+ + "to be archived with multi dataset archiver because maximum size is 27 bytes.\"]",
+ status.getErrorStatuses().toString());
+ assertEquals("[ds1, ds2]: AVAILABLE false\n", statusUpdater.toString());
+ assertEquals("Containers:\nData sets:\ncomitted: false, rolledBack: true, closed: true", transaction.toString());
+ context.assertIsSatisfied();
+ }
@Test
public void testArchiveOneDataSet()
@@ -311,26 +389,297 @@ public class MultiDatasetArchiverTest extends AbstractFileSystemTestCase
prepareLockAndReleaseDataSet(ds2);
properties.setProperty(MINIMUM_CONTAINER_SIZE_IN_BYTES, "15");
- MultiDatasetArchiver archiver = createArchiver();
+ MultiDatasetArchiver archiver = createArchiver(null);
ProcessingStatus status = archiver.archive(Arrays.asList(ds2), archiverContext, false);
assertEquals("INFO OPERATION.AbstractDatastorePlugin - "
- + "Archiving of the following datasets has been requested: [Dataset 'ds2']\n"
- + "INFO OPERATION.MultiDataSetFileOperationsManager - Archive dataset ds2 in ds2.tar\n"
- + "INFO OPERATION.MultiDataSetFileOperationsManager - Data sets archived: ds2.tar\n"
+ + "Archiving of the following datasets has been requested: [Dataset 'ds2']\n"
+ + "INFO OPERATION.MultiDataSetFileOperationsManager - Archive dataset ds2 in ds2.tar\n"
+ + "INFO OPERATION.MultiDataSetFileOperationsManager - Data sets archived: ds2.tar\n"
+ + "INFO OPERATION.MultiDataSetFileOperationsManager - Copy archive container from '"
+ + staging.getAbsolutePath() + "/ds2.tar' to '" + archive.getAbsolutePath(),
+ logRecorder.getLogContent());
+ assertEquals("[]", status.getErrorStatuses().toString());
+ assertEquals("[]", Arrays.asList(staging.list()).toString());
+ checkArchive(new File(archive, ds2.getDataSetCode() + ".tar"), ":\n"
+ + " ds2:\n"
+ + " data:\n"
+ + " >01234567890123456789\n"
+ + " meta-data.tsv:\n"
+ + " >data_set\tcode\tds2\n"
+ + " >data_set\tproduction_timestamp\t\n"
+ + " >data_set\tproducer_code\t\n"
+ + " >data_set\tdata_set_type\tMDT\n"
+ + " >data_set\tis_measured\tTRUE\n"
+ + " >data_set\tis_complete\tFALSE\n"
+ + " >data_set\tparent_codes\t\n"
+ + " >experiment\tspace_code\tS\n"
+ + " >experiment\tproject_code\tP\n"
+ + " >experiment\texperiment_code\tE\n"
+ + " >experiment\texperiment_type_code\tMET\n"
+ + " >experiment\tregistration_timestamp\t\n"
+ + " >experiment\tregistrator\t\n");
+ assertEquals("[ds2]: AVAILABLE true\n", statusUpdater.toString());
+ assertEquals("Containers:\nMultiDataSetArchiverContainerDTO [id=0, path=ds2.tar]\n"
+ + "Data sets:\nMultiDataSetArchiverDataSetDTO [id=1, code=ds2, containerId=0, sizeInBytes=20]\n"
+ + "comitted: true, rolledBack: false, closed: true", transaction.toString());
+ context.assertIsSatisfied();
+ }
+
+ @Test
+ public void testArchiveTwoDataSets()
+ {
+ prepareUpdateShareIdAndSize(ds1, 10);
+ prepareLockAndReleaseDataSet(ds1);
+ prepareUpdateShareIdAndSize(ds2, 20);
+ prepareLockAndReleaseDataSet(ds2);
+ properties.setProperty(MINIMUM_CONTAINER_SIZE_IN_BYTES, "15");
+
+ MultiDatasetArchiver archiver = createArchiver(null);
+ ProcessingStatus status = archiver.archive(Arrays.asList(ds1, ds2), archiverContext, false);
+
+ assertEquals("INFO OPERATION.AbstractDatastorePlugin - "
+ + "Archiving of the following datasets has been requested: [Dataset 'ds1', Dataset 'ds2']\n"
+ + "INFO OPERATION.MultiDataSetFileOperationsManager - Archive dataset ds1 in ds1.tar\n"
+ + "INFO OPERATION.MultiDataSetFileOperationsManager - Archive dataset ds2 in ds1.tar\n"
+ + "INFO OPERATION.MultiDataSetFileOperationsManager - Data sets archived: ds1.tar\n"
+ + "INFO OPERATION.MultiDataSetFileOperationsManager - Copy archive container from '"
+ + staging.getAbsolutePath() + "/ds1.tar' to '" + archive.getAbsolutePath(),
+ logRecorder.getLogContent());
+ assertEquals("[]", status.getErrorStatuses().toString());
+ assertEquals("[]", Arrays.asList(staging.list()).toString());
+ assertEquals("[ds1.tar]", Arrays.asList(archive.list()).toString());
+ checkArchive(new File(archive, ds1.getDataSetCode() + ".tar"), ":\n"
+ + " ds1:\n"
+ + " data:\n"
+ + " >0123456789\n"
+ + " meta-data.tsv:\n"
+ + " >data_set\tcode\tds1\n"
+ + " >data_set\tproduction_timestamp\t\n"
+ + " >data_set\tproducer_code\t\n"
+ + " >data_set\tdata_set_type\tMDT\n"
+ + " >data_set\tis_measured\tTRUE\n"
+ + " >data_set\tis_complete\tFALSE\n"
+ + " >data_set\tparent_codes\t\n"
+ + " >experiment\tspace_code\tS\n"
+ + " >experiment\tproject_code\tP\n"
+ + " >experiment\texperiment_code\tE\n"
+ + " >experiment\texperiment_type_code\tMET\n"
+ + " >experiment\tregistration_timestamp\t\n"
+ + " >experiment\tregistrator\t\n"
+ + " ds2:\n"
+ + " data:\n"
+ + " >01234567890123456789\n"
+ + " meta-data.tsv:\n"
+ + " >data_set\tcode\tds2\n"
+ + " >data_set\tproduction_timestamp\t\n"
+ + " >data_set\tproducer_code\t\n"
+ + " >data_set\tdata_set_type\tMDT\n"
+ + " >data_set\tis_measured\tTRUE\n"
+ + " >data_set\tis_complete\tFALSE\n"
+ + " >data_set\tparent_codes\t\n"
+ + " >experiment\tspace_code\tS\n"
+ + " >experiment\tproject_code\tP\n"
+ + " >experiment\texperiment_code\tE\n"
+ + " >experiment\texperiment_type_code\tMET\n"
+ + " >experiment\tregistration_timestamp\t\n"
+ + " >experiment\tregistrator\t\n");
+ assertEquals("[ds1, ds2]: AVAILABLE true\n", statusUpdater.toString());
+ assertEquals("Containers:\nMultiDataSetArchiverContainerDTO [id=0, path=ds1.tar]\n"
+ + "Data sets:\nMultiDataSetArchiverDataSetDTO [id=1, code=ds1, containerId=0, sizeInBytes=10]\n"
+ + "MultiDataSetArchiverDataSetDTO [id=2, code=ds2, containerId=0, sizeInBytes=20]\n"
+ + "comitted: true, rolledBack: false, closed: true", transaction.toString());
+ context.assertIsSatisfied();
+ }
+
+ @Test
+ public void testArchiveAlreadyArchivedDataSet()
+ {
+ properties.setProperty(MINIMUM_CONTAINER_SIZE_IN_BYTES, "15");
+ MultiDataSetArchiverContainerDTO container = transaction.createContainer("path");
+ ds2.setDataSetSize(20L);
+ transaction.insertDataset(ds2, container);
+
+ MultiDatasetArchiver archiver = createArchiver(null);
+ ProcessingStatus status = archiver.archive(Arrays.asList(ds2), archiverContext, false);
+
+ assertEquals("INFO OPERATION.AbstractDatastorePlugin - "
+ + "Archiving of the following datasets has been requested: [Dataset 'ds2']",
+ logRecorder.getLogContent());
+ assertEquals("[]", status.getErrorStatuses().toString());
+ assertEquals("[]", Arrays.asList(staging.list()).toString());
+ assertEquals("[ds2]: AVAILABLE true\n", statusUpdater.toString());
+ assertEquals("Containers:\nMultiDataSetArchiverContainerDTO [id=0, path=path]\n"
+ + "Data sets:\nMultiDataSetArchiverDataSetDTO [id=1, code=ds2, containerId=0, sizeInBytes=20]\n"
+ + "comitted: false, rolledBack: false, closed: false", transaction.toString());
+ context.assertIsSatisfied();
+ }
+
+ @Test
+ public void testArchiveTwoDataSetsOneAlreadyArchived()
+ {
+ prepareUpdateShareIdAndSize(ds1, 10);
+ prepareLockAndReleaseDataSet(ds1);
+ properties.setProperty(MINIMUM_CONTAINER_SIZE_IN_BYTES, "5");
+ MultiDataSetArchiverContainerDTO container = transaction.createContainer("path");
+ ds2.setDataSetSize(20L);
+ transaction.insertDataset(ds2, container);
+ prepareScheduleDeletion(ds1, ds2);
+
+ MultiDatasetArchiver archiver = createArchiver(null);
+ ProcessingStatus status = archiver.archive(Arrays.asList(ds1, ds2), archiverContext, true);
+
+ assertEquals("INFO OPERATION.AbstractDatastorePlugin - "
+ + "Archiving of the following datasets has been requested: [Dataset 'ds1', Dataset 'ds2']\n"
+ + "INFO OPERATION.MultiDataSetFileOperationsManager - Archive dataset ds1 in ds1.tar\n"
+ + "INFO OPERATION.MultiDataSetFileOperationsManager - Data sets archived: ds1.tar\n"
+ "INFO OPERATION.MultiDataSetFileOperationsManager - Copy archive container from '"
- + staging.getAbsolutePath() + "/ds2.tar' to '" + archive.getAbsolutePath(),
+ + staging.getAbsolutePath() + "/ds1.tar' to '" + archive.getAbsolutePath(),
logRecorder.getLogContent());
assertEquals("[]", status.getErrorStatuses().toString());
+ assertEquals("[]", Arrays.asList(staging.list()).toString());
+ checkArchive(new File(archive, ds1.getDataSetCode() + ".tar"), ":\n"
+ + " ds1:\n"
+ + " data:\n"
+ + " >0123456789\n"
+ + " meta-data.tsv:\n"
+ + " >data_set\tcode\tds1\n"
+ + " >data_set\tproduction_timestamp\t\n"
+ + " >data_set\tproducer_code\t\n"
+ + " >data_set\tdata_set_type\tMDT\n"
+ + " >data_set\tis_measured\tTRUE\n"
+ + " >data_set\tis_complete\tFALSE\n"
+ + " >data_set\tparent_codes\t\n"
+ + " >experiment\tspace_code\tS\n"
+ + " >experiment\tproject_code\tP\n"
+ + " >experiment\texperiment_code\tE\n"
+ + " >experiment\texperiment_type_code\tMET\n"
+ + " >experiment\tregistration_timestamp\t\n"
+ + " >experiment\tregistrator\t\n");
+ assertEquals("[ds1, ds2]: ARCHIVED true\n", statusUpdater.toString());
+ assertEquals("Containers:\nMultiDataSetArchiverContainerDTO [id=0, path=path]\n"
+ + "MultiDataSetArchiverContainerDTO [id=2, path=ds1.tar]\n"
+ + "Data sets:\nMultiDataSetArchiverDataSetDTO [id=1, code=ds2, containerId=0, sizeInBytes=20]\n"
+ + "MultiDataSetArchiverDataSetDTO [id=3, code=ds1, containerId=2, sizeInBytes=10]\n"
+ + "comitted: true, rolledBack: false, closed: true", transaction.toString());
+ context.assertIsSatisfied();
+ }
+
+ // @Test(groups = "broken")
+ public void testArchiveDataSetFails()
+ {
+ prepareUpdateShareIdAndSize(ds2, 20);
+ prepareLockAndReleaseDataSet(ds2);
+ properties.setProperty(MINIMUM_CONTAINER_SIZE_IN_BYTES, "15");
+ final String containerPath = "data-set-path";
+ prepareFileOperationsGenerateContainerPath(containerPath, ds2);
+ context.checking(new Expectations()
+ {
+ {
+ one(fileOperations).createContainerInStage(containerPath, Arrays.asList(ds2));
+ will(returnValue(Status.createError("Failed")));
+ }
+ });
+ prepareFileOperationsDelete(containerPath);
+
+ MultiDatasetArchiver archiver = createArchiver(fileOperations);
+ ProcessingStatus status = archiver.archive(Arrays.asList(ds2), archiverContext, false);
+
+ assertEquals("[ERROR: \"Archiving failed to calculate dataset sizes:Oohps!\"]", status.getErrorStatuses().toString());
assertEquals("[]", Arrays.asList(staging.listFiles()).toString());
- assertEquals(true, new File(archive, ds2.getDataSetCode() + ".tar").exists());
+ File archiveFile = new File(archive, ds2.getDataSetCode() + ".tar");
+ assertEquals(false, archiveFile.exists());
assertEquals("[ds2]: AVAILABLE true\n", statusUpdater.toString());
- assertEquals("Containers:\nMultiDataSetArchiverContainerDTO [id=0, path=ds2.tar]\n"
- + "Data sets:\nMultiDataSetArchiverDataSetDTO [id=1, code=ds2, containerId=0, sizeInBytes=20]\n"
+ assertEquals("Containers:\nMultiDataSetArchiverContainerDTO [id=0, path=ds2.tar]\n"
+ + "Data sets:\nMultiDataSetArchiverDataSetDTO [id=1, code=ds2, containerId=0, sizeInBytes=20]\n"
+ "comitted: true, rolledBack: false, closed: true", transaction.toString());
context.assertIsSatisfied();
}
+ private void checkArchive(File archiveFile, String content)
+ {
+ assertEquals(true, archiveFile.exists());
+ IHierarchicalContentNode rootNode = new TarBasedHierarchicalContent(archiveFile, staging).getRootNode();
+ StringBuilder builder = new StringBuilder();
+ renderContent(rootNode, builder, "");
+ assertEquals(content, builder.toString());
+ }
+
+ private void renderContent(IHierarchicalContentNode node, StringBuilder builder, String indent)
+ {
+ builder.append(indent).append(node.getName()).append(":\n");
+ if (node.isDirectory())
+ {
+ List<IHierarchicalContentNode> childNodes = node.getChildNodes();
+ Collections.sort(childNodes, new Comparator<IHierarchicalContentNode>()
+ {
+ @Override
+ public int compare(IHierarchicalContentNode n1, IHierarchicalContentNode n2)
+ {
+ return n1.getName().compareTo(n2.getName());
+ }
+ });
+ for (IHierarchicalContentNode childNode : childNodes)
+ {
+ renderContent(childNode, builder, indent + " ");
+ }
+ } else
+ {
+ addContent(node, builder, indent + " >");
+ }
+ }
+
+ private void addContent(IHierarchicalContentNode node, StringBuilder builder, String indent)
+ {
+ InputStream inputStream = node.getInputStream();
+ try
+ {
+ BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
+ String line;
+ while ((line = reader.readLine()) != null)
+ {
+ builder.append(indent).append(line).append('\n');
+ }
+ } catch (Exception e)
+ {
+ throw CheckedExceptionTunnel.wrapIfNecessary(e);
+ }
+ }
+
+ private void prepareScheduleDeletion(final DatasetDescription... dataSets)
+ {
+ context.checking(new Expectations()
+ {
+ {
+ one(dataSetDeleter).scheduleDeletionOfDataSets(Arrays.asList(dataSets),
+ TimingParameters.DEFAULT_MAXIMUM_RETRY_COUNT,
+ TimingParameters.DEFAULT_INTERVAL_TO_WAIT_AFTER_FAILURE_SECONDS);
+ }
+ });
+ }
+
+ private void prepareFileOperationsGenerateContainerPath(final String containerPath, final DatasetDescription... dataSets)
+ {
+ context.checking(new Expectations()
+ {
+ {
+ one(fileOperations).generateContainerPath(Arrays.asList(dataSets));
+ will(returnValue(containerPath));
+ }
+ });
+ }
+
+ private void prepareFileOperationsDelete(final String containerPath)
+ {
+ context.checking(new Expectations()
+ {
+ {
+ one(fileOperations).deleteContainerFromFinalDestination(containerPath);
+ one(fileOperations).deleteContainerFromStage(containerPath);
+ }
+ });
+ }
+
private void prepareLockAndReleaseDataSet(final DatasetDescription dataSet)
{
context.checking(new Expectations()
@@ -352,10 +701,10 @@ public class MultiDatasetArchiverTest extends AbstractFileSystemTestCase
});
}
- private MultiDatasetArchiver createArchiver()
+ private MultiDatasetArchiver createArchiver(IMultiDataSetFileOperationsManager fileManagerOrNull)
{
return new MockMultiDatasetArchiver(properties, store, openBISService, shareIdManager, statusUpdater,
- transaction);
+ transaction, fileManagerOrNull);
}
private DatasetDescription dataSet(final String code, String content)
--
GitLab