From e8a62be8cf833181fca2ebd00554fb9d4f5c2062 Mon Sep 17 00:00:00 2001 From: Martin Weise <martin.weise@tuwien.ac.at> Date: Mon, 29 Jan 2024 12:28:38 +0100 Subject: [PATCH] Need to mock the listener --- .../at/tuwien/service/AccessServiceIntegrationTest.java | 2 ++ .../java/at/tuwien/service/AccessServiceUnitTest.java | 2 ++ .../service/AuthenticationServiceIntegrationTest.java | 2 ++ .../service/BannerMessageServiceIntegrationTest.java | 2 ++ .../tuwien/service/ContainerServiceIntegrationTest.java | 2 ++ .../service/DataCiteIdentifierServiceIntegrationTest.java | 2 ++ .../tuwien/service/DataCiteIdentifierServiceUnitTest.java | 2 ++ .../at/tuwien/service/DatabaseServiceComponentTest.java | 2 ++ .../at/tuwien/service/DatabaseServiceIntegrationTest.java | 2 ++ .../java/at/tuwien/service/DatabaseServiceUnitTest.java | 2 ++ .../at/tuwien/service/EntityServiceIntegrationTest.java | 2 ++ .../tuwien/service/IdentifierServiceIntegrationTest.java | 8 +++----- .../java/at/tuwien/service/IdentifierServiceUnitTest.java | 2 ++ .../at/tuwien/service/ImageServiceIntegrationTest.java | 2 ++ .../test/java/at/tuwien/service/ImageServiceUnitTest.java | 2 ++ .../at/tuwien/service/LicenseServiceIntegrationTest.java | 2 ++ .../service/MessageQueueServiceIntegrationTest.java | 2 ++ .../at/tuwien/service/MetadataServiceIntegrationTest.java | 2 ++ .../java/at/tuwien/service/MetadataServiceUnitTest.java | 2 ++ .../at/tuwien/service/PersistenceIntegrationTest.java | 2 ++ .../at/tuwien/service/QueryServiceIntegrationTest.java | 2 ++ .../tuwien/service/QueryStoreServiceIntegrationTest.java | 2 ++ .../at/tuwien/service/SemanticServiceIntegrationTest.java | 2 ++ .../at/tuwien/service/StoreServiceIntegrationTest.java | 2 ++ .../tuwien/service/TableServiceIntegrationReadTest.java | 2 ++ .../tuwien/service/TableServiceIntegrationWriteTest.java | 2 ++ .../test/java/at/tuwien/service/TableServiceUnitTest.java | 2 ++ .../at/tuwien/service/UserServiceIntegrationTest.java | 2 ++ .../test/java/at/tuwien/service/UserServiceUnitTest.java | 2 ++ .../at/tuwien/service/ViewServiceIntegrationTest.java | 2 ++ .../service/ViewServicePersistenceIntegrationTest.java | 2 ++ 31 files changed, 63 insertions(+), 5 deletions(-) diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/AccessServiceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/AccessServiceIntegrationTest.java index bd8ce85f76..ce2a42a9cd 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/AccessServiceIntegrationTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/AccessServiceIntegrationTest.java @@ -2,6 +2,7 @@ package at.tuwien.service; import at.tuwien.BaseUnitTest; import at.tuwien.annotations.MockAmqp; +import at.tuwien.annotations.MockListeners; import at.tuwien.annotations.MockOpensearch; import at.tuwien.api.database.AccessTypeDto; import at.tuwien.api.database.DatabaseGiveAccessDto; @@ -43,6 +44,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD) @ExtendWith(SpringExtension.class) @MockAmqp +@MockListeners @MockOpensearch public class AccessServiceIntegrationTest extends BaseUnitTest { diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/AccessServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/AccessServiceUnitTest.java index 59f15c219b..b2ae2d80b3 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/AccessServiceUnitTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/AccessServiceUnitTest.java @@ -2,6 +2,7 @@ package at.tuwien.service; import at.tuwien.BaseUnitTest; import at.tuwien.annotations.MockAmqp; +import at.tuwien.annotations.MockListeners; import at.tuwien.annotations.MockOpensearch; import at.tuwien.api.database.AccessTypeDto; import at.tuwien.api.database.DatabaseModifyAccessDto; @@ -33,6 +34,7 @@ import static org.mockito.Mockito.when; @SpringBootTest @ExtendWith(SpringExtension.class) @MockAmqp +@MockListeners @MockOpensearch public class AccessServiceUnitTest extends BaseUnitTest { diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/AuthenticationServiceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/AuthenticationServiceIntegrationTest.java index cfa8f9251d..83d9fe5d58 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/AuthenticationServiceIntegrationTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/AuthenticationServiceIntegrationTest.java @@ -2,6 +2,7 @@ package at.tuwien.service; import at.tuwien.BaseUnitTest; import at.tuwien.annotations.MockAmqp; +import at.tuwien.annotations.MockListeners; import at.tuwien.annotations.MockOpensearch; import at.tuwien.exception.*; import at.tuwien.gateway.KeycloakGateway; @@ -28,6 +29,7 @@ import org.testcontainers.junit.jupiter.Testcontainers; @SpringBootTest @ExtendWith(SpringExtension.class) @MockAmqp +@MockListeners @MockOpensearch public class AuthenticationServiceIntegrationTest extends BaseUnitTest { diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/BannerMessageServiceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/BannerMessageServiceIntegrationTest.java index bbf0d7d64d..8ed3f1f9d7 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/BannerMessageServiceIntegrationTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/BannerMessageServiceIntegrationTest.java @@ -2,6 +2,7 @@ package at.tuwien.service; import at.tuwien.BaseUnitTest; import at.tuwien.annotations.MockAmqp; +import at.tuwien.annotations.MockListeners; import at.tuwien.annotations.MockOpensearch; import at.tuwien.api.maintenance.BannerMessageCreateDto; import at.tuwien.api.maintenance.BannerMessageTypeDto; @@ -32,6 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; @SpringBootTest @ExtendWith(SpringExtension.class) @MockAmqp +@MockListeners @MockOpensearch public class BannerMessageServiceIntegrationTest extends BaseUnitTest { diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceIntegrationTest.java index 002ddeb130..172c9801d6 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceIntegrationTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceIntegrationTest.java @@ -2,6 +2,7 @@ package at.tuwien.service; import at.tuwien.BaseUnitTest; import at.tuwien.annotations.MockAmqp; +import at.tuwien.annotations.MockListeners; import at.tuwien.annotations.MockOpensearch; import at.tuwien.api.container.ContainerCreateRequestDto; import at.tuwien.entities.container.Container; @@ -27,6 +28,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; @SpringBootTest @ExtendWith(SpringExtension.class) @MockAmqp +@MockListeners @MockOpensearch public class ContainerServiceIntegrationTest extends BaseUnitTest { diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DataCiteIdentifierServiceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DataCiteIdentifierServiceIntegrationTest.java index c548b7b219..4c903a82eb 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DataCiteIdentifierServiceIntegrationTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DataCiteIdentifierServiceIntegrationTest.java @@ -2,6 +2,7 @@ package at.tuwien.service; import at.tuwien.BaseUnitTest; import at.tuwien.annotations.MockAmqp; +import at.tuwien.annotations.MockListeners; import at.tuwien.annotations.MockOpensearch; import at.tuwien.api.datacite.DataCiteBody; import at.tuwien.api.datacite.DataCiteData; @@ -40,6 +41,7 @@ import static org.mockito.Mockito.when; @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD) @SpringBootTest(properties = "spring.profiles.active:local,doi") @MockAmqp +@MockListeners @MockOpensearch public class DataCiteIdentifierServiceIntegrationTest extends BaseUnitTest { diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DataCiteIdentifierServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DataCiteIdentifierServiceUnitTest.java index 6bcf84616f..afa00b5308 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DataCiteIdentifierServiceUnitTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DataCiteIdentifierServiceUnitTest.java @@ -2,6 +2,7 @@ package at.tuwien.service; import at.tuwien.BaseUnitTest; import at.tuwien.annotations.MockAmqp; +import at.tuwien.annotations.MockListeners; import at.tuwien.annotations.MockOpensearch; import at.tuwien.api.datacite.DataCiteBody; import at.tuwien.api.datacite.DataCiteData; @@ -45,6 +46,7 @@ import static org.mockito.Mockito.when; @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD) @SpringBootTest(properties = "spring.profiles.active:local,doi") @MockAmqp +@MockListeners @MockOpensearch public class DataCiteIdentifierServiceUnitTest extends BaseUnitTest { diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceComponentTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceComponentTest.java index 18de26397a..0f53ecd573 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceComponentTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceComponentTest.java @@ -2,6 +2,7 @@ package at.tuwien.service; import at.tuwien.BaseUnitTest; import at.tuwien.annotations.MockAmqp; +import at.tuwien.annotations.MockListeners; import at.tuwien.annotations.MockOpensearch; import at.tuwien.api.database.DatabaseCreateDto; import at.tuwien.api.database.DatabaseDto; @@ -38,6 +39,7 @@ import static org.mockito.Mockito.when; @ExtendWith(SpringExtension.class) @SpringBootTest @MockAmqp +@MockListeners @MockOpensearch public class DatabaseServiceComponentTest extends BaseUnitTest { diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java index 6533e8a168..c51f148745 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java @@ -2,6 +2,7 @@ package at.tuwien.service; import at.tuwien.BaseUnitTest; import at.tuwien.annotations.MockAmqp; +import at.tuwien.annotations.MockListeners; import at.tuwien.annotations.MockOpensearch; import at.tuwien.api.database.*; import at.tuwien.config.MariaDbConfig; @@ -47,6 +48,7 @@ import static org.mockito.Mockito.*; @ExtendWith(SpringExtension.class) @SpringBootTest @MockAmqp +@MockListeners @MockOpensearch public class DatabaseServiceIntegrationTest extends BaseUnitTest { diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceUnitTest.java index 576129336f..4eea12c7f0 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceUnitTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceUnitTest.java @@ -2,6 +2,7 @@ package at.tuwien.service; import at.tuwien.BaseUnitTest; import at.tuwien.annotations.MockAmqp; +import at.tuwien.annotations.MockListeners; import at.tuwien.annotations.MockOpensearch; import at.tuwien.api.database.DatabaseCreateDto; import at.tuwien.entities.database.Database; @@ -28,6 +29,7 @@ import static org.mockito.Mockito.when; @SpringBootTest @ExtendWith(SpringExtension.class) @MockAmqp +@MockListeners @MockOpensearch public class DatabaseServiceUnitTest extends BaseUnitTest { diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/EntityServiceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/EntityServiceIntegrationTest.java index bd015711b9..0fb358df35 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/EntityServiceIntegrationTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/EntityServiceIntegrationTest.java @@ -2,6 +2,7 @@ package at.tuwien.service; import at.tuwien.BaseUnitTest; import at.tuwien.annotations.MockAmqp; +import at.tuwien.annotations.MockListeners; import at.tuwien.annotations.MockOpensearch; import at.tuwien.api.semantics.EntityDto; import at.tuwien.api.semantics.TableColumnEntityDto; @@ -25,6 +26,7 @@ import static org.junit.jupiter.api.Assertions.*; @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD) @ExtendWith(SpringExtension.class) @MockAmqp +@MockListeners @MockOpensearch public class EntityServiceIntegrationTest extends BaseUnitTest { diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/IdentifierServiceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/IdentifierServiceIntegrationTest.java index a08746df1c..2e5a57a870 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/IdentifierServiceIntegrationTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/IdentifierServiceIntegrationTest.java @@ -174,11 +174,9 @@ public class IdentifierServiceIntegrationTest extends BaseUnitTest { @Test @Transactional - public void create_subsetRelatedIdentifiers_succeeds() - throws DatabaseNotFoundException, UserNotFoundException, IdentifierAlreadyExistsException, - QueryNotFoundException, IdentifierPublishingNotAllowedException, RemoteUnavailableException, - IdentifierRequestException, ViewNotFoundException, QueryStoreException, DatabaseConnectionException, - ImageNotSupportedException, IdentifierNotFoundException { + public void create_subsetRelatedIdentifiers_succeeds() throws DatabaseNotFoundException, UserNotFoundException, + QueryNotFoundException, RemoteUnavailableException, IdentifierRequestException, ViewNotFoundException, + QueryStoreException, ImageNotSupportedException { /* mock */ when(restTemplate.exchange(anyString(), any(HttpMethod.class), any(HttpEntity.class), eq(QueryDto.class))) diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/IdentifierServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/IdentifierServiceUnitTest.java index 3ab088dc73..8b67a8548f 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/IdentifierServiceUnitTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/IdentifierServiceUnitTest.java @@ -2,6 +2,7 @@ package at.tuwien.service; import at.tuwien.BaseUnitTest; import at.tuwien.annotations.MockAmqp; +import at.tuwien.annotations.MockListeners; import at.tuwien.annotations.MockOpensearch; import at.tuwien.api.database.query.QueryDto; import at.tuwien.api.identifier.BibliographyTypeDto; @@ -34,6 +35,7 @@ import static org.mockito.Mockito.when; @ExtendWith(SpringExtension.class) @SpringBootTest @MockAmqp +@MockListeners @MockOpensearch public class IdentifierServiceUnitTest extends BaseUnitTest { diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ImageServiceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ImageServiceIntegrationTest.java index 92d0c06fbf..07c32c5205 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ImageServiceIntegrationTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ImageServiceIntegrationTest.java @@ -2,6 +2,7 @@ package at.tuwien.service; import at.tuwien.BaseUnitTest; import at.tuwien.annotations.MockAmqp; +import at.tuwien.annotations.MockListeners; import at.tuwien.annotations.MockOpensearch; import at.tuwien.api.container.image.ImageCreateDto; import at.tuwien.exception.ImageAlreadyExistsException; @@ -28,6 +29,7 @@ import static org.junit.jupiter.api.Assertions.*; @ExtendWith(SpringExtension.class) @SpringBootTest @MockAmqp +@MockListeners @MockOpensearch public class ImageServiceIntegrationTest extends BaseUnitTest { diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ImageServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ImageServiceUnitTest.java index eaa6fc8bf9..620e66dacd 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ImageServiceUnitTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ImageServiceUnitTest.java @@ -2,6 +2,7 @@ package at.tuwien.service; import at.tuwien.BaseUnitTest; import at.tuwien.annotations.MockAmqp; +import at.tuwien.annotations.MockListeners; import at.tuwien.annotations.MockOpensearch; import at.tuwien.api.container.image.ImageChangeDto; import at.tuwien.api.container.image.ImageCreateDto; @@ -29,6 +30,7 @@ import static org.mockito.Mockito.*; @ExtendWith(SpringExtension.class) @SpringBootTest @MockAmqp +@MockListeners @MockOpensearch public class ImageServiceUnitTest extends BaseUnitTest { diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/LicenseServiceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/LicenseServiceIntegrationTest.java index eca8d1bc91..a9e4490d09 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/LicenseServiceIntegrationTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/LicenseServiceIntegrationTest.java @@ -2,6 +2,7 @@ package at.tuwien.service; import at.tuwien.BaseUnitTest; import at.tuwien.annotations.MockAmqp; +import at.tuwien.annotations.MockListeners; import at.tuwien.annotations.MockOpensearch; import at.tuwien.config.MariaDbContainerConfig; import at.tuwien.entities.database.License; @@ -28,6 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; @SpringBootTest @ExtendWith(SpringExtension.class) @MockAmqp +@MockListeners @MockOpensearch public class LicenseServiceIntegrationTest extends BaseUnitTest { diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/MessageQueueServiceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/MessageQueueServiceIntegrationTest.java index 7a44e6c2bb..28ccbb19e3 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/MessageQueueServiceIntegrationTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/MessageQueueServiceIntegrationTest.java @@ -1,6 +1,7 @@ package at.tuwien.service; import at.tuwien.BaseUnitTest; +import at.tuwien.annotations.MockListeners; import at.tuwien.annotations.MockOpensearch; import at.tuwien.api.amqp.GrantExchangePermissionsDto; import at.tuwien.api.amqp.TopicPermissionDto; @@ -39,6 +40,7 @@ import static org.junit.jupiter.api.Assertions.*; @ExtendWith(SpringExtension.class) @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD) @MockOpensearch +@MockListeners public class MessageQueueServiceIntegrationTest extends BaseUnitTest { @Autowired diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/MetadataServiceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/MetadataServiceIntegrationTest.java index d4f3c634eb..7ec7d0a784 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/MetadataServiceIntegrationTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/MetadataServiceIntegrationTest.java @@ -2,6 +2,7 @@ package at.tuwien.service; import at.tuwien.BaseUnitTest; import at.tuwien.annotations.MockAmqp; +import at.tuwien.annotations.MockListeners; import at.tuwien.annotations.MockOpensearch; import at.tuwien.oaipmh.OaiErrorType; import at.tuwien.oaipmh.OaiListIdentifiersParameters; @@ -24,6 +25,7 @@ import static org.junit.jupiter.api.Assertions.*; @SpringBootTest @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD) @MockAmqp +@MockListeners @MockOpensearch public class MetadataServiceIntegrationTest extends BaseUnitTest { diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/MetadataServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/MetadataServiceUnitTest.java index 1f06ad3c38..f731e99d25 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/MetadataServiceUnitTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/MetadataServiceUnitTest.java @@ -2,6 +2,7 @@ package at.tuwien.service; import at.tuwien.BaseUnitTest; import at.tuwien.annotations.MockAmqp; +import at.tuwien.annotations.MockListeners; import at.tuwien.annotations.MockOpensearch; import at.tuwien.api.crossref.CrossrefDto; import at.tuwien.api.orcid.OrcidDto; @@ -38,6 +39,7 @@ import static org.mockito.Mockito.when; @ExtendWith(SpringExtension.class) @SpringBootTest @MockAmqp +@MockListeners @MockOpensearch public class MetadataServiceUnitTest extends BaseUnitTest { diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/PersistenceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/PersistenceIntegrationTest.java index 5da05bc8a4..5f6e1045f5 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/PersistenceIntegrationTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/PersistenceIntegrationTest.java @@ -2,6 +2,7 @@ package at.tuwien.service; import at.tuwien.BaseUnitTest; import at.tuwien.annotations.MockAmqp; +import at.tuwien.annotations.MockListeners; import at.tuwien.annotations.MockOpensearch; import at.tuwien.exception.ImageNotFoundException; import at.tuwien.repository.mdb.ImageRepository; @@ -22,6 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; @ExtendWith(SpringExtension.class) @SpringBootTest @MockAmqp +@MockListeners @MockOpensearch public class PersistenceIntegrationTest extends BaseUnitTest { diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/QueryServiceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/QueryServiceIntegrationTest.java index 4d3988a88d..77af8cb2fc 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/QueryServiceIntegrationTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/QueryServiceIntegrationTest.java @@ -3,6 +3,7 @@ package at.tuwien.service; import at.tuwien.BaseUnitTest; import at.tuwien.ExportResource; import at.tuwien.annotations.MockAmqp; +import at.tuwien.annotations.MockListeners; import at.tuwien.annotations.MockOpensearch; import at.tuwien.api.database.query.ExecuteStatementDto; import at.tuwien.api.database.query.ImportDto; @@ -62,6 +63,7 @@ import static org.mockito.Mockito.doNothing; @SpringBootTest @ExtendWith(SpringExtension.class) @MockAmqp +@MockListeners @MockOpensearch public class QueryServiceIntegrationTest extends BaseUnitTest { diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/QueryStoreServiceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/QueryStoreServiceIntegrationTest.java index 2c3fb2be26..5f60fdc995 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/QueryStoreServiceIntegrationTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/QueryStoreServiceIntegrationTest.java @@ -2,6 +2,7 @@ package at.tuwien.service; import at.tuwien.BaseUnitTest; import at.tuwien.annotations.MockAmqp; +import at.tuwien.annotations.MockListeners; import at.tuwien.annotations.MockOpensearch; import at.tuwien.config.MariaDbConfig; import at.tuwien.config.MariaDbContainerConfig; @@ -32,6 +33,7 @@ import java.util.List; @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD) @ExtendWith(SpringExtension.class) @MockAmqp +@MockListeners @MockOpensearch public class QueryStoreServiceIntegrationTest extends BaseUnitTest { diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/SemanticServiceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/SemanticServiceIntegrationTest.java index b5746390c7..50466c7775 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/SemanticServiceIntegrationTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/SemanticServiceIntegrationTest.java @@ -2,6 +2,7 @@ package at.tuwien.service; import at.tuwien.BaseUnitTest; import at.tuwien.annotations.MockAmqp; +import at.tuwien.annotations.MockListeners; import at.tuwien.annotations.MockOpensearch; import at.tuwien.entities.database.table.columns.TableColumnConcept; import at.tuwien.entities.database.table.columns.TableColumnUnit; @@ -27,6 +28,7 @@ import static org.junit.jupiter.api.Assertions.*; @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD) @ExtendWith(SpringExtension.class) @MockAmqp +@MockListeners @MockOpensearch public class SemanticServiceIntegrationTest extends BaseUnitTest { diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/StoreServiceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/StoreServiceIntegrationTest.java index e12e7b1b6b..3bb487e8e7 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/StoreServiceIntegrationTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/StoreServiceIntegrationTest.java @@ -2,6 +2,7 @@ package at.tuwien.service; import at.tuwien.BaseUnitTest; import at.tuwien.annotations.MockAmqp; +import at.tuwien.annotations.MockListeners; import at.tuwien.annotations.MockOpensearch; import at.tuwien.api.database.query.ExecuteStatementDto; import at.tuwien.api.database.query.QueryPersistDto; @@ -41,6 +42,7 @@ import static org.junit.jupiter.api.Assertions.*; @SpringBootTest @ExtendWith(SpringExtension.class) @MockAmqp +@MockListeners @MockOpensearch public class StoreServiceIntegrationTest extends BaseUnitTest { diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationReadTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationReadTest.java index c123797552..4220af3f9c 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationReadTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationReadTest.java @@ -2,6 +2,7 @@ package at.tuwien.service; import at.tuwien.BaseUnitTest; import at.tuwien.annotations.MockAmqp; +import at.tuwien.annotations.MockListeners; import at.tuwien.annotations.MockOpensearch; import at.tuwien.api.database.table.TableHistoryDto; import at.tuwien.config.MariaDbConfig; @@ -36,6 +37,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; @SpringBootTest @ExtendWith(SpringExtension.class) @MockAmqp +@MockListeners @MockOpensearch public class TableServiceIntegrationReadTest extends BaseUnitTest { diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationWriteTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationWriteTest.java index 8ef2a0ce4a..c174c3e3b7 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationWriteTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationWriteTest.java @@ -2,6 +2,7 @@ package at.tuwien.service; import at.tuwien.BaseUnitTest; import at.tuwien.annotations.MockAmqp; +import at.tuwien.annotations.MockListeners; import at.tuwien.annotations.MockOpensearch; import at.tuwien.api.database.table.TableCreateDto; import at.tuwien.api.database.table.columns.ColumnCreateDto; @@ -49,6 +50,7 @@ import static org.mockito.ArgumentMatchers.any; @SpringBootTest @ExtendWith(SpringExtension.class) @MockAmqp +@MockListeners @MockOpensearch public class TableServiceIntegrationWriteTest extends BaseUnitTest { diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java index e64c3f09c0..864153b939 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java @@ -2,6 +2,7 @@ package at.tuwien.service; import at.tuwien.BaseUnitTest; import at.tuwien.annotations.MockAmqp; +import at.tuwien.annotations.MockListeners; import at.tuwien.annotations.MockOpensearch; import at.tuwien.entities.database.table.columns.TableColumn; import at.tuwien.exception.DatabaseNotFoundException; @@ -31,6 +32,7 @@ import static org.mockito.Mockito.when; @SpringBootTest @ExtendWith(SpringExtension.class) @MockAmqp +@MockListeners @MockOpensearch public class TableServiceUnitTest extends BaseUnitTest { diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceIntegrationTest.java index ba29bea010..b8ee173b94 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceIntegrationTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceIntegrationTest.java @@ -2,6 +2,7 @@ package at.tuwien.service; import at.tuwien.BaseUnitTest; import at.tuwien.annotations.MockAmqp; +import at.tuwien.annotations.MockListeners; import at.tuwien.annotations.MockOpensearch; import at.tuwien.api.auth.SignupRequestDto; import at.tuwien.api.user.*; @@ -32,6 +33,7 @@ import static org.junit.jupiter.api.Assertions.*; @SpringBootTest @ExtendWith(SpringExtension.class) @MockAmqp +@MockListeners @MockOpensearch public class UserServiceIntegrationTest extends BaseUnitTest { diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceUnitTest.java index 476123cde6..20583370ea 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceUnitTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceUnitTest.java @@ -2,6 +2,7 @@ package at.tuwien.service; import at.tuwien.BaseUnitTest; import at.tuwien.annotations.MockAmqp; +import at.tuwien.annotations.MockListeners; import at.tuwien.annotations.MockOpensearch; import at.tuwien.entities.user.User; import at.tuwien.exception.*; @@ -24,6 +25,7 @@ import static org.mockito.Mockito.*; @ExtendWith(SpringExtension.class) @SpringBootTest @MockAmqp +@MockListeners @MockOpensearch public class UserServiceUnitTest extends BaseUnitTest { diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServiceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServiceIntegrationTest.java index 7d30bca6de..c1b225310a 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServiceIntegrationTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServiceIntegrationTest.java @@ -2,6 +2,7 @@ package at.tuwien.service; import at.tuwien.BaseUnitTest; import at.tuwien.annotations.MockAmqp; +import at.tuwien.annotations.MockListeners; import at.tuwien.api.database.ViewCreateDto; import at.tuwien.config.MariaDbConfig; import at.tuwien.config.MariaDbContainerConfig; @@ -44,6 +45,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; @SpringBootTest @ExtendWith(SpringExtension.class) @MockAmqp +@MockListeners public class ViewServiceIntegrationTest extends BaseUnitTest { @Autowired diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServicePersistenceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServicePersistenceIntegrationTest.java index 40c9e988e3..3480c1682a 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServicePersistenceIntegrationTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServicePersistenceIntegrationTest.java @@ -2,6 +2,7 @@ package at.tuwien.service; import at.tuwien.BaseUnitTest; import at.tuwien.annotations.MockAmqp; +import at.tuwien.annotations.MockListeners; import at.tuwien.annotations.MockOpensearch; import at.tuwien.api.database.ViewCreateDto; import at.tuwien.config.MariaDbConfig; @@ -37,6 +38,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; @SpringBootTest @ExtendWith(SpringExtension.class) @MockAmqp +@MockListeners @MockOpensearch public class ViewServicePersistenceIntegrationTest extends BaseUnitTest { -- GitLab