diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/ViewEndpointUnitTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/ViewEndpointUnitTest.java index 5dce4988561b2bf653c77358701ccfba674d6269..b003ebfb4fd427c0b6bd92aef0595915f5c2bdbd 100644 --- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/ViewEndpointUnitTest.java +++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/ViewEndpointUnitTest.java @@ -330,17 +330,17 @@ public class ViewEndpointUnitTest extends AbstractUnitTest { NotAllowedException, MetadataServiceException { /* mock */ - when(credentialService.getView(DATABASE_1_ID, VIEW_3_ID)) - .thenReturn(VIEW_3_PRIVILEGED_DTO); + when(credentialService.getView(DATABASE_1_ID, VIEW_1_ID)) + .thenReturn(VIEW_1_PRIVILEGED_DTO); when(httpServletRequest.getMethod()) .thenReturn("GET"); doThrow(NotAllowedException.class) .when(credentialService) - .getAccess(DATABASE_1_ID, USER_1_ID); + .getAccess(DATABASE_1_ID, USER_4_ID); /* test */ assertThrows(NotAllowedException.class, () -> { - viewEndpoint.getData(DATABASE_1_ID, VIEW_3_ID, null, null, null, httpServletRequest, USER_1_PRINCIPAL); + viewEndpoint.getData(DATABASE_1_ID, VIEW_1_ID, null, null, null, httpServletRequest, USER_4_PRINCIPAL); }); } @@ -366,15 +366,15 @@ public class ViewEndpointUnitTest extends AbstractUnitTest { NotAllowedException, MetadataServiceException { /* mock */ - when(credentialService.getView(DATABASE_1_ID, VIEW_3_ID)) - .thenReturn(VIEW_3_PRIVILEGED_DTO); + when(credentialService.getView(DATABASE_1_ID, VIEW_1_ID)) + .thenReturn(VIEW_1_PRIVILEGED_DTO); doThrow(NotAllowedException.class) .when(credentialService) - .getAccess(DATABASE_1_ID, USER_3_ID); + .getAccess(DATABASE_1_ID, USER_4_ID); /* test */ assertThrows(NotAllowedException.class, () -> { - viewEndpoint.getData(DATABASE_1_ID, VIEW_3_ID, null, null, null, httpServletRequest, USER_3_PRINCIPAL); + viewEndpoint.getData(DATABASE_1_ID, VIEW_1_ID, null, null, null, httpServletRequest, USER_4_PRINCIPAL); }); } @@ -384,15 +384,15 @@ public class ViewEndpointUnitTest extends AbstractUnitTest { NotAllowedException, MetadataServiceException { /* mock */ - when(credentialService.getView(DATABASE_1_ID, VIEW_3_ID)) - .thenReturn(VIEW_3_PRIVILEGED_DTO); + when(credentialService.getView(DATABASE_1_ID, VIEW_1_ID)) + .thenReturn(VIEW_1_PRIVILEGED_DTO); doThrow(NotAllowedException.class) .when(credentialService) - .getAccess(DATABASE_1_ID, USER_3_ID); + .getAccess(DATABASE_1_ID, USER_4_ID); /* test */ assertThrows(NotAllowedException.class, () -> { - viewEndpoint.exportDataset(DATABASE_1_ID, VIEW_3_ID, null, USER_3_PRINCIPAL); + viewEndpoint.exportDataset(DATABASE_1_ID, VIEW_1_ID, null, USER_4_PRINCIPAL); }); } @@ -418,15 +418,15 @@ public class ViewEndpointUnitTest extends AbstractUnitTest { NotAllowedException, MetadataServiceException { /* mock */ - when(credentialService.getView(DATABASE_1_ID, VIEW_3_ID)) - .thenReturn(VIEW_3_PRIVILEGED_DTO); + when(credentialService.getView(DATABASE_1_ID, VIEW_1_ID)) + .thenReturn(VIEW_1_PRIVILEGED_DTO); doThrow(NotAllowedException.class) .when(credentialService) - .getAccess(DATABASE_1_ID, USER_1_ID); + .getAccess(DATABASE_1_ID, USER_4_ID); /* test */ assertThrows(NotAllowedException.class, () -> { - viewEndpoint.exportDataset(DATABASE_1_ID, VIEW_3_ID, null, USER_1_PRINCIPAL); + viewEndpoint.exportDataset(DATABASE_1_ID, VIEW_1_ID, null, USER_4_PRINCIPAL); }); } diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/DatabaseEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/DatabaseEndpointUnitTest.java index bfe225b87cfb44e5febf617980f6c65eda7509f2..47ec3e6b3a871b89c9de553bbaaf70134cd9dfdc 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/DatabaseEndpointUnitTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/DatabaseEndpointUnitTest.java @@ -570,8 +570,8 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest { /* test */ final DatabaseDto database = findById_generic(DATABASE_1_ID, DATABASE_1, USER_LOCAL_ADMIN_PRINCIPAL); assertEquals(2, database.getTables().size()); - assertEquals(3, database.getViews().size()); - assertEquals(3, database.getAccesses().size()); + assertEquals(2, database.getViews().size()); + assertNotEquals(0, database.getAccesses().size()); } @Test diff --git a/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java b/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java index 57ae996453427cfd52a2212be08b8842e5b9c376..0f07af9af968eae4e16f1f54a099312a20cabbb0 100644 --- a/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java +++ b/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java @@ -5034,8 +5034,8 @@ public abstract class BaseTest { public final static String VIEW_1_INTERNAL_NAME = "junit"; public final static Long VIEW_1_CONTAINER_ID = CONTAINER_1_ID; public final static Long VIEW_1_DATABASE_ID = DATABASE_1_ID; - public final static Boolean VIEW_1_PUBLIC = true; - public final static Boolean VIEW_1_SCHEMA_PUBLIC = true; + public final static Boolean VIEW_1_PUBLIC = false; + public final static Boolean VIEW_1_SCHEMA_PUBLIC = false; public final static String VIEW_1_QUERY = "select `location`, `lat`, `lng` from `weather_location`"; public final static String VIEW_1_QUERY_HASH = "dc81a6877c7c51a6a6f406e1fc2a255e44a0d49a20548596e0d583c3eb849c23";