From f5616c20768a128ad6f616fecd1bee205937d6dc Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 22 Feb 2017 11:48:04 +0000
Subject: [PATCH] SSDM-4824: fixing CreateSampleTest
SVN: 37799
---
.../systemtest/asapi/v3/CreateSampleTest.java | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateSampleTest.java b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateSampleTest.java
index c24e61acfb0..89346ed0dfe 100644
--- a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateSampleTest.java
+++ b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateSampleTest.java
@@ -79,7 +79,7 @@ public class CreateSampleTest extends AbstractSampleTest
v3api.createSamples(sessionToken, Collections.singletonList(creation));
}
- }, "Unsupported object id [not-a-space-id]");
+ }, "Object with CreationId = [not-a-space-id] has not been found");
}
@@ -87,8 +87,9 @@ public class CreateSampleTest extends AbstractSampleTest
public void testCreateSharedSampleWithNoHomeSpaceAndNoAdminRights()
{
final String code = "TEST_TO_FAIL";
-
- assertAuthorizationFailureException(new IDelegatedAction()
+ SampleIdentifier identifier = new SampleIdentifier("/" + code);
+
+ assertUnauthorizedObjectAccessException(new IDelegatedAction()
{
@Override
public void execute()
@@ -102,15 +103,16 @@ public class CreateSampleTest extends AbstractSampleTest
v3api.createSamples(sessionToken, Collections.singletonList(creation));
}
- });
+ }, identifier);
}
@Test
public void testCreateSharedSampleWithNoAdminRights()
{
final String code = "TEST_TO_FAIL";
+ SampleIdentifier identifier = new SampleIdentifier("/" + code);
- assertAuthorizationFailureException(new IDelegatedAction()
+ assertUnauthorizedObjectAccessException(new IDelegatedAction()
{
@Override
public void execute()
@@ -124,7 +126,7 @@ public class CreateSampleTest extends AbstractSampleTest
v3api.createSamples(sessionToken, Collections.singletonList(creation));
}
- });
+ }, identifier);
}
@Test
--
GitLab