From 015171fc81df8b817f1177f74e7e912342b95c80 Mon Sep 17 00:00:00 2001 From: psemenkov Date: Thu, 20 Apr 2023 11:34:16 +0300 Subject: [PATCH] =?UTF-8?q?http://jira.mfd.msk:8088/browse/CLS-258=20?= =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=B2=20=D1=82?= =?UTF-8?q?=D0=B5=D1=81=D1=82=D1=8B=20=D1=82=D0=B5=D1=81=D1=82=D0=BE=D0=B2?= =?UTF-8?q?=D0=BE=D0=B3=D0=BE=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D1=82=D0=B5=D0=BB=D1=8F=20=D1=81=20=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=B0=D0=BC=D0=B8=20=D0=B0=D0=B4=D0=BC=D0=B8=D0=BD=D0=B0?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ClearingMemberCategoryServiceTest.java | 3 ++- .../service/CompanyInfoServiceTest.java | 3 ++- .../company/service/CompanyServiceTest.java | 3 ++- .../service/CompanySymbolServiceTest.java | 3 ++- .../company/service/ContactServiceTest.java | 3 ++- .../service/ProfileDocumentServiceTest.java | 3 ++- .../service/AbstractServiceTest.java | 3 ++- clearing-parent/test-clearing/pom.xml | 8 ++++++++ .../ru/spcex/clearing/test/TestUtils.java | 2 ++ .../clearing/test/config/ImdgTestConfig.java | 20 ++++++++++++++++++- 10 files changed, 43 insertions(+), 8 deletions(-) diff --git a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ClearingMemberCategoryServiceTest.java b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ClearingMemberCategoryServiceTest.java index f3e40c682..9e43b76fa 100644 --- a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ClearingMemberCategoryServiceTest.java +++ b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ClearingMemberCategoryServiceTest.java @@ -41,6 +41,7 @@ import static org.mockito.Mockito.spy; import static ru.spcex.clearing.test.MatcherFactory.usingIgnoringFieldsComparator; import static ru.spcex.clearing.test.TestUtils.*; import static ru.spcex.clearing.test.config.ImdgTestConfig.currentID; +import static ru.spcex.clearing.test.config.ImdgTestConfig.waitAvailableImdgProviderAndAddAdminWithDefaultId; @ExtendWith(SpringExtension.class) @ContextConfiguration(classes = { @@ -78,7 +79,7 @@ class ClearingMemberCategoryServiceTest { @PostConstruct private void init() { - hazelcastServiceTest.waitAvailable(); + waitAvailableImdgProviderAndAddAdminWithDefaultId(); memberCategoryImdg = hazelcastServiceTest.getImdg( IMDGDistributedNames.Map_ClearingMemberCategory, ClearingMemberCategory.class diff --git a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanyInfoServiceTest.java b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanyInfoServiceTest.java index 48219f376..a70d40205 100644 --- a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanyInfoServiceTest.java +++ b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanyInfoServiceTest.java @@ -37,6 +37,7 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static ru.spcex.clearing.test.MatcherFactory.usingIgnoringFieldsComparator; import static ru.spcex.clearing.test.TestUtils.*; +import static ru.spcex.clearing.test.config.ImdgTestConfig.waitAvailableImdgProviderAndAddAdminWithDefaultId; @ExtendWith(SpringExtension.class) @ContextConfiguration(classes = { @@ -74,7 +75,7 @@ class CompanyInfoServiceTest { @PostConstruct private void init() { - hazelcastServiceTest.waitAvailable(); + waitAvailableImdgProviderAndAddAdminWithDefaultId(); companyImdg = hazelcastServiceTest.getImdg(IMDGDistributedNames.Map_Company, Company.class); // Словари для теста, применяются в ValidationConfig diff --git a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanyServiceTest.java b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanyServiceTest.java index 9ef61f7eb..b80446af5 100644 --- a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanyServiceTest.java +++ b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanyServiceTest.java @@ -45,6 +45,7 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static ru.spcex.clearing.test.MatcherFactory.usingIgnoringFieldsComparator; import static ru.spcex.clearing.test.TestUtils.*; +import static ru.spcex.clearing.test.config.ImdgTestConfig.waitAvailableImdgProviderAndAddAdminWithDefaultId; @ExtendWith(SpringExtension.class) @ContextConfiguration(classes = { @@ -83,7 +84,7 @@ class CompanyServiceTest { @PostConstruct private void init() { - hazelcastServiceTest.waitAvailable(); + waitAvailableImdgProviderAndAddAdminWithDefaultId(); companyImdg = hazelcastServiceTest.getImdg(IMDGDistributedNames.Map_Company, Company.class); companySymbolsImdg = hazelcastServiceTest.getImdg(IMDGDistributedNames.Map_CompanySymbols, CompanySymbols.class); diff --git a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanySymbolServiceTest.java b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanySymbolServiceTest.java index db460c4d5..e247fb26a 100644 --- a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanySymbolServiceTest.java +++ b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/CompanySymbolServiceTest.java @@ -36,6 +36,7 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static ru.spcex.clearing.test.MatcherFactory.usingIgnoringFieldsComparator; import static ru.spcex.clearing.test.TestUtils.*; +import static ru.spcex.clearing.test.config.ImdgTestConfig.waitAvailableImdgProviderAndAddAdminWithDefaultId; @ExtendWith(SpringExtension.class) @ContextConfiguration(classes = { @@ -73,7 +74,7 @@ class CompanySymbolServiceTest { @PostConstruct private void init() { - hazelcastServiceTest.waitAvailable(); + waitAvailableImdgProviderAndAddAdminWithDefaultId(); companySymbolsImdg = hazelcastServiceTest.getImdg(IMDGDistributedNames.Map_CompanySymbols, CompanySymbols.class); diff --git a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ContactServiceTest.java b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ContactServiceTest.java index 575d484dd..6597b9e68 100644 --- a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ContactServiceTest.java +++ b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ContactServiceTest.java @@ -38,6 +38,7 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static ru.spcex.clearing.test.MatcherFactory.usingIgnoringFieldsComparator; import static ru.spcex.clearing.test.TestUtils.*; +import static ru.spcex.clearing.test.config.ImdgTestConfig.waitAvailableImdgProviderAndAddAdminWithDefaultId; @ExtendWith(SpringExtension.class) @ContextConfiguration(classes = { @@ -73,7 +74,7 @@ class ContactServiceTest { @PostConstruct private void init() { - hazelcastServiceTest.waitAvailable(); + waitAvailableImdgProviderAndAddAdminWithDefaultId(); contactImdg = hazelcastServiceTest.getImdg(IMDGDistributedNames.Map_Contact, Contact.class); Imdg companyImdg = hazelcastServiceTest.getImdg(IMDGDistributedNames.Map_Company, Company.class); diff --git a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ProfileDocumentServiceTest.java b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ProfileDocumentServiceTest.java index c8ad1bc1a..b37689ea8 100644 --- a/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ProfileDocumentServiceTest.java +++ b/clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ProfileDocumentServiceTest.java @@ -43,6 +43,7 @@ import static org.mockito.Mockito.spy; import static ru.spcex.clearing.test.MatcherFactory.usingIgnoringFieldsComparator; import static ru.spcex.clearing.test.TestUtils.*; import static ru.spcex.clearing.test.config.ImdgTestConfig.currentID; +import static ru.spcex.clearing.test.config.ImdgTestConfig.waitAvailableImdgProviderAndAddAdminWithDefaultId; @ExtendWith(SpringExtension.class) @ContextConfiguration(classes = { @@ -88,7 +89,7 @@ class ProfileDocumentServiceTest { @PostConstruct private void init() { - hazelcastServiceTest.waitAvailable(); + waitAvailableImdgProviderAndAddAdminWithDefaultId(); this.profileDocumentMap = hazelcastServiceTest.getImdg(IMDGDistributedNames.Map_ProfileDocument, ProfileDocument.class); this.companyMap = hazelcastServiceTest.getImdg(IMDGDistributedNames.Map_Company, Company.class); diff --git a/clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/AbstractServiceTest.java b/clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/AbstractServiceTest.java index e74231321..58aba5911 100644 --- a/clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/AbstractServiceTest.java +++ b/clearing-parent/securities-service/src/test/java/ru/spcex/clearing/securities/service/AbstractServiceTest.java @@ -35,6 +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.test.MatcherFactory.usingIgnoringFieldsComparator; +import static ru.spcex.clearing.test.config.ImdgTestConfig.waitAvailableImdgProviderAndAddAdminWithDefaultId; @ExtendWith(SpringExtension.class) @ContextConfiguration(classes = { @@ -83,7 +84,7 @@ public abstract class AbstractServiceTest { protected ImdgProvider imdgProvider; protected void init() { - imdgProvider.waitAvailable(); + waitAvailableImdgProviderAndAddAdminWithDefaultId(); this.moneyMarketSecurityMap = imdgProvider.getImdg(IMDGDistributedNames.Map_MoneyMarketSecurity, MoneyMarketSecurity.class); this.listingImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Listing, Listing.class); this.equitySecurityImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_EquitySecurity, EquitySecurity.class); diff --git a/clearing-parent/test-clearing/pom.xml b/clearing-parent/test-clearing/pom.xml index 4c1f1dc5e..65746a7de 100644 --- a/clearing-parent/test-clearing/pom.xml +++ b/clearing-parent/test-clearing/pom.xml @@ -60,5 +60,13 @@ ru.spcex.platform platform-imdg-api-hazelcast-impl + + ru.spcex.clearing + classes + + + ru.spcex.platform + platform-enum + diff --git a/clearing-parent/test-clearing/src/main/java/ru/spcex/clearing/test/TestUtils.java b/clearing-parent/test-clearing/src/main/java/ru/spcex/clearing/test/TestUtils.java index 47fa6449f..11b6871de 100644 --- a/clearing-parent/test-clearing/src/main/java/ru/spcex/clearing/test/TestUtils.java +++ b/clearing-parent/test-clearing/src/main/java/ru/spcex/clearing/test/TestUtils.java @@ -31,6 +31,7 @@ import static org.mockito.Mockito.timeout; import static org.mockito.Mockito.verify; import static ru.spcex.clearing.platform.messaging.service.Status.Success; import static ru.spcex.clearing.test.MatcherFactory.usingIgnoringFieldsComparator; +import static ru.spcex.clearing.test.config.ImdgTestConfig.defaultAdminId; public class TestUtils { public static final MatcherFactory.Matcher> BASE_REQUEST_MATCHER = usingIgnoringFieldsComparator(); @@ -105,6 +106,7 @@ public class TestUtils { BaseRequest baseRequest = new BaseRequest<>(); baseRequest.setRequestPayload(accountRequest); baseRequest.setId(id); + baseRequest.setUserId(defaultAdminId); baseRequest.setActionType(actionType); String jsonBaseRequest; try { diff --git a/clearing-parent/test-clearing/src/main/java/ru/spcex/clearing/test/config/ImdgTestConfig.java b/clearing-parent/test-clearing/src/main/java/ru/spcex/clearing/test/config/ImdgTestConfig.java index ca50a9d5f..56932f90f 100644 --- a/clearing-parent/test-clearing/src/main/java/ru/spcex/clearing/test/config/ImdgTestConfig.java +++ b/clearing-parent/test-clearing/src/main/java/ru/spcex/clearing/test/config/ImdgTestConfig.java @@ -8,6 +8,11 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; +import ru.clearing.classes.statics.data.user.UserRoleSession; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.platform.enumeration.Status; +import ru.spcex.platform.enumeration.UserRole; +import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.iml.hazelcast.config.HazelcastClientParams; import ru.spcex.platform.imdg.iml.hazelcast.service.HazelcastService; @@ -21,7 +26,19 @@ import java.util.concurrent.atomic.AtomicLong; public class ImdgTestConfig { public static final AtomicLong currentID = new AtomicLong(0L); + public static final Long defaultAdminId = 1000L; private HazelcastInstance hazelcastInstance; + private static ImdgProvider imdgProvider; + + public static void waitAvailableImdgProviderAndAddAdminWithDefaultId(){ + imdgProvider.waitAvailable(); + Imdg userRoleSessions = imdgProvider.getImdg(IMDGDistributedNames.Map_UserRoleSession, UserRoleSession.class); + UserRoleSession userRoleSession = new UserRoleSession(); + userRoleSession.setUserId(defaultAdminId); + userRoleSession.setUserRole(UserRole.Admin.getKey()); + userRoleSession.setStatus(Status.Active.getKey()); + userRoleSessions.insert(userRoleSession); + } private static ThreadPoolTaskExecutor createThreadPoolTestTaskExecutor(int maxPoolSz, boolean waitForCompletion) { ThreadPoolTaskExecutor pool = new ThreadPoolTaskExecutor(); @@ -61,7 +78,8 @@ public class ImdgTestConfig { cfg.setNetworkConfig(networkConfig); hazelcastInstance = Hazelcast.getOrCreateHazelcastInstance(cfg); HazelcastHelper.imdgSystem_setStorageState(true, hazelcastInstance); - return new HazelcastService(taskExecutorHazelcastClientInitializer, taskExecutorIdGeneratorAwaiter, params); + imdgProvider = new HazelcastService(taskExecutorHazelcastClientInitializer, taskExecutorIdGeneratorAwaiter, params); + return imdgProvider; } @Bean(name = "hazelcastClientParams")