From 825c59c2c1cf37302d0a0ec015768cd4463c96f4 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Thu, 23 Feb 2017 11:37:10 +0000
Subject: [PATCH] SSDM-4824: fixing (un)archiving DSS system tests
SVN: 37806
---
.../generic/dss/systemtest/api/v3/ArchiveDataSetTest.java | 3 +--
.../generic/dss/systemtest/api/v3/UnarchiveDataSetTest.java | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/datastore_server/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/ArchiveDataSetTest.java b/datastore_server/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/ArchiveDataSetTest.java
index 72b9947093c..4b93e8baa55 100644
--- a/datastore_server/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/ArchiveDataSetTest.java
+++ b/datastore_server/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/ArchiveDataSetTest.java
@@ -23,7 +23,6 @@ import org.testng.annotations.Test;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.ArchivingStatus;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.archive.DataSetArchiveOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.id.DataSetPermId;
-import ch.systemsx.cisd.common.exceptions.AuthorizationFailureException;
import ch.systemsx.cisd.common.exceptions.UserFailureException;
/**
@@ -42,7 +41,7 @@ public class ArchiveDataSetTest extends AbstractArchiveUnarchiveDataSetTest
v3.archiveDataSets(sessionToken, Arrays.asList(dataSetId), options);
}
- @Test(expectedExceptions = AuthorizationFailureException.class, expectedExceptionsMessageRegExp = ".*User 'test_space' does not have enough privileges.*")
+ @Test(expectedExceptions = UserFailureException.class, expectedExceptionsMessageRegExp = ".*test_space does not have enough privileges.*")
public void testArchiveWithUnauthorizedDataSet() throws Exception
{
registerDataSet();
diff --git a/datastore_server/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/UnarchiveDataSetTest.java b/datastore_server/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/UnarchiveDataSetTest.java
index d5a3e91455e..81550f33a86 100644
--- a/datastore_server/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/UnarchiveDataSetTest.java
+++ b/datastore_server/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/UnarchiveDataSetTest.java
@@ -43,7 +43,7 @@ public class UnarchiveDataSetTest extends AbstractArchiveUnarchiveDataSetTest
v3.unarchiveDataSets(sessionToken, Arrays.asList(dataSetId), options);
}
- @Test(expectedExceptions = AuthorizationFailureException.class, expectedExceptionsMessageRegExp = ".*User 'test_space' does not have enough privileges.*")
+ @Test(expectedExceptions = UserFailureException.class, expectedExceptionsMessageRegExp = ".*test_space does not have enough privileges.*")
public void testUnarchiveWithUnauthorizedDataSet() throws Exception
{
registerDataSet();
--
GitLab