From b54cade6c11de9fbb4a3e7e09c5a50c0a1b83b60 Mon Sep 17 00:00:00 2001 From: psemenkov Date: Thu, 15 Sep 2022 11:56:24 +0300 Subject: [PATCH] http://git.mfd.msk/dashboard/issues?assignee_id=30 --- hz and kafka working --- .../config/HazelcastServiceTestConfiguration.java | 5 ++++- .../account/service/BankAccountServiceTest.java | 13 +++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/clearing-parent/account-service/src/test/java/ru/spcex/clearing/account/config/HazelcastServiceTestConfiguration.java b/clearing-parent/account-service/src/test/java/ru/spcex/clearing/account/config/HazelcastServiceTestConfiguration.java index 2dbc81965..7e92690b0 100644 --- a/clearing-parent/account-service/src/test/java/ru/spcex/clearing/account/config/HazelcastServiceTestConfiguration.java +++ b/clearing-parent/account-service/src/test/java/ru/spcex/clearing/account/config/HazelcastServiceTestConfiguration.java @@ -9,8 +9,10 @@ import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import ru.spcex.platform.imdg.iml.hazelcast.config.HazelcastClientParams; import ru.spcex.platform.imdg.iml.hazelcast.service.HazelcastService; +import ru.spcex.platform.imdg.iml.hazelcast.util.HazelcastHelper; import java.util.List; +import java.util.Random; @Configuration public class HazelcastServiceTestConfiguration { @@ -46,6 +48,7 @@ public class HazelcastServiceTestConfiguration { // ) cfg.setNetworkConfig(networkConfig); hazelcastInstance = Hazelcast.newHazelcastInstance(cfg); + HazelcastHelper.otcSystem_setStorageState(true, hazelcastInstance); return new HazelcastService(taskExecutorHazelcastClientInitializer, taskExecutorIdGeneratorAwaiter, params); } @@ -65,7 +68,7 @@ public class HazelcastServiceTestConfiguration { params.setLogin("dev"); params.setPassword("dev-pass"); params.setClusterMembers("127.0.0.1"); - params.setInstanceName("localhost"); + params.setInstanceName("hzTestClient" + new Random().nextInt()); params.setNearCacheConfig(new NearCacheConfig()); return params; 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 d7c11a50c..ff35a61f7 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 @@ -92,19 +92,16 @@ public class BankAccountServiceTest { // ArgumentCaptor bankAccountCaptor = ArgumentCaptor.forClass(BankAccount.class); // // doReturn(bankAccountMap).when(imdgProvider).getImdg(IMDGDistributedNames.Map_BankAccount, BankAccount.class); - - + //мапа которую проверял Илья + Imdg imdg = hazelcastServiceTest.getImdg(IMDGDistributedNames.Map_BankAccount, BankAccount.class); +// IMap iMap = hazelcastServiceTest.getHazelcast().getMap(IMDGDistributedNames.Map_BankAccount); + BankAccountService bankAccountService = new BankAccountService(mockConsumer, hazelcastServiceTest); try { - hazelcastServiceTest.init(); +// hazelcastServiceTest.init(); Thread.sleep(10000); } catch (InterruptedException e) { throw new RuntimeException(e); } - //мапа которую проверял Илья - IMap map = hazelcastServiceTest.getHazelcast().getMap(IMDGDistributedNames.Map_KeyRate); - Imdg imdg = hazelcastServiceTest.getImdg(IMDGDistributedNames.Map_BankAccount, BankAccount.class); -// IMap iMap = hazelcastServiceTest.getHazelcast().getMap(IMDGDistributedNames.Map_BankAccount); - BankAccountService bankAccountService = new BankAccountService(mockConsumer, hazelcastServiceTest); bankAccountService.afterPropertiesSet();