From 3f39f8bbb5352d12a48aa1edadbc9d3a7f4096f3 Mon Sep 17 00:00:00 2001 From: vkovtun <viktor.kovtun@id.ethz.ch> Date: Tue, 5 Dec 2023 16:39:46 +0100 Subject: [PATCH] BIS-772: Improving Java tests, so that they do not fail on Jenkins. --- .../systemtest/asapi/v3/ExportData.java | 4 ++-- .../test_files/export/export-sample-xlsx.zip | Bin 3601 -> 3473 bytes 2 files changed, 2 insertions(+), 2 deletions(-) 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 1b79d3f0eb2..f107b82476a 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 @@ -107,10 +107,10 @@ class ExportData false // withImportCompatibility }, { - // Sample: /TEST-SPACE/TEST-PROJECT/FV-TEST + // Sample: /CISD/NEMO/3VCP6 "export-sample-xlsx.zip", EnumSet.of(ExportFormat.XLSX), - List.of(new ExportablePermId(ExportableKind.SAMPLE, new SamplePermId("201206191219327-1054"))), + List.of(new ExportablePermId(ExportableKind.SAMPLE, new SamplePermId("200811050946559-980"))), new AllFields(), XlsTextFormat.PLAIN, true, // withReferredTypes diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/test_files/export/export-sample-xlsx.zip b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/test_files/export/export-sample-xlsx.zip index 008f59a869a7b74594f7198f98c07515d129e356..0628a24d6282a6679fc9a70370ad0783314ebe83 100644 GIT binary patch literal 3473 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 literal 3601 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 -- GitLab