Перенес общие классы и конфиги в test-clearing.
This commit is contained in:
psemenkov 2023-04-19 17:39:33 +03:00
parent 542b8c7e58
commit 384847168b
13 changed files with 21 additions and 21 deletions

View file

@ -13,8 +13,8 @@ import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.test.mock.mockito.SpyBean;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import ru.clearing.classes.statics.data.company.Company;
import ru.clearing.classes.statics.data.company.ClearingMemberCategory;
import ru.clearing.classes.statics.data.company.Company;
import ru.clearing.platform.dictionary.ClearingCategoryDictionary;
import ru.spcex.clearing.company.config.BeanConfiguration;
import ru.spcex.clearing.company.config.validation.ClearingMemberCategoryValidationConfig;
@ -151,7 +151,7 @@ class ClearingMemberCategoryServiceTest {
predictableClearingMemberCategory.setClearingMemberCategory(clearingMemberCategory);
//ACT
String jsonString = getJsonStringForUPDATE(memberCategoryUpdateRequest, id);
String jsonString = getJsonStringForUpdate(memberCategoryUpdateRequest, id);
addRecordToKafka((MockConsumer) clearingMemberCategoryService.getConsumer(), TOPIC_MEMBER_CATEGORY_UPDATE, PARTITION, 0, jsonString);
//ASSERT
@ -179,7 +179,7 @@ class ClearingMemberCategoryServiceTest {
memberCategoryDeleteRequest.setId(id);
//ACT
String jsonString = getJsonStringForDELETE(memberCategoryDeleteRequest, id);
String jsonString = getJsonStringForDelete(memberCategoryDeleteRequest, id);
addRecordToKafka((MockConsumer) clearingMemberCategoryService.getConsumer(), TOPIC_MEMBER_CATEGORY_DELETE, PARTITION, 0, jsonString);
//ASSERT

View file

@ -168,7 +168,7 @@ class CompanyInfoServiceTest {
predictableCompanyInfo.setFullName("updated fullName");
//ACT
String jsonString = getJsonStringForUPDATE(companyInfoUpdateRequest, ID);
String jsonString = getJsonStringForUpdate(companyInfoUpdateRequest, ID);
addRecordToKafka((MockConsumer) companyInfoService.getConsumer(), TOPIC_COMPANY_INFO_UPDATE, PARTITION, 0, jsonString);

View file

@ -13,9 +13,9 @@ import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.test.mock.mockito.SpyBean;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import ru.clearing.classes.statics.data.company.ClearingMemberCategory;
import ru.clearing.classes.statics.data.company.Company;
import ru.clearing.classes.statics.data.company.CompanySymbols;
import ru.clearing.classes.statics.data.company.ClearingMemberCategory;
import ru.clearing.platform.dictionary.CompanySymbolDictionary;
import ru.clearing.platform.dictionary.WorkflowStatusDictionary;
import ru.spcex.clearing.company.config.BeanConfiguration;
@ -137,7 +137,7 @@ class CompanyServiceTest {
commonDeleteRequest.setId(ID);
//ACT
String jsonString = getJsonStringForDELETE(commonDeleteRequest, ID);
String jsonString = getJsonStringForDelete(commonDeleteRequest, ID);
addRecordToKafka((MockConsumer) companyService.getConsumer(), TOPIC_COMPANY_DELETE, PARTITION, 0, jsonString);
//ASSERT

View file

@ -130,7 +130,7 @@ class CompanySymbolServiceTest {
predictableCompanySymbols.setCompanySymbolValue(companySymbolValue);
//ACT
String jsonString = getJsonStringForUPDATE(companySymbolUpdateRequest, ID);
String jsonString = getJsonStringForUpdate(companySymbolUpdateRequest, ID);
addRecordToKafka((MockConsumer) companySymbolService.getConsumer(), TOPIC_COMPANY_SYMBOL_UPDATE, PARTITION, 0, jsonString);
//ASSERT

View file

@ -147,7 +147,7 @@ class ContactServiceTest {
predictableContact.setContactValue("new ContactValue");
//ACT
String jsonString = getJsonStringForUPDATE(contactUpdateRequest, existContactID);
String jsonString = getJsonStringForUpdate(contactUpdateRequest, existContactID);
addRecordToKafka((MockConsumer) contactService.getConsumer(), TOPIC_CONTACT_UPDATE, PARTITION, 0, jsonString);
//ASSERT

View file

@ -214,7 +214,7 @@ class ProfileDocumentServiceTest {
profileDocumentUpdateRequest.setLink("new_link");
//ACT
String jsonString = getJsonStringForUPDATE(profileDocumentUpdateRequest, ID);
String jsonString = getJsonStringForUpdate(profileDocumentUpdateRequest, ID);
addRecordToKafka((MockConsumer) profileDocumentService.getConsumer(), TOPIC_DESTINATION_PROFILE_DOCUMENT_UPDATE, PARTITION, 0, jsonString);
@ -249,7 +249,7 @@ class ProfileDocumentServiceTest {
profileDocumentDeleteRequest.setId(PROFILE_DOCUMENT_ID);
//ACT
String jsonString = getJsonStringForUPDATE(profileDocumentDeleteRequest, ID);
String jsonString = getJsonStringForUpdate(profileDocumentDeleteRequest, ID);
addRecordToKafka((MockConsumer) profileDocumentService.getConsumer(), TOPIC_DESTINATION_PROFILE_DOCUMENT_DELETE, PARTITION, 0, jsonString);

View file

@ -107,7 +107,7 @@ public class CouponPeriodServiceTest extends AbstractServiceTest {
request.setPeriodStartDate(testEndDate);
//ACT
String jsonString = getJsonStringForUPDATE(request, id);
String jsonString = getJsonStringForUpdate(request, id);
addRecordToKafka((MockConsumer) couponPeriodService.getConsumer(), TOPIC, PARTITION, 0, jsonString);

View file

@ -82,7 +82,7 @@ public class CurrencyServiceTest extends AbstractServiceTest {
request.setCurrencyCode(currencyCode);
//ACT
String jsonString = getJsonStringForUPDATE(request, ID);
String jsonString = getJsonStringForUpdate(request, ID);
addRecordToKafka((MockConsumer) currencyService.getConsumer(), TOPIC, PARTITION, 0, jsonString);

View file

@ -89,7 +89,7 @@ public class EquitySecurityServiceTest extends AbstractServiceTest {
listingImdg.insert(listingPrediction);
//ACT
String jsonString = getJsonStringForUPDATE(request, ID);
String jsonString = getJsonStringForUpdate(request, ID);
addRecordToKafka((MockConsumer) equitySecurityService.getConsumer(), TOPIC, PARTITION, 0, jsonString);
@ -131,7 +131,7 @@ public class EquitySecurityServiceTest extends AbstractServiceTest {
commonDeleteRequest.setId(ID);
//ACT
String jsonString = getJsonStringForDELETE(commonDeleteRequest, ID);
String jsonString = getJsonStringForDelete(commonDeleteRequest, ID);
addRecordToKafka((MockConsumer) equitySecurityService.getConsumer(), TOPIC, PARTITION, 0, jsonString);

View file

@ -138,7 +138,7 @@ class FixedIncomeCashFlowServiceTest {
predictableFixedIncomeCashFlow.setValueDate(TEST_DATE);
//ACT
String jsonString = getJsonStringForUPDATE(updateRequest, id);
String jsonString = getJsonStringForUpdate(updateRequest, id);
addRecordToKafka((MockConsumer) fixedIncomeCashFlowService.getConsumer(), TOPIC_FIXED_INCOME_CASH_FLOW_UPDATE, PARTITION, 0, jsonString);

View file

@ -91,7 +91,7 @@ public class FixedIncomeSecurityServiceTest extends AbstractServiceTest {
listingImdg.insert(listingPrediction);
//ACT
String jsonString = getJsonStringForUPDATE(request, ID);
String jsonString = getJsonStringForUpdate(request, ID);
addRecordToKafka((MockConsumer) fixedIncomeSecurityService.getConsumer(), TOPIC, PARTITION, 0, jsonString);
@ -133,7 +133,7 @@ public class FixedIncomeSecurityServiceTest extends AbstractServiceTest {
commonDeleteRequest.setId(ID);
//ACT
String jsonString = getJsonStringForDELETE(commonDeleteRequest, ID);
String jsonString = getJsonStringForDelete(commonDeleteRequest, ID);
addRecordToKafka((MockConsumer) fixedIncomeSecurityService.getConsumer(), TOPIC, PARTITION, 0, jsonString);

View file

@ -113,7 +113,7 @@ public class MoneyMarketSecurityServiceTest extends AbstractServiceTest {
commonDeleteRequest.setId(ID);
//ACT
String jsonString = getJsonStringForDELETE(commonDeleteRequest, ID);
String jsonString = getJsonStringForDelete(commonDeleteRequest, ID);
addRecordToKafka((MockConsumer) moneyMarketSecurityService.getConsumer(), TOPIC, PARTITION, 0, jsonString);
@ -162,7 +162,7 @@ public class MoneyMarketSecurityServiceTest extends AbstractServiceTest {
listingPrediction.setLotSize(updateLotSize);
//ACT
String jsonString = getJsonStringForUPDATE(keyRequest, ID);
String jsonString = getJsonStringForUpdate(keyRequest, ID);
addRecordToKafka((MockConsumer) moneyMarketSecurityService.getConsumer(), TOPIC, PARTITION, 0, jsonString);

View file

@ -93,11 +93,11 @@ public class TestUtils {
return getJsonBaseRequest(accountRequest, id, ActionType.NEW);
}
public static <T> String getJsonStringForUPDATE(T accountRequest, long id) {
public static <T> String getJsonStringForUpdate(T accountRequest, long id) {
return getJsonBaseRequest(accountRequest, id, ActionType.UPDATE);
}
public static <T> String getJsonStringForDELETE(T accountRequest, long id) {
public static <T> String getJsonStringForDelete(T accountRequest, long id) {
return getJsonBaseRequest(accountRequest, id, ActionType.DELETE);
}