From ce77aa01d190f3b2013197182e0aa0ad193ecbd0 Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Wed, 7 Jun 2023 18:34:31 +0200
Subject: [PATCH] Fixed some tests
---
.../endpoint/AccessEndpointUnitTest.java | 4 +
.../endpoint/ActuatorComponentTest.java | 4 +
.../endpoint/LicenseEndpointUnitTest.java | 4 +
.../tuwien/endpoint/SwaggerComponentTest.java | 4 +
.../gateway/BrokerServiceGatewayTest.java | 4 +
.../at/tuwien/mapper/DatabaseMapperTest.java | 4 +
.../service/AccessServiceIntegrationTest.java | 4 +
.../tuwien/service/AccessServiceUnitTest.java | 4 +
.../service/DatabaseServiceUnitTest.java | 4 +
.../IdentifierServiceIntegrationTest.java | 4 +
.../LicenseServiceIntegrationTest.java | 4 +
.../MessageQueueServiceIntegrationTest.java | 4 +
.../service/MessageQueueServiceUnitTest.java | 4 +
.../service/UserServiceIntegrationTest.java | 4 +
dbrepo-identifier-service/pom.xml | 1 +
.../DatabaseServiceIntegrationTest.java | 81 +++++++++++++++++++
16 files changed, 138 insertions(+)
create mode 100644 dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java
diff --git a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/AccessEndpointUnitTest.java b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/AccessEndpointUnitTest.java
index a4459ceb4a..df61f6197b 100644
--- a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/AccessEndpointUnitTest.java
+++ b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/AccessEndpointUnitTest.java
@@ -14,6 +14,7 @@ import at.tuwien.entities.user.User;
import at.tuwien.exception.*;
import at.tuwien.mapper.AccessMapper;
import at.tuwien.repository.mdb.*;
+import at.tuwien.repository.sdb.DatabaseIdxRepository;
import at.tuwien.service.AccessService;
import com.rabbitmq.client.Channel;
import lombok.extern.log4j.Log4j2;
@@ -47,6 +48,9 @@ public class AccessEndpointUnitTest extends BaseUnitTest {
@MockBean
private IndexConfig indexInitializer;
+ @MockBean
+ private DatabaseIdxRepository databaseIdxRepository;
+
@MockBean
private Channel channel;
diff --git a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java
index cab709d9c6..e6fd7b8510 100644
--- a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java
+++ b/dbrepo-database-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.DatabaseIdxRepository;
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 DatabaseIdxRepository databaseIdxRepository;
+
@Test
public void actuatorInfo_succeeds() throws Exception {
this.mockMvc.perform(get("/actuator/info"))
diff --git a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/LicenseEndpointUnitTest.java b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/LicenseEndpointUnitTest.java
index 6bddad3d91..8d295059ec 100644
--- a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/LicenseEndpointUnitTest.java
+++ b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/LicenseEndpointUnitTest.java
@@ -6,6 +6,7 @@ import at.tuwien.config.IndexConfig;
import at.tuwien.config.ReadyConfig;
import at.tuwien.endpoints.LicenseEndpoint;
import at.tuwien.repository.mdb.LicenseRepository;
+import at.tuwien.repository.sdb.DatabaseIdxRepository;
import com.rabbitmq.client.Channel;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
@@ -36,6 +37,9 @@ public class LicenseEndpointUnitTest extends BaseUnitTest {
@MockBean
private Channel channel;
+ @MockBean
+ private DatabaseIdxRepository databaseIdxRepository;
+
@MockBean
private LicenseRepository licenseRepository;
diff --git a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java
index 2f448ca36e..fcd6bd8984 100644
--- a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java
+++ b/dbrepo-database-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.DatabaseIdxRepository;
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 DatabaseIdxRepository databaseIdxRepository;
+
@Test
public void swaggerUi_succeeds() throws Exception {
this.mockMvc.perform(get("/swagger-ui/index.html"))
diff --git a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/gateway/BrokerServiceGatewayTest.java b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/gateway/BrokerServiceGatewayTest.java
index 4d920fbbbe..db1c4a966c 100644
--- a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/gateway/BrokerServiceGatewayTest.java
+++ b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/gateway/BrokerServiceGatewayTest.java
@@ -5,6 +5,7 @@ import at.tuwien.config.IndexConfig;
import at.tuwien.config.ReadyConfig;
import at.tuwien.exception.BrokerVirtualHostCreationException;
import at.tuwien.exception.BrokerVirtualHostGrantException;
+import at.tuwien.repository.sdb.DatabaseIdxRepository;
import at.tuwien.test.BaseTest;
import com.rabbitmq.client.Channel;
import lombok.extern.log4j.Log4j2;
@@ -41,6 +42,9 @@ public class BrokerServiceGatewayTest extends BaseUnitTest {
@MockBean
private IndexConfig indexConfig;
+ @MockBean
+ private DatabaseIdxRepository databaseIdxRepository;
+
@MockBean
@Qualifier("brokerRestTemplate")
private RestTemplate restTemplate;
diff --git a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/mapper/DatabaseMapperTest.java b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/mapper/DatabaseMapperTest.java
index 766ba8ed50..af5a088a39 100644
--- a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/mapper/DatabaseMapperTest.java
+++ b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/mapper/DatabaseMapperTest.java
@@ -5,6 +5,7 @@ import at.tuwien.api.database.DatabaseDto;
import at.tuwien.api.user.UserBriefDto;
import at.tuwien.config.IndexConfig;
import at.tuwien.config.ReadyConfig;
+import at.tuwien.repository.sdb.DatabaseIdxRepository;
import at.tuwien.test.BaseTest;
import com.rabbitmq.client.Channel;
import lombok.extern.log4j.Log4j2;
@@ -31,6 +32,9 @@ public class DatabaseMapperTest extends BaseUnitTest {
@MockBean
private Channel channel;
+ @MockBean
+ private DatabaseIdxRepository databaseIdxRepository;
+
@Autowired
private DatabaseMapper databaseMapper;
diff --git a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/AccessServiceIntegrationTest.java b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/AccessServiceIntegrationTest.java
index 839ded8788..2a5de492d3 100644
--- a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/AccessServiceIntegrationTest.java
+++ b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/AccessServiceIntegrationTest.java
@@ -11,6 +11,7 @@ import at.tuwien.entities.database.AccessType;
import at.tuwien.entities.database.DatabaseAccess;
import at.tuwien.exception.*;
import at.tuwien.repository.mdb.*;
+import at.tuwien.repository.sdb.DatabaseIdxRepository;
import com.rabbitmq.client.Channel;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.*;
@@ -47,6 +48,9 @@ public class AccessServiceIntegrationTest extends BaseUnitTest {
@MockBean
private Channel channel;
+ @MockBean
+ private DatabaseIdxRepository databaseIdxRepository;
+
@Autowired
private ImageRepository imageRepository;
diff --git a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/AccessServiceUnitTest.java b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/AccessServiceUnitTest.java
index ba3da601ac..e7221b3642 100644
--- a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/AccessServiceUnitTest.java
+++ b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/AccessServiceUnitTest.java
@@ -10,6 +10,7 @@ import at.tuwien.entities.database.DatabaseAccess;
import at.tuwien.exception.AccessDeniedException;
import at.tuwien.exception.NotAllowedException;
import at.tuwien.repository.mdb.*;
+import at.tuwien.repository.sdb.DatabaseIdxRepository;
import com.rabbitmq.client.Channel;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
@@ -40,6 +41,9 @@ public class AccessServiceUnitTest extends BaseUnitTest {
@MockBean
private Channel channel;
+ @MockBean
+ private DatabaseIdxRepository databaseIdxRepository;
+
@MockBean
private DatabaseRepository databaseRepository;
diff --git a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceUnitTest.java b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceUnitTest.java
index 24d383667a..afd7ddcaf6 100644
--- a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceUnitTest.java
+++ b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceUnitTest.java
@@ -10,6 +10,7 @@ import at.tuwien.entities.database.Database;
import at.tuwien.exception.*;
import at.tuwien.repository.mdb.ContainerRepository;
import at.tuwien.repository.mdb.DatabaseRepository;
+import at.tuwien.repository.sdb.DatabaseIdxRepository;
import at.tuwien.service.impl.MariaDbServiceImpl;
import at.tuwien.service.impl.RabbitMqServiceImpl;
import com.rabbitmq.client.Channel;
@@ -41,6 +42,9 @@ public class DatabaseServiceUnitTest extends BaseUnitTest {
@MockBean
private Channel channel;
+ @MockBean
+ private DatabaseIdxRepository databaseIdxRepository;
+
@MockBean
private RabbitMqServiceImpl rabbitMqService;
diff --git a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/IdentifierServiceIntegrationTest.java b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/IdentifierServiceIntegrationTest.java
index bf3b962a84..b39fa1b507 100644
--- a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/IdentifierServiceIntegrationTest.java
+++ b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/IdentifierServiceIntegrationTest.java
@@ -5,6 +5,7 @@ import at.tuwien.config.IndexConfig;
import at.tuwien.config.ReadyConfig;
import at.tuwien.entities.identifier.Identifier;
import at.tuwien.repository.mdb.*;
+import at.tuwien.repository.sdb.DatabaseIdxRepository;
import com.rabbitmq.client.Channel;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
@@ -35,6 +36,9 @@ public class IdentifierServiceIntegrationTest extends BaseUnitTest {
@MockBean
private Channel channel;
+ @MockBean
+ private DatabaseIdxRepository databaseIdxRepository;
+
@Autowired
private RealmRepository realmRepository;
diff --git a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/LicenseServiceIntegrationTest.java b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/LicenseServiceIntegrationTest.java
index 529cc363db..3cf9f68def 100644
--- a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/LicenseServiceIntegrationTest.java
+++ b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/LicenseServiceIntegrationTest.java
@@ -6,6 +6,7 @@ import at.tuwien.config.ReadyConfig;
import at.tuwien.entities.database.License;
import at.tuwien.exception.LicenseNotFoundException;
import at.tuwien.repository.mdb.*;
+import at.tuwien.repository.sdb.DatabaseIdxRepository;
import com.rabbitmq.client.Channel;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
@@ -35,6 +36,9 @@ public class LicenseServiceIntegrationTest extends BaseUnitTest {
@MockBean
private Channel channel;
+ @MockBean
+ private DatabaseIdxRepository databaseIdxRepository;
+
@Autowired
private LicenseRepository licenseRepository;
diff --git a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/MessageQueueServiceIntegrationTest.java b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/MessageQueueServiceIntegrationTest.java
index 4f954d7b67..800da8a157 100644
--- a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/MessageQueueServiceIntegrationTest.java
+++ b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/MessageQueueServiceIntegrationTest.java
@@ -9,6 +9,7 @@ import at.tuwien.exception.BrokerVirtualHostCreationException;
import at.tuwien.exception.BrokerVirtualHostGrantException;
import at.tuwien.gateway.BrokerServiceGateway;
import at.tuwien.repository.mdb.DatabaseRepository;
+import at.tuwien.repository.sdb.DatabaseIdxRepository;
import at.tuwien.service.impl.RabbitMqServiceImpl;
import at.tuwien.utils.AmqpUtils;
import com.rabbitmq.client.Channel;
@@ -38,6 +39,9 @@ public class MessageQueueServiceIntegrationTest extends BaseUnitTest {
@MockBean
private IndexConfig indexConfig;
+ @MockBean
+ private DatabaseIdxRepository databaseIdxRepository;
+
@MockBean
private DatabaseRepository databaseRepository;
diff --git a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/MessageQueueServiceUnitTest.java b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/MessageQueueServiceUnitTest.java
index b8f3d6a0ff..eeaaf10655 100644
--- a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/MessageQueueServiceUnitTest.java
+++ b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/MessageQueueServiceUnitTest.java
@@ -6,6 +6,7 @@ import at.tuwien.config.ReadyConfig;
import at.tuwien.exception.AmqpException;
import at.tuwien.gateway.BrokerServiceGateway;
import at.tuwien.repository.mdb.DatabaseRepository;
+import at.tuwien.repository.sdb.DatabaseIdxRepository;
import at.tuwien.service.impl.RabbitMqServiceImpl;
import com.rabbitmq.client.BuiltinExchangeType;
import com.rabbitmq.client.Channel;
@@ -33,6 +34,9 @@ public class MessageQueueServiceUnitTest extends BaseUnitTest {
@MockBean
private IndexConfig indexConfig;
+ @MockBean
+ private DatabaseIdxRepository databaseIdxRepository;
+
@MockBean
private DatabaseRepository databaseRepository;
diff --git a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/UserServiceIntegrationTest.java b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/UserServiceIntegrationTest.java
index 060989f1a4..4e76e5409f 100644
--- a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/UserServiceIntegrationTest.java
+++ b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/UserServiceIntegrationTest.java
@@ -7,6 +7,7 @@ import at.tuwien.entities.user.User;
import at.tuwien.exception.UserNotFoundException;
import at.tuwien.repository.mdb.RealmRepository;
import at.tuwien.repository.mdb.UserRepository;
+import at.tuwien.repository.sdb.DatabaseIdxRepository;
import com.rabbitmq.client.Channel;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
@@ -36,6 +37,9 @@ public class UserServiceIntegrationTest extends BaseUnitTest {
@MockBean
private Channel channel;
+ @MockBean
+ private DatabaseIdxRepository databaseIdxRepository;
+
@Autowired
private RealmRepository realmRepository;
diff --git a/dbrepo-identifier-service/pom.xml b/dbrepo-identifier-service/pom.xml
index 95132ce8af..31c7b37685 100644
--- a/dbrepo-identifier-service/pom.xml
+++ b/dbrepo-identifier-service/pom.xml
@@ -227,6 +227,7 @@
<exclude>at/tuwien/exception/**/*</exclude>
<exclude>at/tuwien/utils/**/*</exclude>
<exclude>at/tuwien/handlers/**/*</exclude>
+ <exclude>at/tuwien/auth/**/*</exclude>
<exclude>**/DbrepoIdentifierServiceApplication.class</exclude>
</excludes>
</configuration>
diff --git a/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java b/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java
new file mode 100644
index 0000000000..9570960ead
--- /dev/null
+++ b/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java
@@ -0,0 +1,81 @@
+package at.tuwien.service;
+
+import at.tuwien.BaseUnitTest;
+import at.tuwien.config.IndexConfig;
+import at.tuwien.entities.database.Database;
+import at.tuwien.entities.user.User;
+import at.tuwien.exception.DatabaseNotFoundException;
+import at.tuwien.exception.UserNotFoundException;
+import at.tuwien.repository.mdb.*;
+import at.tuwien.repository.sdb.IdentifierIdxRepository;
+import at.tuwien.service.UserService;
+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;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
+import java.util.Optional;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(SpringExtension.class)
+@SpringBootTest
+public class DatabaseServiceIntegrationTest extends BaseUnitTest {
+
+ @MockBean
+ private IndexConfig indexConfig;
+
+ @MockBean
+ private IdentifierIdxRepository identifierIdxRepository;
+
+ @Autowired
+ private DatabaseService databaseService;
+
+ @Autowired
+ private UserRepository userRepository;
+
+ @Autowired
+ private RealmRepository realmRepository;
+
+ @Autowired
+ private ContainerRepository containerRepository;
+
+ @Autowired
+ private DatabaseRepository databaseRepository;
+
+ @Autowired
+ private ImageRepository imageRepository;
+
+ @BeforeEach
+ public void beforeEach() {
+ userRepository.save(USER_1);
+ realmRepository.save(REALM_DBREPO);
+ imageRepository.save(IMAGE_1);
+ containerRepository.save(CONTAINER_1);
+ databaseRepository.save(DATABASE_1);
+ }
+
+ @Test
+ public void find_succeeds() throws DatabaseNotFoundException {
+
+ /* test */
+ final Database response = databaseService.find(DATABASE_1_ID);
+ assertEquals(DATABASE_1_ID, response.getId());
+ }
+
+ @Test
+ public void find_fails() {
+
+ /* test */
+ assertThrows(DatabaseNotFoundException.class, () -> {
+ databaseService.find(9999L);
+ });
+ }
+
+
+}
--
GitLab