From 78b2f23e6acc883ce83ba5d25f425513d39a0c98 Mon Sep 17 00:00:00 2001
From: anttil <anttil>
Date: Thu, 19 May 2016 06:13:13 +0000
Subject: [PATCH] SSDM-3551: Fix failing tests
SVN: 36550
---
.../systemtest/asapi/v3/AbstractDeletionTest.java | 9 +++++++--
.../openbis/systemtest/asapi/v3/DeleteSampleTest.java | 2 +-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractDeletionTest.java b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractDeletionTest.java
index a789ad2d0aa..a9a5950bf74 100644
--- a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractDeletionTest.java
+++ b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractDeletionTest.java
@@ -100,11 +100,16 @@ public class AbstractDeletionTest extends AbstractTest
}
protected SamplePermId createCisdSample(IExperimentId experimentId)
+ {
+ return createCisdSample(experimentId, "SAMPLE_TO_DELETE");
+ }
+
+ protected SamplePermId createCisdSample(IExperimentId experimentId, String sampleCode)
{
final String sessionToken = v3api.login(TEST_USER, PASSWORD);
SampleCreation creation = new SampleCreation();
- creation.setCode("SAMPLE_TO_DELETE");
+ creation.setCode(sampleCode);
creation.setTypeId(new EntityTypePermId("CELL_PLATE"));
creation.setSpaceId(new SpacePermId("CISD"));
creation.setExperimentId(experimentId);
@@ -114,7 +119,7 @@ public class AbstractDeletionTest extends AbstractTest
List<Sample> samples = new ArrayList<Sample>(map.values());
Assert.assertEquals(1, samples.size());
- Assert.assertEquals("SAMPLE_TO_DELETE", samples.get(0).getCode());
+ Assert.assertEquals(sampleCode, samples.get(0).getCode());
return permIds.get(0);
}
diff --git a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteSampleTest.java b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteSampleTest.java
index fa712c9b995..52fdd774ecd 100644
--- a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteSampleTest.java
+++ b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteSampleTest.java
@@ -49,7 +49,7 @@ public class DeleteSampleTest extends AbstractDeletionTest
String sessionToken = v3api.login(TEST_USER, PASSWORD);
ExperimentPermId experimentPermId =
createCisdExperiment(new ProjectIdentifier("/CISD/DEFAULT"), java.util.UUID.randomUUID().toString().toUpperCase());
- SamplePermId samplePermId = createCisdSample(experimentPermId);
+ SamplePermId samplePermId = createCisdSample(experimentPermId, java.util.UUID.randomUUID().toString().toUpperCase());
TestTransaction.flagForCommit();
TestTransaction.end();
--
GitLab