From f70f705d54def9f6e07dcddd03cdf46c95c4c546 Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Wed, 5 Feb 2025 13:26:05 +0100
Subject: [PATCH] Fixed moar tests
Signed-off-by: Martin Weise <martin.weise@tuwien.ac.at>
---
.../tuwien/endpoint/ViewEndpointUnitTest.java | 32 +++++++++----------
.../endpoints/DatabaseEndpointUnitTest.java | 4 +--
.../main/java/at/tuwien/test/BaseTest.java | 4 +--
3 files changed, 20 insertions(+), 20 deletions(-)
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 5dce498856..b003ebfb4f 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 bfe225b87c..47ec3e6b3a 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 57ae996453..0f07af9af9 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";
--
GitLab