From cd631d7e6723f5b1a391c9df74d30be0872d9f63 Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Sat, 11 Mar 2023 11:55:43 +0100
Subject: [PATCH] Fixed some base unit dtos
---
.../src/test/java/at/tuwien/BaseUnitTest.java | 18 ++++++++++++++++--
.../ViewIdxRepositoryIntegrationTest.java | 7 +++++++
.../service/TableServiceIntegrationTest.java | 3 ++-
3 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/fda-query-service/rest-service/src/test/java/at/tuwien/BaseUnitTest.java b/fda-query-service/rest-service/src/test/java/at/tuwien/BaseUnitTest.java
index 7fb7b65b2f..f68fbda595 100644
--- a/fda-query-service/rest-service/src/test/java/at/tuwien/BaseUnitTest.java
+++ b/fda-query-service/rest-service/src/test/java/at/tuwien/BaseUnitTest.java
@@ -2309,6 +2309,20 @@ public abstract class BaseUnitTest {
.creator(USER_1)
.build();
+ public final static Table TABLE_7_NOCOLS = Table.builder()
+ .id(TABLE_7_ID)
+ .created(Instant.now())
+ .internalName(TABLE_7_INTERNAL_NAME)
+ .description(TABLE_7_DESCRIPTION)
+ .name(TABLE_7_NAME)
+ .lastModified(TABLE_7_LAST_MODIFIED)
+ .tdbid(DATABASE_1_ID)
+ .queueName(TABLE_7_QUEUE_NAME)
+ .routingKey(TABLE_7_ROUTING_KEY)
+ .columns(List.of())
+ .creator(USER_1)
+ .build();
+
public final static Long VIEW_1_ID = 1L;
public final static Boolean VIEW_1_INITIAL_VIEW = false;
public final static String VIEW_1_NAME = "JUnit";
@@ -2433,8 +2447,8 @@ public abstract class BaseUnitTest {
.exchangeName(DATABASE_1_EXCHANGE)
.creator(USER_1)
.owner(USER_1)
- .tables(List.of(TABLE_1, TABLE_2, TABLE_3))
- .views(List.of(VIEW_4))
+ .tables(List.of(TABLE_1, TABLE_2, TABLE_3, TABLE_7))
+ .views(List.of(VIEW_1))
.build();
public final static Database DATABASE_2 = Database.builder()
diff --git a/fda-query-service/rest-service/src/test/java/at/tuwien/repository/ViewIdxRepositoryIntegrationTest.java b/fda-query-service/rest-service/src/test/java/at/tuwien/repository/ViewIdxRepositoryIntegrationTest.java
index 834eb21836..bd9644c6f5 100644
--- a/fda-query-service/rest-service/src/test/java/at/tuwien/repository/ViewIdxRepositoryIntegrationTest.java
+++ b/fda-query-service/rest-service/src/test/java/at/tuwien/repository/ViewIdxRepositoryIntegrationTest.java
@@ -18,6 +18,7 @@ import lombok.extern.log4j.Log4j2;
import org.junit.Rule;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.rules.Timeout;
@@ -94,6 +95,12 @@ public class ViewIdxRepositoryIntegrationTest extends BaseUnitTest {
DockerConfig.removeAllNetworks();
}
+ @BeforeEach
+ public void beforeEach() {
+ DATABASE_1.setTables(List.of(TABLE_1, TABLE_2, TABLE_3, TABLE_7));
+ DATABASE_1.setViews(List.of(VIEW_1));
+ }
+
@Test
public void save_succeeds() throws UserNotFoundException, DatabaseConnectionException, ViewMalformedException,
QueryMalformedException, DatabaseNotFoundException {
diff --git a/fda-query-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationTest.java b/fda-query-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationTest.java
index b5a6c8c819..58f28e9513 100644
--- a/fda-query-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationTest.java
+++ b/fda-query-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationTest.java
@@ -105,8 +105,9 @@ public class TableServiceIntegrationTest extends BaseUnitTest {
tableRepository.save(TABLE_1_NOCOLS);
tableRepository.save(TABLE_2_NOCOLS);
tableRepository.save(TABLE_3_NOCOLS);
- tableRepository.save(TABLE_4_NOCOLS);
+ tableRepository.save(TABLE_7_NOCOLS);
DATABASE_1.setTables(List.of());
+ DATABASE_1.setViews(List.of());
databaseRepository.save(DATABASE_1);
}
--
GitLab