From ea3287ee0247d1b64928952b9100746e241c3d3b Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Sat, 8 Jan 2022 18:24:50 +0100
Subject: [PATCH] Fixed the query service tests

---
 .../src/test/java/at/tuwien/BaseUnitTest.java | 138 +-----------------
 1 file changed, 4 insertions(+), 134 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 14868f85dc..51827163ea 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
@@ -255,21 +255,25 @@ public abstract class BaseUnitTest {
             .build();
 
     public final static List<ContainerImageEnvironmentItem> IMAGE_1_ENV = List.of(ContainerImageEnvironmentItem.builder()
+                    .iid(IMAGE_1_ID)
                     .key("UZERNAME")
                     .value("root")
                     .type(ContainerImageEnvironmentItemType.USERNAME)
                     .build(),
             ContainerImageEnvironmentItem.builder()
+                    .iid(IMAGE_1_ID)
                     .key("MARIADB_USER")
                     .value("mariadb")
                     .type(ContainerImageEnvironmentItemType.OTHER)
                     .build(),
             ContainerImageEnvironmentItem.builder()
+                    .iid(IMAGE_1_ID)
                     .key("MARIADB_PASSWORD")
                     .value("mariadb")
                     .type(ContainerImageEnvironmentItemType.OTHER)
                     .build(),
             ContainerImageEnvironmentItem.builder()
+                    .iid(IMAGE_1_ID)
                     .key("MARIADB_ROOT_PASSWORD")
                     .value("mariadb")
                     .type(ContainerImageEnvironmentItemType.PASSWORD)
@@ -342,66 +346,6 @@ public abstract class BaseUnitTest {
             .created(CONTAINER_2_CREATED)
             .build();
 
-    public final static Container CONTAINER_3 = Container.builder()
-            .id(CONTAINER_3_ID)
-            .name(CONTAINER_3_NAME)
-            .internalName(CONTAINER_3_INTERNALNAME)
-            .image(CONTAINER_3_IMAGE)
-            .hash(CONTAINER_3_HASH)
-            .created(CONTAINER_3_CREATED)
-            .build();
-
-    public final static Container CONTAINER_NGINX = Container.builder()
-            .id(CONTAINER_NGINX_ID)
-            .name(CONTAINER_NGINX_NAME)
-            .internalName(CONTAINER_NGINX_INTERNALNAME)
-            .hash(CONTAINER_NGINX_HASH)
-            .created(CONTAINER_NGINX_CREATED)
-            .build();
-
-    public final static List<TableColumn> TABLE_3_COLUMNS = List.of(TableColumn.builder()
-                    .id(COLUMN_3_1_ID)
-                    .ordinalPosition(COLUMN_3_1_ORDINALPOS)
-                    .cdbid(DATABASE_3_ID)
-                    .tid(TABLE_3_ID)
-                    .name(COLUMN_3_1_NAME)
-                    .internalName(COLUMN_3_1_INTERNAL_NAME)
-                    .columnType(COLUMN_3_1_TYPE)
-                    .isNullAllowed(COLUMN_3_1_NULL)
-                    .isUnique(COLUMN_3_1_UNIQUE)
-                    .autoGenerated(COLUMN_3_1_AUTO_GENERATED)
-                    .isPrimaryKey(COLUMN_3_1_PRIMARY)
-                    .enumValues(COLUMN_3_1_ENUM_VALUES)
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_3_2_ID)
-                    .ordinalPosition(COLUMN_3_2_ORDINALPOS)
-                    .cdbid(DATABASE_3_ID)
-                    .tid(TABLE_3_ID)
-                    .name(COLUMN_3_2_NAME)
-                    .internalName(COLUMN_3_2_INTERNAL_NAME)
-                    .columnType(COLUMN_3_2_TYPE)
-                    .isNullAllowed(COLUMN_3_2_NULL)
-                    .isUnique(COLUMN_3_2_UNIQUE)
-                    .autoGenerated(COLUMN_3_2_AUTO_GENERATED)
-                    .isPrimaryKey(COLUMN_3_2_PRIMARY)
-                    .enumValues(COLUMN_3_2_ENUM_VALUES)
-                    .build(),
-            TableColumn.builder()
-                    .id(COLUMN_3_3_ID)
-                    .ordinalPosition(COLUMN_3_3_ORDINALPOS)
-                    .cdbid(DATABASE_3_ID)
-                    .tid(TABLE_3_ID)
-                    .name(COLUMN_3_3_NAME)
-                    .internalName(COLUMN_3_3_INTERNAL_NAME)
-                    .columnType(COLUMN_3_3_TYPE)
-                    .isNullAllowed(COLUMN_3_3_NULL)
-                    .isUnique(COLUMN_3_3_UNIQUE)
-                    .autoGenerated(COLUMN_3_3_AUTO_GENERATED)
-                    .isPrimaryKey(COLUMN_3_3_PRIMARY)
-                    .enumValues(COLUMN_3_3_ENUM_VALUES)
-                    .build());
-
     public final static List<TableColumn> TABLE_1_COLUMNS = List.of(TableColumn.builder()
                     .id(COLUMN_1_1_ID)
                     .ordinalPosition(COLUMN_1_1_ORDINALPOS)
@@ -511,24 +455,6 @@ public abstract class BaseUnitTest {
             .skipHeaders(TABLE_2_SKIP_HEADERS)
             .build();
 
-
-    public final static Table TABLE_3 = Table.builder()
-            .id(TABLE_3_ID)
-            .tdbid(DATABASE_3_ID)
-            .created(Instant.now())
-            .internalName(TABLE_3_INTERNALNAME)
-            .description(TABLE_3_DESCRIPTION)
-            .name(TABLE_3_NAME)
-            .lastModified(TABLE_3_LAST_MODIFIED)
-            .columns(TABLE_3_COLUMNS)
-            .topic(TABLE_3_TOPIC)
-            .separator(TABLE_3_SEPARATOR)
-            .nullElement(TABLE_3_NULL_ELEMENT)
-            .trueElement(TABLE_3_TRUE_ELEMENT)
-            .falseElement(TABLE_3_FALSE_ELEMENT)
-            .skipHeaders(TABLE_3_SKIP_HEADERS)
-            .build();
-
     public final static Database DATABASE_1 = Database.builder()
             .id(DATABASE_1_ID)
             .created(Instant.now().minus(1, HOURS))
@@ -541,7 +467,6 @@ public abstract class BaseUnitTest {
             .exchange(DATABASE_1_EXCHANGE)
             .build();
 
-    /* no connection */
     public final static Database DATABASE_2 = Database.builder()
             .id(DATABASE_2_ID)
             .created(Instant.now().minus(1, HOURS))
@@ -554,59 +479,4 @@ public abstract class BaseUnitTest {
             .exchange(DATABASE_2_EXCHANGE)
             .build();
 
-    public final static Database DATABASE_3 = Database.builder()
-            .id(DATABASE_3_ID)
-            .created(Instant.now().minus(1, HOURS))
-            .lastModified(Instant.now())
-            .isPublic(false)
-            .name(DATABASE_3_NAME)
-            .container(CONTAINER_3)
-            .tables(List.of(TABLE_3))
-            .internalName(DATABASE_3_INTERNALNAME)
-            .exchange(DATABASE_3_EXCHANGE)
-            .build();
-
-    public final static ColumnCreateDto[] COLUMNS_CSV01 = new ColumnCreateDto[]{
-            ColumnCreateDto.builder()
-                    .type(COLUMN_1_1_TYPE_DTO)
-                    .name(COLUMN_1_1_NAME)
-                    .nullAllowed(COLUMN_1_1_NULL)
-                    .primaryKey(COLUMN_1_1_PRIMARY)
-                    .unique(COLUMN_1_1_UNIQUE)
-                    .build(),
-            ColumnCreateDto.builder()
-                    .type(COLUMN_1_2_TYPE_DTO)
-                    .name(COLUMN_1_2_NAME)
-                    .nullAllowed(COLUMN_1_2_NULL)
-                    .primaryKey(COLUMN_1_2_PRIMARY)
-                    .unique(COLUMN_1_2_UNIQUE)
-                    .build(),
-            ColumnCreateDto.builder()
-                    .type(COLUMN_1_3_TYPE_DTO)
-                    .name(COLUMN_1_3_NAME)
-                    .nullAllowed(COLUMN_1_3_NULL)
-                    .primaryKey(COLUMN_1_3_PRIMARY)
-                    .unique(COLUMN_1_3_UNIQUE)
-                    .build(),
-            ColumnCreateDto.builder()
-                    .type(COLUMN_1_4_TYPE_DTO)
-                    .name(COLUMN_1_4_NAME)
-                    .nullAllowed(COLUMN_1_4_NULL)
-                    .primaryKey(COLUMN_1_4_PRIMARY)
-                    .unique(COLUMN_1_4_UNIQUE)
-                    .build(),
-            ColumnCreateDto.builder()
-                    .type(COLUMN_1_5_TYPE_DTO)
-                    .name(COLUMN_1_5_NAME)
-                    .nullAllowed(COLUMN_1_5_NULL)
-                    .primaryKey(COLUMN_1_5_PRIMARY)
-                    .unique(COLUMN_1_5_UNIQUE)
-                    .build()};
-
-    public final static TableCreateDto TABLE_2_CREATE_DTO = TableCreateDto.builder()
-            .name(TABLE_2_NAME)
-            .description(TABLE_2_DESCRIPTION)
-            .columns(COLUMNS_CSV01)
-            .build();
-
 }
-- 
GitLab