diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateDataSetTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateDataSetTest.java
index 076afb23dff115d21abf07f553e8713ec47ff72e..59018087e35b98a7fb7d88228b2e9a617e9c6ad6 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateDataSetTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateDataSetTest.java
@@ -2293,7 +2293,7 @@ public class CreateDataSetTest extends AbstractDataSetTest
EntityTypePermId sampleType = createASampleType(sessionToken, true, propertyType1, PLATE_GEOMETRY);
SampleCreation sample = new SampleCreation();
- sample.setCode("SAMPLE_WITH_SAMPLE_PROPERTY");
+ sample.setCode("SAMPLE_WITH_SAMPLE_PROPERTY-" + System.currentTimeMillis());
sample.setTypeId(sampleType);
sample.setSpaceId(new SpacePermId("CISD"));
sample.setProperty(PLATE_GEOMETRY.getPermId(), "384_WELLS_16X24");
@@ -2359,7 +2359,7 @@ public class CreateDataSetTest extends AbstractDataSetTest
EntityTypePermId sampleType = createASampleType(sessionToken, true, propertyType1, PLATE_GEOMETRY);
SampleCreation sample = new SampleCreation();
- sample.setCode("SAMPLE_WITH_SAMPLE_PROPERTY");
+ sample.setCode("SAMPLE_WITH_SAMPLE_PROPERTY-" + System.currentTimeMillis());
sample.setTypeId(sampleType);
sample.setSpaceId(new SpacePermId("CISD"));
sample.setProperty(PLATE_GEOMETRY.getPermId(), "384_WELLS_16X24");
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateExperimentTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateExperimentTest.java
index 26f4652b764a05ac8545aa60c5104a38d4058515..78555ce9665dd53b9bc0bf084430aa3075e573c3 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateExperimentTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateExperimentTest.java
@@ -1035,7 +1035,7 @@ public class CreateExperimentTest extends AbstractExperimentTest
EntityTypePermId experimentType = createAnExperimentType(sessionToken, true, propertyType, PLATE_GEOMETRY);
ExperimentCreation creation = new ExperimentCreation();
- creation.setCode("EXPERIMENT_WITH_SAMPLE_PROPERTY");
+ creation.setCode("EXPERIMENT_WITH_MULTI_VOCAB_PROPERTY-" + System.currentTimeMillis());
creation.setTypeId(experimentType);
creation.setProjectId(new ProjectIdentifier("/CISD/NEMO"));
creation.setProperty(PLATE_GEOMETRY.getPermId(), "384_WELLS_16X24");
@@ -1068,7 +1068,7 @@ public class CreateExperimentTest extends AbstractExperimentTest
EntityTypePermId sampleType = createASampleType(sessionToken, true, propertyType1, PLATE_GEOMETRY);
SampleCreation sample = new SampleCreation();
- sample.setCode("SAMPLE_WITH_SAMPLE_PROPERTY");
+ sample.setCode("SAMPLE_WITH_SAMPLE_PROPERTY-" + System.currentTimeMillis());
sample.setTypeId(sampleType);
sample.setSpaceId(new SpacePermId("CISD"));
sample.setProperty(PLATE_GEOMETRY.getPermId(), "384_WELLS_16X24");
@@ -1096,7 +1096,7 @@ public class CreateExperimentTest extends AbstractExperimentTest
EntityTypePermId experimentType = createAnExperimentType(sessionToken, true, propertyType, PLATE_GEOMETRY);
ExperimentCreation creation = new ExperimentCreation();
- creation.setCode("EXPERIMENT_WITH_SAMPLE_PROPERTY");
+ creation.setCode("EXPERIMENT_WITH_SAMPLE_PROPERTY-" + System.currentTimeMillis());
creation.setTypeId(experimentType);
creation.setProjectId(new ProjectIdentifier("/CISD/NEMO"));
creation.setProperty(PLATE_GEOMETRY.getPermId(), "384_WELLS_16X24");
@@ -1135,7 +1135,7 @@ public class CreateExperimentTest extends AbstractExperimentTest
EntityTypePermId sampleType = createASampleType(sessionToken, true, propertyType1, PLATE_GEOMETRY);
SampleCreation sample = new SampleCreation();
- sample.setCode("SAMPLE_WITH_SAMPLE_PROPERTY");
+ sample.setCode("SAMPLE_WITH_SAMPLE_PROPERTY-" + System.currentTimeMillis());
sample.setTypeId(sampleType);
sample.setSpaceId(new SpacePermId("CISD"));
sample.setProperty(PLATE_GEOMETRY.getPermId(), "384_WELLS_16X24");
@@ -1163,7 +1163,7 @@ public class CreateExperimentTest extends AbstractExperimentTest
EntityTypePermId experimentType = createAnExperimentType(sessionToken, true, propertyType, PLATE_GEOMETRY);
ExperimentCreation creation = new ExperimentCreation();
- creation.setCode("EXPERIMENT_WITH_SAMPLE_PROPERTY");
+ creation.setCode("EXPERIMENT_WITH_SAMPLE_PROPERTY-" + System.currentTimeMillis());
creation.setTypeId(experimentType);
creation.setProjectId(new ProjectIdentifier("/CISD/NEMO"));
creation.setProperty(PLATE_GEOMETRY.getPermId(), "384_WELLS_16X24");
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateSampleTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateSampleTest.java
index 631c85eb6de0d2aedafafdeb3324643b6babd4b6..d30283b0b536f938ceed0549be019ea80e8d3ec6 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateSampleTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateSampleTest.java
@@ -1689,7 +1689,7 @@ public class CreateSampleTest extends AbstractSampleTest
EntityTypePermId sampleType = createASampleType(sessionToken, true, propertyType, PLATE_GEOMETRY);
SampleCreation sample = new SampleCreation();
- sample.setCode("SAMPLE_WITH_MULTI_VOCAB_PROPERTY");
+ sample.setCode("SAMPLE_WITH_MULTI_VOCAB_PROPERTY-" + System.currentTimeMillis());
sample.setTypeId(sampleType);
sample.setSpaceId(new SpacePermId("CISD"));
sample.setProperty(PLATE_GEOMETRY.getPermId(), "384_WELLS_16X24");
@@ -1721,7 +1721,7 @@ public class CreateSampleTest extends AbstractSampleTest
EntityTypePermId sampleType1 = createASampleType(sessionToken, true, propertyType1, PLATE_GEOMETRY);
SampleCreation sample = new SampleCreation();
- sample.setCode("NEW_SAMPLE_WITH_SOME_SAMPLE_PROPERTY");
+ sample.setCode("SAMPLE_WITH_SOME_SAMPLE_PROPERTY-" + System.currentTimeMillis());
sample.setTypeId(sampleType1);
sample.setSpaceId(new SpacePermId("CISD"));
sample.setProperty(PLATE_GEOMETRY.getPermId(), "384_WELLS_16X24");
@@ -1744,7 +1744,7 @@ public class CreateSampleTest extends AbstractSampleTest
// Create a sample with multi-value sample property
SampleCreation sampleCreation = new SampleCreation();
- sampleCreation.setCode("SAMPLE_WITH_MULTI_SAMPLE_PROPERTY");
+ sampleCreation.setCode("SAMPLE_WITH_MULTI_SAMPLE_PROPERTY-" + System.currentTimeMillis());
sampleCreation.setTypeId(sampleType);
sampleCreation.setSpaceId(new SpacePermId("CISD"));
sampleCreation.setProperty(PLATE_GEOMETRY.getPermId(), "384_WELLS_16X24");
@@ -1765,11 +1765,11 @@ public class CreateSampleTest extends AbstractSampleTest
Sample[] samples = sampleProperties.get(propertyType.getPermId());
Serializable[] sampleProps = Arrays.stream(samples).map(x -> x.getPermId().getPermId()).sorted().toArray(String[]::new);
- assertEquals(sampleProps, new Serializable[]{"200811050919915-8", sample2.getPermId().getPermId()});
+ assertEquals(sampleProps, new Serializable[]{"200811050919915-8", testSampleIds.get(0).getPermId()});
sampleProps = (Serializable[]) sample2.getProperties().get(propertyType.getPermId());
Arrays.sort(sampleProps);
- assertEquals(sampleProps, new Serializable[]{"200811050919915-8", sample2.getPermId().getPermId()});
+ assertEquals(sampleProps, new Serializable[]{"200811050919915-8", testSampleIds.get(0).getPermId()});
assertEquals(sample2.getProperties().size(), 2);
}
@@ -1783,7 +1783,7 @@ public class CreateSampleTest extends AbstractSampleTest
EntityTypePermId sampleType1 = createASampleType(sessionToken, true, propertyType1, PLATE_GEOMETRY);
SampleCreation sample = new SampleCreation();
- sample.setCode("SAMPLE_WITH_SOME_SAMPLE_PROPERTY");
+ sample.setCode("SAMPLE_WITH_SOME_SAMPLE_PROPERTY-" + System.currentTimeMillis());
sample.setTypeId(sampleType1);
sample.setSpaceId(new SpacePermId("CISD"));
sample.setProperty(PLATE_GEOMETRY.getPermId(), "384_WELLS_16X24");
@@ -1805,14 +1805,14 @@ public class CreateSampleTest extends AbstractSampleTest
EntityTypePermId sampleType = createASampleType(sessionToken, true, propertyType, PLATE_GEOMETRY);
SampleCreation sampleCreation = new SampleCreation();
- sampleCreation.setCode("SAMPLE_WITH_MULTI_SAMPLE_PROPERTY2");
+ sampleCreation.setCode("SAMPLE_WITH_MULTI_SAMPLE_PROPERTY-" + System.currentTimeMillis());
sampleCreation.setTypeId(sampleType);
sampleCreation.setSpaceId(new SpacePermId("CISD"));
sampleCreation.setProperty(PLATE_GEOMETRY.getPermId(), "384_WELLS_16X24");
sampleCreation.setSampleProperty(propertyType.getPermId(), new SamplePermId[]{ new SamplePermId("/CISD/CL1"), testSampleIds.get(0)});
// When
- List<SamplePermId> sampleIds = v3api.createSamples(sessionToken, Arrays.asList(sample));
+ List<SamplePermId> sampleIds = v3api.createSamples(sessionToken, Arrays.asList(sampleCreation));
// Then
assertEquals(sampleIds.size(), 1);
@@ -1826,11 +1826,11 @@ public class CreateSampleTest extends AbstractSampleTest
Sample[] samples = sampleProperties.get(propertyType.getPermId());
Serializable[] sampleProps = Arrays.stream(samples).map(x -> x.getPermId().getPermId()).sorted().toArray(String[]::new);
- assertEquals(sampleProps, new Serializable[]{"200811050919915-8", sample2.getPermId().getPermId()});
+ assertEquals(sampleProps, new Serializable[]{"200811050919915-8", testSampleIds.get(0).getPermId()});
sampleProps = (Serializable[]) sample2.getProperties().get(propertyType.getPermId());
Arrays.sort(sampleProps);
- assertEquals(sampleProps, new Serializable[]{"200811050919915-8", sample2.getPermId().getPermId()});
+ assertEquals(sampleProps, new Serializable[]{"200811050919915-8", testSampleIds.get(0).getPermId()});
assertEquals(sample2.getProperties().size(), 2);
}