diff --git a/scfs-api-service-cat/src/test/java/com/czcb/scfs/service/cat/project/ProjectServiceTest.java b/scfs-api-service-cat/src/test/java/com/czcb/scfs/service/cat/project/ProjectServiceTest.java index b3b3d34..76fd50b 100644 --- a/scfs-api-service-cat/src/test/java/com/czcb/scfs/service/cat/project/ProjectServiceTest.java +++ b/scfs-api-service-cat/src/test/java/com/czcb/scfs/service/cat/project/ProjectServiceTest.java @@ -159,7 +159,7 @@ class ProjectServiceTest { System.out.println(Json.toJson(response)); String responseJson = Json.toJson(response); - Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\",\"project_info_list\":[]}", responseJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\",\"project_info_list\":[{\"channel_no\":\"setChannelNo\",\"app_no\":\"setAppNo\",\"serial_no\":\"setSerialNo\",\"project_no\":\"setProjectNo\",\"project_name\":\"setProjectName\",\"project_type\":\"setProjectType\",\"transport_mode\":\"setTransportMode\",\"base_unit\":\"setBaseUnit\",\"base_price\":100.0,\"bid_date\":\"setBidDate\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"payback_prop\":100.0,\"opp_account_no_1\":\"setOppAccountNo1\",\"opp_account_name_1\":\"setOppAccountName1\",\"opp_account_no_2\":\"setOppAccountNo2\",\"opp_account_name_2\":\"setOppAccountName2\",\"opp_bank_no_2\":\"setOppBankNo2\",\"opp_bank_name_2\":\"setOppBankName2\",\"opp_account_no_3\":\"setOppAccountNo3\",\"opp_account_name_3\":\"setOppAccountName3\",\"opp_bank_no_3\":\"setOppBankNo3\",\"opp_bank_name_3\":\"setOppBankName3\",\"bid_amount\":100.0,\"assess_amount\":100.0,\"credit_prop\":100.0,\"credit_period\":\"setCreditPeriod\",\"project_amount\":100.0,\"note\":\"setNote\",\"check_status\":\"setCheckStatus\",\"check_msg\":\"setCheckMsg\",\"check_time\":\"setCheckTime\",\"checker\":\"setChecker\",\"create_time\":\"setCreateTime\",\"creater\":\"setCreater\",\"update_time\":\"setUpdateTime\",\"updater\":\"setUpdater\",\"record_status\":\"setRecordStatus\",\"credit_info_list\":[{\"channel_no\":\"setChannelNo\",\"app_no\":\"setAppNo\",\"project_no\":\"setProjectNo\",\"product_id\":\"setProductId\",\"contract_no\":\"setContractNo\",\"apply_account_no\":\"setApplyAccountNo\",\"apply_account_name\":\"setApplyAccountName\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"loanacctno\":\"setLoanAcctNo\",\"acctseqno\":\"setAcctSeqNo\",\"loan_amount\":100.0,\"loan_date\":\"setLoanDate\",\"loan_time\":\"setLoanTime\",\"sys_serial_no\":\"setSysSerialNo\",\"core_serial_no\":\"setCoreSerialNo\",\"checker\":\"setRemark\",\"repay_finish_status\":\"setRepayFinishStatus\",\"repay_amount_bj_total\":100.0,\"repay_amount_lx_total\":100.0,\"last_repay_amount_bj\":100.0,\"last_repay_amount_lx\":100.0,\"last_repay_time\":\"setLastRepayTime\",\"create_time\":\"setCreateTime\",\"creater\":\"setCreater\",\"update_time\":\"setUpdateTime\",\"updater\":\"setUpdater\",\"record_status\":\"setRecordStatus\"}],\"credit_repay_list\":[{\"project_no\":\"setProjectNo\",\"product_id\":\"setProductId\",\"contract_no\":\"setContractNo\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"loanacctno\":\"setLoanAcctNo\",\"acctseqno\":\"setAcctSeqNo\",\"repay_amount_bj\":100.0,\"repay_amount_lx\":100.0,\"repay_time\":\"setRepayTime\",\"res_repay_amount_bj\":100.0,\"remark\":\"setRemark\",\"sys_serial_no\":\"setSysSerialNo\",\"repay_status\":\"setRepayStatus\",\"fail_msg\":\"setFailMsg\"}]}]}", responseJson); HttpResponse httpResponse = TestHttpResponse.create("/purchase/project-query", response, ProjectQueryResponse.class); Mockito.when(apiClient.post( @@ -173,7 +173,7 @@ class ProjectServiceTest { System.out.println(Json.toJson(result)); String resultJson = Json.toJson(result); - Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\",\"project_info_list\":[]}", resultJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\",\"project_info_list\":[{\"channel_no\":\"setChannelNo\",\"app_no\":\"setAppNo\",\"serial_no\":\"setSerialNo\",\"project_no\":\"setProjectNo\",\"project_name\":\"setProjectName\",\"project_type\":\"setProjectType\",\"transport_mode\":\"setTransportMode\",\"base_unit\":\"setBaseUnit\",\"base_price\":100.0,\"bid_date\":\"setBidDate\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"payback_prop\":100.0,\"opp_account_no_1\":\"setOppAccountNo1\",\"opp_account_name_1\":\"setOppAccountName1\",\"opp_account_no_2\":\"setOppAccountNo2\",\"opp_account_name_2\":\"setOppAccountName2\",\"opp_bank_no_2\":\"setOppBankNo2\",\"opp_bank_name_2\":\"setOppBankName2\",\"opp_account_no_3\":\"setOppAccountNo3\",\"opp_account_name_3\":\"setOppAccountName3\",\"opp_bank_no_3\":\"setOppBankNo3\",\"opp_bank_name_3\":\"setOppBankName3\",\"bid_amount\":100.0,\"assess_amount\":100.0,\"credit_prop\":100.0,\"credit_period\":\"setCreditPeriod\",\"project_amount\":100.0,\"note\":\"setNote\",\"check_status\":\"setCheckStatus\",\"check_msg\":\"setCheckMsg\",\"check_time\":\"setCheckTime\",\"checker\":\"setChecker\",\"create_time\":\"setCreateTime\",\"creater\":\"setCreater\",\"update_time\":\"setUpdateTime\",\"updater\":\"setUpdater\",\"record_status\":\"setRecordStatus\",\"credit_info_list\":[{\"channel_no\":\"setChannelNo\",\"app_no\":\"setAppNo\",\"project_no\":\"setProjectNo\",\"product_id\":\"setProductId\",\"contract_no\":\"setContractNo\",\"apply_account_no\":\"setApplyAccountNo\",\"apply_account_name\":\"setApplyAccountName\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"loanacctno\":\"setLoanAcctNo\",\"acctseqno\":\"setAcctSeqNo\",\"loan_amount\":100.0,\"loan_date\":\"setLoanDate\",\"loan_time\":\"setLoanTime\",\"sys_serial_no\":\"setSysSerialNo\",\"core_serial_no\":\"setCoreSerialNo\",\"checker\":\"setRemark\",\"repay_finish_status\":\"setRepayFinishStatus\",\"repay_amount_bj_total\":100.0,\"repay_amount_lx_total\":100.0,\"last_repay_amount_bj\":100.0,\"last_repay_amount_lx\":100.0,\"last_repay_time\":\"setLastRepayTime\",\"create_time\":\"setCreateTime\",\"creater\":\"setCreater\",\"update_time\":\"setUpdateTime\",\"updater\":\"setUpdater\",\"record_status\":\"setRecordStatus\"}],\"credit_repay_list\":[{\"project_no\":\"setProjectNo\",\"product_id\":\"setProductId\",\"contract_no\":\"setContractNo\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"loanacctno\":\"setLoanAcctNo\",\"acctseqno\":\"setAcctSeqNo\",\"repay_amount_bj\":100.0,\"repay_amount_lx\":100.0,\"repay_time\":\"setRepayTime\",\"res_repay_amount_bj\":100.0,\"remark\":\"setRemark\",\"sys_serial_no\":\"setSysSerialNo\",\"repay_status\":\"setRepayStatus\",\"fail_msg\":\"setFailMsg\"}]}]}", resultJson); } void extractedProjectQueryRequestParams(ProjectQueryRequest request) { @@ -200,7 +200,10 @@ class ProjectServiceTest { response.setRecode("setRecode"); response.setSysSerialNo("setSysSerialNo"); response.setSysTime("setSysTime"); - response.setProjectInfoLists(Lists.list()); + + ProjectQueryResponse.ProjectInfoList nest = new ProjectQueryResponse.ProjectInfoList(); + extractedProjectInfoListNestParams(nest); + response.setProjectInfoLists(Lists.list(nest)); } void extractedProjectQueryResponseAssertions(ProjectQueryResponse response) { @@ -210,6 +213,209 @@ class ProjectServiceTest { Assertions.assertEquals("setSysSerialNo", response.getSysSerialNo()); Assertions.assertEquals("setSysTime", response.getSysTime()); Assertions.assertNotNull(response.getProjectInfoLists()); + + for (ProjectQueryResponse.ProjectInfoList projectInfoList : response.getProjectInfoLists()) { + extractedProjectInfoListNestAssertions(projectInfoList); + } + } + + void extractedProjectInfoListNestParams(ProjectQueryResponse.ProjectInfoList nest) { + nest.setSerialNo("setSerialNo"); + nest.setProjectName("setProjectName"); + nest.setBidDate("setBidDate"); + nest.setProjectType("setProjectType"); + nest.setPaybackProp(BigDecimal.valueOf(100.00)); + nest.setBaseUnit("setBaseUnit"); + nest.setOppAccountNo1("setOppAccountNo1"); + nest.setOppAccountNo2("setOppAccountNo2"); + nest.setOppBankName2("setOppBankName2"); + nest.setOppAccountNo3("setOppAccountNo3"); + nest.setOppBankName3("setOppBankName3"); + nest.setOppBankNo3("setOppBankNo3"); + nest.setAssessAmount(BigDecimal.valueOf(100.00)); + nest.setCreditProp(BigDecimal.valueOf(100.00)); + nest.setCreditPeriod("setCreditPeriod"); + nest.setProjectAmount(BigDecimal.valueOf(100.00)); + nest.setOppBankNo2("setOppBankNo2"); + nest.setTransportMode("setTransportMode"); + nest.setBidAmount(BigDecimal.valueOf(100.00)); + nest.setBasePrice(BigDecimal.valueOf(100.00)); + nest.setCheckMsg("setCheckMsg"); + nest.setCheckStatus("setCheckStatus"); + nest.setNote("setNote"); + nest.setChecker("setChecker"); + nest.setCheckTime("setCheckTime"); + nest.setOppAccountName2("setOppAccountName2"); + nest.setOppAccountName1("setOppAccountName1"); + nest.setOppAccountName3("setOppAccountName3"); + nest.setAppNo("setAppNo"); + nest.setAccountNo("setAccountNo"); + nest.setChannelNo("setChannelNo"); + nest.setProjectNo("setProjectNo"); + nest.setAccountName("setAccountName"); + nest.setCreateTime("setCreateTime"); + nest.setRecordStatus("setRecordStatus"); + nest.setUpdateTime("setUpdateTime"); + nest.setCreater("setCreater"); + nest.setUpdater("setUpdater"); + + ProjectQueryResponse.CreditInfoList creditInfoList = new ProjectQueryResponse.CreditInfoList(); + extractedCreditInfoListNestParams(creditInfoList); + nest.setCreditInfoLists(Lists.list(creditInfoList)); + + ProjectQueryResponse.CreditRepayList creditRepayList = new ProjectQueryResponse.CreditRepayList(); + extractedCreditRepayListNestParams(creditRepayList); + nest.setCreditRepayLists(Lists.list(creditRepayList)); + } + + void extractedCreditInfoListNestParams(ProjectQueryResponse.CreditInfoList nest) { + nest.setApplyAccountNo("setApplyAccountNo"); + nest.setApplyAccountName("setApplyAccountName"); + nest.setRepayAmountBjTotal(BigDecimal.valueOf(100.00)); + nest.setRepayAmountLxTotal(BigDecimal.valueOf(100.00)); + nest.setRepayFinishStatus("setRepayFinishStatus"); + nest.setLastRepayAmountLx(BigDecimal.valueOf(100.00)); + nest.setLastRepayAmountBj(BigDecimal.valueOf(100.00)); + nest.setAppNo("setAppNo"); + nest.setLoanAcctNo("setLoanAcctNo"); + nest.setLoanAmount(BigDecimal.valueOf(100.00)); + nest.setAcctSeqNo("setAcctSeqNo"); + nest.setLoanDate("setLoanDate"); + nest.setLoanTime("setLoanTime"); + nest.setContractNo("setContractNo"); + nest.setSysSerialNo("setSysSerialNo"); + nest.setCoreSerialNo("setCoreSerialNo"); + nest.setAccountNo("setAccountNo"); + nest.setRemark("setRemark"); + nest.setLastRepayTime("setLastRepayTime"); + nest.setChannelNo("setChannelNo"); + nest.setProductId("setProductId"); + nest.setProjectNo("setProjectNo"); + nest.setAccountName("setAccountName"); + nest.setCreateTime("setCreateTime"); + nest.setRecordStatus("setRecordStatus"); + nest.setUpdateTime("setUpdateTime"); + nest.setCreater("setCreater"); + nest.setUpdater("setUpdater"); + } + + void extractedCreditInfoListNestAssertions(ProjectQueryResponse.CreditInfoList nest) { + Assertions.assertEquals("setApplyAccountNo", nest.getApplyAccountNo()); + Assertions.assertEquals("setApplyAccountName", nest.getApplyAccountName()); + Assertions.assertEquals(BigDecimal.valueOf(100.00), nest.getRepayAmountBjTotal()); + Assertions.assertEquals(BigDecimal.valueOf(100.00), nest.getRepayAmountLxTotal()); + Assertions.assertEquals("setRepayFinishStatus", nest.getRepayFinishStatus()); + Assertions.assertEquals(BigDecimal.valueOf(100.00), nest.getLastRepayAmountLx()); + Assertions.assertEquals(BigDecimal.valueOf(100.00), nest.getLastRepayAmountBj()); + Assertions.assertEquals("setAppNo", nest.getAppNo()); + Assertions.assertEquals("setLoanAcctNo", nest.getLoanAcctNo()); + Assertions.assertEquals(BigDecimal.valueOf(100.00), nest.getLoanAmount()); + Assertions.assertEquals("setAcctSeqNo", nest.getAcctSeqNo()); + Assertions.assertEquals("setLoanDate", nest.getLoanDate()); + Assertions.assertEquals("setLoanTime", nest.getLoanTime()); + Assertions.assertEquals("setContractNo", nest.getContractNo()); + Assertions.assertEquals("setSysSerialNo", nest.getSysSerialNo()); + Assertions.assertEquals("setCoreSerialNo", nest.getCoreSerialNo()); + Assertions.assertEquals("setAccountNo", nest.getAccountNo()); + Assertions.assertEquals("setRemark", nest.getRemark()); + Assertions.assertEquals("setLastRepayTime", nest.getLastRepayTime()); + Assertions.assertEquals("setChannelNo", nest.getChannelNo()); + Assertions.assertEquals("setProductId", nest.getProductId()); + Assertions.assertEquals("setProjectNo", nest.getProjectNo()); + Assertions.assertEquals("setAccountName", nest.getAccountName()); + Assertions.assertEquals("setCreateTime", nest.getCreateTime()); + Assertions.assertEquals("setRecordStatus", nest.getRecordStatus()); + Assertions.assertEquals("setUpdateTime", nest.getUpdateTime()); + Assertions.assertEquals("setCreater", nest.getCreater()); + Assertions.assertEquals("setUpdater", nest.getUpdater()); + } + + void extractedProjectInfoListNestAssertions(ProjectQueryResponse.ProjectInfoList nest) { + Assertions.assertEquals("setSerialNo", nest.getSerialNo()); + Assertions.assertEquals("setProjectName", nest.getProjectName()); + Assertions.assertEquals("setBidDate", nest.getBidDate()); + Assertions.assertEquals("setProjectType", nest.getProjectType()); + Assertions.assertEquals(BigDecimal.valueOf(100.00), nest.getPaybackProp()); + Assertions.assertEquals("setBaseUnit", nest.getBaseUnit()); + Assertions.assertEquals("setOppAccountNo1", nest.getOppAccountNo1()); + Assertions.assertEquals("setOppAccountNo2", nest.getOppAccountNo2()); + Assertions.assertEquals("setOppBankName2", nest.getOppBankName2()); + Assertions.assertEquals("setOppAccountNo3", nest.getOppAccountNo3()); + Assertions.assertEquals("setOppBankName3", nest.getOppBankName3()); + Assertions.assertEquals("setOppBankNo3", nest.getOppBankNo3()); + Assertions.assertEquals(BigDecimal.valueOf(100.00), nest.getAssessAmount()); + Assertions.assertEquals(BigDecimal.valueOf(100.00), nest.getCreditProp()); + Assertions.assertEquals("setCreditPeriod", nest.getCreditPeriod()); + Assertions.assertEquals(BigDecimal.valueOf(100.00), nest.getProjectAmount()); + Assertions.assertEquals("setOppBankNo2", nest.getOppBankNo2()); + Assertions.assertEquals("setTransportMode", nest.getTransportMode()); + Assertions.assertEquals(BigDecimal.valueOf(100.00), nest.getBidAmount()); + Assertions.assertEquals(BigDecimal.valueOf(100.00), nest.getBasePrice()); + Assertions.assertEquals("setCheckMsg", nest.getCheckMsg()); + Assertions.assertEquals("setCheckStatus", nest.getCheckStatus()); + Assertions.assertEquals("setNote", nest.getNote()); + Assertions.assertEquals("setChecker", nest.getChecker()); + Assertions.assertEquals("setCheckTime", nest.getCheckTime()); + Assertions.assertEquals("setOppAccountName2", nest.getOppAccountName2()); + Assertions.assertEquals("setOppAccountName1", nest.getOppAccountName1()); + Assertions.assertEquals("setOppAccountName3", nest.getOppAccountName3()); + Assertions.assertEquals("setAppNo", nest.getAppNo()); + Assertions.assertEquals("setAccountNo", nest.getAccountNo()); + Assertions.assertEquals("setChannelNo", nest.getChannelNo()); + Assertions.assertEquals("setProjectNo", nest.getProjectNo()); + Assertions.assertEquals("setAccountName", nest.getAccountName()); + Assertions.assertEquals("setCreateTime", nest.getCreateTime()); + Assertions.assertEquals("setRecordStatus", nest.getRecordStatus()); + Assertions.assertEquals("setUpdateTime", nest.getUpdateTime()); + Assertions.assertEquals("setCreater", nest.getCreater()); + Assertions.assertEquals("setUpdater", nest.getUpdater()); + + Assertions.assertNotNull(nest.getCreditInfoLists()); + Assertions.assertNotNull(nest.getCreditRepayLists()); + + for (ProjectQueryResponse.CreditInfoList creditInfoList : nest.getCreditInfoLists()) { + extractedCreditInfoListNestAssertions(creditInfoList); + } + + for (ProjectQueryResponse.CreditRepayList creditRepayList : nest.getCreditRepayLists()) { + extractedCreditRepayListNestAssertions(creditRepayList); + } + } + + void extractedCreditRepayListNestParams(ProjectQueryResponse.CreditRepayList nest) { + nest.setResRepayAmountBj(BigDecimal.valueOf(100.00)); + nest.setRepayTime("setRepayTime"); + nest.setFailMsg("setFailMsg"); + nest.setRepayAmountLx(BigDecimal.valueOf(100.00)); + nest.setRepayStatus("setRepayStatus"); + nest.setRepayAmountBj(BigDecimal.valueOf(100.00)); + nest.setLoanAcctNo("setLoanAcctNo"); + nest.setAcctSeqNo("setAcctSeqNo"); + nest.setContractNo("setContractNo"); + nest.setSysSerialNo("setSysSerialNo"); + nest.setAccountNo("setAccountNo"); + nest.setRemark("setRemark"); + nest.setProductId("setProductId"); + nest.setProjectNo("setProjectNo"); + nest.setAccountName("setAccountName"); + } + + void extractedCreditRepayListNestAssertions(ProjectQueryResponse.CreditRepayList nest) { + Assertions.assertEquals(BigDecimal.valueOf(100.00), nest.getResRepayAmountBj()); + Assertions.assertEquals("setRepayTime", nest.getRepayTime()); + Assertions.assertEquals("setFailMsg", nest.getFailMsg()); + Assertions.assertEquals(BigDecimal.valueOf(100.00), nest.getRepayAmountLx()); + Assertions.assertEquals("setRepayStatus", nest.getRepayStatus()); + Assertions.assertEquals(BigDecimal.valueOf(100.00), nest.getRepayAmountBj()); + Assertions.assertEquals("setLoanAcctNo", nest.getLoanAcctNo()); + Assertions.assertEquals("setAcctSeqNo", nest.getAcctSeqNo()); + Assertions.assertEquals("setContractNo", nest.getContractNo()); + Assertions.assertEquals("setSysSerialNo", nest.getSysSerialNo()); + Assertions.assertEquals("setAccountNo", nest.getAccountNo()); + Assertions.assertEquals("setRemark", nest.getRemark()); + Assertions.assertEquals("setProductId", nest.getProductId()); + Assertions.assertEquals("setProjectNo", nest.getProjectNo()); + Assertions.assertEquals("setAccountName", nest.getAccountName()); } @Test @@ -220,7 +426,7 @@ class ProjectServiceTest { System.out.println(Json.toJson(request)); String requestJson = Json.toJson(request); - Assertions.assertEquals("{\"channel_no\":\"setChannelNo\",\"app_no\":\"setAppNo\",\"serial_no\":\"setSerialNo\",\"trans_date\":\"setTransDate\",\"trans_tradetime\":\"setTransTradeTime\",\"project_no\":\"setProjectNo\",\"pay_amount\":\"setPayAmount\",\"loan_amount\":100.0,\"pay_type\":\"setPayType\",\"apply_account_no\":\"setApplyAccountNo\",\"apply_account_name\":\"setApplyAccountName\",\"pay_account_no\":\"setPayAccountNo\",\"pay_account_name\":\"setPayAccountName\",\"verify_code\":\"setVerifyCode\",\"remark\":\"setRemark\",\"file_list\":[]}", requestJson); + Assertions.assertEquals("{\"channel_no\":\"setChannelNo\",\"app_no\":\"setAppNo\",\"serial_no\":\"setSerialNo\",\"trans_date\":\"setTransDate\",\"trans_tradetime\":\"setTransTradeTime\",\"project_no\":\"setProjectNo\",\"pay_amount\":\"setPayAmount\",\"loan_amount\":100.0,\"pay_type\":\"setPayType\",\"apply_account_no\":\"setApplyAccountNo\",\"apply_account_name\":\"setApplyAccountName\",\"pay_account_no\":\"setPayAccountNo\",\"pay_account_name\":\"setPayAccountName\",\"verify_code\":\"setVerifyCode\",\"remark\":\"setRemark\",\"file_list\":[{\"file_no\":\"11\",\"file_type\":\"12\"}]}", requestJson); ProjectPayResponse response = new ProjectPayResponse(); extractedProjectPayResponseParams(response); @@ -257,11 +463,14 @@ class ProjectServiceTest { request.setLoanAmount(BigDecimal.valueOf(100.00)); request.setPayType("setPayType"); request.setPayAmount("setPayAmount"); - request.setFileLists(Lists.list()); request.setTransTradeTime("setTransTradeTime"); request.setPayAccountName("setPayAccountName"); request.setApplyAccountNo("setApplyAccountNo"); request.setApplyAccountName("setApplyAccountName"); + ProjectPayRequest.FileList fileList = new ProjectPayRequest.FileList(); + fileList.setFileNo("11"); + fileList.setFileType("12"); + request.setFileLists(Lists.list(fileList)); } void extractedProjectPayRequestAssertions(ProjectPayRequest request) { @@ -281,6 +490,12 @@ class ProjectServiceTest { Assertions.assertEquals("setPayAccountName", request.getPayAccountName()); Assertions.assertEquals("setApplyAccountNo", request.getApplyAccountNo()); Assertions.assertEquals("setApplyAccountName", request.getApplyAccountName()); + + for (ProjectPayRequest.FileList fileList : request.getFileLists()) { + Assertions.assertEquals("12", fileList.getFileType()); + Assertions.assertEquals("11", fileList.getFileNo()); + } + } void extractedProjectPayResponseParams(ProjectPayResponse response) { @@ -485,7 +700,7 @@ class ProjectServiceTest { System.out.println(Json.toJson(response)); String responseJson = Json.toJson(response); - Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\",\"recode_list\":[]}", responseJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\",\"recode_list\":[{\"file_no\":\"setFileNo\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"opp_account_no\":\"setOppAccountNo\",\"opp_account_name\":\"setOppAccountName\",\"opp_bank_no\":\"setOppBankNo\",\"opp_bank_name\":\"setOppBankName\",\"opp_account_no_1\":\"setOppAccountNo1\",\"opp_account_name_1\":\"setOppAccountName1\",\"opp_bank_no_1\":\"setOppBankNo1\",\"opp_bank_name_1\":\"setOppBankName1\",\"note\":\"setNote\",\"check_status\":\"setCheckStatus\",\"check_time\":\"setCheckTime\",\"check_remark\":\"setCheckRemark\"}]}", responseJson); HttpResponse httpResponse = TestHttpResponse.create("/entpay/agrt-query", response, EntpayAgrtQueryResponse.class); Mockito.when(apiClient.post( @@ -499,7 +714,7 @@ class ProjectServiceTest { System.out.println(Json.toJson(result)); String resultJson = Json.toJson(result); - Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\",\"recode_list\":[]}", resultJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\",\"recode_list\":[{\"file_no\":\"setFileNo\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"opp_account_no\":\"setOppAccountNo\",\"opp_account_name\":\"setOppAccountName\",\"opp_bank_no\":\"setOppBankNo\",\"opp_bank_name\":\"setOppBankName\",\"opp_account_no_1\":\"setOppAccountNo1\",\"opp_account_name_1\":\"setOppAccountName1\",\"opp_bank_no_1\":\"setOppBankNo1\",\"opp_bank_name_1\":\"setOppBankName1\",\"note\":\"setNote\",\"check_status\":\"setCheckStatus\",\"check_time\":\"setCheckTime\",\"check_remark\":\"setCheckRemark\"}]}", resultJson); } void extractedEntpayAgrtQueryRequestParams(EntpayAgrtQueryRequest request) { @@ -534,9 +749,48 @@ class ProjectServiceTest { response.setRecode("setRecode"); response.setSysSerialNo("setSysSerialNo"); response.setSysTime("setSysTime"); - response.setRecodeLists(Lists.list()); + EntpayAgrtQueryResponse.RecodeList nest = new EntpayAgrtQueryResponse.RecodeList(); + extractedRecodeListNestParams(nest); + response.setRecodeLists(Lists.list(nest)); } + void extractedRecodeListNestParams(EntpayAgrtQueryResponse.RecodeList nest) { + nest.setFileNo("setFileNo"); + nest.setAccountNo("setAccountNo"); + nest.setOppAccountNo("setOppAccountNo"); + nest.setOppBankNo("setOppBankNo"); + nest.setAccountName("setAccountName"); + nest.setOppBankName("setOppBankName"); + nest.setOppAccountNo1("setOppAccountNo1"); + nest.setOppBankNo1("setOppBankNo1"); + nest.setOppBankName1("setOppBankName1"); + nest.setCheckStatus("setCheckStatus"); + nest.setCheckRemark("setCheckRemark"); + nest.setCheckTime("setCheckTime"); + nest.setNote("setNote"); + nest.setOppAccountName1("setOppAccountName1"); + nest.setOppAccountName("setOppAccountName"); + } + + void extractedRecodeListNestAssertions(EntpayAgrtQueryResponse.RecodeList nest) { + Assertions.assertEquals("setFileNo", nest.getFileNo()); + Assertions.assertEquals("setAccountNo", nest.getAccountNo()); + Assertions.assertEquals("setOppAccountNo", nest.getOppAccountNo()); + Assertions.assertEquals("setOppBankNo", nest.getOppBankNo()); + Assertions.assertEquals("setAccountName", nest.getAccountName()); + Assertions.assertEquals("setOppBankName", nest.getOppBankName()); + Assertions.assertEquals("setOppAccountNo1", nest.getOppAccountNo1()); + Assertions.assertEquals("setOppBankNo1", nest.getOppBankNo1()); + Assertions.assertEquals("setOppBankName1", nest.getOppBankName1()); + Assertions.assertEquals("setCheckStatus", nest.getCheckStatus()); + Assertions.assertEquals("setCheckRemark", nest.getCheckRemark()); + Assertions.assertEquals("setCheckTime", nest.getCheckTime()); + Assertions.assertEquals("setNote", nest.getNote()); + Assertions.assertEquals("setOppAccountName1", nest.getOppAccountName1()); + Assertions.assertEquals("setOppAccountName", nest.getOppAccountName()); + } + + void extractedEntpayAgrtQueryResponseAssertions(EntpayAgrtQueryResponse response) { Assertions.assertEquals("setRecodeInfo", response.getRecodeInfo()); Assertions.assertEquals("setSysDate", response.getSysDate()); @@ -544,6 +798,9 @@ class ProjectServiceTest { Assertions.assertEquals("setSysSerialNo", response.getSysSerialNo()); Assertions.assertEquals("setSysTime", response.getSysTime()); Assertions.assertNotNull(response.getRecodeLists()); + for (EntpayAgrtQueryResponse.RecodeList data : response.getRecodeLists()) { + extractedRecodeListNestAssertions(data); + } } } \ No newline at end of file diff --git a/scfs-api-test/src/main/java/com/czcb/scfs/api/test/RefGenTestMethod.java b/scfs-api-test/src/main/java/com/czcb/scfs/api/test/RefGenTestMethod.java index ac2c1a6..6e2420c 100644 --- a/scfs-api-test/src/main/java/com/czcb/scfs/api/test/RefGenTestMethod.java +++ b/scfs-api-test/src/main/java/com/czcb/scfs/api/test/RefGenTestMethod.java @@ -121,6 +121,32 @@ public class RefGenTestMethod { genResponseAssertions(response); } + public static void genNest(Class request) { + print("void extracted%sNestParams(%s nest) {\n", request.getSimpleName(), request.getSimpleName()); + + Method[] methods = request.getMethods(); + for (Method method : methods) { + if (!method.getName().startsWith("set")) { + continue; + } + + printParams("\tnest.%s(\"%s\");\n", method); + } + + print("}\n"); + + print("void extracted%sNestAssertions(%s nest) {\n", request.getSimpleName(), request.getSimpleName()); + + for (Method method : methods) { + if (!method.getName().startsWith("set")) { + continue; + } + + printAssertions("\tAssertions.assertEquals(\"%s\", nest.%s());\n", method, true); + } + print("}\n"); + } + private static void print(String format, Object... args) { System.out.printf(format, args); } diff --git a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/RefGenTestMethodTest.java b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/RefGenTestMethodTest.java index 2aa1bac..c5f4767 100644 --- a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/RefGenTestMethodTest.java +++ b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/RefGenTestMethodTest.java @@ -22,7 +22,8 @@ import com.czcb.scfs.api.service.v2.trans.model.QueryTradeDetailsHistoryResponse import com.czcb.scfs.api.service.v2.trans.model.QueryTradeDetailsRequest; import com.czcb.scfs.api.service.v2.trans.model.QueryTradeDetailsResponse; import com.czcb.scfs.service.cat.order.model.*; -import com.czcb.scfs.service.cat.project.model.*; +import com.czcb.scfs.service.cat.project.model.ProjectQueryRequest; +import com.czcb.scfs.service.cat.project.model.ProjectQueryResponse; import org.junit.jupiter.api.Test; class RefGenTestMethodTest { @@ -211,23 +212,29 @@ class RefGenTestMethodTest { @Test void projectServiceTest() { - RefGenTestMethod.gen(ProjectAddRequest.class, ProjectAddResponse.class, - "projectAdd", "/purchase/project-add"); +// RefGenTestMethod.gen(ProjectAddRequest.class, ProjectAddResponse.class, +// "projectAdd", "/purchase/project-add"); +// +// RefGenTestMethod.gen(ProjectQueryRequest.class, ProjectQueryResponse.class, +// "projectQuery", "/purchase/project-query"); - RefGenTestMethod.gen(ProjectQueryRequest.class, ProjectQueryResponse.class, - "projectQuery", "/purchase/project-query"); + RefGenTestMethod.genNest(ProjectQueryResponse.CreditInfoList.class); + RefGenTestMethod.genNest(ProjectQueryResponse.ProjectInfoList.class); + RefGenTestMethod.genNest(ProjectQueryResponse.CreditRepayList.class); - RefGenTestMethod.gen(ProjectPayRequest.class, ProjectPayResponse.class, - "projectPay", "/purchase/project-pay"); +// RefGenTestMethod.gen(ProjectPayRequest.class, ProjectPayResponse.class, +// "projectPay", "/purchase/project-pay"); +// +// RefGenTestMethod.gen(ProjectRepayRequest.class, ProjectRepayResponse.class, +// "projectRepay", "/purchase/project-repay"); +// +// RefGenTestMethod.gen(CommonTradePayRequest.class, CommonTradePayResponse.class, +// "pay", "/common-trade/pay"); +// +// RefGenTestMethod.gen(EntpayAgrtQueryRequest.class, EntpayAgrtQueryResponse.class, +// "agrtQuery", "/entpay/agrt-query"); - RefGenTestMethod.gen(ProjectRepayRequest.class, ProjectRepayResponse.class, - "projectRepay", "/purchase/project-repay"); - - RefGenTestMethod.gen(CommonTradePayRequest.class, CommonTradePayResponse.class, - "pay", "/common-trade/pay"); - - RefGenTestMethod.gen(EntpayAgrtQueryRequest.class, EntpayAgrtQueryResponse.class, - "agrtQuery", "/entpay/agrt-query"); +// RefGenTestMethod.genNest(EntpayAgrtQueryResponse.RecodeList.class); } @Test