From caaa5a0a62bd6649ae79d4b5a0b232af4b2db34b Mon Sep 17 00:00:00 2001 From: 13009 Date: Thu, 20 Jun 2024 20:11:35 +0800 Subject: [PATCH] =?UTF-8?q?test:=20cat=20=E5=8D=95=E5=85=83=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/cat/order/OrderServiceTest.java | 187 ++++++++++++++++-- .../czcb/scfs/api/test/RefGenTestMethod.java | 5 + .../scfs/api/test/RefGenTestMethodTest.java | 38 ++-- 3 files changed, 205 insertions(+), 25 deletions(-) diff --git a/scfs-api-service-cat/src/test/java/com/czcb/scfs/service/cat/order/OrderServiceTest.java b/scfs-api-service-cat/src/test/java/com/czcb/scfs/service/cat/order/OrderServiceTest.java index 79dad34..cf013f7 100644 --- a/scfs-api-service-cat/src/test/java/com/czcb/scfs/service/cat/order/OrderServiceTest.java +++ b/scfs-api-service-cat/src/test/java/com/czcb/scfs/service/cat/order/OrderServiceTest.java @@ -34,7 +34,7 @@ class OrderServiceTest { 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\",\"order_no\":\"setOrderNo\",\"order_type\":\"setOrderType\",\"order_amount\":100.0,\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"opp_account_no\":\"setOppAccountNo\",\"opp_account_name\":\"setOppAccountName\",\"fee_account_no\":\"setFeeAccountNo\",\"fee_account_name\":\"setFeeAccountName\",\"remark\":\"setRemark\",\"goods_info_list\":[],\"file_list\":[]}", requestJson); + Assertions.assertEquals("{\"channel_no\":\"setChannelNo\",\"app_no\":\"setAppNo\",\"serial_no\":\"setSerialNo\",\"trans_date\":\"setTransDate\",\"trans_tradetime\":\"setTransTradeTime\",\"project_no\":\"setProjectNo\",\"order_no\":\"setOrderNo\",\"order_type\":\"setOrderType\",\"order_amount\":100.0,\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"opp_account_no\":\"setOppAccountNo\",\"opp_account_name\":\"setOppAccountName\",\"fee_account_no\":\"setFeeAccountNo\",\"fee_account_name\":\"setFeeAccountName\",\"remark\":\"setRemark\",\"goods_info_list\":[{\"goods_no\":\"setGoodsNo\",\"goods_name\":\"setGoodsName\",\"goods_type\":\"setGoodsType\",\"goods_quantity\":1,\"goods_unit\":\"setGoodsUnit\",\"goods_price\":100.0,\"goods_amount\":100.0,\"goods_note\":\"setGoodsNote\"}],\"file_list\":[{\"file_no\":\"setFileNo\",\"file_type\":\"setFileType\"}]}", requestJson); TradeOrdersCreateResponse response = new TradeOrdersCreateResponse(); extractedTradeOrdersCreateResponseParams(response); @@ -60,7 +60,6 @@ class OrderServiceTest { } void extractedTradeOrdersCreateRequestParams(TradeOrdersCreateRequest request) { - request.setGoodsInfoLists(Lists.list()); request.setTransTradeTime("setTransTradeTime"); request.setOppAccountName("setOppAccountName"); request.setFeeAccountName("setFeeAccountName"); @@ -74,10 +73,17 @@ class OrderServiceTest { request.setFeeAccountNo("setFeeAccountNo"); request.setAccountNo("setAccountNo"); request.setAccountName("setAccountName"); - request.setFileLists(Lists.list()); request.setOppAccountNo("setOppAccountNo"); request.setOrderNo("setOrderNo"); request.setProjectNo("setProjectNo"); + + TradeOrdersCreateRequest.GoodsInfoList goodsInfoList = new TradeOrdersCreateRequest.GoodsInfoList(); + extractedGoodsInfoListNestParams(goodsInfoList); + request.setGoodsInfoLists(Lists.list(goodsInfoList)); + + TradeOrdersCreateRequest.FileList fileList = new TradeOrdersCreateRequest.FileList(); + extractedFileListNestParams(fileList); + request.setFileLists(Lists.list(fileList)); } void extractedTradeOrdersCreateRequestAssertions(TradeOrdersCreateRequest request) { @@ -99,6 +105,46 @@ class OrderServiceTest { Assertions.assertEquals("setOppAccountNo", request.getOppAccountNo()); Assertions.assertEquals("setOrderNo", request.getOrderNo()); Assertions.assertEquals("setProjectNo", request.getProjectNo()); + + for (TradeOrdersCreateRequest.GoodsInfoList goodsInfoList : request.getGoodsInfoLists()) { + extractedGoodsInfoListNestAssertions(goodsInfoList); + } + + for (TradeOrdersCreateRequest.FileList fileList : request.getFileLists()) { + extractedFileListNestAssertions(fileList); + } + } + + void extractedGoodsInfoListNestParams(TradeOrdersCreateRequest.GoodsInfoList nest) { + nest.setGoodsName("setGoodsName"); + nest.setGoodsPrice(BigDecimal.valueOf(100.00)); + nest.setGoodsNo("setGoodsNo"); + nest.setGoodsNote("setGoodsNote"); + nest.setGoodsType("setGoodsType"); + nest.setGoodsAmount(BigDecimal.valueOf(100.00)); + nest.setGoodsUnit("setGoodsUnit"); + nest.setGoodsQuantity(1); + } + + void extractedGoodsInfoListNestAssertions(TradeOrdersCreateRequest.GoodsInfoList nest) { + Assertions.assertEquals("setGoodsName", nest.getGoodsName()); + Assertions.assertEquals(BigDecimal.valueOf(100.00), nest.getGoodsPrice()); + Assertions.assertEquals("setGoodsNo", nest.getGoodsNo()); + Assertions.assertEquals("setGoodsNote", nest.getGoodsNote()); + Assertions.assertEquals("setGoodsType", nest.getGoodsType()); + Assertions.assertEquals(BigDecimal.valueOf(100.00), nest.getGoodsAmount()); + Assertions.assertEquals("setGoodsUnit", nest.getGoodsUnit()); + Assertions.assertEquals(1, nest.getGoodsQuantity()); + } + + void extractedFileListNestParams(TradeOrdersCreateRequest.FileList nest) { + nest.setFileType("setFileType"); + nest.setFileNo("setFileNo"); + } + + void extractedFileListNestAssertions(TradeOrdersCreateRequest.FileList nest) { + Assertions.assertEquals("setFileType", nest.getFileType()); + Assertions.assertEquals("setFileNo", nest.getFileNo()); } void extractedTradeOrdersCreateResponseParams(TradeOrdersCreateResponse response) { @@ -261,7 +307,7 @@ class OrderServiceTest { 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\",\"order_no\":\"setOrderNo\",\"order_type\":\"setOrderType\",\"order_pay_type\":\"setOrderPayType\",\"order_amount\":100.0,\"settle_amount\":100.0,\"is_load\":\"setIsLoad\",\"apply_account_no\":\"setApplyAccountNo\",\"apply_account_name\":\"setApplyAccountName\",\"apply_trans_amount\":100.0,\"is_repay_gd\":\"setIsRepayGd\",\"gd_account_no\":\"setGdAccountNo\",\"gd_account_name\":\"setGdAccountName\",\"gd_trans_amount\":100.0,\"is_balance_pay\":\"setIsBalancePay\",\"pay_account_no\":\"setPayAccountNo\",\"pay_account_name\":\"setPayAccountName\",\"pay_amount\":100.0,\"verify_code\":\"setVerifyCode\",\"pay_detail_list\":[]}", requestJson); + Assertions.assertEquals("{\"channel_no\":\"setChannelNo\",\"app_no\":\"setAppNo\",\"serial_no\":\"setSerialNo\",\"trans_date\":\"setTransDate\",\"trans_tradetime\":\"setTransTradeTime\",\"order_no\":\"setOrderNo\",\"order_type\":\"setOrderType\",\"order_pay_type\":\"setOrderPayType\",\"order_amount\":100.0,\"settle_amount\":100.0,\"is_load\":\"setIsLoad\",\"apply_account_no\":\"setApplyAccountNo\",\"apply_account_name\":\"setApplyAccountName\",\"apply_trans_amount\":100.0,\"is_repay_gd\":\"setIsRepayGd\",\"gd_account_no\":\"setGdAccountNo\",\"gd_account_name\":\"setGdAccountName\",\"gd_trans_amount\":100.0,\"is_balance_pay\":\"setIsBalancePay\",\"pay_account_no\":\"setPayAccountNo\",\"pay_account_name\":\"setPayAccountName\",\"pay_amount\":100.0,\"verify_code\":\"setVerifyCode\",\"pay_detail_list\":[{\"pay_type\":\"setPayType\",\"pay_detail_type\":\"setPayDetailType\",\"pay_index\":0,\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"pay_amount\":100.0,\"opp_account_no\":\"setOppAccountNo\",\"opp_account_name\":\"setOppAccountName\",\"opp_bank_no\":\"setOppBankNo\",\"opp_bank_name\":\"setOppBankName\",\"opp_amount\":100.0,\"remark\":\"setRemark\"}]}", requestJson); TradeOrdersPaySettleResponse response = new TradeOrdersPaySettleResponse(); extractedTradeOrdersPaySettleResponseParams(response); @@ -269,7 +315,7 @@ class OrderServiceTest { 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\",\"serial_no\":\"setSerialNo\",\"order_pay_time\":\"setOrderPayTime\",\"order_pay_status\":\"setOrderPayStatus\",\"order_pay_failmsg\":\"setOrderPayFailMsg\",\"loan_serial_no\":\"setLoanSerialNo\",\"loan_time\":\"setLoanTime\",\"loan_status\":\"setLoanStatus\",\"loan_failmsg\":\"setLoanFailMsg\",\"loanacctno\":\"setLoanAcctNo\",\"gd_serial_no\":\"setGdSerialNo\",\"gd_trans_time\":\"setGdTransTime\",\"gd_trans_status\":\"setGdTransStatus\",\"gd_trans_failmsg\":\"setGdTransFailMsg\",\"pay_serial_no\":\"setPaySerialNo\",\"pay_time\":\"setPayTime\",\"pay_status\":\"setPayStatus\",\"pay_failmsg\":\"setPayFailMsg\",\"pay_detail_list\":[]}", responseJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\",\"serial_no\":\"setSerialNo\",\"order_pay_time\":\"setOrderPayTime\",\"order_pay_status\":\"setOrderPayStatus\",\"order_pay_failmsg\":\"setOrderPayFailMsg\",\"loan_serial_no\":\"setLoanSerialNo\",\"loan_time\":\"setLoanTime\",\"loan_status\":\"setLoanStatus\",\"loan_failmsg\":\"setLoanFailMsg\",\"loanacctno\":\"setLoanAcctNo\",\"gd_serial_no\":\"setGdSerialNo\",\"gd_trans_time\":\"setGdTransTime\",\"gd_trans_status\":\"setGdTransStatus\",\"gd_trans_failmsg\":\"setGdTransFailMsg\",\"pay_serial_no\":\"setPaySerialNo\",\"pay_time\":\"setPayTime\",\"pay_status\":\"setPayStatus\",\"pay_failmsg\":\"setPayFailMsg\",\"pay_detail_list\":[{\"serial_no\":\"setSerialNo\",\"sys_serial_no\":\"setSysSerialNo\",\"pay_type\":\"setPayType\",\"pay_detail_type\":\"setPayDetailType\",\"pay_index\":1,\"pay_time\":\"setPayTime\",\"pay_status\":\"setPayStatus\",\"pay_failmsg\":\"setPayFailMsg\"}]}", responseJson); HttpResponse httpResponse = TestHttpResponse.create("/trade-orders/pay-settle", response, TradeOrdersPaySettleResponse.class); Mockito.when(apiClient.post( @@ -283,7 +329,7 @@ class OrderServiceTest { 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\",\"serial_no\":\"setSerialNo\",\"order_pay_time\":\"setOrderPayTime\",\"order_pay_status\":\"setOrderPayStatus\",\"order_pay_failmsg\":\"setOrderPayFailMsg\",\"loan_serial_no\":\"setLoanSerialNo\",\"loan_time\":\"setLoanTime\",\"loan_status\":\"setLoanStatus\",\"loan_failmsg\":\"setLoanFailMsg\",\"loanacctno\":\"setLoanAcctNo\",\"gd_serial_no\":\"setGdSerialNo\",\"gd_trans_time\":\"setGdTransTime\",\"gd_trans_status\":\"setGdTransStatus\",\"gd_trans_failmsg\":\"setGdTransFailMsg\",\"pay_serial_no\":\"setPaySerialNo\",\"pay_time\":\"setPayTime\",\"pay_status\":\"setPayStatus\",\"pay_failmsg\":\"setPayFailMsg\",\"pay_detail_list\":[]}", resultJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\",\"serial_no\":\"setSerialNo\",\"order_pay_time\":\"setOrderPayTime\",\"order_pay_status\":\"setOrderPayStatus\",\"order_pay_failmsg\":\"setOrderPayFailMsg\",\"loan_serial_no\":\"setLoanSerialNo\",\"loan_time\":\"setLoanTime\",\"loan_status\":\"setLoanStatus\",\"loan_failmsg\":\"setLoanFailMsg\",\"loanacctno\":\"setLoanAcctNo\",\"gd_serial_no\":\"setGdSerialNo\",\"gd_trans_time\":\"setGdTransTime\",\"gd_trans_status\":\"setGdTransStatus\",\"gd_trans_failmsg\":\"setGdTransFailMsg\",\"pay_serial_no\":\"setPaySerialNo\",\"pay_time\":\"setPayTime\",\"pay_status\":\"setPayStatus\",\"pay_failmsg\":\"setPayFailMsg\",\"pay_detail_list\":[{\"serial_no\":\"setSerialNo\",\"sys_serial_no\":\"setSysSerialNo\",\"pay_type\":\"setPayType\",\"pay_detail_type\":\"setPayDetailType\",\"pay_index\":1,\"pay_time\":\"setPayTime\",\"pay_status\":\"setPayStatus\",\"pay_failmsg\":\"setPayFailMsg\"}]}", resultJson); } void extractedTradeOrdersPaySettleRequestParams(TradeOrdersPaySettleRequest request) { @@ -291,7 +337,6 @@ class OrderServiceTest { request.setApplyTransAmount(BigDecimal.valueOf(100.00)); request.setApplyAccountNo("setApplyAccountNo"); request.setApplyAccountName("setApplyAccountName"); - request.setPayDetailLists(Lists.list()); request.setPayAccountName("setPayAccountName"); request.setTransDate("setTransDate"); request.setChannelNo("setChannelNo"); @@ -311,6 +356,10 @@ class OrderServiceTest { request.setVerifyCode("setVerifyCode"); request.setOrderPayType("setOrderPayType"); request.setGdTransAmount(BigDecimal.valueOf(100.00)); + + TradeOrdersPaySettleRequest.PayDetailList payDetailList = new TradeOrdersPaySettleRequest.PayDetailList(); + extractedPayDetailListNestParams(payDetailList); + request.setPayDetailLists(Lists.list(payDetailList)); } void extractedTradeOrdersPaySettleRequestAssertions(TradeOrdersPaySettleRequest request) { @@ -338,10 +387,87 @@ class OrderServiceTest { Assertions.assertEquals("setVerifyCode", request.getVerifyCode()); Assertions.assertEquals("setOrderPayType", request.getOrderPayType()); Assertions.assertEquals(BigDecimal.valueOf(100.00), request.getGdTransAmount()); + + for (TradeOrdersPaySettleRequest.PayDetailList payDetailList : request.getPayDetailLists()) { + extractedPayDetailListNestAssertions(payDetailList); + } } + void extractedPayDetailListNestParams(TradeOrdersPaySettleRequest.PayDetailList nest) { + nest.setOppAccountName("setOppAccountName"); + nest.setRemark("setRemark"); + nest.setPayDetailType("setPayDetailType"); + nest.setOppBankName("setOppBankName"); + nest.setOppAmount(BigDecimal.valueOf(100.00)); + nest.setAccountNo("setAccountNo"); + nest.setOppBankNo("setOppBankNo"); + nest.setOppAccountNo("setOppAccountNo"); + nest.setPayType("setPayType"); + nest.setAccountName("setAccountName"); + nest.setPayAmount(BigDecimal.valueOf(100.00)); + } + + void extractedPayDetailListNestAssertions(TradeOrdersPaySettleRequest.PayDetailList nest) { + Assertions.assertEquals("setOppAccountName", nest.getOppAccountName()); + Assertions.assertEquals("setRemark", nest.getRemark()); + Assertions.assertEquals("setPayDetailType", nest.getPayDetailType()); + Assertions.assertEquals("setOppBankName", nest.getOppBankName()); + Assertions.assertEquals(BigDecimal.valueOf(100.00), nest.getOppAmount()); + Assertions.assertEquals("setAccountNo", nest.getAccountNo()); + Assertions.assertEquals("setOppBankNo", nest.getOppBankNo()); + Assertions.assertEquals("setOppAccountNo", nest.getOppAccountNo()); + Assertions.assertEquals("setPayType", nest.getPayType()); + Assertions.assertEquals("setAccountName", nest.getAccountName()); + Assertions.assertEquals(BigDecimal.valueOf(100.00), nest.getPayAmount()); + } + + void extractedCreditLoanListNestParams(TradeOrdersCreditStatResponse.CreditLoanList nest) { + nest.setContractNo("setContractNo"); + nest.setAccountNo("setAccountNo"); + nest.setOrderNo("setOrderNo"); + nest.setDealDate("setDealDate"); + nest.setAcctSeqNo("setAcctSeqNo"); + nest.setCoreSerialNo("setCoreSerialNo"); + nest.setRemark("setRemark"); + nest.setSysSerialNo("setSysSerialNo"); + nest.setLastRepayTime("setLastRepayTime"); + nest.setAccountName("setAccountName"); + nest.setLoanAcctNo("setLoanAcctNo"); + nest.setProductId("setProductId"); + nest.setLoanAmount(BigDecimal.valueOf(100.00)); + nest.setLoanTime("setLoanTime"); + nest.setRepayAmountBjTotal(BigDecimal.valueOf(100.00)); + nest.setLastRepayAmountBj(BigDecimal.valueOf(100.00)); + nest.setRepayFinishStatus("setRepayFinishStatus"); + nest.setRepayAmountLxTotal(BigDecimal.valueOf(100.00)); + nest.setLastRepayAmountLx(BigDecimal.valueOf(100.00)); + } + + void extractedCreditLoanListNestAssertions(TradeOrdersCreditStatResponse.CreditLoanList nest) { + Assertions.assertEquals("setContractNo", nest.getContractNo()); + Assertions.assertEquals("setAccountNo", nest.getAccountNo()); + Assertions.assertEquals("setOrderNo", nest.getOrderNo()); + Assertions.assertEquals("setDealDate", nest.getDealDate()); + Assertions.assertEquals("setAcctSeqNo", nest.getAcctSeqNo()); + Assertions.assertEquals("setCoreSerialNo", nest.getCoreSerialNo()); + Assertions.assertEquals("setRemark", nest.getRemark()); + Assertions.assertEquals("setSysSerialNo", nest.getSysSerialNo()); + Assertions.assertEquals("setLastRepayTime", nest.getLastRepayTime()); + Assertions.assertEquals("setAccountName", nest.getAccountName()); + Assertions.assertEquals("setLoanAcctNo", nest.getLoanAcctNo()); + Assertions.assertEquals("setProductId", nest.getProductId()); + Assertions.assertEquals(BigDecimal.valueOf(100.00), nest.getLoanAmount()); + Assertions.assertEquals("setLoanTime", nest.getLoanTime()); + Assertions.assertEquals(BigDecimal.valueOf(100.00), nest.getRepayAmountBjTotal()); + Assertions.assertEquals(BigDecimal.valueOf(100.00), nest.getLastRepayAmountBj()); + Assertions.assertEquals("setRepayFinishStatus", nest.getRepayFinishStatus()); + Assertions.assertEquals(BigDecimal.valueOf(100.00), nest.getRepayAmountLxTotal()); + Assertions.assertEquals(BigDecimal.valueOf(100.00), nest.getLastRepayAmountLx()); + } + + void extractedTradeOrdersPaySettleResponseParams(TradeOrdersPaySettleResponse response) { - response.setPayDetailLists(Lists.list()); + response.setGdTransFailMsg("setGdTransFailMsg"); response.setOrderPayStatus("setOrderPayStatus"); response.setOrderPayFailMsg("setOrderPayFailMsg"); @@ -364,6 +490,10 @@ class OrderServiceTest { response.setLoanSerialNo("setLoanSerialNo"); response.setPayTime("setPayTime"); response.setPayFailMsg("setPayFailMsg"); + + TradeOrdersPaySettleResponse.PayDetailList payDetailList = new TradeOrdersPaySettleResponse.PayDetailList(); + extractedPayDetailListNestParams(payDetailList); + response.setPayDetailLists(Lists.list(payDetailList)); } void extractedTradeOrdersPaySettleResponseAssertions(TradeOrdersPaySettleResponse response) { @@ -390,8 +520,35 @@ class OrderServiceTest { Assertions.assertEquals("setLoanSerialNo", response.getLoanSerialNo()); Assertions.assertEquals("setPayTime", response.getPayTime()); Assertions.assertEquals("setPayFailMsg", response.getPayFailMsg()); + + for (TradeOrdersPaySettleResponse.PayDetailList payDetailList : response.getPayDetailLists()) { + extractedPayDetailListNestAssertions(payDetailList); + } } + void extractedPayDetailListNestParams(TradeOrdersPaySettleResponse.PayDetailList nest) { + nest.setPayFailMsg("setPayFailMsg"); + nest.setSerialNo("setSerialNo"); + nest.setPayStatus("setPayStatus"); + nest.setPayType("setPayType"); + nest.setPayTime("setPayTime"); + nest.setSysSerialNo("setSysSerialNo"); + nest.setPayDetailType("setPayDetailType"); + nest.setPayIndex(1); + } + + void extractedPayDetailListNestAssertions(TradeOrdersPaySettleResponse.PayDetailList nest) { + Assertions.assertEquals("setPayFailMsg", nest.getPayFailMsg()); + Assertions.assertEquals("setSerialNo", nest.getSerialNo()); + Assertions.assertEquals("setPayStatus", nest.getPayStatus()); + Assertions.assertEquals("setPayType", nest.getPayType()); + Assertions.assertEquals("setPayTime", nest.getPayTime()); + Assertions.assertEquals("setSysSerialNo", nest.getSysSerialNo()); + Assertions.assertEquals("setPayDetailType", nest.getPayDetailType()); + Assertions.assertEquals(1, nest.getPayIndex()); + } + + @Test void tradeOrdersCreditStatTest() { TradeOrdersCreditStatRequest request = new TradeOrdersCreditStatRequest(); @@ -408,7 +565,7 @@ class OrderServiceTest { 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\",\"credit_limit_total\":100.0,\"credit_balance\":100.0,\"credit_limit_usable\":100.0,\"order_limit_usable\":100.0,\"order_loan_total\":100.0,\"credit_loan_list\":[]}", responseJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\",\"credit_limit_total\":100.0,\"credit_balance\":100.0,\"credit_limit_usable\":100.0,\"order_limit_usable\":100.0,\"order_loan_total\":100.0,\"credit_loan_list\":[{\"order_no\":\"setOrderNo\",\"product_id\":\"setProductId\",\"contract_no\":\"setContractNo\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"loanacctno\":\"setLoanAcctNo\",\"acctseqno\":\"setAcctSeqNo\",\"loan_amount\":100.0,\"loan_time\":\"setLoanTime\",\"deal_date\":\"setDealDate\",\"sys_serial_no\":\"setSysSerialNo\",\"core_serial_no\":\"setCoreSerialNo\",\"remark\":\"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\"}]}", responseJson); HttpResponse httpResponse = TestHttpResponse.create("/trade-orders/credit-stat", response, TradeOrdersCreditStatResponse.class); Mockito.when(apiClient.post( @@ -422,7 +579,7 @@ class OrderServiceTest { 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\",\"credit_limit_total\":100.0,\"credit_balance\":100.0,\"credit_limit_usable\":100.0,\"order_limit_usable\":100.0,\"order_loan_total\":100.0,\"credit_loan_list\":[]}", resultJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\",\"credit_limit_total\":100.0,\"credit_balance\":100.0,\"credit_limit_usable\":100.0,\"order_limit_usable\":100.0,\"order_loan_total\":100.0,\"credit_loan_list\":[{\"order_no\":\"setOrderNo\",\"product_id\":\"setProductId\",\"contract_no\":\"setContractNo\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"loanacctno\":\"setLoanAcctNo\",\"acctseqno\":\"setAcctSeqNo\",\"loan_amount\":100.0,\"loan_time\":\"setLoanTime\",\"deal_date\":\"setDealDate\",\"sys_serial_no\":\"setSysSerialNo\",\"core_serial_no\":\"setCoreSerialNo\",\"remark\":\"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\"}]}", resultJson); } void extractedTradeOrdersCreditStatRequestParams(TradeOrdersCreditStatRequest request) { @@ -453,7 +610,7 @@ class OrderServiceTest { void extractedTradeOrdersCreditStatResponseParams(TradeOrdersCreditStatResponse response) { response.setCreditLimitTotal(BigDecimal.valueOf(100.00)); - response.setCreditLoanLists(Lists.list()); + response.setOrderLimitUsable(BigDecimal.valueOf(100.00)); response.setOrderLoanTotal(BigDecimal.valueOf(100.00)); response.setCreditLimitUsable(BigDecimal.valueOf(100.00)); @@ -463,6 +620,10 @@ class OrderServiceTest { response.setSysSerialNo("setSysSerialNo"); response.setSysTime("setSysTime"); response.setCreditBalance(BigDecimal.valueOf(100.00)); + + TradeOrdersCreditStatResponse.CreditLoanList creditLoanList = new TradeOrdersCreditStatResponse.CreditLoanList(); + extractedCreditLoanListNestParams(creditLoanList); + response.setCreditLoanLists(Lists.list(creditLoanList)); } void extractedTradeOrdersCreditStatResponseAssertions(TradeOrdersCreditStatResponse response) { @@ -477,6 +638,10 @@ class OrderServiceTest { Assertions.assertEquals("setSysSerialNo", response.getSysSerialNo()); Assertions.assertEquals("setSysTime", response.getSysTime()); Assertions.assertEquals(BigDecimal.valueOf(100.00), response.getCreditBalance()); + + for (TradeOrdersCreditStatResponse.CreditLoanList creditLoanList : response.getCreditLoanLists()) { + extractedCreditLoanListNestAssertions(creditLoanList); + } } @Test 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 6e2420c..17609f7 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 @@ -158,6 +158,8 @@ public class RefGenTestMethod { print(String.format(fmt, method.getName(), "BigDecimal.valueOf(100.00)").replace("\"", "")); } else if (method.getParameterTypes()[0].isAssignableFrom(List.class)) { print(String.format(fmt, method.getName(), "Lists.list()").replace("\"", "")); + } else if (method.getParameterTypes()[0].isAssignableFrom(Integer.class)) { + print(String.format(fmt, method.getName(), "1").replace("\"", "")); } } @@ -170,6 +172,9 @@ public class RefGenTestMethod { } else if (method.getParameterTypes()[0].isAssignableFrom(List.class)) { print(String.format(FMT_NOT_NULL_ASSERTIONS, isRequest ? "request" : "response", method.getName() .replace("set", "get"))); + } else if (method.getParameterTypes()[0].isAssignableFrom(Integer.class)) { + print(String.format(fmt, "1", method.getName().replace("set", "get")) + .replace("\"", "")); } } } 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 c5f4767..3029933 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 @@ -21,8 +21,9 @@ import com.czcb.scfs.api.service.v2.trans.model.QueryTradeDetailsHistoryRequest; 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.ProjectQueryRequest; +import com.czcb.scfs.service.cat.order.model.TradeOrdersCreateRequest; +import com.czcb.scfs.service.cat.order.model.TradeOrdersCreateResponse; +import com.czcb.scfs.service.cat.order.model.TradeOrdersPaySettleRequest; import com.czcb.scfs.service.cat.project.model.ProjectQueryResponse; import org.junit.jupiter.api.Test; @@ -239,22 +240,31 @@ class RefGenTestMethodTest { @Test void orderServiceTest() { - RefGenTestMethod.gen(TradeOrdersCreateRequest.class, TradeOrdersCreateResponse.class, - "tradeOrdersCreate", "/trade-orders/create"); +// RefGenTestMethod.gen(TradeOrdersCreateRequest.class, TradeOrdersCreateResponse.class, +// "tradeOrdersCreate", "/trade-orders/create"); +// + RefGenTestMethod.genNest(TradeOrdersCreateRequest.GoodsInfoList.class); + RefGenTestMethod.genNest(TradeOrdersCreateRequest.FileList.class); - RefGenTestMethod.gen(TradeOrdersCancelRequest.class, TradeOrdersCancelResponse.class, - "tradeOrdersCancel", "/trade-orders/cancel"); +// RefGenTestMethod.gen(TradeOrdersCancelRequest.class, TradeOrdersCancelResponse.class, +// "tradeOrdersCancel", "/trade-orders/cancel"); +// +// RefGenTestMethod.gen(TradeOrdersQueryRequest.class, TradeOrdersQueryResponse.class, +// "tradeOrdersQuery", "/trade-orders/query"); +// +// RefGenTestMethod.gen(TradeOrdersPaySettleRequest.class, TradeOrdersPaySettleResponse.class, +// "tradeOrdersPaySettle", "/trade-orders/pay-settle"); - RefGenTestMethod.gen(TradeOrdersQueryRequest.class, TradeOrdersQueryResponse.class, - "tradeOrdersQuery", "/trade-orders/query"); +// RefGenTestMethod.genNest(TradeOrdersPaySettleRequest.PayDetailList.class); - RefGenTestMethod.gen(TradeOrdersPaySettleRequest.class, TradeOrdersPaySettleResponse.class, - "tradeOrdersPaySettle", "/trade-orders/pay-settle"); +// RefGenTestMethod.genNest(TradeOrdersPaySettleResponse.PayDetailList.class); - RefGenTestMethod.gen(TradeOrdersCreditStatRequest.class, TradeOrdersCreditStatResponse.class, - "tradeOrdersCreditStat", "/trade-orders/credit-stat"); +// RefGenTestMethod.gen(TradeOrdersCreditStatRequest.class, TradeOrdersCreditStatResponse.class, +// "tradeOrdersCreditStat", "/trade-orders/credit-stat"); - RefGenTestMethod.gen(TradeOrderRepayRequest.class, TradeOrderRepayResponse.class, - "tradeOrderRepay", "/trade-orders/credit-repay"); +// RefGenTestMethod.genNest(TradeOrdersCreditStatResponse.CreditLoanList.class); + +// RefGenTestMethod.gen(TradeOrderRepayRequest.class, TradeOrderRepayResponse.class, +// "tradeOrderRepay", "/trade-orders/credit-repay"); } } \ No newline at end of file