From f1d4aa5259fb66c88e57241a337448fdf74b0a8b Mon Sep 17 00:00:00 2001
From: pkupczyk <pkupczyk@ethz.ch>
Date: Fri, 31 May 2024 15:53:09 +0200
Subject: [PATCH] BIS-736 : external data table for AFS : fix tests
---
.../openbis/systemtest/asapi/v3/SearchDataStoreTest.java | 2 +-
.../systemsx/cisd/openbis/systemtest/CommonServerTest.java | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchDataStoreTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchDataStoreTest.java
index f1fbe438658..7fa622f69f6 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchDataStoreTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchDataStoreTest.java
@@ -35,7 +35,7 @@ public class SearchDataStoreTest extends AbstractTest
@Test
public void testSearchWithEmptyCriteria()
{
- testSearch(TEST_USER, new DataStoreSearchCriteria(), "AFS", "STANDARD");
+ testSearch(TEST_USER, new DataStoreSearchCriteria(), "STANDARD");
}
@Test
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/CommonServerTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/CommonServerTest.java
index 4b295e8652c..9a71dfdb826 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/CommonServerTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/CommonServerTest.java
@@ -3549,10 +3549,8 @@ public class CommonServerTest extends SystemTestCase
if (user.isInstanceUserOrSpaceUserOrEnabledProjectUser())
{
List<DataStore> stores = commonServer.listDataStores(session.getSessionToken());
- stores.sort(Comparator.comparing(DataStore::getCode));
- assertEquals(stores.size(), 2);
- assertEquals(stores.get(0).getCode(), "AFS");
- assertEquals(stores.get(1).getCode(), "STANDARD");
+ assertEquals(stores.size(), 1);
+ assertEquals(stores.get(0).getCode(), "STANDARD");
} else
{
try
--
GitLab