diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/DataSetExpectations.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/DataSetExpectations.java index fb9a9a24de8e0101cade0373f61f98049014d717..61dc2ba42bbf7ed6c853c843d14c061eb9afdeea 100644 --- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/DataSetExpectations.java +++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/DataSetExpectations.java @@ -29,14 +29,14 @@ import org.jmock.lib.action.CustomAction; import ch.ethz.sis.openbis.generic.asapi.v3.IApplicationServerApi; import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.ArchivingStatus; -import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.PhysicalData; -import ch.ethz.sis.openbis.generic.asapi.v3.dto.entitytype.EntityKind; -import ch.ethz.sis.openbis.generic.asapi.v3.dto.entitytype.id.EntityTypePermId; import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.DataSet; import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.DataSetType; +import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.PhysicalData; import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions.DataSetFetchOptions; import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions.DataSetTypeFetchOptions; import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.id.DataSetPermId; +import ch.ethz.sis.openbis.generic.asapi.v3.dto.entitytype.EntityKind; +import ch.ethz.sis.openbis.generic.asapi.v3.dto.entitytype.id.EntityTypePermId; import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.Experiment; import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.id.ExperimentIdentifier; import ch.ethz.sis.openbis.generic.asapi.v3.dto.person.Person; @@ -105,18 +105,21 @@ class DataSetExpectations extends Expectations physicalData[0].setPresentInArchive(true); physicalData[0].setStorageConfirmation(true); physicalData[0].setStatus(ArchivingStatus.AVAILABLE); + physicalData[0].setSize(123456L); physicalData[1] = new PhysicalData(); physicalData[1].setArchivingRequested(true); physicalData[1].setPresentInArchive(false); physicalData[1].setStorageConfirmation(false); physicalData[1].setStatus(ArchivingStatus.AVAILABLE); + physicalData[1].setSize(234567L); physicalData[2] = new PhysicalData(); physicalData[2].setArchivingRequested(true); physicalData[2].setPresentInArchive(true); physicalData[2].setStorageConfirmation(false); physicalData[2].setStatus(ArchivingStatus.ARCHIVED); + physicalData[2].setSize(345678L); final DataSet[] dataSets = new DataSet[3]; diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-data-set-plain-text.xlsx b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-data-set-plain-text.xlsx index 3f69fe76dc1a2ee4dbc880714936b13287b3b9f0..3eab308523bd9a574cc6c12666b7f937d75c2ecf 100644 Binary files a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-data-set-plain-text.xlsx and b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-data-set-plain-text.xlsx differ diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-data-set-rich-text.xlsx b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-data-set-rich-text.xlsx index 69fb52c5ce44bed5aec6bc9833aee538cd3134b7..2bcd88cae7d912b2de9386e4b241ffcba1c4b78a 100644 Binary files a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-data-set-rich-text.xlsx and b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-data-set-rich-text.xlsx differ