From b58ed3023de502e45752435890bf713aec78f27d Mon Sep 17 00:00:00 2001
From: psemenkov <psemenkov@mfd.ru>
Date: Tue, 24 Jan 2023 12:03:10 +0300
Subject: [PATCH] simple cheng.

---
 .../balance/config/KafkaTestConfig.java       |  3 +--
 .../balance/service/Sdf08ServiceTest.java     | 25 ++++++++-----------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/clearing-parent/balance-service/src/test/java/ru/spcex/clearing/balance/config/KafkaTestConfig.java b/clearing-parent/balance-service/src/test/java/ru/spcex/clearing/balance/config/KafkaTestConfig.java
index 29feac545..32708e256 100644
--- a/clearing-parent/balance-service/src/test/java/ru/spcex/clearing/balance/config/KafkaTestConfig.java
+++ b/clearing-parent/balance-service/src/test/java/ru/spcex/clearing/balance/config/KafkaTestConfig.java
@@ -1,6 +1,5 @@
 package ru.spcex.clearing.balance.config;
 
-import org.apache.kafka.clients.consumer.Consumer;
 import org.apache.kafka.clients.consumer.MockConsumer;
 import org.apache.kafka.clients.consumer.OffsetResetStrategy;
 import org.apache.kafka.clients.producer.MockProducer;
@@ -17,7 +16,7 @@ public class KafkaTestConfig {
 
     @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
     @Bean
-    public Consumer<String, Object> createTestConsumer() {
+    public MockConsumer<String, Object> createTestConsumer() {
         return new MockConsumer<>(OffsetResetStrategy.EARLIEST);
     }
 
diff --git a/clearing-parent/balance-service/src/test/java/ru/spcex/clearing/balance/service/Sdf08ServiceTest.java b/clearing-parent/balance-service/src/test/java/ru/spcex/clearing/balance/service/Sdf08ServiceTest.java
index 0da633a66..de5476e5c 100644
--- a/clearing-parent/balance-service/src/test/java/ru/spcex/clearing/balance/service/Sdf08ServiceTest.java
+++ b/clearing-parent/balance-service/src/test/java/ru/spcex/clearing/balance/service/Sdf08ServiceTest.java
@@ -1,18 +1,16 @@
 package ru.spcex.clearing.balance.service;
 
 import com.hazelcast.core.IMap;
-import org.apache.kafka.clients.consumer.Consumer;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.apache.kafka.clients.consumer.MockConsumer;
 import org.apache.kafka.common.TopicPartition;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import ru.clearing.classes.statics.data.account.BankAccount;
 import ru.clearing.classes.statics.data.sdf.SDf08;
 import ru.clearing.classes.statics.data.statement.Statement;
 import ru.spcex.clearing.balance.utils.ImapEvent;
-import ru.spcex.clearing.balance.utils.MatcherFactory;
-import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.clearing.platform.messaging.domain.cud.balance.StatementRequest;
+import ru.spcex.platform.enumeration.Task;
 
 import javax.annotation.PostConstruct;
 import java.time.Instant;
@@ -20,13 +18,13 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 
-import static ru.spcex.clearing.balance.utils.MatcherFactory.usingIgnoringFieldsComparator;
-
 class Sdf08ServiceTest extends AbstractServiceTest {
-    private static final MatcherFactory.Matcher<SDf08> SDF_08_MATCHER = usingIgnoringFieldsComparator("created", "comment", "outSDfId", "generationTime", "generationId", "id");
+//    private static final MatcherFactory.Matcher<SDf08> SDF_08_MATCHER = usingIgnoringFieldsComparator("created", "comment", "outSDfId", "generationTime", "generationId", "id");
+    private static final String TOPIC = Task.getAllBalance.topic();
+    private static final int PARTITION = 1;
 
     @Autowired
-    private Consumer<String, Object> mockConsumer;
+    private MockConsumer<String, Object> mockConsumer;
 
     @Autowired
     Sdf08Service sdf08Service;
@@ -60,20 +58,17 @@ class Sdf08ServiceTest extends AbstractServiceTest {
 
         //KAFKA
         mockConsumer.schedulePollTask(() -> {
-            mockConsumer.rebalance(Collections.singletonList(new TopicPartition(TOPIC_ACCOUNT_NEW, PARTITION)));
-            mockConsumer.addRecord(new ConsumerRecord<>(TOPIC_ACCOUNT_NEW, PARTITION, 0, "key", jsonBaseNewRequest));
+            mockConsumer.rebalance(Collections.singletonList(new TopicPartition(TOPIC, PARTITION)));
+            mockConsumer.addRecord(new ConsumerRecord<>(TOPIC, PARTITION, 0, "key", jsonBaseNewRequest));
         });
 
-
         HashMap<TopicPartition, Long> startOffsets = new HashMap<>();
-        TopicPartition tp = new TopicPartition(TOPIC_ACCOUNT_NEW, PARTITION);
+        TopicPartition tp = new TopicPartition(TOPIC, PARTITION);
         startOffsets.put(tp, 0L);
         mockConsumer.updateBeginningOffsets(startOffsets);
 
-        IMap<Long, BankAccount> iMap = hazelcastServiceTest.getHazelcast().getMap(IMDGDistributedNames.Map_BankAccount);
-
         //waiting for hazelcast map item updates
-        ImapEvent imapEvent = new ImapEvent(iMap);
+        ImapEvent imapEvent = new ImapEvent(sdf08Map);
         imapEvent.waitWhenHappened();
 
     }