diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/TableEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/TableEndpointUnitTest.java index 51e1548b486d98003009c217ebbe61dcc064de29..a4fb0c4f8acd1b3b65a829376bc8487353435008 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/TableEndpointUnitTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/TableEndpointUnitTest.java @@ -922,12 +922,12 @@ public class TableEndpointUnitTest extends AbstractUnitTest { @Test @WithAnonymousUser - public void findById_privateDatabasePrivateDataPublicSchemaAnonymous_fails() { + public void findById_privateDatabasePrivateDataPublicSchemaAnonymous_fails() throws UserNotFoundException, + TableNotFoundException, NotAllowedException, DataServiceException, DatabaseNotFoundException, + AccessNotFoundException, QueueNotFoundException, DataServiceConnectionException { /* test */ - assertThrows(NotAllowedException.class, () -> { - generic_findById(DATABASE_1_ID, DATABASE_1, TABLE_2_ID, TABLE_2, null, null, null); - }); + generic_findById(DATABASE_1_ID, DATABASE_1, TABLE_2_ID, TABLE_2, null, null, null); } @Test @@ -965,12 +965,12 @@ public class TableEndpointUnitTest extends AbstractUnitTest { @Test @WithMockUser(username = USER_4_USERNAME) - public void findById_privateNoRole_fails() { + public void findById_privateDatabasePrivateDataPrivateSchemaNoRole_succeeds() throws UserNotFoundException, + TableNotFoundException, NotAllowedException, DataServiceException, DatabaseNotFoundException, + AccessNotFoundException, QueueNotFoundException, DataServiceConnectionException { /* test */ - assertThrows(NotAllowedException.class, () -> { - generic_findById(DATABASE_1_ID, DATABASE_1, TABLE_1_ID, TABLE_1, USER_4_PRINCIPAL, USER_4, null); - }); + generic_findById(DATABASE_1_ID, DATABASE_1, TABLE_1_ID, TABLE_1, USER_4_PRINCIPAL, USER_4, null); } @Test diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServicePersistenceTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServicePersistenceTest.java index f323d2837541d7bff7e15d51273bc9e5f6840d58..9c91084f77cdac6c554cb11ea847bbb447185283 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServicePersistenceTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServicePersistenceTest.java @@ -88,10 +88,7 @@ public class DatabaseServicePersistenceTest extends AbstractUnitTest { /* test */ final List<Database> response = databaseService.findAllAtLestReadAccess(USER_4_ID); - assertEquals(3, response.size()); - assertEquals(DATABASE_4, response.get(0)); - assertEquals(DATABASE_3, response.get(1)); - assertEquals(DATABASE_2, response.get(2)); + assertEquals(0, response.size()); } @Test @@ -100,11 +97,10 @@ public class DatabaseServicePersistenceTest extends AbstractUnitTest { /* test */ final List<Database> response = databaseService.findAllAtLestReadAccess(USER_2_ID); - assertEquals(4, response.size()); + assertEquals(3, response.size()); assertEquals(DATABASE_4, response.get(0)); - assertEquals(DATABASE_3, response.get(1)); - assertEquals(DATABASE_2, response.get(2)); - assertEquals(DATABASE_1, response.get(3)); + assertEquals(DATABASE_2, response.get(1)); + assertEquals(DATABASE_1, response.get(2)); } }