http://jira.mfd.msk:8088/browse/CLS-258

Добавил в тесты тестового пользователя с правами админа.

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

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

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);
 

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);
 
 

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<Company> companyImdg = hazelcastServiceTest.getImdg(IMDGDistributedNames.Map_Company, Company.class);

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);
 

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);

clearing-parent/test-clearing/pom.xml

@@ -60,5 +60,13 @@
             <groupId>ru.spcex.platform</groupId>
             <artifactId>platform-imdg-api-hazelcast-impl</artifactId>
         </dependency>
+        <dependency>
+            <groupId>ru.spcex.clearing</groupId>
+            <artifactId>classes</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>ru.spcex.platform</groupId>
+            <artifactId>platform-enum</artifactId>
+        </dependency>
     </dependencies>
 </project>

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<BaseRequest<Object>> BASE_REQUEST_MATCHER = usingIgnoringFieldsComparator();
@@ -105,6 +106,7 @@ public class TestUtils {
         BaseRequest<T> baseRequest = new BaseRequest<>();
         baseRequest.setRequestPayload(accountRequest);
         baseRequest.setId(id);
+        baseRequest.setUserId(defaultAdminId);
         baseRequest.setActionType(actionType);
         String jsonBaseRequest;
         try {

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<UserRoleSession> 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")