Skip to content
Snippets Groups Projects
Commit 781b3e6f authored by juanf's avatar juanf
Browse files

SSDM-13343 : Attempt to have versioning for property assignments

parent 15a6a333
No related branches found
No related tags found
1 merge request!40SSDM-13578 : 2PT : Database and V3 Implementation - include the new AFS "free"...
Hide whitespace changes
Inline Side-by-side
core-plugin-openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/plugin/excelimport/ImportSamplesTest.java
+ 2
− 2
View file @ 781b3e6f
...@@ -191,7 +191,7 @@ public class ImportSamplesTest extends AbstractImportTest ...@@ -191,7 +191,7 @@ public class ImportSamplesTest extends AbstractImportTest
Paths.get(FilenameUtils.concat(FILES_DIR, VOCABULARY_TYPE)), Paths.get(FilenameUtils.concat(FILES_DIR, VOCABULARY_TYPE)),
Paths.get(FilenameUtils.concat(FILES_DIR, SAMPLE_TYPE_CYCLIC))); Paths.get(FilenameUtils.concat(FILES_DIR, SAMPLE_TYPE_CYCLIC)));
List<IObjectId> ids = TestUtils.createFrom(v3api, sessionToken, UpdateMode.UPDATE_IF_EXISTS, Paths.get(FilenameUtils.concat(FILES_DIR, SAMPLES_SAMPLE_TYPE_ELSWHERE_CYCLIC))); List<IObjectId> ids = TestUtils.createFrom(v3api, sessionToken, UpdateMode.UPDATE_IF_EXISTS, Paths.get(FilenameUtils.concat(FILES_DIR, SAMPLES_SAMPLE_TYPE_ELSWHERE_CYCLIC)));
List<ISampleId> sampleIds = List.of((SampleIdentifier)ids.get(6), (SampleIdentifier)ids.get(7), (SampleIdentifier)ids.get(8)); List<ISampleId> sampleIds = List.of((SampleIdentifier)ids.get(9), (SampleIdentifier)ids.get(10), (SampleIdentifier)ids.get(11));
// WHEN // WHEN
List<Sample> samples = (List<Sample>) TestUtils.getSamplesById(v3api, sessionToken, sampleIds); List<Sample> samples = (List<Sample>) TestUtils.getSamplesById(v3api, sessionToken, sampleIds);
Set<String> differentCyclicAssignments = new HashSet<>(); Set<String> differentCyclicAssignments = new HashSet<>();
...@@ -215,7 +215,7 @@ public class ImportSamplesTest extends AbstractImportTest ...@@ -215,7 +215,7 @@ public class ImportSamplesTest extends AbstractImportTest
Paths.get(FilenameUtils.concat(FILES_DIR, VOCABULARY_TYPE)), Paths.get(FilenameUtils.concat(FILES_DIR, VOCABULARY_TYPE)),
Paths.get(FilenameUtils.concat(FILES_DIR, SAMPLE_TYPE_CYCLIC_FIX_TYPE))); Paths.get(FilenameUtils.concat(FILES_DIR, SAMPLE_TYPE_CYCLIC_FIX_TYPE)));
List<IObjectId> ids = TestUtils.createFrom(v3api, sessionToken, UpdateMode.UPDATE_IF_EXISTS, Paths.get(FilenameUtils.concat(FILES_DIR, SAMPLES_SAMPLE_TYPE_ELSWHERE_CYCLIC))); List<IObjectId> ids = TestUtils.createFrom(v3api, sessionToken, UpdateMode.UPDATE_IF_EXISTS, Paths.get(FilenameUtils.concat(FILES_DIR, SAMPLES_SAMPLE_TYPE_ELSWHERE_CYCLIC)));
List<ISampleId> sampleIds = List.of((SampleIdentifier)ids.get(6), (SampleIdentifier)ids.get(7), (SampleIdentifier)ids.get(8)); List<ISampleId> sampleIds = List.of((SampleIdentifier)ids.get(9), (SampleIdentifier)ids.get(10), (SampleIdentifier)ids.get(11));
// WHEN // WHEN
List<Sample> samples = (List<Sample>) TestUtils.getSamplesById(v3api, sessionToken, sampleIds); List<Sample> samples = (List<Sample>) TestUtils.getSamplesById(v3api, sessionToken, sampleIds);
Set<String> differentCyclicAssignments = new HashSet<>(); Set<String> differentCyclicAssignments = new HashSet<>();
......
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