diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/exporter/ExportExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/exporter/ExportExecutor.java
index 69c9526a1a823c747ccdc046d7cdf0792cb0f32d..5c699e25629cb48d79cebcd2ecf6d8ef9d7dc7d6 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/exporter/ExportExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/exporter/ExportExecutor.java
@@ -362,71 +362,61 @@ public class ExportExecutor implements IExportExecutor
final EntitiesVo entitiesVo, final Set<String> existingZipEntries,
final Map<String, Map<String, List<Map<String, String>>>> exportFields) throws IOException
{
-
- final IApplicationServerInternalApi v3 = CommonServiceProvider.getApplicationServerApi();
- final IDataStoreServerApi v3Dss = CommonServiceProvider.getDataStoreServerApi();
-
- // final Collection<DataSet> dataSets = entitiesVo.getDataSets();
final Collection<Sample> samples = entitiesVo.getSamples();
-
for (final Sample sample : samples)
{
- final List<DataSet> dataSets = sample.getDataSets();
- final Sample container = sample.getContainer();
+ exportDatasetsData(zos, bos, sessionToken, existingZipEntries, sample.getDataSets(), sample, sample.getContainer());
+ }
- for (final DataSet dataSet : dataSets)
+ final Collection<Experiment> experiments = entitiesVo.getExperiments();
+ for (final Experiment experiment : experiments)
+ {
+ exportDatasetsData(zos, bos, sessionToken, existingZipEntries, experiment.getDataSets(), experiment, null);
+ }
+ }
+
+ private static void exportDatasetsData(final ZipOutputStream zos, final BufferedOutputStream bos, final String sessionToken,
+ final Set<String> existingZipEntries, final List<DataSet> dataSets, final ICodeHolder codeHolder,
+ final Sample container) throws IOException
+ {
+ final IDataStoreServerApi v3Dss = CommonServiceProvider.getDataStoreServerApi();
+ for (final DataSet dataSet : dataSets)
+ {
+ final String dataSetPermId = dataSet.getPermId().getPermId();
+ final String dataSetCode = dataSet.getCode();
+ final String dataSetTypeCode = dataSet.getType().getCode();
+ if (dataSet.getKind() != DataSetKind.LINK)
{
- final String dataSetPermId = dataSet.getPermId().getPermId();
- final String dataSetCode = dataSet.getCode();
- final String dataSetTypeCode = dataSet.getType().getCode();
- if (dataSet.getKind() != DataSetKind.LINK)
- {
- final DataSetFileSearchCriteria criteria = new DataSetFileSearchCriteria();
- criteria.withDataSet().withPermId().thatEquals(dataSetPermId);
+ final DataSetFileSearchCriteria criteria = new DataSetFileSearchCriteria();
+ criteria.withDataSet().withPermId().thatEquals(dataSetPermId);
- final SearchResult<DataSetFile> results = v3Dss.searchFiles(sessionToken, criteria, new DataSetFileFetchOptions());
+ final SearchResult<DataSetFile> results = v3Dss.searchFiles(sessionToken, criteria, new DataSetFileFetchOptions());
- OPERATION_LOG.info(String.format("Found: %d files", results.getTotalCount()));
+ OPERATION_LOG.info(String.format("Found: %d files", results.getTotalCount()));
- final List<DataSetFile> dataSetFiles = results.getObjects();
- final List<DataSetFilePermId> fileIds = dataSetFiles.stream().map(DataSetFile::getPermId).collect(Collectors.toList());
+ final List<DataSetFile> dataSetFiles = results.getObjects();
+ final List<DataSetFilePermId> fileIds = dataSetFiles.stream().map(DataSetFile::getPermId).collect(Collectors.toList());
- final DataSetFileDownloadOptions options = new DataSetFileDownloadOptions();
- options.setRecursive(true);
+ final DataSetFileDownloadOptions options = new DataSetFileDownloadOptions();
+ options.setRecursive(true);
- try (final InputStream is = v3Dss.downloadFiles(sessionToken, fileIds, options))
+ try (final InputStream is = v3Dss.downloadFiles(sessionToken, fileIds, options))
+ {
+ final DataSetFileDownloadReader reader = new DataSetFileDownloadReader(is);
+ DataSetFileDownload file;
+ while ((file = reader.read()) != null)
{
- final DataSetFileDownloadReader reader = new DataSetFileDownloadReader(is);
- DataSetFileDownload file;
- while ((file = reader.read()) != null)
- {
- putNextDataZipEntry(existingZipEntries, zos, bos, 'O', getSpaceCode(sample), getProjectCode(sample),
- container == null ? null : container.getCode(), sample.getCode(), dataSetTypeCode, dataSetCode,
- getEntityName(dataSet), file);
- }
+ putNextDataZipEntry(existingZipEntries, zos, bos, 'O', getSpaceCode(codeHolder), getProjectCode(codeHolder),
+ container == null ? null : container.getCode(), codeHolder.getCode(), dataSetTypeCode, dataSetCode,
+ getEntityName(dataSet), file);
}
-
-// for (final DataSetFile dataSetFile : dataSetFiles)
-// {
-// final String filePath = dataSetFile.getPath();
-// final Sample container = sample.getContainer();
-// putNextDataZipEntry(existingZipEntries, zos, 'O', getSpaceCode(sample), getProjectCode(sample),
-// container == null ? null : container.getCode(), sample.getCode(), getEntityName(sample), getFileName(filePath));
-//
-// v3Dss.downloadFiles(sessionToken, )
-//
-// if (!dataSetFile.isDirectory())
-// {
-// try (final FileInputStream fis = new FileInputStream(filePath))
-// {
-// writeInChunks(bos, fis);
-// }
-// }
-// }
- } else
+ } catch (final Exception e)
{
- OPERATION_LOG.info(String.format("Omitted data export for link dataset with permId: %s", dataSetPermId));
+ throw new RuntimeException("Exception is thrown while reading from a file.", e);
}
+ } else
+ {
+ OPERATION_LOG.info(String.format("Omitted data export for link dataset with permId: %s", dataSetPermId));
}
}
}
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ExportData.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ExportData.java
index 3bb881950022ab06d31351fc7aa0101dedc4d217..98ec2d855f05dfd9b0901af4a72f26c0c878ab3a 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ExportData.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ExportData.java
@@ -65,467 +65,467 @@ class ExportData
static final String RICH_TEXT_WITH_SPREADSHEET_PROPERTY_NAME = "MULTILINE_WITH_SPREADSHEET";
static final Object[][] EXPORT_DATA = {
-// // XLS: All fields
-// {
-// // Non-existing sample
-// "empty-xlsx.zip",
-// EnumSet.of(ExportFormat.XLSX),
-// List.of(new ExportablePermId(ExportableKind.SAMPLE, new SamplePermId("WrongPermId"))),
-// new AllFields(),
-// XlsTextFormat.PLAIN,
-// true, // withReferredTypes
-// false // withImportCompatibility
-// },
-// {
-// // Space: TEST-SPACE
-// "export-space-xlsx.zip",
-// EnumSet.of(ExportFormat.XLSX),
-// List.of(new ExportablePermId(ExportableKind.SPACE, new SpacePermId("TEST-SPACE"))),
-// new AllFields(),
-// XlsTextFormat.PLAIN,
-// true, // withReferredTypes
-// false // withImportCompatibility
-// },
-// {
-// // Project: TEST-PROJECT
-// "export-project-xlsx.zip",
-// EnumSet.of(ExportFormat.XLSX),
-// List.of(new ExportablePermId(ExportableKind.PROJECT, new ProjectPermId("20120814110011738-105"))),
-// new AllFields(),
-// XlsTextFormat.PLAIN,
-// true, // withReferredTypes
-// false // withImportCompatibility
-// },
-// {
-// // Experiment: EXP-SPACE-TEST
-// "export-experiment-xlsx.zip",
-// EnumSet.of(ExportFormat.XLSX),
-// List.of(new ExportablePermId(ExportableKind.EXPERIMENT, new ExperimentPermId("201206190940555-1032"))),
-// new AllFields(),
-// XlsTextFormat.PLAIN,
-// true, // withReferredTypes
-// false // withImportCompatibility
-// },
-// {
-// // Sample: /TEST-SPACE/TEST-PROJECT/FV-TEST
-// "export-sample-xlsx.zip",
-// EnumSet.of(ExportFormat.XLSX),
-// List.of(new ExportablePermId(ExportableKind.SAMPLE, new SamplePermId("201206191219327-1054"))),
-// new AllFields(),
-// XlsTextFormat.PLAIN,
-// true, // withReferredTypes
-// false // withImportCompatibility
-// },
-// {
-// // Sample: /TEST-SPACE/TEST-PROJECT/FV-TEST
-// "export-sample-compatible-with-import-xlsx.zip",
-// EnumSet.of(ExportFormat.XLSX),
-// List.of(new ExportablePermId(ExportableKind.SAMPLE, new SamplePermId("201206191219327-1054"))),
-// new AllFields(),
-// XlsTextFormat.PLAIN,
-// true, // withReferredTypes
-// true // withImportCompatibility
-// },
-// {
-// // Sample: /MP
-// "export-sample-shared-xlsx.zip",
-// EnumSet.of(ExportFormat.XLSX),
-// List.of(new ExportablePermId(ExportableKind.SAMPLE, new SamplePermId("200811050947161-652"))),
-// new AllFields(),
-// XlsTextFormat.RICH,
-// true, // withReferredTypes
-// false // withImportCompatibility
-// },
-//// {
-//// // Sample: /MP:A03
-//// "export-sample-contained-xlsx.zip",
-//// EnumSet.of(ExportFormat.XLSX),
-//// List.of(new ExportablePermId(ExportableKind.SAMPLE, new SamplePermId("200811050947161-653"))),
-//// new AllFields(),
-//// XlsTextFormat.RICH,
-//// true, // withReferredTypes
-//// false // withImportCompatibility
-//// },
-// {
-// // Data set: "ROOT_CONTAINER"
-// "export-data-set-xlsx.zip",
-// EnumSet.of(ExportFormat.XLSX),
-// List.of(new ExportablePermId(ExportableKind.DATASET, new DataSetPermId("ROOT_CONTAINER"))),
-// new AllFields(),
-// XlsTextFormat.PLAIN,
-// true, // withReferredTypes
-// false // withImportCompatibility
-// },
-// {
-// // Sample Type: CELL_PLATE
-// "export-sample-type-xlsx.zip",
-// EnumSet.of(ExportFormat.XLSX),
-// List.of(new ExportablePermId(ExportableKind.SAMPLE_TYPE, new EntityTypePermId("CELL_PLATE", EntityKind.SAMPLE))),
-// new AllFields(),
-// XlsTextFormat.PLAIN,
-// false, // withReferredTypes
-// false // withImportCompatibility
-// },
-// {
-// // Sample Type: CELL_PLATE
-// "export-sample-type-with-referred-types-xlsx.zip",
-// EnumSet.of(ExportFormat.XLSX),
-// List.of(new ExportablePermId(ExportableKind.SAMPLE_TYPE, new EntityTypePermId("CELL_PLATE", EntityKind.SAMPLE))),
-// new AllFields(),
-// XlsTextFormat.PLAIN,
-// true, // withReferredTypes
-// false // withImportCompatibility
-// },
-// {
-// // Experiment Type: SIRNA_HCS
-// "export-experiment-type-xlsx.zip",
-// EnumSet.of(ExportFormat.XLSX),
-// List.of(new ExportablePermId(ExportableKind.EXPERIMENT_TYPE, new EntityTypePermId("SIRNA_HCS", EntityKind.EXPERIMENT))),
-// new AllFields(),
-// XlsTextFormat.PLAIN,
-// false, // withReferredTypes
-// false // withImportCompatibility
-// },
-// {
-// // Dataset Type: HCS_IMAGE
-// "export-data-set-type-xlsx.zip",
-// EnumSet.of(ExportFormat.XLSX),
-// List.of(new ExportablePermId(ExportableKind.DATASET_TYPE, new EntityTypePermId("HCS_IMAGE", EntityKind.DATA_SET))),
-// new AllFields(),
-// XlsTextFormat.PLAIN,
-// false, // withReferredTypes
-// false // withImportCompatibility
-// },
-//
-// // XLS: Selected fields
-// {
-// // Space: TEST-SPACE
-// "export-space-filtered-attributes-xlsx.zip",
-// EnumSet.of(ExportFormat.XLSX),
-// List.of(new ExportablePermId(ExportableKind.SPACE, new SpacePermId("TEST-SPACE"))),
-// new SelectedFields(List.of(CODE, REGISTRATOR, DESCRIPTION), List.of()),
-// XlsTextFormat.PLAIN,
-// false, // withReferredTypes
-// false // withImportCompatibility
-// },
-// {
-// // Project: TEST-PROJECT
-// "export-project-filtered-fields-xlsx.zip",
-// EnumSet.of(ExportFormat.XLSX),
-// List.of(new ExportablePermId(ExportableKind.PROJECT, new ProjectPermId("20120814110011738-105"))),
-// new SelectedFields(
-// List.of(REGISTRATOR, REGISTRATION_DATE, CODE, IDENTIFIER, SPACE, DESCRIPTION),
-// List.of()),
-// XlsTextFormat.PLAIN,
-// true, // withReferredTypes
-// false // withImportCompatibility
-// },
-// {
-// // Experiment: EXP-SPACE-TEST
-// "export-experiment-filtered-fields-xlsx.zip",
-// EnumSet.of(ExportFormat.XLSX),
-// List.of(new ExportablePermId(ExportableKind.EXPERIMENT, new ExperimentPermId("201206190940555-1032"))),
-// new SelectedFields(
-// List.of(CODE, PERM_ID, IDENTIFIER, PROJECT, REGISTRATOR, MODIFIER),
-// List.of(new PropertyTypePermId("GENDER"), new PropertyTypePermId("DESCRIPTION"))),
-// XlsTextFormat.PLAIN,
-// true, // withReferredTypes
-// false // withImportCompatibility
-// },
-// {
-// // Sample: /TEST-SPACE/TEST-PROJECT/FV-TEST
-// "export-sample-filtered-fields-xlsx.zip",
-// EnumSet.of(ExportFormat.XLSX),
-// List.of(new ExportablePermId(ExportableKind.SAMPLE, new SamplePermId("201206191219327-1054"))),
-// new SelectedFields(
-// List.of(CODE, PERM_ID, IDENTIFIER, SPACE, PARENTS, CHILDREN, REGISTRATOR, REGISTRATION_DATE, MODIFIER, MODIFICATION_DATE),
-// List.of(new PropertyTypePermId("BACTERIUM"), new PropertyTypePermId("COMMENT"), new PropertyTypePermId("ORGANISM"))),
-// XlsTextFormat.PLAIN,
-// false, // withReferredTypes
-// false // withImportCompatibility
-// },
-// {
-// // Data set: "20081105092159188-3", type: "HCS_IMAGE"
-// "export-data-set-filtered-fields-xlsx.zip",
-// EnumSet.of(ExportFormat.XLSX),
-// List.of(new ExportablePermId(ExportableKind.DATASET, new DataSetPermId("20081105092159188-3"))),
-// new SelectedFields(
-// List.of(REGISTRATOR, REGISTRATION_DATE, CODE, IDENTIFIER, PARENTS, CHILDREN, STORAGE_CONFIRMATION, PRESENT_IN_ARCHIVE,
-// SAMPLE, EXPERIMENT),
-// List.of(new PropertyTypePermId("COMMENT"), new PropertyTypePermId("GENDER"))),
-// XlsTextFormat.PLAIN,
-// true, // withReferredTypes
-// false // withImportCompatibility
-// },
-// {
-// // Sample Type: CELL_PLATE
-// "export-sample-type-filtered-attributes-xlsx.zip",
-// EnumSet.of(ExportFormat.XLSX),
-// List.of(new ExportablePermId(ExportableKind.SAMPLE_TYPE, new EntityTypePermId("CELL_PLATE", EntityKind.SAMPLE))),
-// new SelectedFields(List.of(CODE, AUTO_GENERATE_CODES, DESCRIPTION, GENERATED_CODE_PREFIX, UNIQUE_SUBCODES), List.of()),
-// XlsTextFormat.PLAIN,
-// false, // withReferredTypes
-// false // withImportCompatibility
-// },
-// {
-// // Experiment Type: SIRNA_HCS
-// "export-experiment-type-filtered-attributes-xlsx.zip",
-// EnumSet.of(ExportFormat.XLSX),
-// List.of(new ExportablePermId(ExportableKind.EXPERIMENT_TYPE, new EntityTypePermId("SIRNA_HCS", EntityKind.EXPERIMENT))),
-// new SelectedFields(List.of(DESCRIPTION, CODE, MODIFICATION_DATE), List.of()),
-// XlsTextFormat.PLAIN,
-// false, // withReferredTypes
-// false // withImportCompatibility
-// },
-// {
-// // Dataset Type: HCS_IMAGE
-// "export-data-set-type-filtered-attributes-xlsx.zip",
-// EnumSet.of(ExportFormat.XLSX),
-// List.of(new ExportablePermId(ExportableKind.DATASET_TYPE, new EntityTypePermId("HCS_IMAGE", EntityKind.DATA_SET))),
-// new SelectedFields(List.of(CODE, DISALLOW_DELETION, DESCRIPTION), List.of()),
-// XlsTextFormat.PLAIN,
-// false, // withReferredTypes
-// false // withImportCompatibility
-// },
-// {
-// // Sample: /TEST-SPACE/TEST-PROJECT/FV-TEST
-// "export-sample-plain-text-xlsx.zip",
-// EnumSet.of(ExportFormat.XLSX),
-// List.of(new ExportablePermId(ExportableKind.SAMPLE, null)), // null perm ID indicates that the newly created value in the setup of the test should be used.
-// new SelectedFields(List.of(IDENTIFIER, CODE), List.of(new PropertyTypePermId(RICH_TEXT_PROPERTY_NAME))),
-// XlsTextFormat.PLAIN,
-// true, // withReferredTypes
-// false // withImportCompatibility
-// },
+ // XLS: All fields
+ {
+ // Non-existing sample
+ "empty-xlsx.zip",
+ EnumSet.of(ExportFormat.XLSX),
+ List.of(new ExportablePermId(ExportableKind.SAMPLE, new SamplePermId("WrongPermId"))),
+ new AllFields(),
+ XlsTextFormat.PLAIN,
+ true, // withReferredTypes
+ false // withImportCompatibility
+ },
+ {
+ // Space: TEST-SPACE
+ "export-space-xlsx.zip",
+ EnumSet.of(ExportFormat.XLSX),
+ List.of(new ExportablePermId(ExportableKind.SPACE, new SpacePermId("TEST-SPACE"))),
+ new AllFields(),
+ XlsTextFormat.PLAIN,
+ true, // withReferredTypes
+ false // withImportCompatibility
+ },
+ {
+ // Project: TEST-PROJECT
+ "export-project-xlsx.zip",
+ EnumSet.of(ExportFormat.XLSX),
+ List.of(new ExportablePermId(ExportableKind.PROJECT, new ProjectPermId("20120814110011738-105"))),
+ new AllFields(),
+ XlsTextFormat.PLAIN,
+ true, // withReferredTypes
+ false // withImportCompatibility
+ },
+ {
+ // Experiment: EXP-SPACE-TEST
+ "export-experiment-xlsx.zip",
+ EnumSet.of(ExportFormat.XLSX),
+ List.of(new ExportablePermId(ExportableKind.EXPERIMENT, new ExperimentPermId("201206190940555-1032"))),
+ new AllFields(),
+ XlsTextFormat.PLAIN,
+ true, // withReferredTypes
+ false // withImportCompatibility
+ },
+ {
+ // Sample: /TEST-SPACE/TEST-PROJECT/FV-TEST
+ "export-sample-xlsx.zip",
+ EnumSet.of(ExportFormat.XLSX),
+ List.of(new ExportablePermId(ExportableKind.SAMPLE, new SamplePermId("201206191219327-1054"))),
+ new AllFields(),
+ XlsTextFormat.PLAIN,
+ true, // withReferredTypes
+ false // withImportCompatibility
+ },
+ {
+ // Sample: /TEST-SPACE/TEST-PROJECT/FV-TEST
+ "export-sample-compatible-with-import-xlsx.zip",
+ EnumSet.of(ExportFormat.XLSX),
+ List.of(new ExportablePermId(ExportableKind.SAMPLE, new SamplePermId("201206191219327-1054"))),
+ new AllFields(),
+ XlsTextFormat.PLAIN,
+ true, // withReferredTypes
+ true // withImportCompatibility
+ },
+ {
+ // Sample: /MP
+ "export-sample-shared-xlsx.zip",
+ EnumSet.of(ExportFormat.XLSX),
+ List.of(new ExportablePermId(ExportableKind.SAMPLE, new SamplePermId("200811050947161-652"))),
+ new AllFields(),
+ XlsTextFormat.RICH,
+ true, // withReferredTypes
+ false // withImportCompatibility
+ },
// {
-// // Sample: /TEST-SPACE/TEST-PROJECT/FV-TEST
-// "export-sample-rich-text-xlsx.zip",
+// // Sample: /MP:A03
+// "export-sample-contained-xlsx.zip",
// EnumSet.of(ExportFormat.XLSX),
-// List.of(new ExportablePermId(ExportableKind.SAMPLE, null)), // null perm ID indicates that the newly created value in the setup of the test should be used.
-// new SelectedFields(List.of(IDENTIFIER, CODE), List.of(new PropertyTypePermId(RICH_TEXT_PROPERTY_NAME))),
-// XlsTextFormat.RICH,
-// true, // withReferredTypes
-// false // withImportCompatibility
-// },
-//
-// // HTML: All fields
-// {
-// // Space: TEST-SPACE
-// "export-space-html.zip",
-// EnumSet.of(ExportFormat.HTML),
-// List.of(new ExportablePermId(ExportableKind.SPACE, new SpacePermId("TEST-SPACE"))),
-// new AllFields(),
-// XlsTextFormat.PLAIN,
-// true, // withReferredTypes
-// false // withImportCompatibility
-// },
-// {
-// // Project: TEST-PROJECT
-// "export-project-html.zip",
-// EnumSet.of(ExportFormat.HTML),
-// List.of(new ExportablePermId(ExportableKind.PROJECT, new ProjectPermId("20120814110011738-105"))),
-// new AllFields(),
-// XlsTextFormat.PLAIN,
-// true, // withReferredTypes
-// false // withImportCompatibility
-// },
-// {
-// // Experiment: EXP-SPACE-TEST
-// "export-experiment-html.zip",
-// EnumSet.of(ExportFormat.HTML),
-// List.of(new ExportablePermId(ExportableKind.EXPERIMENT, new ExperimentPermId("201206190940555-1032"))),
-// new AllFields(),
-// XlsTextFormat.PLAIN,
-// true, // withReferredTypes
-// false // withImportCompatibility
-// },
-// {
-// // Sample: /TEST-SPACE/TEST-PROJECT/FV-TEST
-// "export-sample-html.zip",
-// EnumSet.of(ExportFormat.HTML),
-// List.of(new ExportablePermId(ExportableKind.SAMPLE, new SamplePermId("201206191219327-1054"))),
+// List.of(new ExportablePermId(ExportableKind.SAMPLE, new SamplePermId("200811050947161-653"))),
// new AllFields(),
-// XlsTextFormat.PLAIN,
-// true, // withReferredTypes
-// false // withImportCompatibility
-// },
-// {
-// // Sample: /MP
-// "export-sample-shared-html.zip",
-// EnumSet.of(ExportFormat.HTML),
-// List.of(new ExportablePermId(ExportableKind.SAMPLE, new SamplePermId("200811050947161-652"))),
-// new AllFields(),
-// XlsTextFormat.RICH,
-// true, // withReferredTypes
-// false // withImportCompatibility
-// },
-//// {
-//// // Sample: /MP:A03
-//// "export-sample-contained-html.zip",
-//// EnumSet.of(ExportFormat.HTML),
-//// List.of(new ExportablePermId(ExportableKind.SAMPLE, new SamplePermId("200811050947161-653"))),
-//// new AllFields(),
-//// XlsTextFormat.RICH,
-//// true, // withReferredTypes
-//// false // withImportCompatibility
-//// },
-// {
-// // Data set: "ROOT_CONTAINER"
-// "export-data-set-html.zip",
-// EnumSet.of(ExportFormat.HTML),
-// List.of(new ExportablePermId(ExportableKind.DATASET, new DataSetPermId("ROOT_CONTAINER"))),
-// new AllFields(),
-// XlsTextFormat.PLAIN,
-// true, // withReferredTypes
-// false // withImportCompatibility
-// },
-//
-// // HTML: Selected fields
-// {
-// // Space: TEST-SPACE
-// "export-space-filtered-fields-html.zip",
-// EnumSet.of(ExportFormat.HTML),
-// List.of(new ExportablePermId(ExportableKind.SPACE, new SpacePermId("TEST-SPACE"))),
-// new SelectedFields(List.of(CODE, PERM_ID, MODIFICATION_DATE), List.of()),
-// XlsTextFormat.PLAIN,
-// true, // withReferredTypes
-// false // withImportCompatibility
-// },
-// {
-// // Project: TEST-PROJECT
-// "export-project-filtered-fields-html.zip",
-// EnumSet.of(ExportFormat.HTML),
-// List.of(new ExportablePermId(ExportableKind.PROJECT, new ProjectPermId("20120814110011738-105"))),
-// new SelectedFields(List.of(PERM_ID, IDENTIFIER, REGISTRATOR, REGISTRATION_DATE), List.of()),
-// XlsTextFormat.PLAIN,
-// true, // withReferredTypes
-// false // withImportCompatibility
-// },
-// {
-// // Experiment: EXP-SPACE-TEST
-// "export-experiment-filtered-fields-html.zip",
-// EnumSet.of(ExportFormat.HTML),
-// List.of(new ExportablePermId(ExportableKind.EXPERIMENT, new ExperimentPermId("201206190940555-1032"))),
-// new SelectedFields(List.of(CODE, PARENTS, CHILDREN, REGISTRATOR, REGISTRATION_DATE),
-// List.of(new PropertyTypePermId("DESCRIPTION"))),
-// XlsTextFormat.PLAIN,
-// true, // withReferredTypes
-// false // withImportCompatibility
-// },
-// {
-// // Sample: /TEST-SPACE/TEST-PROJECT/FV-TEST
-// "export-sample-filtered-fields-html.zip",
-// EnumSet.of(ExportFormat.HTML),
-// List.of(new ExportablePermId(ExportableKind.SAMPLE, new SamplePermId("201206191219327-1054"))),
-// new SelectedFields(
-// List.of(CODE, PARENTS, CHILDREN, MODIFIER, MODIFICATION_DATE),
-// List.of(new PropertyTypePermId("BACTERIUM"), new PropertyTypePermId("COMMENT"), new PropertyTypePermId("ORGANISM"))),
-// XlsTextFormat.PLAIN,
-// false, // withReferredTypes
-// false // withImportCompatibility
-// },
-// {
-// // Sample: /TEST-SPACE/TEST-PROJECT/FV-TEST
-// "export-sample-plain-text-html.zip",
-// EnumSet.of(ExportFormat.HTML),
-// List.of(new ExportablePermId(ExportableKind.SAMPLE, null)), // null perm ID indicates that the newly created value in the setup of the test should be used.
-// new SelectedFields(List.of(IDENTIFIER, CODE), List.of(new PropertyTypePermId(RICH_TEXT_PROPERTY_NAME))),
-// XlsTextFormat.PLAIN,
-// true, // withReferredTypes
-// false // withImportCompatibility
-// },
-// {
-// // Sample: /TEST-SPACE/TEST-PROJECT/FV-TEST
-// "export-sample-rich-text-html.zip",
-// EnumSet.of(ExportFormat.HTML),
-// List.of(new ExportablePermId(ExportableKind.SAMPLE, null)), // null perm ID indicates that the newly created value in the setup of the test should be used.
-// new SelectedFields(List.of(IDENTIFIER, CODE), List.of(new PropertyTypePermId(RICH_TEXT_PROPERTY_NAME))),
-// XlsTextFormat.RICH,
-// true, // withReferredTypes
-// false // withImportCompatibility
-// },
-// {
-// // Sample: /TEST-SPACE/TEST-PROJECT/FV-TEST
-// "export-sample-with-image-html.zip",
-// EnumSet.of(ExportFormat.HTML),
-// List.of(new ExportablePermId(ExportableKind.SAMPLE, null)), // null perm ID indicates that the newly created value in the setup of the test should be used.
-// new SelectedFields(List.of(IDENTIFIER, CODE), List.of(new PropertyTypePermId(RICH_TEXT_WITH_IMAGE_PROPERTY_NAME))),
// XlsTextFormat.RICH,
// true, // withReferredTypes
// false // withImportCompatibility
// },
+ {
+ // Data set: "ROOT_CONTAINER"
+ "export-data-set-xlsx.zip",
+ EnumSet.of(ExportFormat.XLSX),
+ List.of(new ExportablePermId(ExportableKind.DATASET, new DataSetPermId("ROOT_CONTAINER"))),
+ new AllFields(),
+ XlsTextFormat.PLAIN,
+ true, // withReferredTypes
+ false // withImportCompatibility
+ },
+ {
+ // Sample Type: CELL_PLATE
+ "export-sample-type-xlsx.zip",
+ EnumSet.of(ExportFormat.XLSX),
+ List.of(new ExportablePermId(ExportableKind.SAMPLE_TYPE, new EntityTypePermId("CELL_PLATE", EntityKind.SAMPLE))),
+ new AllFields(),
+ XlsTextFormat.PLAIN,
+ false, // withReferredTypes
+ false // withImportCompatibility
+ },
+ {
+ // Sample Type: CELL_PLATE
+ "export-sample-type-with-referred-types-xlsx.zip",
+ EnumSet.of(ExportFormat.XLSX),
+ List.of(new ExportablePermId(ExportableKind.SAMPLE_TYPE, new EntityTypePermId("CELL_PLATE", EntityKind.SAMPLE))),
+ new AllFields(),
+ XlsTextFormat.PLAIN,
+ true, // withReferredTypes
+ false // withImportCompatibility
+ },
+ {
+ // Experiment Type: SIRNA_HCS
+ "export-experiment-type-xlsx.zip",
+ EnumSet.of(ExportFormat.XLSX),
+ List.of(new ExportablePermId(ExportableKind.EXPERIMENT_TYPE, new EntityTypePermId("SIRNA_HCS", EntityKind.EXPERIMENT))),
+ new AllFields(),
+ XlsTextFormat.PLAIN,
+ false, // withReferredTypes
+ false // withImportCompatibility
+ },
+ {
+ // Dataset Type: HCS_IMAGE
+ "export-data-set-type-xlsx.zip",
+ EnumSet.of(ExportFormat.XLSX),
+ List.of(new ExportablePermId(ExportableKind.DATASET_TYPE, new EntityTypePermId("HCS_IMAGE", EntityKind.DATA_SET))),
+ new AllFields(),
+ XlsTextFormat.PLAIN,
+ false, // withReferredTypes
+ false // withImportCompatibility
+ },
+
+ // XLS: Selected fields
+ {
+ // Space: TEST-SPACE
+ "export-space-filtered-attributes-xlsx.zip",
+ EnumSet.of(ExportFormat.XLSX),
+ List.of(new ExportablePermId(ExportableKind.SPACE, new SpacePermId("TEST-SPACE"))),
+ new SelectedFields(List.of(CODE, REGISTRATOR, DESCRIPTION), List.of()),
+ XlsTextFormat.PLAIN,
+ false, // withReferredTypes
+ false // withImportCompatibility
+ },
+ {
+ // Project: TEST-PROJECT
+ "export-project-filtered-fields-xlsx.zip",
+ EnumSet.of(ExportFormat.XLSX),
+ List.of(new ExportablePermId(ExportableKind.PROJECT, new ProjectPermId("20120814110011738-105"))),
+ new SelectedFields(
+ List.of(REGISTRATOR, REGISTRATION_DATE, CODE, IDENTIFIER, SPACE, DESCRIPTION),
+ List.of()),
+ XlsTextFormat.PLAIN,
+ true, // withReferredTypes
+ false // withImportCompatibility
+ },
+ {
+ // Experiment: EXP-SPACE-TEST
+ "export-experiment-filtered-fields-xlsx.zip",
+ EnumSet.of(ExportFormat.XLSX),
+ List.of(new ExportablePermId(ExportableKind.EXPERIMENT, new ExperimentPermId("201206190940555-1032"))),
+ new SelectedFields(
+ List.of(CODE, PERM_ID, IDENTIFIER, PROJECT, REGISTRATOR, MODIFIER),
+ List.of(new PropertyTypePermId("GENDER"), new PropertyTypePermId("DESCRIPTION"))),
+ XlsTextFormat.PLAIN,
+ true, // withReferredTypes
+ false // withImportCompatibility
+ },
+ {
+ // Sample: /TEST-SPACE/TEST-PROJECT/FV-TEST
+ "export-sample-filtered-fields-xlsx.zip",
+ EnumSet.of(ExportFormat.XLSX),
+ List.of(new ExportablePermId(ExportableKind.SAMPLE, new SamplePermId("201206191219327-1054"))),
+ new SelectedFields(
+ List.of(CODE, PERM_ID, IDENTIFIER, SPACE, PARENTS, CHILDREN, REGISTRATOR, REGISTRATION_DATE, MODIFIER, MODIFICATION_DATE),
+ List.of(new PropertyTypePermId("BACTERIUM"), new PropertyTypePermId("COMMENT"), new PropertyTypePermId("ORGANISM"))),
+ XlsTextFormat.PLAIN,
+ false, // withReferredTypes
+ false // withImportCompatibility
+ },
+ {
+ // Data set: "20081105092159188-3", type: "HCS_IMAGE"
+ "export-data-set-filtered-fields-xlsx.zip",
+ EnumSet.of(ExportFormat.XLSX),
+ List.of(new ExportablePermId(ExportableKind.DATASET, new DataSetPermId("20081105092159188-3"))),
+ new SelectedFields(
+ List.of(REGISTRATOR, REGISTRATION_DATE, CODE, IDENTIFIER, PARENTS, CHILDREN, STORAGE_CONFIRMATION, PRESENT_IN_ARCHIVE,
+ SAMPLE, EXPERIMENT),
+ List.of(new PropertyTypePermId("COMMENT"), new PropertyTypePermId("GENDER"))),
+ XlsTextFormat.PLAIN,
+ true, // withReferredTypes
+ false // withImportCompatibility
+ },
+ {
+ // Sample Type: CELL_PLATE
+ "export-sample-type-filtered-attributes-xlsx.zip",
+ EnumSet.of(ExportFormat.XLSX),
+ List.of(new ExportablePermId(ExportableKind.SAMPLE_TYPE, new EntityTypePermId("CELL_PLATE", EntityKind.SAMPLE))),
+ new SelectedFields(List.of(CODE, AUTO_GENERATE_CODES, DESCRIPTION, GENERATED_CODE_PREFIX, UNIQUE_SUBCODES), List.of()),
+ XlsTextFormat.PLAIN,
+ false, // withReferredTypes
+ false // withImportCompatibility
+ },
+ {
+ // Experiment Type: SIRNA_HCS
+ "export-experiment-type-filtered-attributes-xlsx.zip",
+ EnumSet.of(ExportFormat.XLSX),
+ List.of(new ExportablePermId(ExportableKind.EXPERIMENT_TYPE, new EntityTypePermId("SIRNA_HCS", EntityKind.EXPERIMENT))),
+ new SelectedFields(List.of(DESCRIPTION, CODE, MODIFICATION_DATE), List.of()),
+ XlsTextFormat.PLAIN,
+ false, // withReferredTypes
+ false // withImportCompatibility
+ },
+ {
+ // Dataset Type: HCS_IMAGE
+ "export-data-set-type-filtered-attributes-xlsx.zip",
+ EnumSet.of(ExportFormat.XLSX),
+ List.of(new ExportablePermId(ExportableKind.DATASET_TYPE, new EntityTypePermId("HCS_IMAGE", EntityKind.DATA_SET))),
+ new SelectedFields(List.of(CODE, DISALLOW_DELETION, DESCRIPTION), List.of()),
+ XlsTextFormat.PLAIN,
+ false, // withReferredTypes
+ false // withImportCompatibility
+ },
+ {
+ // Sample: /TEST-SPACE/TEST-PROJECT/FV-TEST
+ "export-sample-plain-text-xlsx.zip",
+ EnumSet.of(ExportFormat.XLSX),
+ List.of(new ExportablePermId(ExportableKind.SAMPLE, null)), // null perm ID indicates that the newly created value in the setup of the test should be used.
+ new SelectedFields(List.of(IDENTIFIER, CODE), List.of(new PropertyTypePermId(RICH_TEXT_PROPERTY_NAME))),
+ XlsTextFormat.PLAIN,
+ true, // withReferredTypes
+ false // withImportCompatibility
+ },
+ {
+ // Sample: /TEST-SPACE/TEST-PROJECT/FV-TEST
+ "export-sample-rich-text-xlsx.zip",
+ EnumSet.of(ExportFormat.XLSX),
+ List.of(new ExportablePermId(ExportableKind.SAMPLE, null)), // null perm ID indicates that the newly created value in the setup of the test should be used.
+ new SelectedFields(List.of(IDENTIFIER, CODE), List.of(new PropertyTypePermId(RICH_TEXT_PROPERTY_NAME))),
+ XlsTextFormat.RICH,
+ true, // withReferredTypes
+ false // withImportCompatibility
+ },
+
+ // HTML: All fields
+ {
+ // Space: TEST-SPACE
+ "export-space-html.zip",
+ EnumSet.of(ExportFormat.HTML),
+ List.of(new ExportablePermId(ExportableKind.SPACE, new SpacePermId("TEST-SPACE"))),
+ new AllFields(),
+ XlsTextFormat.PLAIN,
+ true, // withReferredTypes
+ false // withImportCompatibility
+ },
+ {
+ // Project: TEST-PROJECT
+ "export-project-html.zip",
+ EnumSet.of(ExportFormat.HTML),
+ List.of(new ExportablePermId(ExportableKind.PROJECT, new ProjectPermId("20120814110011738-105"))),
+ new AllFields(),
+ XlsTextFormat.PLAIN,
+ true, // withReferredTypes
+ false // withImportCompatibility
+ },
+ {
+ // Experiment: EXP-SPACE-TEST
+ "export-experiment-html.zip",
+ EnumSet.of(ExportFormat.HTML),
+ List.of(new ExportablePermId(ExportableKind.EXPERIMENT, new ExperimentPermId("201206190940555-1032"))),
+ new AllFields(),
+ XlsTextFormat.PLAIN,
+ true, // withReferredTypes
+ false // withImportCompatibility
+ },
+ {
+ // Sample: /TEST-SPACE/TEST-PROJECT/FV-TEST
+ "export-sample-html.zip",
+ EnumSet.of(ExportFormat.HTML),
+ List.of(new ExportablePermId(ExportableKind.SAMPLE, new SamplePermId("201206191219327-1054"))),
+ new AllFields(),
+ XlsTextFormat.PLAIN,
+ true, // withReferredTypes
+ false // withImportCompatibility
+ },
+ {
+ // Sample: /MP
+ "export-sample-shared-html.zip",
+ EnumSet.of(ExportFormat.HTML),
+ List.of(new ExportablePermId(ExportableKind.SAMPLE, new SamplePermId("200811050947161-652"))),
+ new AllFields(),
+ XlsTextFormat.RICH,
+ true, // withReferredTypes
+ false // withImportCompatibility
+ },
// {
-// // Sample: /TEST-SPACE/TEST-PROJECT/FV-TEST
-// "export-sample-with-spreadsheet-html.zip",
+// // Sample: /MP:A03
+// "export-sample-contained-html.zip",
// EnumSet.of(ExportFormat.HTML),
-// List.of(new ExportablePermId(ExportableKind.SAMPLE, null)), // null perm ID indicates that the newly created value in the setup of the test should be used.
-// new SelectedFields(List.of(IDENTIFIER, CODE), List.of(new PropertyTypePermId(RICH_TEXT_WITH_SPREADSHEET_PROPERTY_NAME))),
-// XlsTextFormat.RICH,
-// true, // withReferredTypes
-// false // withImportCompatibility
-// },
-//
-// // PDF: All fields
-// {
-// // Space: TEST-SPACE
-// "export-space-pdf.zip",
-// EnumSet.of(ExportFormat.PDF),
-// List.of(new ExportablePermId(ExportableKind.SPACE, new SpacePermId("TEST-SPACE"))),
-// new AllFields(),
-// XlsTextFormat.PLAIN,
-// true, // withReferredTypes
-// false // withImportCompatibility
-// },
-// {
-// // Project: TEST-PROJECT
-// "export-project-pdf.zip",
-// EnumSet.of(ExportFormat.PDF),
-// List.of(new ExportablePermId(ExportableKind.PROJECT, new ProjectPermId("20120814110011738-105"))),
-// new AllFields(),
-// XlsTextFormat.PLAIN,
-// true, // withReferredTypes
-// false // withImportCompatibility
-// },
-// {
-// // Experiment: EXP-SPACE-TEST
-// "export-experiment-pdf.zip",
-// EnumSet.of(ExportFormat.PDF),
-// List.of(new ExportablePermId(ExportableKind.EXPERIMENT, new ExperimentPermId("201206190940555-1032"))),
-// new AllFields(),
-// XlsTextFormat.PLAIN,
-// true, // withReferredTypes
-// false // withImportCompatibility
-// },
-// {
-// // Sample: /TEST-SPACE/TEST-PROJECT/FV-TEST
-// "export-sample-pdf.zip",
-// EnumSet.of(ExportFormat.PDF),
-// List.of(new ExportablePermId(ExportableKind.SAMPLE, new SamplePermId("201206191219327-1054"))),
-// new AllFields(),
-// XlsTextFormat.PLAIN,
-// true, // withReferredTypes
-// false // withImportCompatibility
-// },
-// {
-// // Sample: /MP
-// "export-sample-shared-pdf.zip",
-// EnumSet.of(ExportFormat.PDF),
-// List.of(new ExportablePermId(ExportableKind.SAMPLE, new SamplePermId("200811050947161-652"))),
+// List.of(new ExportablePermId(ExportableKind.SAMPLE, new SamplePermId("200811050947161-653"))),
// new AllFields(),
// XlsTextFormat.RICH,
// true, // withReferredTypes
// false // withImportCompatibility
// },
-// {
-// // Data set: "ROOT_CONTAINER"
-// "export-data-set-pdf.zip",
-// EnumSet.of(ExportFormat.PDF),
-// List.of(new ExportablePermId(ExportableKind.DATASET, new DataSetPermId("ROOT_CONTAINER"))),
-// new AllFields(),
-// XlsTextFormat.PLAIN,
-// true, // withReferredTypes
-// false // withImportCompatibility
-// },
+ {
+ // Data set: "ROOT_CONTAINER"
+ "export-data-set-html.zip",
+ EnumSet.of(ExportFormat.HTML),
+ List.of(new ExportablePermId(ExportableKind.DATASET, new DataSetPermId("ROOT_CONTAINER"))),
+ new AllFields(),
+ XlsTextFormat.PLAIN,
+ true, // withReferredTypes
+ false // withImportCompatibility
+ },
+
+ // HTML: Selected fields
+ {
+ // Space: TEST-SPACE
+ "export-space-filtered-fields-html.zip",
+ EnumSet.of(ExportFormat.HTML),
+ List.of(new ExportablePermId(ExportableKind.SPACE, new SpacePermId("TEST-SPACE"))),
+ new SelectedFields(List.of(CODE, PERM_ID, MODIFICATION_DATE), List.of()),
+ XlsTextFormat.PLAIN,
+ true, // withReferredTypes
+ false // withImportCompatibility
+ },
+ {
+ // Project: TEST-PROJECT
+ "export-project-filtered-fields-html.zip",
+ EnumSet.of(ExportFormat.HTML),
+ List.of(new ExportablePermId(ExportableKind.PROJECT, new ProjectPermId("20120814110011738-105"))),
+ new SelectedFields(List.of(PERM_ID, IDENTIFIER, REGISTRATOR, REGISTRATION_DATE), List.of()),
+ XlsTextFormat.PLAIN,
+ true, // withReferredTypes
+ false // withImportCompatibility
+ },
+ {
+ // Experiment: EXP-SPACE-TEST
+ "export-experiment-filtered-fields-html.zip",
+ EnumSet.of(ExportFormat.HTML),
+ List.of(new ExportablePermId(ExportableKind.EXPERIMENT, new ExperimentPermId("201206190940555-1032"))),
+ new SelectedFields(List.of(CODE, PARENTS, CHILDREN, REGISTRATOR, REGISTRATION_DATE),
+ List.of(new PropertyTypePermId("DESCRIPTION"))),
+ XlsTextFormat.PLAIN,
+ true, // withReferredTypes
+ false // withImportCompatibility
+ },
+ {
+ // Sample: /TEST-SPACE/TEST-PROJECT/FV-TEST
+ "export-sample-filtered-fields-html.zip",
+ EnumSet.of(ExportFormat.HTML),
+ List.of(new ExportablePermId(ExportableKind.SAMPLE, new SamplePermId("201206191219327-1054"))),
+ new SelectedFields(
+ List.of(CODE, PARENTS, CHILDREN, MODIFIER, MODIFICATION_DATE),
+ List.of(new PropertyTypePermId("BACTERIUM"), new PropertyTypePermId("COMMENT"), new PropertyTypePermId("ORGANISM"))),
+ XlsTextFormat.PLAIN,
+ false, // withReferredTypes
+ false // withImportCompatibility
+ },
+ {
+ // Sample: /TEST-SPACE/TEST-PROJECT/FV-TEST
+ "export-sample-plain-text-html.zip",
+ EnumSet.of(ExportFormat.HTML),
+ List.of(new ExportablePermId(ExportableKind.SAMPLE, null)), // null perm ID indicates that the newly created value in the setup of the test should be used.
+ new SelectedFields(List.of(IDENTIFIER, CODE), List.of(new PropertyTypePermId(RICH_TEXT_PROPERTY_NAME))),
+ XlsTextFormat.PLAIN,
+ true, // withReferredTypes
+ false // withImportCompatibility
+ },
+ {
+ // Sample: /TEST-SPACE/TEST-PROJECT/FV-TEST
+ "export-sample-rich-text-html.zip",
+ EnumSet.of(ExportFormat.HTML),
+ List.of(new ExportablePermId(ExportableKind.SAMPLE, null)), // null perm ID indicates that the newly created value in the setup of the test should be used.
+ new SelectedFields(List.of(IDENTIFIER, CODE), List.of(new PropertyTypePermId(RICH_TEXT_PROPERTY_NAME))),
+ XlsTextFormat.RICH,
+ true, // withReferredTypes
+ false // withImportCompatibility
+ },
+ {
+ // Sample: /TEST-SPACE/TEST-PROJECT/FV-TEST
+ "export-sample-with-image-html.zip",
+ EnumSet.of(ExportFormat.HTML),
+ List.of(new ExportablePermId(ExportableKind.SAMPLE, null)), // null perm ID indicates that the newly created value in the setup of the test should be used.
+ new SelectedFields(List.of(IDENTIFIER, CODE), List.of(new PropertyTypePermId(RICH_TEXT_WITH_IMAGE_PROPERTY_NAME))),
+ XlsTextFormat.RICH,
+ true, // withReferredTypes
+ false // withImportCompatibility
+ },
+ {
+ // Sample: /TEST-SPACE/TEST-PROJECT/FV-TEST
+ "export-sample-with-spreadsheet-html.zip",
+ EnumSet.of(ExportFormat.HTML),
+ List.of(new ExportablePermId(ExportableKind.SAMPLE, null)), // null perm ID indicates that the newly created value in the setup of the test should be used.
+ new SelectedFields(List.of(IDENTIFIER, CODE), List.of(new PropertyTypePermId(RICH_TEXT_WITH_SPREADSHEET_PROPERTY_NAME))),
+ XlsTextFormat.RICH,
+ true, // withReferredTypes
+ false // withImportCompatibility
+ },
+
+ // PDF: All fields
+ {
+ // Space: TEST-SPACE
+ "export-space-pdf.zip",
+ EnumSet.of(ExportFormat.PDF),
+ List.of(new ExportablePermId(ExportableKind.SPACE, new SpacePermId("TEST-SPACE"))),
+ new AllFields(),
+ XlsTextFormat.PLAIN,
+ true, // withReferredTypes
+ false // withImportCompatibility
+ },
+ {
+ // Project: TEST-PROJECT
+ "export-project-pdf.zip",
+ EnumSet.of(ExportFormat.PDF),
+ List.of(new ExportablePermId(ExportableKind.PROJECT, new ProjectPermId("20120814110011738-105"))),
+ new AllFields(),
+ XlsTextFormat.PLAIN,
+ true, // withReferredTypes
+ false // withImportCompatibility
+ },
+ {
+ // Experiment: EXP-SPACE-TEST
+ "export-experiment-pdf.zip",
+ EnumSet.of(ExportFormat.PDF),
+ List.of(new ExportablePermId(ExportableKind.EXPERIMENT, new ExperimentPermId("201206190940555-1032"))),
+ new AllFields(),
+ XlsTextFormat.PLAIN,
+ true, // withReferredTypes
+ false // withImportCompatibility
+ },
+ {
+ // Sample: /TEST-SPACE/TEST-PROJECT/FV-TEST
+ "export-sample-pdf.zip",
+ EnumSet.of(ExportFormat.PDF),
+ List.of(new ExportablePermId(ExportableKind.SAMPLE, new SamplePermId("201206191219327-1054"))),
+ new AllFields(),
+ XlsTextFormat.PLAIN,
+ true, // withReferredTypes
+ false // withImportCompatibility
+ },
+ {
+ // Sample: /MP
+ "export-sample-shared-pdf.zip",
+ EnumSet.of(ExportFormat.PDF),
+ List.of(new ExportablePermId(ExportableKind.SAMPLE, new SamplePermId("200811050947161-652"))),
+ new AllFields(),
+ XlsTextFormat.RICH,
+ true, // withReferredTypes
+ false // withImportCompatibility
+ },
+ {
+ // Data set: "ROOT_CONTAINER"
+ "export-data-set-pdf.zip",
+ EnumSet.of(ExportFormat.PDF),
+ List.of(new ExportablePermId(ExportableKind.DATASET, new DataSetPermId("ROOT_CONTAINER"))),
+ new AllFields(),
+ XlsTextFormat.PLAIN,
+ true, // withReferredTypes
+ false // withImportCompatibility
+ },
// Data
{
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ExportTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ExportTest.java
index b2a885a32c91f178f9150e8129fdfcc9fd89e910..734b8f57db23c3b946177cd2bfef4eb39ddebf55 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ExportTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ExportTest.java
@@ -25,7 +25,6 @@ import static ch.ethz.sis.openbis.generic.server.xls.export.XLSExport.ZIP_EXTENS
import static ch.ethz.sis.openbis.systemtest.asapi.v3.ExportData.RICH_TEXT_PROPERTY_NAME;
import static ch.ethz.sis.openbis.systemtest.asapi.v3.ExportData.RICH_TEXT_WITH_IMAGE_PROPERTY_NAME;
import static ch.ethz.sis.openbis.systemtest.asapi.v3.ExportData.RICH_TEXT_WITH_SPREADSHEET_PROPERTY_NAME;
-import static org.hamcrest.EasyMock2Matchers.equalTo;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertNull;
@@ -35,6 +34,7 @@ import java.io.BufferedInputStream;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FilenameFilter;
@@ -43,10 +43,8 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import java.io.SequenceInputStream;
import java.net.URISyntaxException;
import java.net.URL;
-import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Map;
@@ -61,7 +59,6 @@ import java.util.zip.ZipFile;
import javax.annotation.Resource;
import org.apache.commons.io.filefilter.NameFileFilter;
-import org.apache.commons.io.input.CharSequenceInputStream;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.jmock.Expectations;
@@ -130,8 +127,6 @@ public class ExportTest extends AbstractTest
private static final String DATASTORE_CODE = "ABC";
- private static final String DATA_FILE_CONTENT = "This is some test data.";
-
protected String sessionToken;
private PropertyTypePermId richTextPropertyTypePermId;
@@ -287,7 +282,7 @@ public class ExportTest extends AbstractTest
v3api.logout(sessionToken);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "resource" })
@Test(dataProvider = EXPORT_DATA_PROVIDER)
public void testDataExport(final String expectedResultFileName, final Set<ExportFormat> formats, final List<ExportablePermId> permIds,
final IExportableFields fields, final XlsTextFormat xlsTextFormat, final boolean withReferredTypes,
@@ -297,27 +292,29 @@ public class ExportTest extends AbstractTest
if (formats.contains(ExportFormat.DATA))
{
- final int fileLength = DATA_FILE_CONTENT.length();
-
- final DataSetFilePermId dataSetFilePermId = new DataSetFilePermId(new DataSetPermId("20230904175944612-1"), "data.txt");
- final DataSetFile dataSetFile = new DataSetFile();
- dataSetFile.setPermId(dataSetFilePermId);
- dataSetFile.setFileLength(fileLength);
+ final String fileContent1 = "This is some test data.";
+ final DataSetFile dataSetFile1 = createDataSetFile("default/data1.txt", fileContent1.length());
+ final SearchResult<DataSetFile> results1 = new SearchResult<>(List.of(dataSetFile1), 1);
+ final InputStream is1 = objectAndDataToStream(dataSetFile1, fileContent1);
- final SearchResult<DataSetFile> results = new SearchResult<>(List.of(dataSetFile), 1);
- final InputStream is = objectToStream(dataSetFile);
+ final String fileContent2 = "This is some other test data.";
+ final DataSetFile dataSetFile2 = createDataSetFile("my-folder/data2.txt", fileContent2.length());
+ final SearchResult<DataSetFile> results2 = new SearchResult<>(List.of(dataSetFile2), 1);
+ final InputStream is2 = objectAndDataToStream(dataSetFile2, fileContent2);
mockery.checking(new Expectations()
{{
- atLeast(1).of(v3Dss).searchFiles(with(equal(sessionToken)), with(any(DataSetFileSearchCriteria.class)),
+ exactly(2).of(v3Dss).searchFiles(with(equal(sessionToken)), with(any(DataSetFileSearchCriteria.class)),
with(any(DataSetFileFetchOptions.class)));
- will(returnValue(results));
+ will(onConsecutiveCalls(returnValue(results1), returnValue(results2)));
- atLeast(1).of(v3Dss).downloadFiles(with(equal(sessionToken)), with(equal(List.<IDataSetFileId>of(dataSetFilePermId))),
+ exactly(1).of(v3Dss).downloadFiles(with(equal(sessionToken)), with(equal(List.<IDataSetFileId>of(dataSetFile1.getPermId()))),
with(any(DataSetFileDownloadOptions.class)));
- will(returnValue(is));
+ will(returnValue(is1));
- is.close();
+ exactly(1).of(v3Dss).downloadFiles(with(equal(sessionToken)), with(equal(List.<IDataSetFileId>of(dataSetFile2.getPermId()))),
+ with(any(DataSetFileDownloadOptions.class)));
+ will(returnValue(is2));
}});
}
@@ -326,21 +323,66 @@ public class ExportTest extends AbstractTest
final ExportResult exportResult = v3api.executeExport(sessionToken, exportData, exportOptions);
compareFiles(XLS_EXPORT_RESOURCES_PATH + expectedResultFileName, exportResult.getDownloadURL());
+ mockery.assertIsSatisfied();
}
- private static ObjectInputStream objectToStream(final Object object) throws IOException
+ private static DataSetFile createDataSetFile(final String filePath, final int fileLength)
{
+ final DataSetFilePermId dataSetFilePermId = new DataSetFilePermId(new DataSetPermId("20230904175944612-1"), filePath);
+ final DataSetFile dataSetFile = new DataSetFile();
+ dataSetFile.setPermId(dataSetFilePermId);
+ dataSetFile.setFileLength(fileLength);
+ dataSetFile.setPath(filePath);
+ return dataSetFile;
+ }
+
+ public static InputStream objectAndDataToStream(final Object obj, final String data) throws IOException {
+ final byte[] objectBytes = getObjectBytes(obj);
+
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ final DataOutputStream dos = new DataOutputStream(baos);
+
+ // Write the size of the object
+ dos.writeLong(objectBytes.length);
+
+ // Write the object again
+ dos.write(objectBytes);
+
+ // Convert the string to bytes and write its size followed by the data
+ final byte[] stringBytes = data.getBytes();
+ final long stringSize = stringBytes.length;
+ dos.writeLong(stringSize);
+ dos.write(stringBytes);
+
+ dos.close();
+
+ // Return a ByteArrayInputStream containing the sequence
+ return new ByteArrayInputStream(baos.toByteArray());
+ }
+ private static byte[] getObjectBytes(final Object obj) throws IOException
+ {
+ try (
+ final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ final ObjectOutputStream oos = new ObjectOutputStream(baos)
+ )
+ {
+ oos.writeObject(obj);
+ return baos.toByteArray();
+ }
+ }
+
+ private static ObjectInputStream objectToStream(final Object object) throws IOException
+ {
+ final ByteArrayOutputStream baos = new ByteArrayOutputStream();
try (final ObjectOutputStream oos = new ObjectOutputStream(baos))
{
oos.writeObject(object);
}
-
final byte[] objectBytes = baos.toByteArray();
+
final ByteArrayInputStream bais = new ByteArrayInputStream(objectBytes);
- final ObjectInputStream ois = new ObjectInputStream(bais);
- return ois;
+ return new ObjectInputStream(bais);
}
/**
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/test_files/export/export-data.zip b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/test_files/export/export-data.zip
index b7a739d726c06bfc9e7f5b1bd55f0316b76a127f..9415d9d519908b7af3e2b17aa904f664b5dcf984 100644
Binary files a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/test_files/export/export-data.zip and b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/test_files/export/export-data.zip differ