diff --git a/clearing-parent/account-service/src/test/java/ru/spcex/clearing/account/service/BankAccountServiceTest.java b/clearing-parent/account-service/src/test/java/ru/spcex/clearing/account/service/BankAccountServiceTest.java index ed1a44667..437759940 100644 --- a/clearing-parent/account-service/src/test/java/ru/spcex/clearing/account/service/BankAccountServiceTest.java +++ b/clearing-parent/account-service/src/test/java/ru/spcex/clearing/account/service/BankAccountServiceTest.java @@ -19,6 +19,7 @@ import org.springframework.test.context.junit.jupiter.SpringExtension; import ru.clearing.classes.statics.data.account.BankAccount; import ru.spcex.clearing.account.config.ErrorResolverConfig; import ru.spcex.clearing.account.config.HazelcastServiceTestConfiguration; +import ru.spcex.clearing.account.config.ValidationConfig; import ru.spcex.clearing.account.utils.MatcherFactory.Matcher; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.platform.messaging.domain.ActionType; @@ -29,15 +30,18 @@ import ru.spcex.clearing.platform.messaging.domain.cud.account.BankAccountUpdate import ru.spcex.clearing.platform.messaging.domain.cud.common.CommonDeleteRequest; import ru.spcex.platform.imdg.iml.hazelcast.service.HazelcastService; import ru.spcex.platform.utils.enumeration.IMessageResolver; +import ru.spcex.platform.utils.validation.IValidator; import java.util.Collections; import java.util.HashMap; +import java.util.function.Function; import static ru.spcex.clearing.account.utils.MatcherFactory.usingIgnoringFieldsComparator; @ExtendWith(SpringExtension.class) @ContextConfiguration(classes = { - HazelcastServiceTestConfiguration.class, ErrorResolverConfig.class}) + HazelcastServiceTestConfiguration.class, ErrorResolverConfig.class, + ValidationConfig.class}) public class BankAccountServiceTest { public static final Matcher BANK_ACCOUNT_MATCHER = usingIgnoringFieldsComparator(); private static final int PARTITION = 0; @@ -54,6 +58,9 @@ public class BankAccountServiceTest { private MockConsumer mockConsumer; private MockProducer mockProducer; + @Autowired + private Function bankAccountNewRequestValidator; + @BeforeEach void setUp() { mockConsumer = new MockConsumer<>(OffsetResetStrategy.EARLIEST); @@ -125,7 +132,8 @@ public class BankAccountServiceTest { //service set up BankAccountService bankAccountService = new BankAccountService(mockConsumer, mockProducer, - hazelcastServiceTest, messageResolver); + hazelcastServiceTest, messageResolver, + bankAccountNewRequestValidator); Thread.sleep(10000); //callbacks set up bankAccountService.afterPropertiesSet(); @@ -227,7 +235,8 @@ public class BankAccountServiceTest { //ACT //service set up BankAccountService bankAccountService = new BankAccountService(mockConsumer, mockProducer, - hazelcastServiceTest, messageResolver); + hazelcastServiceTest, messageResolver, + bankAccountNewRequestValidator); Thread.sleep(10000); //callbacks set up bankAccountService.afterPropertiesSet(); @@ -312,7 +321,8 @@ public class BankAccountServiceTest { //ACT //service set up BankAccountService bankAccountService = new BankAccountService(mockConsumer, mockProducer, - hazelcastServiceTest, messageResolver); + hazelcastServiceTest, messageResolver, + bankAccountNewRequestValidator); Thread.sleep(10000); //callbacks set up bankAccountService.afterPropertiesSet(); diff --git a/clearing-parent/backend-api/src/main/resources/meta/meta.xml b/clearing-parent/backend-api/src/main/resources/meta/meta.xml index 0469ba416..cfe78384c 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/meta.xml +++ b/clearing-parent/backend-api/src/main/resources/meta/meta.xml @@ -99,7 +99,7 @@ - + @@ -966,8 +966,8 @@ - - + + @@ -986,8 +986,8 @@ - - + + @@ -1007,8 +1007,8 @@ - - + + @@ -1019,8 +1019,8 @@ - - + +