From 95d80c95af2276c592d14458badd02b3ef592338 Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Tue, 29 Nov 2022 16:51:30 +0100
Subject: [PATCH] Added image id
---
.../src/test/java/at/tuwien/BaseUnitTest.java | 3 +++
.../service/QueryServiceIntegrationTest.java | 16 ++++++----------
2 files changed, 9 insertions(+), 10 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 c54769404b..2045c6a86f 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
@@ -714,6 +714,7 @@ public abstract class BaseUnitTest {
.id(CONTAINER_1_ID)
.name(CONTAINER_1_NAME)
.internalName(CONTAINER_1_INTERNALNAME)
+ .imageId(IMAGE_1_ID)
.image(CONTAINER_1_IMAGE)
.hash(CONTAINER_1_HASH)
.created(CONTAINER_1_CREATED)
@@ -723,6 +724,7 @@ public abstract class BaseUnitTest {
.id(CONTAINER_2_ID)
.name(CONTAINER_2_NAME)
.internalName(CONTAINER_2_INTERNALNAME)
+ .imageId(IMAGE_1_ID)
.image(CONTAINER_2_IMAGE)
.hash(CONTAINER_2_HASH)
.created(CONTAINER_2_CREATED)
@@ -732,6 +734,7 @@ public abstract class BaseUnitTest {
.id(CONTAINER_3_ID)
.name(CONTAINER_3_NAME)
.internalName(CONTAINER_3_INTERNALNAME)
+ .imageId(IMAGE_1_ID)
.image(CONTAINER_3_IMAGE)
.hash(CONTAINER_3_HASH)
.created(CONTAINER_3_CREATED)
diff --git a/fda-query-service/rest-service/src/test/java/at/tuwien/service/QueryServiceIntegrationTest.java b/fda-query-service/rest-service/src/test/java/at/tuwien/service/QueryServiceIntegrationTest.java
index a25a26c57a..1cdfebecc7 100644
--- a/fda-query-service/rest-service/src/test/java/at/tuwien/service/QueryServiceIntegrationTest.java
+++ b/fda-query-service/rest-service/src/test/java/at/tuwien/service/QueryServiceIntegrationTest.java
@@ -81,6 +81,9 @@ public class QueryServiceIntegrationTest extends BaseUnitTest {
@Autowired
private ConceptRepository conceptRepository;
+ @Autowired
+ private ContainerRepository containerRepository;
+
@Rule
public Timeout globalTimeout = Timeout.seconds(60);
@@ -169,6 +172,9 @@ public class QueryServiceIntegrationTest extends BaseUnitTest {
/* image dates */
IMAGE_1.setDateFormats(List.of(IMAGE_DATE_1, IMAGE_DATE_2));
imageRepository.save(IMAGE_1);
+ containerRepository.save(CONTAINER_1);
+ containerRepository.save(CONTAINER_2);
+ containerRepository.save(CONTAINER_3);
/* create databases */
databaseRepository.save(DATABASE_1);
databaseRepository.save(DATABASE_2);
@@ -188,16 +194,6 @@ public class QueryServiceIntegrationTest extends BaseUnitTest {
/* create tables 3 */
TABLE_3.setDatabase(DATABASE_3);
tableRepository.save(TABLE_3);
-// TABLE_4.setDatabase(DATABASE_2);
-// tableRepository.save(TABLE_4);
-// TABLE_4.setColumns(TABLE_4_COLUMNS);
-// TABLE_4_COLUMNS.forEach(column -> column.setTable(TABLE_4));
-// tableRepository.save(TABLE_4);
-// TABLE_5.setDatabase(DATABASE_2);
-// tableRepository.save(TABLE_5);
-// TABLE_5.setColumns(TABLE_5_COLUMNS);
-// TABLE_5_COLUMNS.forEach(column -> column.setTable(TABLE_5));
-// tableRepository.save(TABLE_5);
}
@Test
--
GitLab