From 9bebeda22cb20d535760ccfc816232999c21f2cc Mon Sep 17 00:00:00 2001 From: psemenkov Date: Thu, 29 Dec 2022 12:36:08 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=82=D0=B5=D1=81=D1=82=20Sdf01ExecutorTest.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../balance/service/AccountBalanceServiceTest.java | 2 +- .../clearing/balance/service/Sdf01ExecutorTest.java | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/clearing-parent/balance-service/src/test/java/ru/spcex/clearing/balance/service/AccountBalanceServiceTest.java b/clearing-parent/balance-service/src/test/java/ru/spcex/clearing/balance/service/AccountBalanceServiceTest.java index 495ffb276..d45fc9c97 100644 --- a/clearing-parent/balance-service/src/test/java/ru/spcex/clearing/balance/service/AccountBalanceServiceTest.java +++ b/clearing-parent/balance-service/src/test/java/ru/spcex/clearing/balance/service/AccountBalanceServiceTest.java @@ -19,7 +19,7 @@ import static ru.spcex.clearing.balance.utils.MatcherFactory.usingIgnoringFields class AccountBalanceServiceTest extends AbstractServiceTest { - public static final Matcher ACCOUNT_BALANCE_MATCHER = usingIgnoringFieldsComparator("account.created", "account.updated", "account.clearingDate"); + private static final Matcher ACCOUNT_BALANCE_MATCHER = usingIgnoringFieldsComparator("account.created", "account.updated", "account.clearingDate"); private final BigDecimal amountNew = new BigDecimal(1000); private final String cashMovementCurrencyCodeNew = "cash"; private final Long accountIdUpdate = accountIdNew; diff --git a/clearing-parent/balance-service/src/test/java/ru/spcex/clearing/balance/service/Sdf01ExecutorTest.java b/clearing-parent/balance-service/src/test/java/ru/spcex/clearing/balance/service/Sdf01ExecutorTest.java index a745cfe74..a3e5a56b3 100644 --- a/clearing-parent/balance-service/src/test/java/ru/spcex/clearing/balance/service/Sdf01ExecutorTest.java +++ b/clearing-parent/balance-service/src/test/java/ru/spcex/clearing/balance/service/Sdf01ExecutorTest.java @@ -5,14 +5,20 @@ import org.springframework.beans.factory.annotation.Autowired; import ru.clearing.classes.statics.data.account.Account; import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.sdf.SDf01; +import ru.clearing.classes.statics.data.statement.Statement; +import ru.spcex.clearing.balance.utils.MatcherFactory; import ru.spcex.clearing.platform.messaging.domain.cud.balance.StatementRequest; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.Collections; +import static ru.spcex.clearing.balance.utils.MatcherFactory.usingIgnoringFieldsComparator; + class Sdf01ExecutorTest extends AbstractServiceTest { + private static final MatcherFactory.Matcher SDF01_MATCHER = usingIgnoringFieldsComparator("account.created", "account.updated", "account.clearingDate"); + private final static DateTimeFormatter datFormatter = DateTimeFormatter.ofPattern("dd.MM.yy"); private final Long id = currentId.getAndIncrement(); @Autowired @@ -20,6 +26,7 @@ class Sdf01ExecutorTest extends AbstractServiceTest { @Test void execute() { + //check create statement SDf01 sDf01 = new SDf01(); sDf01.setMarket("U");//!"U".equals sDf01.setDeal(deal);//tradingCode @@ -38,6 +45,8 @@ class Sdf01ExecutorTest extends AbstractServiceTest { Result predictableResult = new Result(); predictableResult.setGenerationId(id); + Statement predictableStatement = new Statement(); Result result = sdf01Executor.execute(Collections.singletonList(sDf01), statementRequest); + SDF01_MATCHER.assertMatch(result, predictableResult); } } \ No newline at end of file