From 4fe1424843b0255f5ed015bdaa1ba93a1a001b67 Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Fri, 24 Jan 2025 14:44:20 +0100
Subject: [PATCH] Need the correct container
Signed-off-by: Martin Weise <martin.weise@tuwien.ac.at>
---
.../tuwien/service/DatabaseServiceIntegrationTest.java | 4 ++--
.../at/tuwien/service/QueueServiceIntegrationTest.java | 4 ++--
.../tuwien/service/SubsetServiceIntegrationTest.java | 4 ++--
.../at/tuwien/service/TableServiceIntegrationTest.java | 10 +++++-----
.../at/tuwien/service/ViewServiceIntegrationTest.java | 4 ++--
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java
index ae1917202d..2b7476e50f 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java
@@ -106,7 +106,7 @@ public class DatabaseServiceIntegrationTest extends AbstractUnitTest {
.build();
/* mock */
- MariaDbConfig.createInitDatabase(CONTAINER_1_DTO, DATABASE_1_DTO);
+ MariaDbConfig.createInitDatabase(CONTAINER_1_PRIVILEGED_DTO, DATABASE_1_DTO);
MariaDbConfig.grantWriteAccess(DATABASE_1_DTO, USER_1_USERNAME);
/* pre-condition */
@@ -131,7 +131,7 @@ public class DatabaseServiceIntegrationTest extends AbstractUnitTest {
.build();
/* mock */
- MariaDbConfig.createInitDatabase(CONTAINER_1_DTO, DATABASE_1_DTO);
+ MariaDbConfig.createInitDatabase(CONTAINER_1_PRIVILEGED_DTO, DATABASE_1_DTO);
/* test */
assertThrows(DatabaseMalformedException.class, () -> {
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/QueueServiceIntegrationTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/QueueServiceIntegrationTest.java
index a2ff1716e5..fc9860909f 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/QueueServiceIntegrationTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/QueueServiceIntegrationTest.java
@@ -52,8 +52,8 @@ public class QueueServiceIntegrationTest extends AbstractUnitTest {
public void beforeEach() throws SQLException {
genesis();
/* metadata database */
- MariaDbConfig.dropDatabase(CONTAINER_1_DTO, DATABASE_1_INTERNALNAME);
- MariaDbConfig.createInitDatabase(CONTAINER_1_DTO, DATABASE_1_DTO);
+ MariaDbConfig.dropDatabase(CONTAINER_1_PRIVILEGED_DTO, DATABASE_1_INTERNALNAME);
+ MariaDbConfig.createInitDatabase(CONTAINER_1_PRIVILEGED_DTO, DATABASE_1_DTO);
}
@Test
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/SubsetServiceIntegrationTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/SubsetServiceIntegrationTest.java
index 886d492cd7..ea58aa1da4 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/SubsetServiceIntegrationTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/SubsetServiceIntegrationTest.java
@@ -44,8 +44,8 @@ public class SubsetServiceIntegrationTest extends AbstractUnitTest {
public void beforeEach() throws SQLException {
genesis();
/* metadata database */
- MariaDbConfig.dropDatabase(CONTAINER_1_DTO, DATABASE_1_INTERNALNAME);
- MariaDbConfig.createInitDatabase(CONTAINER_1_DTO, DATABASE_1_DTO);
+ MariaDbConfig.dropDatabase(CONTAINER_1_PRIVILEGED_DTO, DATABASE_1_INTERNALNAME);
+ MariaDbConfig.createInitDatabase(CONTAINER_1_PRIVILEGED_DTO, DATABASE_1_DTO);
}
@Test
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationTest.java
index cfab2600e5..e29e418ca8 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationTest.java
@@ -82,11 +82,11 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
public void beforeEach() throws SQLException {
genesis();
/* metadata database */
- MariaDbConfig.dropDatabase(CONTAINER_1_DTO, DATABASE_1_INTERNALNAME);
- MariaDbConfig.dropDatabase(CONTAINER_1_DTO, DATABASE_2_INTERNALNAME);
- MariaDbConfig.dropDatabase(CONTAINER_1_DTO, DATABASE_3_INTERNALNAME);
- MariaDbConfig.createInitDatabase(CONTAINER_1_DTO, DATABASE_1_DTO);
- MariaDbConfig.createInitDatabase(CONTAINER_1_DTO, DATABASE_3_DTO);
+ MariaDbConfig.dropDatabase(CONTAINER_1_PRIVILEGED_DTO, DATABASE_1_INTERNALNAME);
+ MariaDbConfig.dropDatabase(CONTAINER_1_PRIVILEGED_DTO, DATABASE_2_INTERNALNAME);
+ MariaDbConfig.dropDatabase(CONTAINER_1_PRIVILEGED_DTO, DATABASE_3_INTERNALNAME);
+ MariaDbConfig.createInitDatabase(CONTAINER_1_PRIVILEGED_DTO, DATABASE_1_DTO);
+ MariaDbConfig.createInitDatabase(CONTAINER_1_PRIVILEGED_DTO, DATABASE_3_DTO);
/* s3 */
if (s3Client.listBuckets().buckets().stream().noneMatch(b -> b.name().equals(s3Config.getS3Bucket()))) {
s3Client.createBucket(CreateBucketRequest.builder()
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/ViewServiceIntegrationTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/ViewServiceIntegrationTest.java
index 658c099724..74e2bd3d68 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/ViewServiceIntegrationTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/ViewServiceIntegrationTest.java
@@ -33,8 +33,8 @@ public class ViewServiceIntegrationTest extends AbstractUnitTest {
public void beforeEach() throws SQLException {
genesis();
/* metadata database */
- MariaDbConfig.dropDatabase(CONTAINER_1_DTO, DATABASE_1_INTERNALNAME);
- MariaDbConfig.createInitDatabase(CONTAINER_1_DTO, DATABASE_1_DTO);
+ MariaDbConfig.dropDatabase(CONTAINER_1_PRIVILEGED_DTO, DATABASE_1_INTERNALNAME);
+ MariaDbConfig.createInitDatabase(CONTAINER_1_PRIVILEGED_DTO, DATABASE_1_DTO);
}
@Test
--
GitLab