Skip to content
Snippets Groups Projects
Commit 172e3896 authored by felmer's avatar felmer
Browse files

SSDM-12081: fixing broken tests in UpdateSpaceTest

parent f744c926
No related branches found
No related tags found
1 merge request!40SSDM-13578 : 2PT : Database and V3 Implementation - include the new AFS "free"...
...@@ -37,6 +37,7 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.create.SampleCreation; ...@@ -37,6 +37,7 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.create.SampleCreation;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.delete.SampleDeletionOptions; import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.delete.SampleDeletionOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.id.SamplePermId; import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.id.SamplePermId;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.space.Space; import ch.ethz.sis.openbis.generic.asapi.v3.dto.space.Space;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.space.create.SpaceCreation;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.space.fetchoptions.SpaceFetchOptions; import ch.ethz.sis.openbis.generic.asapi.v3.dto.space.fetchoptions.SpaceFetchOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.space.id.ISpaceId; import ch.ethz.sis.openbis.generic.asapi.v3.dto.space.id.ISpaceId;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.space.id.SpacePermId; import ch.ethz.sis.openbis.generic.asapi.v3.dto.space.id.SpacePermId;
...@@ -302,7 +303,9 @@ public class UpdateSpaceTest extends AbstractTest ...@@ -302,7 +303,9 @@ public class UpdateSpaceTest extends AbstractTest
{ {
// Given // Given
final String sessionToken = v3api.login(TEST_USER, PASSWORD); final String sessionToken = v3api.login(TEST_USER, PASSWORD);
SpacePermId spaceId = new SpacePermId("CISD"); SpaceCreation spaceCreation = new SpaceCreation();
spaceCreation.setCode("SPACE-" + System.currentTimeMillis());
SpacePermId spaceId = v3api.createSpaces(sessionToken, Arrays.asList(spaceCreation)).get(0);
SpaceUpdate spaceUpdate = new SpaceUpdate(); SpaceUpdate spaceUpdate = new SpaceUpdate();
spaceUpdate.setSpaceId(spaceId); spaceUpdate.setSpaceId(spaceId);
spaceUpdate.freezeForSamples(); spaceUpdate.freezeForSamples();
...@@ -314,8 +317,7 @@ public class UpdateSpaceTest extends AbstractTest ...@@ -314,8 +317,7 @@ public class UpdateSpaceTest extends AbstractTest
// When // When
assertUserFailureException(Void -> v3api.createSamples(sessionToken, Arrays.asList(sampleCreation)), assertUserFailureException(Void -> v3api.createSamples(sessionToken, Arrays.asList(sampleCreation)),
// Then "ERROR: Operation SET SPACE is not allowed because space " + spaceId + " is frozen for sample UST-S1.");
"ERROR: Operation SET SPACE is not allowed because space CISD is frozen for sample UST-S1.");
} }
@Test @Test
...@@ -323,7 +325,9 @@ public class UpdateSpaceTest extends AbstractTest ...@@ -323,7 +325,9 @@ public class UpdateSpaceTest extends AbstractTest
{ {
// Given // Given
final String sessionToken = v3api.login(TEST_USER, PASSWORD); final String sessionToken = v3api.login(TEST_USER, PASSWORD);
SpacePermId spaceId = new SpacePermId("CISD"); SpaceCreation spaceCreation = new SpaceCreation();
spaceCreation.setCode("SPACE-" + System.currentTimeMillis());
SpacePermId spaceId = v3api.createSpaces(sessionToken, Arrays.asList(spaceCreation)).get(0);
SampleCreation sampleCreation = new SampleCreation(); SampleCreation sampleCreation = new SampleCreation();
sampleCreation.setSpaceId(spaceId); sampleCreation.setSpaceId(spaceId);
sampleCreation.setTypeId(new EntityTypePermId("NORMAL", EntityKind.SAMPLE)); sampleCreation.setTypeId(new EntityTypePermId("NORMAL", EntityKind.SAMPLE));
...@@ -338,8 +342,7 @@ public class UpdateSpaceTest extends AbstractTest ...@@ -338,8 +342,7 @@ public class UpdateSpaceTest extends AbstractTest
// When // When
assertUserFailureException(Void -> v3api.deleteSamples(sessionToken, Arrays.asList(samplePermId), deletionOptions), assertUserFailureException(Void -> v3api.deleteSamples(sessionToken, Arrays.asList(samplePermId), deletionOptions),
// Then "ERROR: Operation DELETE SAMPLE is not allowed because space " + spaceId + " is frozen.");
"ERROR: Operation DELETE SAMPLE is not allowed because space CISD is frozen.");
} }
@Test(dataProvider = "freezeMethods") @Test(dataProvider = "freezeMethods")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment