From 8f2b072ab80a462cd9e222028f613648d0ccfe75 Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Wed, 7 Jun 2023 17:49:47 +0200
Subject: [PATCH] Fixed some tests
---
.../java/at/tuwien/endpoint/ActuatorComponentTest.java | 10 +++++++---
.../endpoint/IdentifierEndpointIntegrationTest.java | 4 ++++
.../at/tuwien/endpoint/IdentifierEndpointUnitTest.java | 6 +++++-
.../tuwien/endpoint/PersistenceEndpointUnitTest.java | 6 +++++-
.../java/at/tuwien/endpoint/SwaggerComponentTest.java | 4 ++++
.../at/tuwien/gateway/QueryServiceGatewayUnitTest.java | 6 +++++-
.../service/DataCiteIdentifierServiceUnitTest.java | 6 +++++-
.../java/at/tuwien/service/UserServiceUnitTest.java | 6 +++++-
.../test/src/main/java/at/tuwien/test/BaseTest.java | 4 ++--
.../java/at/tuwien/endpoint/ActuatorComponentTest.java | 4 ++++
.../at/tuwien/endpoint/ExportEndpointUnitTest.java | 6 +++++-
.../java/at/tuwien/endpoint/QueryEndpointUnitTest.java | 8 +++++---
.../java/at/tuwien/endpoint/StoreEndpointUnitTest.java | 6 +++++-
.../java/at/tuwien/endpoint/SwaggerComponentTest.java | 4 ++++
.../at/tuwien/endpoint/TableDataEndpointUnitTest.java | 6 ++++--
.../tuwien/endpoint/TableHistoryEndpointUnitTest.java | 6 ++++--
.../java/at/tuwien/endpoint/ViewEndpointUnitTest.java | 8 +++++---
.../listener/RabbitMqListenerIntegrationTest.java | 4 ++++
.../test/java/at/tuwien/mapper/QueryMapperTest.java | 6 +++++-
.../repository/ViewIdxRepositoryIntegrationTest.java | 2 --
.../repository/ViewRepositoryIntegrationTest.java | 4 ++++
.../service/ContainerServiceIntegrationTest.java | 6 ++++--
.../at/tuwien/service/QueryServiceIntegrationTest.java | 4 ++++
.../at/tuwien/service/QueueServiceIntegrationTest.java | 6 +++++-
.../service/StoreServiceIntegrationModifyTest.java | 6 ++++--
.../service/StoreServiceIntegrationReadTest.java | 4 ++++
.../service/TableServiceIntegrationReadTest.java | 6 ++++--
.../java/at/tuwien/service/TableServiceUnitTest.java | 6 +++++-
.../tuwien/repository/mdb/TableColumnRepository.java | 2 +-
.../java/at/tuwien/endpoint/ActuatorComponentTest.java | 8 ++++++++
.../java/at/tuwien/endpoint/SwaggerComponentTest.java | 8 ++++++++
.../java/at/tuwien/endpoint/ActuatorComponentTest.java | 8 ++++++++
.../tuwien/endpoint/MaintenanceEndpointUnitTest.java | 8 ++++++++
.../java/at/tuwien/endpoint/SwaggerComponentTest.java | 8 ++++++++
.../java/at/tuwien/endpoint/UserEndpointUnitTest.java | 8 ++++++++
.../src/test/java/at/tuwien/mapper/UserMapperTest.java | 9 +++++++++
.../service/BannerMessageServiceIntegrationTest.java | 9 +++++++++
.../at/tuwien/service/RealmServiceIntegrationTest.java | 9 +++++++++
.../at/tuwien/service/RoleServiceIntegrationTest.java | 9 +++++++++
.../service/UserAttributeServiceIntegrationTest.java | 9 +++++++++
.../at/tuwien/service/UserServiceIntegrationTest.java | 9 +++++++++
41 files changed, 224 insertions(+), 34 deletions(-)
diff --git a/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java b/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java
index 2f817c1ec8..2b4f129bfb 100644
--- a/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java
+++ b/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java
@@ -2,6 +2,7 @@ package at.tuwien.endpoint;
import at.tuwien.BaseUnitTest;
import at.tuwien.config.IndexConfig;
+import at.tuwien.repository.sdb.IdentifierIdxRepository;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -22,12 +23,15 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
@SpringBootTest
public class ActuatorComponentTest extends BaseUnitTest {
- @Autowired
- private MockMvc mockMvc;
-
@MockBean
private IndexConfig indexConfig;
+ @MockBean
+ private IdentifierIdxRepository identifierIdxRepository;
+
+ @Autowired
+ private MockMvc mockMvc;
+
@Test
public void actuatorInfo_succeeds() throws Exception {
this.mockMvc.perform(get("/actuator/info"))
diff --git a/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/IdentifierEndpointIntegrationTest.java b/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/IdentifierEndpointIntegrationTest.java
index 7c108704fb..406ca2e65b 100644
--- a/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/IdentifierEndpointIntegrationTest.java
+++ b/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/IdentifierEndpointIntegrationTest.java
@@ -8,6 +8,7 @@ import at.tuwien.config.ReadyConfig;
import at.tuwien.endpoints.IdentifierEndpoint;
import at.tuwien.exception.NotAllowedException;
import at.tuwien.repository.mdb.*;
+import at.tuwien.repository.sdb.IdentifierIdxRepository;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -39,6 +40,9 @@ public class IdentifierEndpointIntegrationTest extends BaseUnitTest {
@MockBean
private ReadyConfig readyConfig;
+ @MockBean
+ private IdentifierIdxRepository identifierIdxRepository;
+
@Autowired
private IdentifierRepository identifierRepository;
diff --git a/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/IdentifierEndpointUnitTest.java b/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/IdentifierEndpointUnitTest.java
index b7725ef7ff..c98c045e69 100644
--- a/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/IdentifierEndpointUnitTest.java
+++ b/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/IdentifierEndpointUnitTest.java
@@ -17,6 +17,7 @@ import at.tuwien.entities.user.User;
import at.tuwien.exception.*;
import at.tuwien.gateway.QueryServiceGateway;
import at.tuwien.repository.mdb.*;
+import at.tuwien.repository.sdb.IdentifierIdxRepository;
import at.tuwien.service.AccessService;
import at.tuwien.service.IdentifierService;
import org.apache.commons.io.FileUtils;
@@ -53,7 +54,7 @@ public class IdentifierEndpointUnitTest extends BaseUnitTest {
private ReadyConfig readyConfig;
@MockBean
- private IndexConfig indexInitializer;
+ private IndexConfig indexConfig;
@MockBean
private IdentifierService identifierService;
@@ -79,6 +80,9 @@ public class IdentifierEndpointUnitTest extends BaseUnitTest {
@MockBean
private QueryServiceGateway queryServiceGateway;
+ @MockBean
+ private IdentifierIdxRepository identifierIdxRepository;
+
@Autowired
private IdentifierEndpoint identifierEndpoint;
diff --git a/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/PersistenceEndpointUnitTest.java b/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/PersistenceEndpointUnitTest.java
index 7e9c11f73d..2f74995d16 100644
--- a/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/PersistenceEndpointUnitTest.java
+++ b/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/PersistenceEndpointUnitTest.java
@@ -11,6 +11,7 @@ import at.tuwien.endpoints.PersistenceEndpoint;
import at.tuwien.entities.identifier.Identifier;
import at.tuwien.entities.user.User;
import at.tuwien.exception.*;
+import at.tuwien.repository.sdb.IdentifierIdxRepository;
import at.tuwien.service.AccessService;
import at.tuwien.service.IdentifierService;
import at.tuwien.service.UserService;
@@ -54,7 +55,10 @@ public class PersistenceEndpointUnitTest extends BaseUnitTest {
private ReadyConfig readyConfig;
@MockBean
- private IndexConfig indexInitializer;
+ private IndexConfig indexConfig;
+
+ @MockBean
+ private IdentifierIdxRepository identifierIdxRepository;
@MockBean
private AccessService accessService;
diff --git a/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java b/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java
index 47a1359841..6ef1503d94 100644
--- a/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java
+++ b/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java
@@ -2,6 +2,7 @@ package at.tuwien.endpoint;
import at.tuwien.BaseUnitTest;
import at.tuwien.config.IndexConfig;
+import at.tuwien.repository.sdb.IdentifierIdxRepository;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -28,6 +29,9 @@ public class SwaggerComponentTest extends BaseUnitTest {
@MockBean
private IndexConfig indexConfig;
+ @MockBean
+ private IdentifierIdxRepository identifierIdxRepository;
+
@Test
public void swaggerUi_succeeds() throws Exception {
this.mockMvc.perform(get("/swagger-ui/index.html"))
diff --git a/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/gateway/QueryServiceGatewayUnitTest.java b/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/gateway/QueryServiceGatewayUnitTest.java
index a647d6e54e..055cc56e07 100644
--- a/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/gateway/QueryServiceGatewayUnitTest.java
+++ b/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/gateway/QueryServiceGatewayUnitTest.java
@@ -7,6 +7,7 @@ import at.tuwien.config.ReadyConfig;
import at.tuwien.exception.QueryNotFoundException;
import at.tuwien.exception.RemoteUnavailableException;
import at.tuwien.repository.mdb.UserRepository;
+import at.tuwien.repository.sdb.IdentifierIdxRepository;
import com.google.common.io.Files;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
@@ -36,11 +37,14 @@ import static org.mockito.Mockito.*;
public class QueryServiceGatewayUnitTest extends BaseUnitTest {
@MockBean
- private IndexConfig indexInitializer;
+ private IndexConfig indexConfig;
@MockBean
private ReadyConfig readyConfig;
+ @MockBean
+ private IdentifierIdxRepository identifierIdxRepository;
+
@MockBean
@Qualifier("restTemplate")
private RestTemplate restTemplate;
diff --git a/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/service/DataCiteIdentifierServiceUnitTest.java b/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/service/DataCiteIdentifierServiceUnitTest.java
index 152ee248ab..beea45933d 100644
--- a/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/service/DataCiteIdentifierServiceUnitTest.java
+++ b/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/service/DataCiteIdentifierServiceUnitTest.java
@@ -12,6 +12,7 @@ import at.tuwien.config.IndexConfig;
import at.tuwien.entities.identifier.Identifier;
import at.tuwien.exception.*;
import at.tuwien.repository.mdb.*;
+import at.tuwien.repository.sdb.IdentifierIdxRepository;
import at.tuwien.service.impl.IdentifierServiceImpl;
import org.apache.http.auth.BasicUserPrincipal;
import org.junit.jupiter.api.BeforeEach;
@@ -46,7 +47,7 @@ import static org.mockito.Mockito.when;
public class DataCiteIdentifierServiceUnitTest extends BaseUnitTest {
@MockBean
- private IndexConfig indexInitializer;
+ private IndexConfig indexConfig;
@MockBean(answer = Answers.RETURNS_MOCKS)
private DataCiteConfig dataCiteConfig;
@@ -54,6 +55,9 @@ public class DataCiteIdentifierServiceUnitTest extends BaseUnitTest {
@MockBean(answer = Answers.RETURNS_MOCKS)
private EndpointConfig endpointConfig;
+ @MockBean
+ private IdentifierIdxRepository identifierIdxRepository;
+
@Autowired
private ImageRepository imageRepository;
diff --git a/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/service/UserServiceUnitTest.java b/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/service/UserServiceUnitTest.java
index 8c51b6b76f..aeaaa30d62 100644
--- a/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/service/UserServiceUnitTest.java
+++ b/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/service/UserServiceUnitTest.java
@@ -5,6 +5,7 @@ import at.tuwien.config.IndexConfig;
import at.tuwien.entities.user.User;
import at.tuwien.exception.*;
import at.tuwien.repository.mdb.UserRepository;
+import at.tuwien.repository.sdb.IdentifierIdxRepository;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,7 +24,10 @@ import static org.mockito.Mockito.when;
public class UserServiceUnitTest extends BaseUnitTest {
@MockBean
- private IndexConfig indexInitializer;
+ private IndexConfig indexConfig;
+
+ @MockBean
+ private IdentifierIdxRepository identifierIdxRepository;
@MockBean
private UserRepository userRepository;
diff --git a/dbrepo-metadata-db/test/src/main/java/at/tuwien/test/BaseTest.java b/dbrepo-metadata-db/test/src/main/java/at/tuwien/test/BaseTest.java
index c9874c5799..519e37ec54 100644
--- a/dbrepo-metadata-db/test/src/main/java/at/tuwien/test/BaseTest.java
+++ b/dbrepo-metadata-db/test/src/main/java/at/tuwien/test/BaseTest.java
@@ -900,8 +900,8 @@ public abstract class BaseTest {
.build();
public final static Long IMAGE_ELASTIC_ID = 3L;
- public final static String IMAGE_ELASTIC_REPOSITORY = "elasticsearch";
- public final static String IMAGE_ELASTIC_TAG = "8.7.1";
+ public final static String IMAGE_ELASTIC_REPOSITORY = "opensearchproject/opensearch";
+ public final static String IMAGE_ELASTIC_TAG = "2";
public final static ContainerImage IMAGE_ELASTIC = ContainerImage.builder()
.id(IMAGE_ELASTIC_ID)
diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java
index cab709d9c6..3ff9a84267 100644
--- a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java
+++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java
@@ -2,6 +2,7 @@ package at.tuwien.endpoint;
import at.tuwien.BaseUnitTest;
import at.tuwien.config.IndexConfig;
+import at.tuwien.repository.sdb.ViewIdxRepository;
import com.rabbitmq.client.Channel;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
@@ -32,6 +33,9 @@ public class ActuatorComponentTest extends BaseUnitTest {
@MockBean
private IndexConfig indexConfig;
+ @MockBean
+ private ViewIdxRepository viewIdxRepository;
+
@Test
public void actuatorInfo_succeeds() throws Exception {
this.mockMvc.perform(get("/actuator/info"))
diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/ExportEndpointUnitTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/ExportEndpointUnitTest.java
index 79fb6ebffa..2fc48f70c8 100644
--- a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/ExportEndpointUnitTest.java
+++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/ExportEndpointUnitTest.java
@@ -11,6 +11,7 @@ import at.tuwien.gateway.BrokerServiceGateway;
import at.tuwien.listener.impl.RabbitMqListenerImpl;
import at.tuwien.repository.mdb.DatabaseAccessRepository;
import at.tuwien.repository.mdb.TableRepository;
+import at.tuwien.repository.sdb.ViewIdxRepository;
import at.tuwien.service.DatabaseService;
import at.tuwien.service.QueryService;
import com.rabbitmq.client.Channel;
@@ -50,7 +51,10 @@ public class ExportEndpointUnitTest extends BaseUnitTest {
private Channel channel;
@MockBean
- private IndexConfig indexInitializer;
+ private IndexConfig indexConfig;
+
+ @MockBean
+ private ViewIdxRepository viewIdxRepository;
@MockBean
private RabbitMqListenerImpl rabbitMqListener;
diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/QueryEndpointUnitTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/QueryEndpointUnitTest.java
index 5d9f72c2e6..e9b3371a74 100644
--- a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/QueryEndpointUnitTest.java
+++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/QueryEndpointUnitTest.java
@@ -17,6 +17,7 @@ import at.tuwien.repository.mdb.ContainerRepository;
import at.tuwien.repository.mdb.DatabaseAccessRepository;
import at.tuwien.repository.mdb.DatabaseRepository;
import at.tuwien.repository.mdb.ImageRepository;
+import at.tuwien.repository.sdb.ViewIdxRepository;
import at.tuwien.service.QueryService;
import at.tuwien.service.StoreService;
import com.rabbitmq.client.Channel;
@@ -55,13 +56,14 @@ public class QueryEndpointUnitTest extends BaseUnitTest {
private Channel channel;
@MockBean
- private IndexConfig indexInitializer;
+ private IndexConfig indexConfig;
+
+ @MockBean
+ private ViewIdxRepository viewIdxRepository;
- /* keep */
@MockBean
private RabbitMqListenerImpl rabbitMqListener;
- /* keep */
@MockBean
private BrokerServiceGateway brokerServiceGateway;
diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/StoreEndpointUnitTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/StoreEndpointUnitTest.java
index e488a3983a..e4d98d8044 100644
--- a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/StoreEndpointUnitTest.java
+++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/StoreEndpointUnitTest.java
@@ -13,6 +13,7 @@ import at.tuwien.gateway.BrokerServiceGateway;
import at.tuwien.listener.impl.RabbitMqListenerImpl;
import at.tuwien.querystore.Query;
import at.tuwien.repository.mdb.UserRepository;
+import at.tuwien.repository.sdb.ViewIdxRepository;
import at.tuwien.service.AccessService;
import at.tuwien.service.DatabaseService;
import at.tuwien.service.impl.StoreServiceImpl;
@@ -48,7 +49,10 @@ public class StoreEndpointUnitTest extends BaseUnitTest {
private Channel channel;
@MockBean
- private IndexConfig indexInitializer;
+ private IndexConfig indexConfig;
+
+ @MockBean
+ private ViewIdxRepository viewIdxRepository;
@MockBean
private RabbitMqListenerImpl rabbitMqListener;
diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java
index 2f448ca36e..0516fc4682 100644
--- a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java
+++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java
@@ -2,6 +2,7 @@ package at.tuwien.endpoint;
import at.tuwien.BaseUnitTest;
import at.tuwien.config.IndexConfig;
+import at.tuwien.repository.sdb.ViewIdxRepository;
import com.rabbitmq.client.Channel;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
@@ -32,6 +33,9 @@ public class SwaggerComponentTest extends BaseUnitTest {
@MockBean
private IndexConfig indexConfig;
+ @MockBean
+ private ViewIdxRepository viewIdxRepository;
+
@Test
public void swaggerUi_succeeds() throws Exception {
this.mockMvc.perform(get("/swagger-ui/index.html"))
diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/TableDataEndpointUnitTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/TableDataEndpointUnitTest.java
index 263118e014..0374aae586 100644
--- a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/TableDataEndpointUnitTest.java
+++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/TableDataEndpointUnitTest.java
@@ -14,6 +14,7 @@ import at.tuwien.exception.*;
import at.tuwien.gateway.BrokerServiceGateway;
import at.tuwien.listener.MessageQueueListener;
import at.tuwien.listener.impl.RabbitMqListenerImpl;
+import at.tuwien.repository.sdb.ViewIdxRepository;
import at.tuwien.service.AccessService;
import at.tuwien.service.DatabaseService;
import at.tuwien.service.TableService;
@@ -53,11 +54,12 @@ public class TableDataEndpointUnitTest extends BaseUnitTest {
@MockBean
private Channel channel;
- /* keep */
+ @MockBean
+ private ViewIdxRepository viewIdxRepository;
+
@MockBean
private RabbitMqListenerImpl rabbitMqListener;
- /* keep */
@MockBean
private BrokerServiceGateway brokerServiceGateway;
diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/TableHistoryEndpointUnitTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/TableHistoryEndpointUnitTest.java
index 37d5445356..3a32885368 100644
--- a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/TableHistoryEndpointUnitTest.java
+++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/TableHistoryEndpointUnitTest.java
@@ -11,6 +11,7 @@ import at.tuwien.exception.*;
import at.tuwien.gateway.BrokerServiceGateway;
import at.tuwien.listener.impl.RabbitMqListenerImpl;
import at.tuwien.repository.mdb.DatabaseAccessRepository;
+import at.tuwien.repository.sdb.ViewIdxRepository;
import at.tuwien.service.DatabaseService;
import at.tuwien.service.QueryService;
import at.tuwien.service.TableService;
@@ -48,11 +49,12 @@ public class TableHistoryEndpointUnitTest extends BaseUnitTest {
@MockBean
private Channel channel;
- /* keep */
+ @MockBean
+ private ViewIdxRepository viewIdxRepository;
+
@MockBean
private RabbitMqListenerImpl rabbitMqListener;
- /* keep */
@MockBean
private BrokerServiceGateway brokerServiceGateway;
diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/ViewEndpointUnitTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/ViewEndpointUnitTest.java
index 0d26d44b03..9644e2113a 100644
--- a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/ViewEndpointUnitTest.java
+++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/ViewEndpointUnitTest.java
@@ -14,6 +14,7 @@ import at.tuwien.exception.*;
import at.tuwien.gateway.BrokerServiceGateway;
import at.tuwien.listener.MessageQueueListener;
import at.tuwien.listener.impl.RabbitMqListenerImpl;
+import at.tuwien.repository.sdb.ViewIdxRepository;
import at.tuwien.service.AccessService;
import at.tuwien.service.DatabaseService;
import at.tuwien.service.QueryService;
@@ -51,13 +52,14 @@ public class ViewEndpointUnitTest extends BaseUnitTest {
private Channel channel;
@MockBean
- private IndexConfig indexInitializer;
+ private IndexConfig indexConfig;
+
+ @MockBean
+ private ViewIdxRepository viewIdxRepository;
- /* keep */
@MockBean
private RabbitMqListenerImpl rabbitMqListener;
- /* keep */
@MockBean
private BrokerServiceGateway brokerServiceGateway;
diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/listener/RabbitMqListenerIntegrationTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/listener/RabbitMqListenerIntegrationTest.java
index 20ac8e4176..5acda1d8b2 100644
--- a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/listener/RabbitMqListenerIntegrationTest.java
+++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/listener/RabbitMqListenerIntegrationTest.java
@@ -4,6 +4,7 @@ import at.tuwien.BaseUnitTest;
import at.tuwien.api.amqp.ConsumerDto;
import at.tuwien.config.*;
import at.tuwien.repository.mdb.*;
+import at.tuwien.repository.sdb.ViewIdxRepository;
import com.rabbitmq.client.BuiltinExchangeType;
import com.rabbitmq.client.Channel;
import lombok.extern.log4j.Log4j2;
@@ -38,6 +39,9 @@ public class RabbitMqListenerIntegrationTest extends BaseUnitTest {
@MockBean
private IndexConfig indexConfig;
+ @MockBean
+ private ViewIdxRepository viewIdxRepository;
+
@Autowired
private Channel channel;
diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/mapper/QueryMapperTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/mapper/QueryMapperTest.java
index f68804e6e0..038b63c95a 100644
--- a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/mapper/QueryMapperTest.java
+++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/mapper/QueryMapperTest.java
@@ -7,6 +7,7 @@ import at.tuwien.entities.container.image.ContainerImageDate;
import at.tuwien.entities.database.table.columns.TableColumn;
import at.tuwien.entities.database.table.columns.TableColumnType;
import at.tuwien.listener.impl.RabbitMqListenerImpl;
+import at.tuwien.repository.sdb.ViewIdxRepository;
import com.rabbitmq.client.Channel;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
@@ -33,7 +34,10 @@ public class QueryMapperTest extends BaseUnitTest {
private Channel channel;
@MockBean
- private IndexConfig indexInitializer;
+ private IndexConfig indexConfig;
+
+ @MockBean
+ private ViewIdxRepository viewIdxRepository;
@MockBean
private RabbitMqListenerImpl rabbitMqListener;
diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/repository/ViewIdxRepositoryIntegrationTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/repository/ViewIdxRepositoryIntegrationTest.java
index e686fdb705..1dd83a35bb 100644
--- a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/repository/ViewIdxRepositoryIntegrationTest.java
+++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/repository/ViewIdxRepositoryIntegrationTest.java
@@ -48,11 +48,9 @@ public class ViewIdxRepositoryIntegrationTest extends BaseUnitTest {
@MockBean
private Channel channel;
- /* keep */
@MockBean
private RabbitMqListenerImpl rabbitMqListener;
- /* keep */
@MockBean
private BrokerServiceGateway brokerServiceGateway;
diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/repository/ViewRepositoryIntegrationTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/repository/ViewRepositoryIntegrationTest.java
index 3e3e84f705..e064717095 100644
--- a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/repository/ViewRepositoryIntegrationTest.java
+++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/repository/ViewRepositoryIntegrationTest.java
@@ -7,6 +7,7 @@ import at.tuwien.entities.database.View;
import at.tuwien.gateway.BrokerServiceGateway;
import at.tuwien.listener.impl.RabbitMqListenerImpl;
import at.tuwien.repository.mdb.*;
+import at.tuwien.repository.sdb.ViewIdxRepository;
import com.rabbitmq.client.Channel;
import lombok.extern.log4j.Log4j2;
import org.junit.Rule;
@@ -45,6 +46,9 @@ public class ViewRepositoryIntegrationTest extends BaseUnitTest {
@MockBean
private IndexConfig indexConfig;
+ @MockBean
+ private ViewIdxRepository viewIdxRepository;
+
@Autowired
private ImageRepository imageRepository;
diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceIntegrationTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceIntegrationTest.java
index 016f4aa756..c4c6016e50 100644
--- a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceIntegrationTest.java
+++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceIntegrationTest.java
@@ -8,6 +8,7 @@ import at.tuwien.exception.*;
import at.tuwien.gateway.BrokerServiceGateway;
import at.tuwien.listener.impl.RabbitMqListenerImpl;
import at.tuwien.repository.mdb.*;
+import at.tuwien.repository.sdb.ViewIdxRepository;
import com.rabbitmq.client.Channel;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
@@ -39,11 +40,12 @@ public class ContainerServiceIntegrationTest extends BaseUnitTest {
@MockBean
private Channel channel;
- /* keep */
+ @MockBean
+ private ViewIdxRepository viewIdxRepository;
+
@MockBean
private RabbitMqListenerImpl rabbitMqListener;
- /* keep */
@MockBean
private BrokerServiceGateway brokerServiceGateway;
diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/QueryServiceIntegrationTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/QueryServiceIntegrationTest.java
index cb6424ba35..7e8d87f806 100644
--- a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/QueryServiceIntegrationTest.java
+++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/QueryServiceIntegrationTest.java
@@ -13,6 +13,7 @@ import at.tuwien.gateway.BrokerServiceGateway;
import at.tuwien.listener.impl.RabbitMqListenerImpl;
import at.tuwien.querystore.Query;
import at.tuwien.repository.mdb.*;
+import at.tuwien.repository.sdb.ViewIdxRepository;
import com.rabbitmq.client.Channel;
import at.tuwien.config.DockerConfig;
import lombok.SneakyThrows;
@@ -63,6 +64,9 @@ public class QueryServiceIntegrationTest extends BaseUnitTest {
@MockBean
private RabbitMqListenerImpl rabbitMqListener;
+ @MockBean
+ private ViewIdxRepository viewIdxRepository;
+
@MockBean
private BrokerServiceGateway brokerServiceGateway;
diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/QueueServiceIntegrationTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/QueueServiceIntegrationTest.java
index c5a1c96c0c..7bc34bce9e 100644
--- a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/QueueServiceIntegrationTest.java
+++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/QueueServiceIntegrationTest.java
@@ -10,6 +10,7 @@ import at.tuwien.gateway.BrokerServiceGateway;
import at.tuwien.listener.impl.RabbitMqListenerImpl;
import at.tuwien.repository.mdb.DatabaseRepository;
import at.tuwien.repository.mdb.TableRepository;
+import at.tuwien.repository.sdb.ViewIdxRepository;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.rabbitmq.client.*;
import lombok.extern.log4j.Log4j2;
@@ -49,7 +50,10 @@ public class QueueServiceIntegrationTest extends BaseUnitTest {
private TableRepository tableRepository;
@MockBean
- private IndexConfig indexInitializer;
+ private ViewIdxRepository viewIdxRepository;
+
+ @MockBean
+ private IndexConfig indexConfig;
@MockBean
private RabbitMqConsumer rabbitMqConsumer;
diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/StoreServiceIntegrationModifyTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/StoreServiceIntegrationModifyTest.java
index cf29825133..559633c43b 100644
--- a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/StoreServiceIntegrationModifyTest.java
+++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/StoreServiceIntegrationModifyTest.java
@@ -11,6 +11,7 @@ import at.tuwien.gateway.BrokerServiceGateway;
import at.tuwien.listener.impl.RabbitMqListenerImpl;
import at.tuwien.querystore.Query;
import at.tuwien.repository.mdb.*;
+import at.tuwien.repository.sdb.ViewIdxRepository;
import com.rabbitmq.client.Channel;
import at.tuwien.config.DockerConfig;
import lombok.extern.log4j.Log4j2;
@@ -51,14 +52,15 @@ public class StoreServiceIntegrationModifyTest extends BaseUnitTest {
@MockBean
private IndexConfig indexConfig;
+ @MockBean
+ private ViewIdxRepository viewIdxRepository;
+
@MockBean
private Channel channel;
- /* keep */
@MockBean
private RabbitMqListenerImpl rabbitMqListener;
- /* keep */
@MockBean
private BrokerServiceGateway brokerServiceGateway;
diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/StoreServiceIntegrationReadTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/StoreServiceIntegrationReadTest.java
index 21d1c91d17..f41d511770 100644
--- a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/StoreServiceIntegrationReadTest.java
+++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/StoreServiceIntegrationReadTest.java
@@ -10,6 +10,7 @@ import at.tuwien.querystore.Query;
import at.tuwien.repository.mdb.DatabaseRepository;
import at.tuwien.repository.mdb.TableRepository;
import at.tuwien.repository.mdb.UserRepository;
+import at.tuwien.repository.sdb.ViewIdxRepository;
import com.rabbitmq.client.Channel;
import at.tuwien.config.DockerConfig;
import lombok.extern.log4j.Log4j2;
@@ -48,6 +49,9 @@ public class StoreServiceIntegrationReadTest extends BaseUnitTest {
@MockBean
private Channel channel;
+ @MockBean
+ private ViewIdxRepository viewIdxRepository;
+
@MockBean
private RabbitMqListenerImpl rabbitMqListener;
diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationReadTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationReadTest.java
index 118f368e02..f7b8b21bff 100644
--- a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationReadTest.java
+++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationReadTest.java
@@ -9,6 +9,7 @@ import at.tuwien.exception.*;
import at.tuwien.gateway.BrokerServiceGateway;
import at.tuwien.listener.impl.RabbitMqListenerImpl;
import at.tuwien.repository.mdb.*;
+import at.tuwien.repository.sdb.ViewIdxRepository;
import com.rabbitmq.client.Channel;
import at.tuwien.config.DockerConfig;
import lombok.extern.log4j.Log4j2;
@@ -48,11 +49,12 @@ public class TableServiceIntegrationReadTest extends BaseUnitTest {
@MockBean
private Channel channel;
- /* keep */
+ @MockBean
+ private ViewIdxRepository viewIdxRepository;
+
@MockBean
private RabbitMqListenerImpl rabbitMqListener;
- /* keep */
@MockBean
private BrokerServiceGateway brokerServiceGateway;
diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java
index 5a8bc48cea..5c91cb6b6b 100644
--- a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java
+++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java
@@ -8,6 +8,7 @@ import at.tuwien.exception.*;
import at.tuwien.gateway.BrokerServiceGateway;
import at.tuwien.listener.impl.RabbitMqListenerImpl;
import at.tuwien.repository.mdb.*;
+import at.tuwien.repository.sdb.ViewIdxRepository;
import com.rabbitmq.client.Channel;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.*;
@@ -41,7 +42,10 @@ public class TableServiceUnitTest extends BaseUnitTest {
private Channel channel;
@MockBean
- private IndexConfig indexInitializer;
+ private IndexConfig indexConfig;
+
+ @MockBean
+ private ViewIdxRepository viewIdxRepository;
@MockBean
private RabbitMqListenerImpl rabbitMqListener;
diff --git a/dbrepo-semantics-service/services/src/main/java/at/tuwien/repository/mdb/TableColumnRepository.java b/dbrepo-semantics-service/services/src/main/java/at/tuwien/repository/mdb/TableColumnRepository.java
index de41d04da2..b52cc85d35 100644
--- a/dbrepo-semantics-service/services/src/main/java/at/tuwien/repository/mdb/TableColumnRepository.java
+++ b/dbrepo-semantics-service/services/src/main/java/at/tuwien/repository/mdb/TableColumnRepository.java
@@ -6,6 +6,6 @@ import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
@Repository
-public interface TableColumnRepository extends JpaRepository<TableColumn, Long> {
+public interface TableColumnRepository extends JpaRepository<TableColumn, TableColumnKey> {
}
diff --git a/dbrepo-table-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java b/dbrepo-table-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java
index cab709d9c6..1bb964bbbd 100644
--- a/dbrepo-table-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java
+++ b/dbrepo-table-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java
@@ -2,6 +2,8 @@ package at.tuwien.endpoint;
import at.tuwien.BaseUnitTest;
import at.tuwien.config.IndexConfig;
+import at.tuwien.repository.sdb.TableColumnIdxRepository;
+import at.tuwien.repository.sdb.TableIdxRepository;
import com.rabbitmq.client.Channel;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
@@ -32,6 +34,12 @@ public class ActuatorComponentTest extends BaseUnitTest {
@MockBean
private IndexConfig indexConfig;
+ @MockBean
+ private TableIdxRepository tableIdxRepository;
+
+ @MockBean
+ private TableColumnIdxRepository tableColumnIdxRepository;
+
@Test
public void actuatorInfo_succeeds() throws Exception {
this.mockMvc.perform(get("/actuator/info"))
diff --git a/dbrepo-table-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java b/dbrepo-table-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java
index 2f448ca36e..ee93d9c9a2 100644
--- a/dbrepo-table-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java
+++ b/dbrepo-table-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java
@@ -2,6 +2,8 @@ package at.tuwien.endpoint;
import at.tuwien.BaseUnitTest;
import at.tuwien.config.IndexConfig;
+import at.tuwien.repository.sdb.TableColumnIdxRepository;
+import at.tuwien.repository.sdb.TableIdxRepository;
import com.rabbitmq.client.Channel;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
@@ -32,6 +34,12 @@ public class SwaggerComponentTest extends BaseUnitTest {
@MockBean
private IndexConfig indexConfig;
+ @MockBean
+ private TableIdxRepository tableIdxRepository;
+
+ @MockBean
+ private TableColumnIdxRepository tableColumnIdxRepository;
+
@Test
public void swaggerUi_succeeds() throws Exception {
this.mockMvc.perform(get("/swagger-ui/index.html"))
diff --git a/dbrepo-user-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java
index 041e444616..d63621139c 100644
--- a/dbrepo-user-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java
+++ b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java
@@ -1,6 +1,8 @@
package at.tuwien.endpoint;
import at.tuwien.BaseUnitTest;
+import at.tuwien.config.IndexConfig;
+import at.tuwien.repository.sdb.UserIdxRepository;
import com.rabbitmq.client.Channel;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
@@ -22,6 +24,12 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
@SpringBootTest
public class ActuatorComponentTest extends BaseUnitTest {
+ @MockBean
+ private IndexConfig indexConfig;
+
+ @MockBean
+ private UserIdxRepository userIdxRepository;
+
@Autowired
private MockMvc mockMvc;
diff --git a/dbrepo-user-service/rest-service/src/test/java/at/tuwien/endpoint/MaintenanceEndpointUnitTest.java b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/endpoint/MaintenanceEndpointUnitTest.java
index 36097258c1..329c1c57b3 100644
--- a/dbrepo-user-service/rest-service/src/test/java/at/tuwien/endpoint/MaintenanceEndpointUnitTest.java
+++ b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/endpoint/MaintenanceEndpointUnitTest.java
@@ -5,9 +5,11 @@ import at.tuwien.api.maintenance.BannerMessageBriefDto;
import at.tuwien.api.maintenance.BannerMessageCreateDto;
import at.tuwien.api.maintenance.BannerMessageDto;
import at.tuwien.api.maintenance.BannerMessageUpdateDto;
+import at.tuwien.config.IndexConfig;
import at.tuwien.config.ReadyConfig;
import at.tuwien.entities.maintenance.BannerMessage;
import at.tuwien.exception.*;
+import at.tuwien.repository.sdb.UserIdxRepository;
import at.tuwien.service.BannerMessageService;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
@@ -35,6 +37,12 @@ import static org.mockito.Mockito.*;
@ExtendWith(SpringExtension.class)
public class MaintenanceEndpointUnitTest extends BaseUnitTest {
+ @MockBean
+ private IndexConfig indexConfig;
+
+ @MockBean
+ private UserIdxRepository userIdxRepository;
+
@MockBean
private ReadyConfig readyConfig;
diff --git a/dbrepo-user-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java
index 431a54052c..c47f9dfbc7 100644
--- a/dbrepo-user-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java
+++ b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java
@@ -1,6 +1,8 @@
package at.tuwien.endpoint;
import at.tuwien.BaseUnitTest;
+import at.tuwien.config.IndexConfig;
+import at.tuwien.repository.sdb.UserIdxRepository;
import com.rabbitmq.client.Channel;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
@@ -22,6 +24,12 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
@SpringBootTest
public class SwaggerComponentTest extends BaseUnitTest {
+ @MockBean
+ private IndexConfig indexConfig;
+
+ @MockBean
+ private UserIdxRepository userIdxRepository;
+
@Autowired
private MockMvc mockMvc;
diff --git a/dbrepo-user-service/rest-service/src/test/java/at/tuwien/endpoint/UserEndpointUnitTest.java b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/endpoint/UserEndpointUnitTest.java
index cec34bf0a5..088b60ed47 100644
--- a/dbrepo-user-service/rest-service/src/test/java/at/tuwien/endpoint/UserEndpointUnitTest.java
+++ b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/endpoint/UserEndpointUnitTest.java
@@ -4,10 +4,12 @@ import at.tuwien.BaseUnitTest;
import at.tuwien.api.auth.SignupRequestDto;
import at.tuwien.api.user.*;
import at.tuwien.config.AuthenticationConfig;
+import at.tuwien.config.IndexConfig;
import at.tuwien.entities.user.Realm;
import at.tuwien.entities.user.Role;
import at.tuwien.entities.user.User;
import at.tuwien.exception.*;
+import at.tuwien.repository.sdb.UserIdxRepository;
import at.tuwien.service.RealmService;
import at.tuwien.service.RoleService;
import at.tuwien.service.UserService;
@@ -40,6 +42,12 @@ import static org.mockito.Mockito.*;
@ExtendWith(SpringExtension.class)
public class UserEndpointUnitTest extends BaseUnitTest {
+ @MockBean
+ private IndexConfig indexConfig;
+
+ @MockBean
+ private UserIdxRepository userIdxRepository;
+
@MockBean
private UserService userService;
diff --git a/dbrepo-user-service/rest-service/src/test/java/at/tuwien/mapper/UserMapperTest.java b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/mapper/UserMapperTest.java
index eefde32629..1a8e6ee845 100644
--- a/dbrepo-user-service/rest-service/src/test/java/at/tuwien/mapper/UserMapperTest.java
+++ b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/mapper/UserMapperTest.java
@@ -1,10 +1,13 @@
package at.tuwien.mapper;
import at.tuwien.BaseUnitTest;
+import at.tuwien.config.IndexConfig;
import at.tuwien.entities.user.User;
+import at.tuwien.repository.sdb.UserIdxRepository;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -13,6 +16,12 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals;
@SpringBootTest
public class UserMapperTest extends BaseUnitTest {
+ @MockBean
+ private IndexConfig indexConfig;
+
+ @MockBean
+ private UserIdxRepository userIdxRepository;
+
@Test
public void equals_fails() {
diff --git a/dbrepo-user-service/rest-service/src/test/java/at/tuwien/service/BannerMessageServiceIntegrationTest.java b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/service/BannerMessageServiceIntegrationTest.java
index 5d181b3f75..673b484588 100644
--- a/dbrepo-user-service/rest-service/src/test/java/at/tuwien/service/BannerMessageServiceIntegrationTest.java
+++ b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/service/BannerMessageServiceIntegrationTest.java
@@ -4,10 +4,12 @@ import at.tuwien.BaseUnitTest;
import at.tuwien.api.maintenance.BannerMessageCreateDto;
import at.tuwien.api.maintenance.BannerMessageTypeDto;
import at.tuwien.api.maintenance.BannerMessageUpdateDto;
+import at.tuwien.config.IndexConfig;
import at.tuwien.entities.maintenance.BannerMessage;
import at.tuwien.entities.maintenance.BannerMessageType;
import at.tuwien.exception.BannerMessageNotFoundException;
import at.tuwien.repository.mdb.BannerMessageRepository;
+import at.tuwien.repository.sdb.UserIdxRepository;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -16,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit.jupiter.SpringExtension;
@@ -30,6 +33,12 @@ import static org.junit.jupiter.api.Assertions.*;
@ExtendWith(SpringExtension.class)
public class BannerMessageServiceIntegrationTest extends BaseUnitTest {
+ @MockBean
+ private IndexConfig indexConfig;
+
+ @MockBean
+ private UserIdxRepository userIdxRepository;
+
@Autowired
private BannerMessageRepository bannerMessageRepository;
diff --git a/dbrepo-user-service/rest-service/src/test/java/at/tuwien/service/RealmServiceIntegrationTest.java b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/service/RealmServiceIntegrationTest.java
index 584a508ebb..5107c8fda0 100644
--- a/dbrepo-user-service/rest-service/src/test/java/at/tuwien/service/RealmServiceIntegrationTest.java
+++ b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/service/RealmServiceIntegrationTest.java
@@ -1,9 +1,11 @@
package at.tuwien.service;
import at.tuwien.BaseUnitTest;
+import at.tuwien.config.IndexConfig;
import at.tuwien.entities.user.Realm;
import at.tuwien.exception.RealmNotFoundException;
import at.tuwien.repository.mdb.RealmRepository;
+import at.tuwien.repository.sdb.UserIdxRepository;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -12,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit.jupiter.SpringExtension;
@@ -24,6 +27,12 @@ import static org.junit.jupiter.api.Assertions.*;
@ExtendWith(SpringExtension.class)
public class RealmServiceIntegrationTest extends BaseUnitTest {
+ @MockBean
+ private IndexConfig indexConfig;
+
+ @MockBean
+ private UserIdxRepository userIdxRepository;
+
@Autowired
private RealmRepository realmRepository;
diff --git a/dbrepo-user-service/rest-service/src/test/java/at/tuwien/service/RoleServiceIntegrationTest.java b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/service/RoleServiceIntegrationTest.java
index ef6382bc37..6d957b51a8 100644
--- a/dbrepo-user-service/rest-service/src/test/java/at/tuwien/service/RoleServiceIntegrationTest.java
+++ b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/service/RoleServiceIntegrationTest.java
@@ -1,10 +1,12 @@
package at.tuwien.service;
import at.tuwien.BaseUnitTest;
+import at.tuwien.config.IndexConfig;
import at.tuwien.entities.user.Role;
import at.tuwien.exception.RoleNotFoundException;
import at.tuwien.repository.mdb.RoleRepository;
import at.tuwien.repository.mdb.UserRepository;
+import at.tuwien.repository.sdb.UserIdxRepository;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -13,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit.jupiter.SpringExtension;
@@ -25,6 +28,12 @@ import static org.junit.jupiter.api.Assertions.*;
@ExtendWith(SpringExtension.class)
public class RoleServiceIntegrationTest extends BaseUnitTest {
+ @MockBean
+ private IndexConfig indexConfig;
+
+ @MockBean
+ private UserIdxRepository userIdxRepository;
+
@Autowired
private UserRepository userRepository;
diff --git a/dbrepo-user-service/rest-service/src/test/java/at/tuwien/service/UserAttributeServiceIntegrationTest.java b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/service/UserAttributeServiceIntegrationTest.java
index 131e7891e3..95ce65f079 100644
--- a/dbrepo-user-service/rest-service/src/test/java/at/tuwien/service/UserAttributeServiceIntegrationTest.java
+++ b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/service/UserAttributeServiceIntegrationTest.java
@@ -1,10 +1,12 @@
package at.tuwien.service;
import at.tuwien.BaseUnitTest;
+import at.tuwien.config.IndexConfig;
import at.tuwien.entities.user.UserAttribute;
import at.tuwien.exception.UserAttributeNotFoundException;
import at.tuwien.repository.mdb.UserAttributeRepository;
import at.tuwien.repository.mdb.UserRepository;
+import at.tuwien.repository.sdb.UserIdxRepository;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -13,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit.jupiter.SpringExtension;
@@ -27,6 +30,12 @@ import static org.junit.jupiter.api.Assertions.*;
@ExtendWith(SpringExtension.class)
public class UserAttributeServiceIntegrationTest extends BaseUnitTest {
+ @MockBean
+ private IndexConfig indexConfig;
+
+ @MockBean
+ private UserIdxRepository userIdxRepository;
+
@Autowired
private UserRepository userRepository;
diff --git a/dbrepo-user-service/rest-service/src/test/java/at/tuwien/service/UserServiceIntegrationTest.java b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/service/UserServiceIntegrationTest.java
index bef7f2b3b4..1f13cf0998 100644
--- a/dbrepo-user-service/rest-service/src/test/java/at/tuwien/service/UserServiceIntegrationTest.java
+++ b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/service/UserServiceIntegrationTest.java
@@ -5,6 +5,7 @@ import at.tuwien.api.auth.SignupRequestDto;
import at.tuwien.api.user.UserPasswordDto;
import at.tuwien.api.user.UserThemeSetDto;
import at.tuwien.api.user.UserUpdateDto;
+import at.tuwien.config.IndexConfig;
import at.tuwien.entities.user.Role;
import at.tuwien.entities.user.User;
import at.tuwien.entities.user.UserAttribute;
@@ -12,6 +13,7 @@ import at.tuwien.exception.*;
import at.tuwien.repository.mdb.RealmRepository;
import at.tuwien.repository.mdb.RoleRepository;
import at.tuwien.repository.mdb.UserRepository;
+import at.tuwien.repository.sdb.UserIdxRepository;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -20,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.dao.DataIntegrityViolationException;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit.jupiter.SpringExtension;
@@ -37,6 +40,12 @@ import static org.junit.jupiter.api.Assertions.*;
@ExtendWith(SpringExtension.class)
public class UserServiceIntegrationTest extends BaseUnitTest {
+ @MockBean
+ private IndexConfig indexConfig;
+
+ @MockBean
+ private UserIdxRepository userIdxRepository;
+
@Autowired
private UserRepository userRepository;
--
GitLab