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

ClearingMemberCategoryServiceTest fix

Browse source
This commit is contained in:
akulikov 2023-04-06 12:01:41 +03:00
parent 61953777e6
commit de137377bc
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
clearing-parent/company-service/src/test/java/ru/spcex/clearing/company/service/ClearingMemberCategoryServiceTest.java
View file

@ -105,7 +105,6 @@ class ClearingMemberCategoryServiceTest {
memberCategoryNewRequest.setCompanyId(TEST_COMPANY.getId()); memberCategoryNewRequest.setCompanyId(TEST_COMPANY.getId());
ClearingMemberCategory predictableClearingMemberCategory = new ClearingMemberCategory(); ClearingMemberCategory predictableClearingMemberCategory = new ClearingMemberCategory();
predictableClearingMemberCategory.setId(ID);
predictableClearingMemberCategory.setCompanyId(COMPANY_ID); predictableClearingMemberCategory.setCompanyId(COMPANY_ID);
predictableClearingMemberCategory.setClearingMemberCategory(clearingMemberCategory); predictableClearingMemberCategory.setClearingMemberCategory(clearingMemberCategory);
@ -117,6 +116,7 @@ class ClearingMemberCategoryServiceTest {
//ASSERT //ASSERT
waitingWhenAddedRecordAndCheckIt(ID, mockProducer, producerRecord); waitingWhenAddedRecordAndCheckIt(ID, mockProducer, producerRecord);
ClearingMemberCategory resultNew = memberCategoryImdg.getSingleObjectBySQL(String.format("clearingMemberCategory = %s", clearingMemberCategory)); ClearingMemberCategory resultNew = memberCategoryImdg.getSingleObjectBySQL(String.format("clearingMemberCategory = %s", clearingMemberCategory));
predictableClearingMemberCategory.setId(resultNew.getId());
MEMBER_CATEGORY_MATCHER.assertMatch(resultNew, predictableClearingMemberCategory); MEMBER_CATEGORY_MATCHER.assertMatch(resultNew, predictableClearingMemberCategory);
} }
@ -132,28 +132,27 @@ class ClearingMemberCategoryServiceTest {
//ARRANGE //ARRANGE
String clearingMemberCategory = CLEARING_CATEGORY_DICT_CODE; String clearingMemberCategory = CLEARING_CATEGORY_DICT_CODE;
ClearingMemberCategory existsClearingMemberCategory = new ClearingMemberCategory(); ClearingMemberCategory existsClearingMemberCategory = new ClearingMemberCategory();
existsClearingMemberCategory.setId(ID);
existsClearingMemberCategory.setClearingMemberCategory("0000"); existsClearingMemberCategory.setClearingMemberCategory("0000");
existsClearingMemberCategory.setCompanyId(COMPANY_ID); existsClearingMemberCategory.setCompanyId(COMPANY_ID);
memberCategoryImdg.insert(existsClearingMemberCategory); Long id = memberCategoryImdg.insert(existsClearingMemberCategory);
ClearingMemberCategoryUpdateRequest memberCategoryUpdateRequest = new ClearingMemberCategoryUpdateRequest(); ClearingMemberCategoryUpdateRequest memberCategoryUpdateRequest = new ClearingMemberCategoryUpdateRequest();
memberCategoryUpdateRequest.setId(ID); memberCategoryUpdateRequest.setId(id);
memberCategoryUpdateRequest.setClearingMemberCategory(clearingMemberCategory); memberCategoryUpdateRequest.setClearingMemberCategory(clearingMemberCategory);
ClearingMemberCategory predictableClearingMemberCategory = new ClearingMemberCategory(); ClearingMemberCategory predictableClearingMemberCategory = new ClearingMemberCategory();
predictableClearingMemberCategory.setCompanyId(COMPANY_ID); predictableClearingMemberCategory.setCompanyId(COMPANY_ID);
predictableClearingMemberCategory.setId(ID); predictableClearingMemberCategory.setId(id);
predictableClearingMemberCategory.setClearingMemberCategory(clearingMemberCategory); predictableClearingMemberCategory.setClearingMemberCategory(clearingMemberCategory);
//ACT //ACT
String jsonString = getJsonStringForUPDATE(memberCategoryUpdateRequest, ID); String jsonString = getJsonStringForUPDATE(memberCategoryUpdateRequest, id);
addRecordToKafka((MockConsumer) clearingMemberCategoryService.getConsumer(), TOPIC_MEMBER_CATEGORY_UPDATE, PARTITION, 0, jsonString); addRecordToKafka((MockConsumer) clearingMemberCategoryService.getConsumer(), TOPIC_MEMBER_CATEGORY_UPDATE, PARTITION, 0, jsonString);
//ASSERT //ASSERT
waitingWhenAddedRecordAndCheckIt(ID, mockProducer, producerRecord); waitingWhenAddedRecordAndCheckIt(id, mockProducer, producerRecord);
ClearingMemberCategory resultUpdating = memberCategoryImdg.getSingleObjectBySQL(String.format("clearingMemberCategory = %s", clearingMemberCategory)); ClearingMemberCategory resultUpdating = memberCategoryImdg.getSingleObjectByID(id);
MEMBER_CATEGORY_MATCHER.assertMatch(resultUpdating, predictableClearingMemberCategory); MEMBER_CATEGORY_MATCHER.assertMatch(resultUpdating, predictableClearingMemberCategory);
} }
@ -168,19 +167,18 @@ class ClearingMemberCategoryServiceTest {
//ARRANGE //ARRANGE
String clearingMemberCategory = "0000"; String clearingMemberCategory = "0000";
ClearingMemberCategory existsClearingMemberCategory = new ClearingMemberCategory(); ClearingMemberCategory existsClearingMemberCategory = new ClearingMemberCategory();
existsClearingMemberCategory.setId(ID);
existsClearingMemberCategory.setClearingMemberCategory(clearingMemberCategory); existsClearingMemberCategory.setClearingMemberCategory(clearingMemberCategory);
memberCategoryImdg.insert(existsClearingMemberCategory); Long id = memberCategoryImdg.insert(existsClearingMemberCategory);
CommonDeleteRequest memberCategoryDeleteRequest = new CommonDeleteRequest(); CommonDeleteRequest memberCategoryDeleteRequest = new CommonDeleteRequest();
memberCategoryDeleteRequest.setId(ID); memberCategoryDeleteRequest.setId(id);
//ACT //ACT
String jsonString = getJsonStringForDELETE(memberCategoryDeleteRequest, ID); String jsonString = getJsonStringForDELETE(memberCategoryDeleteRequest, id);
addRecordToKafka((MockConsumer) clearingMemberCategoryService.getConsumer(), TOPIC_MEMBER_CATEGORY_DELETE, PARTITION, 0, jsonString); addRecordToKafka((MockConsumer) clearingMemberCategoryService.getConsumer(), TOPIC_MEMBER_CATEGORY_DELETE, PARTITION, 0, jsonString);
//ASSERT //ASSERT
waitingWhenAddedRecordAndCheckIt(ID, mockProducer, producerRecord); waitingWhenAddedRecordAndCheckIt(id, mockProducer, producerRecord);
ClearingMemberCategory resultDeleting = memberCategoryImdg.getSingleObjectBySQL(String.format("clearingMemberCategory = %s", clearingMemberCategory)); ClearingMemberCategory resultDeleting = memberCategoryImdg.getSingleObjectBySQL(String.format("clearingMemberCategory = %s", clearingMemberCategory));
Assertions.assertNull(resultDeleting); Assertions.assertNull(resultDeleting);