treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Исправил название тестовой директории.
This commit is contained in:
psemenkov 2023-04-24 17:54:04 +03:00
parent 70433b7f85
commit 1d9d670c3a
12 changed files with 47 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
clearing-parent/scheduler-service/src/test/java/ru/specx/clearing/scheduler/AbstractServiceTest.java → clearing-parent/scheduler-service/src/test/java/ru/spcex/clearing/scheduler/AbstractServiceTest.java
View file

@ -1,4 +1,4 @@
package ru.specx.clearing.scheduler;
package ru.spcex.clearing.scheduler;
import org.apache.kafka.clients.producer.MockProducer;
import org.apache.kafka.clients.producer.ProducerRecord;
@ -17,16 +17,14 @@ import ru.clearing.platform.dictionary.DayStatusDictionary;
import ru.clearing.platform.dictionary.TaskDictionary;
import ru.clearing.platform.dictionary.TaskStatusDictionary;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.scheduler.PlannerAllTodayBuilder;
import ru.spcex.clearing.scheduler.config.ErrorResolverConfig;
import ru.spcex.clearing.scheduler.config.PlannerQueueConfig;
import ru.spcex.clearing.scheduler.config.SchedulerTestConfig;
import ru.spcex.clearing.scheduler.config.validation.ClearingCalendarValidationConfig;
import ru.spcex.clearing.scheduler.config.validation.PlannerTemplateValidationConfig;
import ru.spcex.clearing.scheduler.config.validation.PlannerValidationConfig;
import ru.spcex.clearing.scheduler.config.validation.ValidationConfig;
import ru.spcex.clearing.scheduler.service.ClearingCalendarService;
import ru.spcex.clearing.scheduler.service.LauncherService;
import ru.spcex.clearing.scheduler.service.PlannerService;
import ru.spcex.clearing.scheduler.service.PlannerTemplateService;
import ru.spcex.clearing.scheduler.service.*;
import ru.spcex.clearing.test.MatcherFactory;
import ru.spcex.clearing.test.TestUtils;
import ru.spcex.clearing.test.config.ImdgTestConfig;
@ -54,11 +52,15 @@ import static ru.spcex.platform.enumeration.Market.mkrs;
PlannerTemplateValidationConfig.class,
ClearingCalendarService.class,
PlannerTemplateService.class,
TaskManager.class,
LauncherSender.class,
PlannerValidationConfig.class,
ClearingCalendarValidationConfig.class,
ValidationConfig.class,
LauncherService.class,
ErrorResolverConfig.class,
PlannerQueueConfig.class,
SchedulerTestConfig.class,
ImdgTestConfig.class,
KafkaTestConfig.class})
public abstract class AbstractServiceTest {

19
clearing-parent/scheduler-service/src/test/java/ru/spcex/clearing/scheduler/config/SchedulerTestConfig.java Normal file
View file

@ -0,0 +1,19 @@
package ru.spcex.clearing.scheduler.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.TaskScheduler;
import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
@Configuration
public class SchedulerTestConfig {
@Bean
public TaskScheduler threadPoolTaskScheduler(){
ThreadPoolTaskScheduler threadPoolTaskScheduler
= new ThreadPoolTaskScheduler();
threadPoolTaskScheduler.setPoolSize(5);
threadPoolTaskScheduler.setThreadNamePrefix("ThreadPoolTaskScheduler");
return threadPoolTaskScheduler;
}
}

5
clearing-parent/scheduler-service/src/test/java/ru/specx/clearing/scheduler/service/ClearingCalendarServiceTest.java → clearing-parent/scheduler-service/src/test/java/ru/spcex/clearing/scheduler/service/ClearingCalendarServiceTest.java
View file

@ -1,4 +1,4 @@
package ru.specx.clearing.scheduler.service;
package ru.spcex.clearing.scheduler.service;
import org.apache.kafka.clients.consumer.MockConsumer;
import org.junit.jupiter.api.BeforeEach;
@ -13,12 +13,11 @@ import ru.spcex.clearing.platform.messaging.domain.Consts;
import ru.spcex.clearing.platform.messaging.domain.cud.common.CommonDeleteRequest;
import ru.spcex.clearing.platform.messaging.domain.cud.schedule.ClearingCalendarNewRequest;
import ru.spcex.clearing.platform.messaging.domain.cud.schedule.ClearingCalendarUpdateRequest;
import ru.spcex.clearing.scheduler.AbstractServiceTest;
import ru.spcex.clearing.scheduler.PlannerAllTodayBuilder;
import ru.spcex.clearing.scheduler.service.ClearingCalendarService;
import ru.spcex.clearing.test.MatcherFactory;
import ru.spcex.platform.enumeration.DayStatus;
import ru.spcex.platform.enumeration.Status;
import ru.specx.clearing.scheduler.AbstractServiceTest;
import javax.annotation.PostConstruct;
import java.time.LocalDate;

5
clearing-parent/scheduler-service/src/test/java/ru/specx/clearing/scheduler/service/LauncherServiceTest.java → clearing-parent/scheduler-service/src/test/java/ru/spcex/clearing/scheduler/service/LauncherServiceTest.java
View file

@ -1,4 +1,4 @@
package ru.specx.clearing.scheduler.service;
package ru.spcex.clearing.scheduler.service;
import org.apache.kafka.clients.consumer.MockConsumer;
import org.junit.jupiter.api.BeforeEach;
@ -12,9 +12,8 @@ import ru.spcex.clearing.platform.messaging.domain.ActionType;
import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
import ru.spcex.clearing.platform.messaging.domain.Consts;
import ru.spcex.clearing.platform.messaging.domain.cud.schedule.LauncherCommandRequest;
import ru.spcex.clearing.scheduler.service.LauncherService;
import ru.spcex.clearing.scheduler.AbstractServiceTest;
import ru.spcex.clearing.test.MatcherFactory;
import ru.specx.clearing.scheduler.AbstractServiceTest;
import javax.annotation.PostConstruct;

5
clearing-parent/scheduler-service/src/test/java/ru/specx/clearing/scheduler/service/PlannerServiceTest.java → clearing-parent/scheduler-service/src/test/java/ru/spcex/clearing/scheduler/service/PlannerServiceTest.java
View file

@ -1,4 +1,4 @@
package ru.specx.clearing.scheduler.service;
package ru.spcex.clearing.scheduler.service;
import org.apache.kafka.clients.consumer.MockConsumer;
import org.junit.jupiter.api.BeforeEach;
@ -11,11 +11,10 @@ import ru.spcex.clearing.platform.messaging.domain.Consts;
import ru.spcex.clearing.platform.messaging.domain.cud.common.CommonDeleteRequest;
import ru.spcex.clearing.platform.messaging.domain.cud.schedule.PlannerNewRequest;
import ru.spcex.clearing.platform.messaging.domain.cud.schedule.PlannerUpdateRequest;
import ru.spcex.clearing.scheduler.AbstractServiceTest;
import ru.spcex.clearing.scheduler.PlannerAllTodayBuilder;
import ru.spcex.clearing.scheduler.service.PlannerService;
import ru.spcex.clearing.test.MatcherFactory;
import ru.spcex.platform.enumeration.Status;
import ru.specx.clearing.scheduler.AbstractServiceTest;
import javax.annotation.PostConstruct;

5
clearing-parent/scheduler-service/src/test/java/ru/specx/clearing/scheduler/service/PlannerTemplateServiceTest.java → clearing-parent/scheduler-service/src/test/java/ru/spcex/clearing/scheduler/service/PlannerTemplateServiceTest.java
View file

@ -1,4 +1,4 @@
package ru.specx.clearing.scheduler.service;
package ru.spcex.clearing.scheduler.service;
import org.apache.kafka.clients.consumer.MockConsumer;
import org.junit.jupiter.api.Test;
@ -10,10 +10,9 @@ import ru.spcex.clearing.platform.messaging.domain.Consts;
import ru.spcex.clearing.platform.messaging.domain.cud.common.CommonDeleteRequest;
import ru.spcex.clearing.platform.messaging.domain.cud.schedule.PlannerTemplateNewRequest;
import ru.spcex.clearing.platform.messaging.domain.cud.schedule.PlannerTemplateUpdateRequest;
import ru.spcex.clearing.scheduler.AbstractServiceTest;
import ru.spcex.clearing.scheduler.PlannerAllTodayBuilder;
import ru.spcex.clearing.scheduler.service.PlannerTemplateService;
import ru.spcex.clearing.test.MatcherFactory;
import ru.specx.clearing.scheduler.AbstractServiceTest;
import javax.annotation.PostConstruct;

4
clearing-parent/scheduler-service/src/test/java/ru/specx/clearing/scheduler/validation/DateNotBeforeRuleTest.java → clearing-parent/scheduler-service/src/test/java/ru/spcex/clearing/scheduler/validation/DateNotBeforeRuleTest.java
View file

@ -1,13 +1,13 @@
package ru.specx.clearing.scheduler.validation;
package ru.spcex.clearing.scheduler.validation;
import org.junit.jupiter.api.Test;
import ru.spcex.clearing.platform.messaging.domain.cud.schedule.PlannerNewRequest;
import ru.spcex.clearing.scheduler.AbstractServiceTest;
import ru.spcex.clearing.scheduler.validation.rules.common.DateNotBeforeRule;
import ru.spcex.platform.imdg.validation.ImdgValidationContext;
import ru.spcex.platform.utils.enumeration.EnumMessage;
import ru.spcex.platform.utils.validation.IValidator;
import ru.spcex.platform.utils.validation.ValidatorImpl;
import ru.specx.clearing.scheduler.AbstractServiceTest;
import java.time.LocalDate;
import java.util.Collection;

4
clearing-parent/scheduler-service/src/test/java/ru/specx/clearing/scheduler/validation/DictionaryPresentRuleTest.java → clearing-parent/scheduler-service/src/test/java/ru/spcex/clearing/scheduler/validation/DictionaryPresentRuleTest.java
View file

@ -1,4 +1,4 @@
package ru.specx.clearing.scheduler.validation;
package ru.spcex.clearing.scheduler.validation;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
@ -10,6 +10,7 @@ import ru.clearing.platform.dictionary.TaskStatusDictionary;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.platform.messaging.domain.cud.schedule.ClearingCalendarNewRequest;
import ru.spcex.clearing.platform.messaging.domain.cud.schedule.PlannerNewRequest;
import ru.spcex.clearing.scheduler.AbstractServiceTest;
import ru.spcex.clearing.scheduler.error.ValidationError;
import ru.spcex.clearing.scheduler.validation.rules.common.DictionaryPresentRule;
import ru.spcex.platform.enumeration.DayStatus;
@ -22,7 +23,6 @@ import ru.spcex.platform.utils.enumeration.EnumMessage;
import ru.spcex.platform.utils.enumeration.IEnumKey;
import ru.spcex.platform.utils.validation.IValidator;
import ru.spcex.platform.utils.validation.ValidatorImpl;
import ru.specx.clearing.scheduler.AbstractServiceTest;
import java.lang.reflect.InvocationTargetException;
import java.util.Collection;

4
clearing-parent/scheduler-service/src/test/java/ru/specx/clearing/scheduler/validation/EnumPresentRuleTest.java → clearing-parent/scheduler-service/src/test/java/ru/spcex/clearing/scheduler/validation/EnumPresentRuleTest.java
View file

@ -1,4 +1,4 @@
package ru.specx.clearing.scheduler.validation;
package ru.spcex.clearing.scheduler.validation;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
@ -6,6 +6,7 @@ import org.springframework.beans.factory.annotation.Qualifier;
import ru.clearing.platform.dictionary.AbstractDictionary;
import ru.spcex.clearing.platform.messaging.domain.cud.schedule.ClearingCalendarNewRequest;
import ru.spcex.clearing.platform.messaging.domain.cud.schedule.PlannerNewRequest;
import ru.spcex.clearing.scheduler.AbstractServiceTest;
import ru.spcex.clearing.scheduler.error.ValidationError;
import ru.spcex.clearing.scheduler.validation.rules.common.EnumPresentRule;
import ru.spcex.platform.enumeration.DayStatus;
@ -17,7 +18,6 @@ import ru.spcex.platform.utils.enumeration.EnumMessage;
import ru.spcex.platform.utils.enumeration.IEnumKey;
import ru.spcex.platform.utils.validation.IValidator;
import ru.spcex.platform.utils.validation.ValidatorImpl;
import ru.specx.clearing.scheduler.AbstractServiceTest;
import java.lang.reflect.InvocationTargetException;
import java.util.Collection;

4
clearing-parent/scheduler-service/src/test/java/ru/specx/clearing/scheduler/validation/FieldRequiredRuleTest.java → clearing-parent/scheduler-service/src/test/java/ru/spcex/clearing/scheduler/validation/FieldRequiredRuleTest.java
View file

@ -1,13 +1,13 @@
package ru.specx.clearing.scheduler.validation;
package ru.spcex.clearing.scheduler.validation;
import org.junit.jupiter.api.Test;
import ru.spcex.clearing.platform.messaging.domain.cud.schedule.PlannerNewRequest;
import ru.spcex.clearing.scheduler.AbstractServiceTest;
import ru.spcex.clearing.scheduler.validation.rules.common.FieldRequiredRule;
import ru.spcex.platform.imdg.validation.ImdgValidationContext;
import ru.spcex.platform.utils.enumeration.EnumMessage;
import ru.spcex.platform.utils.validation.IValidator;
import ru.spcex.platform.utils.validation.ValidatorImpl;
import ru.specx.clearing.scheduler.AbstractServiceTest;
import java.util.Collection;
import java.util.function.Function;

4
clearing-parent/scheduler-service/src/test/java/ru/specx/clearing/scheduler/validation/IdPresentRuleTest.java → clearing-parent/scheduler-service/src/test/java/ru/spcex/clearing/scheduler/validation/IdPresentRuleTest.java
View file

@ -1,4 +1,4 @@
package ru.specx.clearing.scheduler.validation;
package ru.spcex.clearing.scheduler.validation;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
@ -7,6 +7,7 @@ import ru.clearing.classes.statics.data.company.Company;
import ru.clearing.classes.statics.data.security.Security;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.platform.messaging.domain.cud.schedule.PlannerNewRequest;
import ru.spcex.clearing.scheduler.AbstractServiceTest;
import ru.spcex.clearing.scheduler.error.ValidationError;
import ru.spcex.clearing.scheduler.validation.rules.common.IdPresentRule;
import ru.spcex.platform.classes.base.SpcexObjectBase;
@ -16,7 +17,6 @@ import ru.spcex.platform.imdg.validation.ImdgValidationContext;
import ru.spcex.platform.utils.enumeration.EnumMessage;
import ru.spcex.platform.utils.validation.IValidator;
import ru.spcex.platform.utils.validation.ValidatorImpl;
import ru.specx.clearing.scheduler.AbstractServiceTest;
import java.lang.reflect.InvocationTargetException;
import java.util.Collection;

4
clearing-parent/scheduler-service/src/test/java/ru/specx/clearing/scheduler/validation/TimeNotBeforeRuleTest.java → clearing-parent/scheduler-service/src/test/java/ru/spcex/clearing/scheduler/validation/TimeNotBeforeRuleTest.java
View file

@ -1,13 +1,13 @@
package ru.specx.clearing.scheduler.validation;
package ru.spcex.clearing.scheduler.validation;
import org.junit.jupiter.api.Test;
import ru.spcex.clearing.platform.messaging.domain.cud.schedule.PlannerNewRequest;
import ru.spcex.clearing.scheduler.AbstractServiceTest;
import ru.spcex.clearing.scheduler.validation.rules.common.TimeNotBeforeRule;
import ru.spcex.platform.imdg.validation.ImdgValidationContext;
import ru.spcex.platform.utils.enumeration.EnumMessage;
import ru.spcex.platform.utils.validation.IValidator;
import ru.spcex.platform.utils.validation.ValidatorImpl;
import ru.specx.clearing.scheduler.AbstractServiceTest;
import java.time.LocalTime;
import java.util.Collection;