http://jira.mfd.msk:8088/browse/CLS-258

Перенес тестовые утилиты в test-clearing.

clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/AbstractControllerTest.java

@@ -27,6 +27,7 @@ import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.filter.CharacterEncodingFilter;
 import ru.clearing.classes.statics.data.user.User;
+import ru.spcex.clearing.TestUtils;
 import ru.spcex.clearing.backendapi.controller.config.*;
 import ru.spcex.clearing.backendapi.controller.queue.account.AccountBalanceController;
 import ru.spcex.clearing.backendapi.controller.queue.account.AccountController;
@@ -58,8 +59,7 @@ import ru.spcex.clearing.backendapi.controller.response.entity.CommonGetAllRespo
 import ru.spcex.clearing.backendapi.domain.actions.IAction;
 import ru.spcex.clearing.backendapi.meta.GetResponseFactory;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
-import ru.spcex.clearing.imdg.MatcherFactoryImdg;
-import ru.spcex.clearing.imdg.TestUtils;
+import ru.spcex.clearing.imdg.MatcherFactoryWithJson;
 import ru.spcex.clearing.platform.messaging.domain.ActionType;
 import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
 import ru.spcex.platform.classes.base.SpcexObjectBase;
@@ -82,7 +82,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 import static ru.spcex.clearing.imdg.JsonUtil.readValue;
 import static ru.spcex.clearing.imdg.JsonUtil.writeValue;
-import static ru.spcex.clearing.imdg.MatcherFactoryImdg.usingIgnoringFieldsComparator;
+import static ru.spcex.clearing.imdg.MatcherFactoryWithJson.usingIgnoringFieldsComparatorForClass;
 
 
 @ContextConfiguration(classes = {
@@ -156,8 +156,8 @@ import static ru.spcex.clearing.imdg.MatcherFactoryImdg.usingIgnoringFieldsCompa
 @WebMvcTest//(controllers = DeleteCompanyController.class)
 //@TestPropertySource(properties = "spring.config.location=D:/repo/mfd/clearing/clearing-parent/backend-api/src/main/resources/")
 public abstract class AbstractControllerTest {
-    protected static final MatcherFactoryImdg.Matcher<BaseRequest> BASE_REQUEST_MATCHER = usingIgnoringFieldsComparator(BaseRequest.class);
-    protected static final MatcherFactoryImdg.Matcher<CudResponse> CUD_RESPONSE_MATCHER = usingIgnoringFieldsComparator(CudResponse.class);
+    protected static final MatcherFactoryWithJson.Matcher<BaseRequest> BASE_REQUEST_MATCHER = usingIgnoringFieldsComparatorForClass(BaseRequest.class);
+    protected static final MatcherFactoryWithJson.Matcher<CudResponse> CUD_RESPONSE_MATCHER = usingIgnoringFieldsComparatorForClass(CudResponse.class);
     protected static final AtomicLong currentId = new AtomicLong();
     private static final CharacterEncodingFilter CHARACTER_ENCODING_FILTER = new CharacterEncodingFilter();
 

clearing-parent/securities-service/pom.xml

@@ -45,6 +45,11 @@
             <artifactId>jackson-databind</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>ru.spcex.clearing</groupId>
+            <artifactId>test-clearing</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/CouponPeriodService.java

@@ -18,7 +18,6 @@ import ru.spcex.clearing.platform.messaging.service.RequestInfoUpdate;
 import ru.spcex.clearing.securities.validation.ValidationProvider;
 import ru.spcex.clearing.util.security.UserRoleVerification;
 import ru.spcex.clearing.validation.common.ValidationHelper;
-import ru.spcex.platform.enumeration.UserRole;
 import ru.spcex.platform.imdg.api.Imdg;
 import ru.spcex.platform.imdg.api.ImdgId;
 import ru.spcex.platform.imdg.api.ImdgProvider;
@@ -45,7 +44,7 @@ public class CouponPeriodService extends QueueConsumer implements InitializingBe
         this.couponPeriodImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_CouponPeriod, CouponPeriod.class);
         this.imdgProvider = imdgProvider;
         this.idGenerator = imdgProvider.getImdgIdGenerator();
-        this.userRoleVerification = userRoleVerification.setRoleForVerification(UserRole.Admin);
+        this.userRoleVerification = userRoleVerification;
         this.validationHelper = validationHelper;
     }
 

clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/AbstractServiceTest.java

@@ -18,6 +18,8 @@ import ru.clearing.classes.statics.data.misc.Currency;
 import ru.clearing.classes.statics.data.misc.Listing;
 import ru.clearing.classes.statics.data.misc.MoneyMarketSecurity;
 import ru.clearing.platform.dictionary.*;
+import ru.spcex.clearing.MatcherFactory;
+import ru.spcex.clearing.TestUtils;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.clearing.securities.component.ListingBuilder;
 import ru.spcex.clearing.securities.config.ErrorResolverConfig;
@@ -25,8 +27,6 @@ import ru.spcex.clearing.securities.config.ImdgTestConfig;
 import ru.spcex.clearing.securities.config.KafkaTestConfig;
 import ru.spcex.clearing.securities.config.ValidationConfig;
 import ru.spcex.clearing.securities.service.cud.*;
-import ru.spcex.clearing.securities.utils.MatcherFactory;
-import ru.spcex.clearing.securities.utils.TestUtils;
 import ru.spcex.clearing.securities.validation.ValidationProvider;
 import ru.spcex.platform.imdg.api.Imdg;
 import ru.spcex.platform.imdg.api.ImdgProvider;
@@ -35,7 +35,7 @@ import java.util.concurrent.atomic.AtomicLong;
 
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
-import static ru.spcex.clearing.securities.utils.MatcherFactory.usingIgnoringFieldsComparator;
+import static ru.spcex.clearing.MatcherFactory.usingIgnoringFieldsComparator;
 
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {

clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/CouponPeriodServiceTest.java

@@ -4,19 +4,19 @@ import org.apache.kafka.clients.consumer.MockConsumer;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import ru.clearing.classes.statics.data.instrument.issue.CouponPeriod;
+import ru.spcex.clearing.MatcherFactory;
 import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
 import ru.spcex.clearing.platform.messaging.domain.Consts;
 import ru.spcex.clearing.platform.messaging.domain.cud.securitites.CouponPeriodNewRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.securitites.CouponPeriodUpdateRequest;
 import ru.spcex.clearing.securities.service.cud.CouponPeriodService;
-import ru.spcex.clearing.securities.utils.MatcherFactory;
 
 import javax.annotation.PostConstruct;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 
-import static ru.spcex.clearing.securities.utils.MatcherFactory.usingIgnoringFieldsComparator;
-import static ru.spcex.clearing.securities.utils.TestUtils.*;
+import static ru.spcex.clearing.MatcherFactory.usingIgnoringFieldsComparator;
+import static ru.spcex.clearing.TestUtils.*;
 
 public class CouponPeriodServiceTest extends AbstractServiceTest {
     private static final MatcherFactory.Matcher<CouponPeriod> COUPON_PERIOD_MATCHER = usingIgnoringFieldsComparator();

clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/CurrencyServiceTest.java

@@ -4,17 +4,18 @@ import org.apache.kafka.clients.consumer.MockConsumer;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import ru.clearing.classes.statics.data.misc.Currency;
+import ru.spcex.clearing.MatcherFactory;
 import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
 import ru.spcex.clearing.platform.messaging.domain.Consts;
 import ru.spcex.clearing.platform.messaging.domain.cud.securitites.CurrencyNewRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.securitites.CurrencyUpdateRequest;
 import ru.spcex.clearing.securities.service.cud.CurrencyService;
-import ru.spcex.clearing.securities.utils.MatcherFactory;
 
 import javax.annotation.PostConstruct;
 
-import static ru.spcex.clearing.securities.utils.MatcherFactory.usingIgnoringFieldsComparator;
-import static ru.spcex.clearing.securities.utils.TestUtils.*;
+import static ru.spcex.clearing.MatcherFactory.usingIgnoringFieldsComparator;
+import static ru.spcex.clearing.TestUtils.*;
+
 
 public class CurrencyServiceTest extends AbstractServiceTest {
     private static final MatcherFactory.Matcher<Currency> CURRENCY_MATCHER = usingIgnoringFieldsComparator();

clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/EquitySecurityServiceTest.java

@@ -5,20 +5,20 @@ import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import ru.clearing.classes.statics.data.instrument.issue.EquitySecurity;
 import ru.clearing.classes.statics.data.misc.Listing;
+import ru.spcex.clearing.MatcherFactory;
 import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
 import ru.spcex.clearing.platform.messaging.domain.Consts;
 import ru.spcex.clearing.platform.messaging.domain.cud.common.CommonDeleteRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.securitites.EquitySecurityNewRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.securitites.EquitySecurityUpdateRequest;
 import ru.spcex.clearing.securities.service.cud.EquitySecurityService;
-import ru.spcex.clearing.securities.utils.MatcherFactory;
 
 import javax.annotation.PostConstruct;
 import java.math.BigDecimal;
 import java.util.Map;
 
-import static ru.spcex.clearing.securities.utils.MatcherFactory.usingIgnoringFieldsComparator;
-import static ru.spcex.clearing.securities.utils.TestUtils.*;
+import static ru.spcex.clearing.MatcherFactory.usingIgnoringFieldsComparator;
+import static ru.spcex.clearing.TestUtils.*;
 
 public class EquitySecurityServiceTest extends AbstractServiceTest {
     private static final MatcherFactory.Matcher<EquitySecurity> EQUITY_SECURITY_MATCHER = usingIgnoringFieldsComparator("created", "updated");

clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/FixedIncomeCashFlowServiceTest.java

@@ -13,6 +13,7 @@ import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import ru.clearing.classes.statics.data.instrument.issue.FixedIncomeCashFlow;
+import ru.spcex.clearing.MatcherFactory;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.clearing.platform.messaging.domain.Consts;
 import ru.spcex.clearing.platform.messaging.domain.cud.securitites.FixedIncomeCashFlowNewRequest;
@@ -23,7 +24,6 @@ import ru.spcex.clearing.securities.config.KafkaTestConfig;
 import ru.spcex.clearing.securities.config.ValidationConfig;
 import ru.spcex.clearing.securities.config.validation.FixedIncomeCashFlowValidationConfig;
 import ru.spcex.clearing.securities.service.cud.FixedIncomeCashFlowService;
-import ru.spcex.clearing.securities.utils.MatcherFactory.Matcher;
 import ru.spcex.platform.imdg.api.Imdg;
 import ru.spcex.platform.imdg.api.ImdgProvider;
 
@@ -31,9 +31,9 @@ import javax.annotation.PostConstruct;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 
+import static ru.spcex.clearing.MatcherFactory.usingIgnoringFieldsComparator;
+import static ru.spcex.clearing.TestUtils.*;
 import static ru.spcex.clearing.securities.config.ImdgTestConfig.currentID;
-import static ru.spcex.clearing.securities.utils.MatcherFactory.usingIgnoringFieldsComparator;
-import static ru.spcex.clearing.securities.utils.TestUtils.*;
 
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {
@@ -44,7 +44,7 @@ import static ru.spcex.clearing.securities.utils.TestUtils.*;
         KafkaTestConfig.class,
         ImdgTestConfig.class})
 class FixedIncomeCashFlowServiceTest {
-    public static final Matcher<FixedIncomeCashFlow> FIXED_INCOME_CASH_FLOW_MATCHER = usingIgnoringFieldsComparator();
+    public static final MatcherFactory.Matcher<FixedIncomeCashFlow> FIXED_INCOME_CASH_FLOW_MATCHER = usingIgnoringFieldsComparator();
 
     private static final String TOPIC_FIXED_INCOME_CASH_FLOW_NEW = Consts.DESTINATION_FIXED_INCOME_CASH_FLOW_NEW;
     private static final String TOPIC_FIXED_INCOME_CASH_FLOW_UPDATE = Consts.DESTINATION_FIXED_INCOME_CASH_FLOW_UPDATE;

clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/FixedIncomeSecurityServiceTest.java

@@ -5,21 +5,21 @@ import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import ru.clearing.classes.statics.data.instrument.issue.FixedIncomeSecurity;
 import ru.clearing.classes.statics.data.misc.Listing;
+import ru.spcex.clearing.MatcherFactory;
 import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
 import ru.spcex.clearing.platform.messaging.domain.Consts;
 import ru.spcex.clearing.platform.messaging.domain.cud.common.CommonDeleteRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.securitites.FixedIncomeSecurityNewRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.securitites.FixedIncomeSecurityUpdateRequest;
 import ru.spcex.clearing.securities.service.cud.FixedIncomeSecurityService;
-import ru.spcex.clearing.securities.utils.MatcherFactory;
 
 import javax.annotation.PostConstruct;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.Map;
 
-import static ru.spcex.clearing.securities.utils.MatcherFactory.usingIgnoringFieldsComparator;
-import static ru.spcex.clearing.securities.utils.TestUtils.*;
+import static ru.spcex.clearing.MatcherFactory.usingIgnoringFieldsComparator;
+import static ru.spcex.clearing.TestUtils.*;
 
 public class FixedIncomeSecurityServiceTest extends AbstractServiceTest {
     private static final MatcherFactory.Matcher<FixedIncomeSecurity> FIXED_INCOME_SECURITY_MATCHER = usingIgnoringFieldsComparator("created", "updated");

clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/MoneyMarketSecurityServiceTest.java

@@ -5,6 +5,7 @@ import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import ru.clearing.classes.statics.data.misc.Listing;
 import ru.clearing.classes.statics.data.misc.MoneyMarketSecurity;
+import ru.spcex.clearing.MatcherFactory;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
 import ru.spcex.clearing.platform.messaging.domain.Consts;
@@ -14,15 +15,14 @@ import ru.spcex.clearing.platform.messaging.domain.cud.securitites.MoneyMarketSe
 import ru.spcex.clearing.platform.messaging.service.RequestInfo;
 import ru.spcex.clearing.platform.messaging.service.Status;
 import ru.spcex.clearing.securities.service.cud.MoneyMarketSecurityService;
-import ru.spcex.clearing.securities.utils.MatcherFactory;
 import ru.spcex.platform.imdg.api.Imdg;
 
 import javax.annotation.PostConstruct;
 import java.math.BigDecimal;
 import java.util.Map;
 
-import static ru.spcex.clearing.securities.utils.MatcherFactory.usingIgnoringFieldsComparator;
-import static ru.spcex.clearing.securities.utils.TestUtils.*;
+import static ru.spcex.clearing.MatcherFactory.usingIgnoringFieldsComparator;
+import static ru.spcex.clearing.TestUtils.*;
 
 public class MoneyMarketSecurityServiceTest extends AbstractServiceTest{
     private static final MatcherFactory.Matcher<MoneyMarketSecurity> MONEY_MARKET_SECURITY_MATCHER = usingIgnoringFieldsComparator("created", "updated");

clearing-parent/test-clearing/pom.xml

@@ -8,11 +8,8 @@
     </parent>
     <artifactId>test-clearing</artifactId>
     <name>Test-clearing</name>
+    <version>SPCEX-1.0.0.0</version>
     <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
         <dependency>
             <groupId>ru.spcex.platform</groupId>
             <artifactId>platform-imdg-api</artifactId>
@@ -21,6 +18,10 @@
             <groupId>ru.spcex.platform</groupId>
             <artifactId>platform-messaging</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
@@ -28,50 +29,27 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.skyscreamer</groupId>
             <artifactId>jsonassert</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.reflections</groupId>
             <artifactId>reflections</artifactId>
             <version>0.9.11</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-test-autoconfigure</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <version>3.23.1</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jsr310</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
         </dependency>
     </dependencies>
-    <version>SPCEX-1.0.0.0</version>
 </project>

clearing-parent/test-clearing/src/main/java/ru/spcex/clearing/MatcherFactory.java

@@ -1,4 +1,4 @@
-package ru.spcex.clearing.securities.utils;
+package ru.spcex.clearing;
 
 import java.util.Arrays;
 

clearing-parent/test-clearing/src/main/java/ru/spcex/clearing/TestUtils.java

@@ -1,4 +1,4 @@
-package ru.spcex.clearing.securities.utils;
+package ru.spcex.clearing;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -13,12 +13,14 @@ import ru.spcex.clearing.platform.messaging.domain.ActionType;
 import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
 import ru.spcex.clearing.platform.messaging.domain.Consts;
 import ru.spcex.clearing.platform.messaging.service.RequestInfoUpdate;
+import ru.spcex.clearing.platform.messaging.service.Status;
 import ru.spcex.platform.classes.base.SpcexObjectBase;
 import ru.spcex.platform.imdg.api.Imdg;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
@@ -27,8 +29,8 @@ import java.util.concurrent.TimeoutException;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.timeout;
 import static org.mockito.Mockito.verify;
+import static ru.spcex.clearing.MatcherFactory.usingIgnoringFieldsComparator;
 import static ru.spcex.clearing.platform.messaging.service.Status.Success;
-import static ru.spcex.clearing.securities.utils.MatcherFactory.usingIgnoringFieldsComparator;
 
 public class TestUtils {
     public static final MatcherFactory.Matcher<BaseRequest<Object>> BASE_REQUEST_MATCHER = usingIgnoringFieldsComparator();
@@ -52,6 +54,29 @@ public class TestUtils {
         BASE_REQUEST_MATCHER.assertMatch(baseRequestResult, predictableBaseRequest);
     }
 
+    public static void waitingWhenTryAddRecordAndCheckError(Long id,
+                                                            MockProducer mockProducer,
+                                                            ArgumentCaptor<ProducerRecord> producerRecord,
+                                                            String errorCode,
+                                                            List<String> errorMessageArgs) {
+        BaseRequest<Object> predictableBaseRequest = new BaseRequest<>();
+        predictableBaseRequest.setId(id);
+        predictableBaseRequest.setActionType(ActionType.SYSTEM);
+        RequestInfoUpdate requestInfoUpdate = new RequestInfoUpdate();
+        requestInfoUpdate.setId(id);
+        requestInfoUpdate.setStatus(Status.Error);
+        String errorsMessage = "(%s) args [%s]".formatted(errorCode, String.join(", ", errorMessageArgs));
+        requestInfoUpdate.setMessage(errorsMessage);
+        predictableBaseRequest.setRequestPayload(requestInfoUpdate);
+
+        //waiting for kafka producer send message (finale event)
+        verify(mockProducer, timeout(30_000L).times(1))
+                .send(producerRecord.capture());
+
+        BaseRequest<Object> baseRequestResult = (BaseRequest<Object>) producerRecord.getValue().value();
+        assertEquals(Consts.REQUEST_INFO_UPDATE, producerRecord.getValue().topic());
+        BASE_REQUEST_MATCHER.assertMatch(baseRequestResult, predictableBaseRequest);
+    }
     public static void addRecordToKafka(MockConsumer mockConsumer, String topic, int partition, long offset, String jsonValue) {
         TopicPartition tp = new TopicPartition(topic, partition);
         HashMap<TopicPartition, Long> startOffsets = new HashMap<>();

clearing-parent/test-clearing/src/main/java/ru/spcex/clearing/imdg/MatcherFactoryWithJson.java

@@ -15,20 +15,20 @@ import java.util.function.BiConsumer;
  * Comparing actual and expected objects via AssertJ
  * Support converting json MvcResult to objects for comparation.
  */
-public class MatcherFactoryImdg {
+public class MatcherFactoryWithJson {
 
-    public static <T> Matcher<T> usingAssertions(Class<T> clazz, BiConsumer<T, T> assertion, BiConsumer<Iterable<T>, Iterable<T>> iterableAssertion) {
+    public static <T> Matcher<T> usingAssertionsForClass(Class<T> clazz, BiConsumer<T, T> assertion, BiConsumer<Iterable<T>, Iterable<T>> iterableAssertion) {
         return new Matcher<>(clazz, assertion, iterableAssertion);
     }
 
-    public static <T> Matcher<T> usingEqualsComparator(Class<T> clazz) {
-        return usingAssertions(clazz,
+    public static <T> Matcher<T> usingEqualsComparatorForClass(Class<T> clazz) {
+        return usingAssertionsForClass(clazz,
                 (a, e) -> Assertions.assertThat(a).isEqualTo(e),
                 (a, e) -> Assertions.assertThat(a).isEqualTo(e));
     }
 
-    public static <T> Matcher<T> usingIgnoringFieldsComparator(Class<T> clazz, String... fieldsToIgnore) {
-        return usingAssertions(clazz,
+    public static <T> Matcher<T> usingIgnoringFieldsComparatorForClass(Class<T> clazz, String... fieldsToIgnore) {
+        return usingAssertionsForClass(clazz,
                 (a, e) -> Assertions.assertThat(a).usingRecursiveComparison().ignoringFields(fieldsToIgnore).isEqualTo(e),
                 (a, e) -> Assertions.assertThat(a).usingRecursiveFieldByFieldElementComparatorIgnoringFields(fieldsToIgnore).isEqualTo(e));
     }

clearing-parent/test-clearing/src/main/java/ru/spcex/clearing/imdg/TestUtils.java

@@ -1,95 +0,0 @@
-package ru.spcex.clearing.imdg;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.clients.consumer.MockConsumer;
-import org.apache.kafka.clients.producer.RecordMetadata;
-import org.apache.kafka.common.TopicPartition;
-import ru.spcex.clearing.platform.messaging.domain.ActionType;
-import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
-import ru.spcex.platform.classes.base.SpcexObjectBase;
-import ru.spcex.platform.imdg.api.Imdg;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-public class TestUtils {
-    private static final ObjectMapper objectMapper = new ObjectMapper();
-
-    public static void addRecordToKafka(MockConsumer mockConsumer, String topic, int partition, long offset, String jsonValue) {
-        TopicPartition tp = new TopicPartition(topic, partition);
-        HashMap<TopicPartition, Long> startOffsets = new HashMap<>();
-        startOffsets.put(tp, 0L);
-        mockConsumer.updateBeginningOffsets(startOffsets);
-        mockConsumer.schedulePollTask(() -> {
-            mockConsumer.rebalance(Collections.singletonList(tp));
-            mockConsumer.addRecord(new ConsumerRecord<>(topic, partition, offset, "key", jsonValue));
-        });
-    }
-
-    public static <T> String getJsonStringForNew(T accountRequest, long id) {
-        return getJsonBaseRequest(accountRequest, id, ActionType.NEW);
-    }
-
-    public static <T> String getJsonStringForUPDATE(T accountRequest, long id) {
-        return getJsonBaseRequest(accountRequest, id, ActionType.UPDATE);
-    }
-
-    public static <T> String getJsonStringForDELETE(T accountRequest, long id) {
-        return getJsonBaseRequest(accountRequest, id, ActionType.DELETE);
-    }
-
-    private static <T> String getJsonBaseRequest(T accountRequest, long id, ActionType actionType) {
-        BaseRequest<T> baseRequest = new BaseRequest<>();
-        baseRequest.setRequestPayload(accountRequest);
-        baseRequest.setId(id);
-        baseRequest.setActionType(actionType);
-        String jsonBaseRequest;
-        try {
-            jsonBaseRequest = objectMapper.writeValueAsString(baseRequest);
-        } catch (JsonProcessingException e) {
-            throw new RuntimeException(e);
-        }
-        return jsonBaseRequest;
-    }
-
-    public static <T extends SpcexObjectBase> void clearImdg(Imdg<T> imdg) {
-        Collection<T> values = imdg.getAllValues();
-        for (T val : values) {
-            imdg.delete(val);
-        }
-    }
-
-    public static class FutureRecordMetadata implements Future<RecordMetadata> {
-        @Override
-        public boolean cancel(boolean mayInterruptIfRunning) {
-            return false;
-        }
-
-        @Override
-        public boolean isCancelled() {
-            return false;
-        }
-
-        @Override
-        public boolean isDone() {
-            return false;
-        }
-
-        @Override
-        public RecordMetadata get() throws InterruptedException, ExecutionException {
-            return null;
-        }
-
-        @Override
-        public RecordMetadata get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
-            return null;
-        }
-    }
-}