Skip to content
Snippets Groups Projects
Commit cd92f4a5 authored by felmer's avatar felmer
Browse files

SSDM-5515: AbstractPackageArchiverTest fixed 

SVN: 38714
parent 86212e36
No related branches found
Tags 0.2.0
No related merge requests found
Hide whitespace changes
Inline Side-by-side
datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractPackageArchiverTest.java
+ 14
− 0
View file @ cd92f4a5
...@@ -133,6 +133,7 @@ public abstract class AbstractPackageArchiverTest extends AbstractArchiverTestCa ...@@ -133,6 +133,7 @@ public abstract class AbstractPackageArchiverTest extends AbstractArchiverTestCa
.registrationDate(new Date(12345)).store(new DataStoreBuilder(DATA_STORE_CODE).getStore()) .registrationDate(new Date(12345)).store(new DataStoreBuilder(DATA_STORE_CODE).getStore())
.experiment(experiment).getDataSet(); .experiment(experiment).getDataSet();
DatasetDescription dsd1 = DataSetTranslator.translateToDescription(ds1); DatasetDescription dsd1 = DataSetTranslator.translateToDescription(ds1);
dsd1.setH5Folders(true);
prepareGetShareId(); prepareGetShareId();
prepareUpdateShareIdAndSize(537669); prepareUpdateShareIdAndSize(537669);
prepareGetDataSetDirectory(dsd1); prepareGetDataSetDirectory(dsd1);
...@@ -191,6 +192,7 @@ public abstract class AbstractPackageArchiverTest extends AbstractArchiverTestCa ...@@ -191,6 +192,7 @@ public abstract class AbstractPackageArchiverTest extends AbstractArchiverTestCa
.store(new DataStoreBuilder(DATA_STORE_CODE).getStore()).fileFormat("ABC") .store(new DataStoreBuilder(DATA_STORE_CODE).getStore()).fileFormat("ABC")
.experiment(experiment).sample(sample).getDataSet(); .experiment(experiment).sample(sample).getDataSet();
DatasetDescription dsd1 = DataSetTranslator.translateToDescription(ds1); DatasetDescription dsd1 = DataSetTranslator.translateToDescription(ds1);
dsd1.setH5Folders(true);
prepareGetShareId(); prepareGetShareId();
prepareUpdateShareIdAndSize(537669); prepareUpdateShareIdAndSize(537669);
prepareGetDataSetDirectory(dsd1); prepareGetDataSetDirectory(dsd1);
...@@ -272,6 +274,7 @@ public abstract class AbstractPackageArchiverTest extends AbstractArchiverTestCa ...@@ -272,6 +274,7 @@ public abstract class AbstractPackageArchiverTest extends AbstractArchiverTestCa
.store(new DataStoreBuilder(DATA_STORE_CODE).getStore()).fileFormat("ABC") .store(new DataStoreBuilder(DATA_STORE_CODE).getStore()).fileFormat("ABC")
.experiment(experiment).sample(sample).getDataSet(); .experiment(experiment).sample(sample).getDataSet();
DatasetDescription dsd1 = DataSetTranslator.translateToDescription(ds1); DatasetDescription dsd1 = DataSetTranslator.translateToDescription(ds1);
dsd1.setH5Folders(true);
prepareGetStoreRoot(); prepareGetStoreRoot();
prepareGetShareId(); prepareGetShareId();
prepareUpdateShareIdAndSize(537669); prepareUpdateShareIdAndSize(537669);
...@@ -319,6 +322,7 @@ public abstract class AbstractPackageArchiverTest extends AbstractArchiverTestCa ...@@ -319,6 +322,7 @@ public abstract class AbstractPackageArchiverTest extends AbstractArchiverTestCa
.store(new DataStoreBuilder(DATA_STORE_CODE).getStore()).fileFormat("ABC") .store(new DataStoreBuilder(DATA_STORE_CODE).getStore()).fileFormat("ABC")
.experiment(experiment).getDataSet(); .experiment(experiment).getDataSet();
final DatasetDescription dsd1 = DataSetTranslator.translateToDescription(ds1); final DatasetDescription dsd1 = DataSetTranslator.translateToDescription(ds1);
dsd1.setH5Folders(true);
prepareGetShareId(); prepareGetShareId();
prepareGetDataSetDirectory(dsd1); prepareGetDataSetDirectory(dsd1);
prepareTryGetDataSet(ds1); prepareTryGetDataSet(ds1);
...@@ -399,6 +403,7 @@ public abstract class AbstractPackageArchiverTest extends AbstractArchiverTestCa ...@@ -399,6 +403,7 @@ public abstract class AbstractPackageArchiverTest extends AbstractArchiverTestCa
.store(new DataStoreBuilder(DATA_STORE_CODE).getStore()).fileFormat("ABC") .store(new DataStoreBuilder(DATA_STORE_CODE).getStore()).fileFormat("ABC")
.experiment(experiment).getDataSet(); .experiment(experiment).getDataSet();
DatasetDescription dsd1 = DataSetTranslator.translateToDescription(ds1); DatasetDescription dsd1 = DataSetTranslator.translateToDescription(ds1);
dsd1.setH5Folders(true);
prepareGetShareId(); prepareGetShareId();
prepareUpdateShareIdAndSize(537669); prepareUpdateShareIdAndSize(537669);
prepareGetDataSetDirectory(dsd1); prepareGetDataSetDirectory(dsd1);
...@@ -414,6 +419,7 @@ public abstract class AbstractPackageArchiverTest extends AbstractArchiverTestCa ...@@ -414,6 +419,7 @@ public abstract class AbstractPackageArchiverTest extends AbstractArchiverTestCa
assertEquals("[]", processingStatus1.getErrorStatuses().toString()); assertEquals("[]", processingStatus1.getErrorStatuses().toString());
ds1.setExperiment(new ExperimentBuilder().identifier("/S/P/E2").type("MY-E").getExperiment()); ds1.setExperiment(new ExperimentBuilder().identifier("/S/P/E2").type("MY-E").getExperiment());
dsd1 = DataSetTranslator.translateToDescription(ds1); dsd1 = DataSetTranslator.translateToDescription(ds1);
dsd1.setH5Folders(true);
prepareUpdateShareIdAndSize(537669); prepareUpdateShareIdAndSize(537669);
prepareGetDataSetDirectory(dsd1); prepareGetDataSetDirectory(dsd1);
prepareTryGetDataSet(ds1); prepareTryGetDataSet(ds1);
...@@ -468,6 +474,7 @@ public abstract class AbstractPackageArchiverTest extends AbstractArchiverTestCa ...@@ -468,6 +474,7 @@ public abstract class AbstractPackageArchiverTest extends AbstractArchiverTestCa
.store(new DataStoreBuilder(DATA_STORE_CODE).getStore()).fileFormat("ABC") .store(new DataStoreBuilder(DATA_STORE_CODE).getStore()).fileFormat("ABC")
.experiment(experiment).getDataSet(); .experiment(experiment).getDataSet();
DatasetDescription dsd1 = DataSetTranslator.translateToDescription(ds1); DatasetDescription dsd1 = DataSetTranslator.translateToDescription(ds1);
dsd1.setH5Folders(true);
prepareGetShareId(); prepareGetShareId();
prepareUpdateShareIdAndSize(537669); prepareUpdateShareIdAndSize(537669);
prepareGetDataSetDirectory(dsd1); prepareGetDataSetDirectory(dsd1);
...@@ -483,6 +490,7 @@ public abstract class AbstractPackageArchiverTest extends AbstractArchiverTestCa ...@@ -483,6 +490,7 @@ public abstract class AbstractPackageArchiverTest extends AbstractArchiverTestCa
assertEquals("[]", processingStatus1.getErrorStatuses().toString()); assertEquals("[]", processingStatus1.getErrorStatuses().toString());
ds1.setExperiment(new ExperimentBuilder().identifier("/S/P/E2").type("MY-E").getExperiment()); ds1.setExperiment(new ExperimentBuilder().identifier("/S/P/E2").type("MY-E").getExperiment());
dsd1 = DataSetTranslator.translateToDescription(ds1); dsd1 = DataSetTranslator.translateToDescription(ds1);
dsd1.setH5Folders(true);
prepareUpdateShareIdAndSize(537669); prepareUpdateShareIdAndSize(537669);
prepareGetDataSetDirectory(dsd1); prepareGetDataSetDirectory(dsd1);
prepareUpdateStatus(DataSetArchivingStatus.AVAILABLE, true); prepareUpdateStatus(DataSetArchivingStatus.AVAILABLE, true);
...@@ -535,6 +543,7 @@ public abstract class AbstractPackageArchiverTest extends AbstractArchiverTestCa ...@@ -535,6 +543,7 @@ public abstract class AbstractPackageArchiverTest extends AbstractArchiverTestCa
.store(new DataStoreBuilder(DATA_STORE_CODE).getStore()).fileFormat("ABC") .store(new DataStoreBuilder(DATA_STORE_CODE).getStore()).fileFormat("ABC")
.experiment(experiment).getDataSet(); .experiment(experiment).getDataSet();
DatasetDescription dsd1 = DataSetTranslator.translateToDescription(ds1); DatasetDescription dsd1 = DataSetTranslator.translateToDescription(ds1);
dsd1.setH5Folders(true);
prepareGetShareId(); prepareGetShareId();
prepareUpdateShareIdAndSize(537669); prepareUpdateShareIdAndSize(537669);
prepareGetDataSetDirectory(dsd1); prepareGetDataSetDirectory(dsd1);
...@@ -572,6 +581,7 @@ public abstract class AbstractPackageArchiverTest extends AbstractArchiverTestCa ...@@ -572,6 +581,7 @@ public abstract class AbstractPackageArchiverTest extends AbstractArchiverTestCa
.store(new DataStoreBuilder(DATA_STORE_CODE).getStore()).fileFormat("ABC") .store(new DataStoreBuilder(DATA_STORE_CODE).getStore()).fileFormat("ABC")
.experiment(experiment).getDataSet(); .experiment(experiment).getDataSet();
DatasetDescription dsd1 = DataSetTranslator.translateToDescription(ds1); DatasetDescription dsd1 = DataSetTranslator.translateToDescription(ds1);
dsd1.setH5Folders(true);
prepareGetShareId(); prepareGetShareId();
prepareUpdateShareIdAndSize(537669); prepareUpdateShareIdAndSize(537669);
prepareGetDataSetDirectory(dsd1); prepareGetDataSetDirectory(dsd1);
...@@ -613,6 +623,7 @@ public abstract class AbstractPackageArchiverTest extends AbstractArchiverTestCa ...@@ -613,6 +623,7 @@ public abstract class AbstractPackageArchiverTest extends AbstractArchiverTestCa
.store(new DataStoreBuilder(DATA_STORE_CODE).getStore()).fileFormat("ABC") .store(new DataStoreBuilder(DATA_STORE_CODE).getStore()).fileFormat("ABC")
.experiment(experiment).getDataSet(); .experiment(experiment).getDataSet();
DatasetDescription dsd1 = DataSetTranslator.translateToDescription(ds1); DatasetDescription dsd1 = DataSetTranslator.translateToDescription(ds1);
dsd1.setH5Folders(true);
prepareGetShareId(); prepareGetShareId();
prepareUpdateShareIdAndSize(537669); prepareUpdateShareIdAndSize(537669);
prepareGetDataSetDirectory(dsd1); prepareGetDataSetDirectory(dsd1);
...@@ -659,6 +670,7 @@ public abstract class AbstractPackageArchiverTest extends AbstractArchiverTestCa ...@@ -659,6 +670,7 @@ public abstract class AbstractPackageArchiverTest extends AbstractArchiverTestCa
.store(new DataStoreBuilder(DATA_STORE_CODE).getStore()).fileFormat("ABC") .store(new DataStoreBuilder(DATA_STORE_CODE).getStore()).fileFormat("ABC")
.experiment(experiment).getDataSet(); .experiment(experiment).getDataSet();
DatasetDescription dsd1 = DataSetTranslator.translateToDescription(ds1); DatasetDescription dsd1 = DataSetTranslator.translateToDescription(ds1);
dsd1.setH5Folders(true);
prepareGetShareId(); prepareGetShareId();
prepareUpdateShareIdAndSize(537669); prepareUpdateShareIdAndSize(537669);
prepareGetDataSetDirectory(dsd1); prepareGetDataSetDirectory(dsd1);
...@@ -702,6 +714,7 @@ public abstract class AbstractPackageArchiverTest extends AbstractArchiverTestCa ...@@ -702,6 +714,7 @@ public abstract class AbstractPackageArchiverTest extends AbstractArchiverTestCa
.store(new DataStoreBuilder(DATA_STORE_CODE).getStore()).fileFormat("ABC").property("ANSWER", "42") .store(new DataStoreBuilder(DATA_STORE_CODE).getStore()).fileFormat("ABC").property("ANSWER", "42")
.experiment(experiment).getDataSet(); .experiment(experiment).getDataSet();
DatasetDescription dsd1 = DataSetTranslator.translateToDescription(ds1); DatasetDescription dsd1 = DataSetTranslator.translateToDescription(ds1);
dsd1.setH5Folders(true);
prepareGetShareId(); prepareGetShareId();
prepareUpdateShareIdAndSize(537669); prepareUpdateShareIdAndSize(537669);
prepareGetDataSetDirectory(dsd1); prepareGetDataSetDirectory(dsd1);
...@@ -761,6 +774,7 @@ public abstract class AbstractPackageArchiverTest extends AbstractArchiverTestCa ...@@ -761,6 +774,7 @@ public abstract class AbstractPackageArchiverTest extends AbstractArchiverTestCa
.store(new DataStoreBuilder(DATA_STORE_CODE).getStore()).fileFormat("ABC") .store(new DataStoreBuilder(DATA_STORE_CODE).getStore()).fileFormat("ABC")
.experiment(experiment).getDataSet(); .experiment(experiment).getDataSet();
final DatasetDescription dsd1 = DataSetTranslator.translateToDescription(ds1); final DatasetDescription dsd1 = DataSetTranslator.translateToDescription(ds1);
dsd1.setH5Folders(true);
prepareGetShareId(); prepareGetShareId();
prepareGetDataSetDirectory(dsd1); prepareGetDataSetDirectory(dsd1);
prepareTryGetDataSet(ds1); prepareTryGetDataSet(ds1);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment