From 34d1a8c4443f90655235eade6cb3cf1d37401492 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Thu, 6 Apr 2023 13:52:29 +0300 Subject: [PATCH] company-service fix log error in test --- .../company/service/ClearingMemberCategoryServiceTest.java | 5 +++++ .../clearing/company/service/CompanyInfoServiceTest.java | 5 +++++ .../spcex/clearing/company/service/CompanyServiceTest.java | 6 ++++++ .../clearing/company/service/CompanySymbolServiceTest.java | 6 ++++++ .../spcex/clearing/company/service/ContactServiceTest.java | 6 ++++++ .../company/service/ProfileDocumentServiceTest.java | 6 +++++- 6 files changed, 33 insertions(+), 1 deletion(-) diff --git a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ClearingMemberCategoryServiceTest.java b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ClearingMemberCategoryServiceTest.java index b864b48a7..df802532f 100644 --- a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ClearingMemberCategoryServiceTest.java +++ b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ClearingMemberCategoryServiceTest.java @@ -22,6 +22,7 @@ import ru.spcex.clearing.company.config.KafkaConfigTest; import ru.spcex.clearing.company.config.validation.ClearingMemberCategoryValidationConfig; import ru.spcex.clearing.company.config.validation.ValidationConfig; import ru.spcex.clearing.company.utils.MatcherFactory.Matcher; +import ru.spcex.clearing.company.utils.TestUtils; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.platform.messaging.domain.BaseRequest; import ru.spcex.clearing.platform.messaging.domain.Consts; @@ -35,6 +36,8 @@ import ru.spcex.platform.imdg.iml.hazelcast.service.HazelcastService; import javax.annotation.PostConstruct; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.spy; import static ru.spcex.clearing.company.config.HazelcastServiceTestConfiguration.currentID; import static ru.spcex.clearing.company.utils.MatcherFactory.usingIgnoringFieldsComparator; import static ru.spcex.clearing.company.utils.TestUtils.*; @@ -94,6 +97,8 @@ class ClearingMemberCategoryServiceTest { clearingCategoryDictionary.setCode(CLEARING_CATEGORY_DICT_CODE); clearingCategoryDictionaryImdg.insert(clearingCategoryDictionary); + TestUtils.FutureRecordMetadata future = spy(TestUtils.FutureRecordMetadata.class); + doReturn(future).when(mockProducer).send(producerRecord.capture()); } @Test diff --git a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanyInfoServiceTest.java b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanyInfoServiceTest.java index dfebef889..8ab19f2f4 100644 --- a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanyInfoServiceTest.java +++ b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanyInfoServiceTest.java @@ -21,6 +21,7 @@ import ru.spcex.clearing.company.config.KafkaConfigTest; import ru.spcex.clearing.company.config.validation.CompanyValidationConfig; import ru.spcex.clearing.company.config.validation.ValidationConfig; import ru.spcex.clearing.company.utils.MatcherFactory; +import ru.spcex.clearing.company.utils.TestUtils; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.platform.messaging.domain.BaseRequest; import ru.spcex.clearing.platform.messaging.domain.Consts; @@ -31,6 +32,8 @@ import ru.spcex.platform.imdg.iml.hazelcast.service.HazelcastService; import javax.annotation.PostConstruct; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.spy; import static ru.spcex.clearing.company.utils.MatcherFactory.usingIgnoringFieldsComparator; import static ru.spcex.clearing.company.utils.TestUtils.*; @@ -80,6 +83,8 @@ class CompanyInfoServiceTest { putToDictionary(IMDGDistributedNames.Map_LegalKindDictionary, new LegalKindDictionary(), "JURD"); putToDictionary(IMDGDistributedNames.Map_OrganizationTypeDictionary, new OrganizationTypeDictionary(), "NCRD"); + TestUtils.FutureRecordMetadata future = spy(TestUtils.FutureRecordMetadata.class); + doReturn(future).when(mockProducer).send(producerRecord.capture()); } private void putToDictionary(String mapName, D object, String code) { diff --git a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanyServiceTest.java b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanyServiceTest.java index bdcf902a6..eacb5cd11 100644 --- a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanyServiceTest.java +++ b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanyServiceTest.java @@ -23,6 +23,7 @@ import ru.spcex.clearing.company.config.KafkaConfigTest; import ru.spcex.clearing.company.config.validation.CompanyValidationConfig; import ru.spcex.clearing.company.config.validation.ValidationConfig; import ru.spcex.clearing.company.utils.MatcherFactory; +import ru.spcex.clearing.company.utils.TestUtils; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.platform.messaging.domain.BaseRequest; import ru.spcex.clearing.platform.messaging.domain.Consts; @@ -37,6 +38,8 @@ import javax.annotation.PostConstruct; import java.util.Map; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.spy; import static ru.spcex.clearing.company.utils.MatcherFactory.usingIgnoringFieldsComparator; import static ru.spcex.clearing.company.utils.TestUtils.*; @@ -97,6 +100,9 @@ class CompanyServiceTest { cSymbol.setShortname(" CLRC key"); companySymbolDictionaryImdg.insert(cSymbol); } + + TestUtils.FutureRecordMetadata future = spy(TestUtils.FutureRecordMetadata.class); + doReturn(future).when(mockProducer).send(producerRecord.capture()); } /** diff --git a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanySymbolServiceTest.java b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanySymbolServiceTest.java index 456b4a893..7ddfaaaee 100644 --- a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanySymbolServiceTest.java +++ b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanySymbolServiceTest.java @@ -16,6 +16,7 @@ import ru.clearing.classes.statics.data.company.CompanySymbols; import ru.spcex.clearing.company.config.HazelcastServiceTestConfiguration; import ru.spcex.clearing.company.config.KafkaConfigTest; import ru.spcex.clearing.company.utils.MatcherFactory; +import ru.spcex.clearing.company.utils.TestUtils; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.platform.messaging.domain.BaseRequest; import ru.spcex.clearing.platform.messaging.domain.Consts; @@ -25,6 +26,8 @@ import ru.spcex.platform.imdg.iml.hazelcast.service.HazelcastService; import javax.annotation.PostConstruct; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.spy; import static ru.spcex.clearing.company.utils.MatcherFactory.usingIgnoringFieldsComparator; import static ru.spcex.clearing.company.utils.TestUtils.*; @@ -56,6 +59,9 @@ class CompanySymbolServiceTest { private void init() { hazelcastServiceTest.waitAvailable(); companySymbolsImdg = hazelcastServiceTest.getImdg(IMDGDistributedNames.Map_CompanySymbols, CompanySymbols.class); + + TestUtils.FutureRecordMetadata future = spy(TestUtils.FutureRecordMetadata.class); + doReturn(future).when(mockProducer).send(producerRecord.capture()); } /** diff --git a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ContactServiceTest.java b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ContactServiceTest.java index e361852d5..5864d1538 100644 --- a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ContactServiceTest.java +++ b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ContactServiceTest.java @@ -21,6 +21,7 @@ import ru.spcex.clearing.company.config.KafkaConfigTest; import ru.spcex.clearing.company.config.validation.ContactValidationConfig; import ru.spcex.clearing.company.config.validation.ValidationConfig; import ru.spcex.clearing.company.utils.MatcherFactory; +import ru.spcex.clearing.company.utils.TestUtils; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.platform.messaging.domain.BaseRequest; import ru.spcex.clearing.platform.messaging.domain.Consts; @@ -33,6 +34,8 @@ import ru.spcex.platform.imdg.iml.hazelcast.service.HazelcastService; import javax.annotation.PostConstruct; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.spy; import static ru.spcex.clearing.company.utils.MatcherFactory.usingIgnoringFieldsComparator; import static ru.spcex.clearing.company.utils.TestUtils.*; @@ -85,6 +88,9 @@ class ContactServiceTest { IMDGDistributedNames.Map_ContactTypeDictionary, ContactTypeDictionary.class ); contactTypeDictionaryImdg.insert(contactTypeDictionary); + + TestUtils.FutureRecordMetadata future = spy(TestUtils.FutureRecordMetadata.class); + doReturn(future).when(mockProducer).send(producerRecord.capture()); } @Test void contactNew() throws InterruptedException { diff --git a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ProfileDocumentServiceTest.java b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ProfileDocumentServiceTest.java index 298d1483d..3042b85f5 100644 --- a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ProfileDocumentServiceTest.java +++ b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ProfileDocumentServiceTest.java @@ -21,6 +21,7 @@ import ru.spcex.clearing.company.config.KafkaConfigTest; import ru.spcex.clearing.company.config.validation.ProfileDocumentValidationConfig; import ru.spcex.clearing.company.config.validation.ValidationConfig; import ru.spcex.clearing.company.utils.MatcherFactory; +import ru.spcex.clearing.company.utils.TestUtils; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.platform.messaging.domain.BaseRequest; import ru.spcex.clearing.platform.messaging.domain.Consts; @@ -35,6 +36,8 @@ import javax.annotation.PostConstruct; import java.time.LocalDate; import java.time.temporal.ChronoUnit; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.spy; import static ru.spcex.clearing.company.config.HazelcastServiceTestConfiguration.currentID; import static ru.spcex.clearing.company.utils.MatcherFactory.usingIgnoringFieldsComparator; import static ru.spcex.clearing.company.utils.TestUtils.*; @@ -104,7 +107,8 @@ class ProfileDocumentServiceTest { documentTypeDictionary1.setName("new_test_name"); documentTypeDictionaryImdg.insert(documentTypeDictionary1); - + TestUtils.FutureRecordMetadata future = spy(TestUtils.FutureRecordMetadata.class); + doReturn(future).when(mockProducer).send(producerRecord.capture()); } /**