From 965eb40d15a062efed638f676194c1d421c5c038 Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Mon, 28 Nov 2022 10:29:36 +0100
Subject: [PATCH] Added fda schema
---
.../ElasticSearchIndexIntegrationTest.java | 17 +++++++++++++++++
.../service/TableServiceIntegrationTest.java | 4 ++++
.../src/test/resources/application.properties | 2 +-
3 files changed, 22 insertions(+), 1 deletion(-)
create mode 100644 fda-table-service/rest-service/src/test/java/at/tuwien/service/ElasticSearchIndexIntegrationTest.java
diff --git a/fda-table-service/rest-service/src/test/java/at/tuwien/service/ElasticSearchIndexIntegrationTest.java b/fda-table-service/rest-service/src/test/java/at/tuwien/service/ElasticSearchIndexIntegrationTest.java
new file mode 100644
index 0000000000..4f14953175
--- /dev/null
+++ b/fda-table-service/rest-service/src/test/java/at/tuwien/service/ElasticSearchIndexIntegrationTest.java
@@ -0,0 +1,17 @@
+package at.tuwien.service;
+
+import at.tuwien.BaseUnitTest;
+import lombok.extern.log4j.Log4j2;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
+@Log4j2
+@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD)
+@SpringBootTest
+@ExtendWith(SpringExtension.class)
+public class ElasticSearchIndexIntegrationTest extends BaseUnitTest {
+
+
+}
diff --git a/fda-table-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationTest.java b/fda-table-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationTest.java
index f1a180377c..abbc84317d 100644
--- a/fda-table-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationTest.java
+++ b/fda-table-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationTest.java
@@ -2,6 +2,7 @@ package at.tuwien.service;
import at.tuwien.BaseUnitTest;
import at.tuwien.config.DockerConfig;
+import at.tuwien.config.IndexInitializer;
import at.tuwien.config.ReadyConfig;
import at.tuwien.entities.database.table.Table;
import at.tuwien.exception.*;
@@ -42,6 +43,9 @@ public class TableServiceIntegrationTest extends BaseUnitTest {
@MockBean
private Channel channel;
+ @MockBean
+ private IndexInitializer indexInitializer;
+
@Autowired
private ImageRepository imageRepository;
diff --git a/fda-table-service/rest-service/src/test/resources/application.properties b/fda-table-service/rest-service/src/test/resources/application.properties
index efc45ddfe2..92f6e9d907 100644
--- a/fda-table-service/rest-service/src/test/resources/application.properties
+++ b/fda-table-service/rest-service/src/test/resources/application.properties
@@ -9,7 +9,7 @@ spring.cloud.config.discovery.enabled = false
spring.cloud.config.enabled = false
# disable datasource
-spring.datasource.url=jdbc:h2:mem:testdb;DB_CLOSE_ON_EXIT=FALSE
+spring.datasource.url=jdbc:h2:mem:testdb;DB_CLOSE_ON_EXIT=FALSE;INIT=CREATE SCHEMA IF NOT EXISTS FDA
spring.datasource.driverClassName=org.h2.Driver
spring.datasource.username=sa
spring.datasource.password=password
--
GitLab