From ffd86d1f4955330c6bddd9cb373f3aa1289b7dea Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Sat, 11 Mar 2023 17:52:24 +0100
Subject: [PATCH] Fixed the tests
---
.../at/tuwien/service/QueueServiceIntegrationTest.java | 3 +--
.../java/at/tuwien/service/ViewServiceIntegrationTest.java | 7 +++++++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/fda-query-service/rest-service/src/test/java/at/tuwien/service/QueueServiceIntegrationTest.java b/fda-query-service/rest-service/src/test/java/at/tuwien/service/QueueServiceIntegrationTest.java
index acfe952c72..2e24a14b66 100644
--- a/fda-query-service/rest-service/src/test/java/at/tuwien/service/QueueServiceIntegrationTest.java
+++ b/fda-query-service/rest-service/src/test/java/at/tuwien/service/QueueServiceIntegrationTest.java
@@ -199,7 +199,7 @@ public class QueueServiceIntegrationTest extends BaseUnitTest {
}
@Test
- public void restore_succeeds() throws AmqpException, IOException, InterruptedException {
+ public void restore_succeeds() throws AmqpException, IOException {
/* mock */
when(tableRepository.findAll())
@@ -207,7 +207,6 @@ public class QueueServiceIntegrationTest extends BaseUnitTest {
/* test */
messageQueueService.restore();
- Thread.sleep(5 * 1000);
final List<ConsumerDto> response = rabbitMqConfig.findAllConsumers();
assertEquals(amqpConfig.getAmqpConsumers(), (int) response.stream().filter(c -> c.getQueue().getName().equals(TABLE_1_QUEUE_NAME)).count());
}
diff --git a/fda-query-service/rest-service/src/test/java/at/tuwien/service/ViewServiceIntegrationTest.java b/fda-query-service/rest-service/src/test/java/at/tuwien/service/ViewServiceIntegrationTest.java
index c2cf5c3008..7034c836a5 100644
--- a/fda-query-service/rest-service/src/test/java/at/tuwien/service/ViewServiceIntegrationTest.java
+++ b/fda-query-service/rest-service/src/test/java/at/tuwien/service/ViewServiceIntegrationTest.java
@@ -17,6 +17,7 @@ import com.rabbitmq.client.Channel;
import lombok.extern.log4j.Log4j2;
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.springframework.beans.factory.annotation.Autowired;
@@ -93,6 +94,12 @@ public class ViewServiceIntegrationTest 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_3));
+ }
+
@Test
public void create_viewJoinOnView_succeeds() throws DatabaseNotFoundException, UserNotFoundException,
DatabaseConnectionException, ViewMalformedException, QueryMalformedException, SQLException {
--
GitLab