From 42d8e12e329d533d7bd8cb5749db2fe4c2d9a7a9 Mon Sep 17 00:00:00 2001 From: 13009 Date: Fri, 21 Jun 2024 12:59:14 +0800 Subject: [PATCH] =?UTF-8?q?test:=20genService=20=E5=8D=95=E5=85=83?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v1/account/AccountServiceTest.java | 190 +++++++++--------- .../czcb/scfs/api/test/RefGenTestMethod.java | 2 +- 2 files changed, 101 insertions(+), 91 deletions(-) diff --git a/scfs-api-service/src/test/java/com/czcb/scfs/api/service/v1/account/AccountServiceTest.java b/scfs-api-service/src/test/java/com/czcb/scfs/api/service/v1/account/AccountServiceTest.java index fcaeca3..e6a76b8 100644 --- a/scfs-api-service/src/test/java/com/czcb/scfs/api/service/v1/account/AccountServiceTest.java +++ b/scfs-api-service/src/test/java/com/czcb/scfs/api/service/v1/account/AccountServiceTest.java @@ -34,7 +34,7 @@ class AccountServiceTest { System.out.println(Json.toJson(request)); String requestJson = Json.toJson(request); - Assertions.assertEquals("", requestJson); + Assertions.assertEquals("{\"channel_no\":\"setChannelNo\",\"app_no\":\"setAppNo\",\"serial_no\":\"setSerialNo\",\"trans_date\":\"setTransDate\",\"trans_tradetime\":\"setTransTradeTime\"}", requestJson); QueryBalanceBatchResponse response = new QueryBalanceBatchResponse(); extractedQueryBalanceBatchResponseParams(response); @@ -42,11 +42,11 @@ class AccountServiceTest { System.out.println(Json.toJson(response)); String responseJson = Json.toJson(response); - Assertions.assertEquals("", responseJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"detail_list\":[{\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"account_relation\":\"setAccountRelation\",\"inner_primary_account_no\":\"setInnerPrimaryAccountNo\",\"account_class\":\"setAccountClass\",\"cur_balance\":\"setCurBalance\",\"avail_balance\":\"setAvailBalance\",\"withdraw_balance\":\"setWithdrawBalance\",\"pre_balance\":\"setPreBalance\",\"id_type\":\"setIdType\",\"id_no\":\"setIdNo\",\"mobile\":\"setMobile\",\"account_status\":\"setAccountStatus\"}],\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", responseJson); - HttpResponse httpResponse = TestHttpResponse.create("queryBalanceBatch", response, QueryBalanceBatchResponse.class); + HttpResponse httpResponse = TestHttpResponse.create("/accInfo/queryBalanceBatch", response, QueryBalanceBatchResponse.class); Mockito.when(apiClient.post( - Mockito.eq("queryBalanceBatch"), + Mockito.eq("/accInfo/queryBalanceBatch"), Mockito.any(HttpHeaders.class), Mockito.any(RequestBody.class), Mockito.eq(QueryBalanceBatchResponse.class))) @@ -56,7 +56,7 @@ class AccountServiceTest { System.out.println(Json.toJson(result)); String resultJson = Json.toJson(result); - Assertions.assertEquals("", resultJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"detail_list\":[{\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"account_relation\":\"setAccountRelation\",\"inner_primary_account_no\":\"setInnerPrimaryAccountNo\",\"account_class\":\"setAccountClass\",\"cur_balance\":\"setCurBalance\",\"avail_balance\":\"setAvailBalance\",\"withdraw_balance\":\"setWithdrawBalance\",\"pre_balance\":\"setPreBalance\",\"id_type\":\"setIdType\",\"id_no\":\"setIdNo\",\"mobile\":\"setMobile\",\"account_status\":\"setAccountStatus\"}],\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", resultJson); } void extractedQueryBalanceBatchRequestParams(QueryBalanceBatchRequest request) { @@ -135,7 +135,7 @@ class AccountServiceTest { System.out.println(Json.toJson(request)); String requestJson = Json.toJson(request); - Assertions.assertEquals("", requestJson); + Assertions.assertEquals("{\"channel_no\":\"setChannelNo\",\"app_no\":\"setAppNo\",\"serial_no\":\"setSerialNo\",\"account_no\":\"setAccountNo\",\"account_property\":\"setAccountProperty\",\"id_type\":\"setIdType\",\"id_no\":\"setIdNo\",\"mobile\":\"setMobile\",\"trade_no\":\"setTradeNo\",\"verify_code\":\"setVerifyCode\",\"primary_account\":\"setPrimaryAccount\",\"bank_no\":\"setBankNo\",\"bank_name\":\"setBankName\",\"set_default\":\"setSetDefault\",\"trans_date\":\"setTransDate\",\"trans_tradetime\":\"setTransTradeTime\"}", requestJson); AddPrimAccCompanyResponse response = new AddPrimAccCompanyResponse(); extractedAddPrimAccCompanyResponseParams(response); @@ -143,11 +143,11 @@ class AccountServiceTest { System.out.println(Json.toJson(response)); String responseJson = Json.toJson(response); - Assertions.assertEquals("", responseJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", responseJson); - HttpResponse httpResponse = TestHttpResponse.create("addPrimAccCompany", response, AddPrimAccCompanyResponse.class); + HttpResponse httpResponse = TestHttpResponse.create("/accInfo/addPrimAcc", response, AddPrimAccCompanyResponse.class); Mockito.when(apiClient.post( - Mockito.eq("addPrimAccCompany"), + Mockito.eq("/accInfo/addPrimAcc"), Mockito.any(HttpHeaders.class), Mockito.any(RequestBody.class), Mockito.eq(AddPrimAccCompanyResponse.class))) @@ -157,7 +157,7 @@ class AccountServiceTest { System.out.println(Json.toJson(result)); String resultJson = Json.toJson(result); - Assertions.assertEquals("", resultJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", resultJson); } void extractedAddPrimAccCompanyRequestParams(AddPrimAccCompanyRequest request) { @@ -220,7 +220,7 @@ class AccountServiceTest { System.out.println(Json.toJson(request)); String requestJson = Json.toJson(request); - Assertions.assertEquals("", requestJson); + Assertions.assertEquals("{\"channel_no\":\"setChannelNo\",\"app_no\":\"setAppNo\",\"serial_no\":\"setSerialNo\",\"account_name\":\"setAccountName\",\"account_class\":\"setAccountClass\",\"account_property\":\"setAccountProperty\",\"id_type\":\"setIdType\",\"id_no\":\"setIdNo\",\"id_startdate\":\"setIdStartDate\",\"id_enddate\":\"setIdEndDate\",\"sign_no\":\"setSignNo\",\"sign_name\":\"setSignName\",\"id_address\":\"setIdAddress\",\"mobile\":\"setMobile\",\"orgcodes\":\"setOrgcodes\",\"ratcodes\":\"setRatcodes\",\"zsopscope\":\"setZsopscope\",\"primary_account\":\"setPrimaryAccount\",\"bank_no\":\"setBankNo\",\"bank_name\":\"setBankName\",\"industry\":\"setIndustry\",\"trade_no\":\"setTradeNo\",\"verify_code\":\"setVerifyCode\",\"company_id_type\":\"setCompanyIdType\",\"company_id_no\":\"setCompanyIdNo\",\"company_id_name\":\"setCompanyIdName\",\"company_opto\":\"setCompanyOpto\",\"controller_id_type\":\"setControllerIdType\",\"controller_id_no\":\"setControllerIdNo\",\"controller_id_name\":\"setControllerIdName\",\"controller_opto\":\"setControllerOpto\",\"leader_id_type\":\"setLeaderIdType\",\"leader_id_no\":\"setLeaderIdNo\",\"leader_id_name\":\"setLeaderIdName\",\"leader_mobile\":\"setLeaderMobile\",\"leader_opto\":\"setLeaderOpto\",\"operator_id_type\":\"setOperatorIdType\",\"operator_id_no\":\"setOperatorIdNo\",\"operator_id_name\":\"setOperatorIdName\",\"operator_mobile\":\"setOperatorMobile\",\"operator_opto\":\"setOperatorOpto\",\"bene_name\":\"setBeneName\",\"bene_sex\":\"setBeneSex\",\"bene_nationality\":\"setBeneNationality\",\"bene_is_shareholider\":\"setBeneIsShareholider\",\"bene_ratio\":\"setBeneRatio\",\"bene_addr\":\"setBeneAddr\",\"bene_id_type\":\"setBeneIdType\",\"bene_id_no\":\"setBeneIdNo\",\"bene_opto\":\"setBeneOpto\",\"bene_owner\":\"setBeneOwner\",\"file_list\":[{\"file_no\":\"setFileNo\",\"file_type\":\"setFileType\",\"file_page\":1}],\"open_longitude\":\"setOpenLongitude\",\"open_dimensions\":\"setOpenDimensions\",\"open_ip\":\"setOpenIp\",\"open_date\":\"setOpenDate\",\"open_tradetime\":\"setOpenTradeTime\"}", requestJson); OpenAccAllCompanyResponse response = new OpenAccAllCompanyResponse(); extractedOpenAccAllCompanyResponseParams(response); @@ -228,11 +228,11 @@ class AccountServiceTest { System.out.println(Json.toJson(response)); String responseJson = Json.toJson(response); - Assertions.assertEquals("", responseJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"original_serialno\":\"setOriginalSerialNo\",\"account_no\":\"setAccountNo\",\"customer_no\":\"setCustomerNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", responseJson); - HttpResponse httpResponse = TestHttpResponse.create("openAccAllCompany", response, OpenAccAllCompanyResponse.class); + HttpResponse httpResponse = TestHttpResponse.create("/accInfo/openAccAll", response, OpenAccAllCompanyResponse.class); Mockito.when(apiClient.post( - Mockito.eq("openAccAllCompany"), + Mockito.eq("/accInfo/openAccAll"), Mockito.any(HttpHeaders.class), Mockito.any(RequestBody.class), Mockito.eq(OpenAccAllCompanyResponse.class))) @@ -242,7 +242,7 @@ class AccountServiceTest { System.out.println(Json.toJson(result)); String resultJson = Json.toJson(result); - Assertions.assertEquals("", resultJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"original_serialno\":\"setOriginalSerialNo\",\"account_no\":\"setAccountNo\",\"customer_no\":\"setCustomerNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", resultJson); } void extractedOpenAccAllCompanyRequestParams(OpenAccAllCompanyRequest request) { @@ -310,11 +310,13 @@ class AccountServiceTest { void extractedOpenAccAllCompanyRequestFileListNestParams(OpenAccAllCompanyRequest.FileList nest) { nest.setFileNo("setFileNo"); nest.setFileType("setFileType"); + nest.setFilePage(1); } void extractedOpenAccAllCompanyRequestFileListNestAssertions(OpenAccAllCompanyRequest.FileList nest) { Assertions.assertEquals("setFileNo", nest.getFileNo()); Assertions.assertEquals("setFileType", nest.getFileType()); + Assertions.assertEquals(1, nest.getFilePage()); } void extractedOpenAccAllCompanyRequestAssertions(OpenAccAllCompanyRequest request) { @@ -407,7 +409,7 @@ class AccountServiceTest { System.out.println(Json.toJson(request)); String requestJson = Json.toJson(request); - Assertions.assertEquals("", requestJson); + Assertions.assertEquals("{\"channel_no\":\"setChannelNo\",\"app_no\":\"setAppNo\",\"serial_no\":\"setSerialNo\",\"account_name\":\"setAccountName\",\"account_class\":\"setAccountClass\",\"account_property\":\"setAccountProperty\",\"id_type\":\"setIdType\",\"id_no\":\"setIdNo\",\"id_startdate\":\"setIdStartDate\",\"id_enddate\":\"setIdEndDate\",\"sign_no\":\"setSignNo\",\"sign_name\":\"setSignName\",\"id_address\":\"setIdAddress\",\"sex\":\"setSex\",\"ethnic\":\"setEthnic\",\"job\":\"setJob\",\"job_note\":\"setJobNote\",\"mobile\":\"setMobile\",\"primary_account\":\"setPrimaryAccount\",\"bank_no\":\"setBankNo\",\"bank_name\":\"setBankName\",\"trade_no\":\"setTradeNo\",\"verify_code\":\"setVerifyCode\",\"file_list\":[{\"file_no\":\"setFileNo\",\"file_type\":\"setFileType\",\"file_page\":1}],\"open_longitude\":\"setOpenLongitude\",\"open_dimensions\":\"setOpenDimensions\",\"open_ip\":\"setOpenIp\",\"open_date\":\"setOpenDate\",\"open_tradetime\":\"setOpenTradeTime\"}", requestJson); OpenAccAllPersonResponse response = new OpenAccAllPersonResponse(); extractedOpenAccAllPersonResponseParams(response); @@ -415,11 +417,11 @@ class AccountServiceTest { System.out.println(Json.toJson(response)); String responseJson = Json.toJson(response); - Assertions.assertEquals("", responseJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"original_serialno\":\"setOriginalSerialNo\",\"account_no\":\"setAccountNo\",\"customer_no\":\"setCustomerNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", responseJson); - HttpResponse httpResponse = TestHttpResponse.create("openAccAllPerson", response, OpenAccAllPersonResponse.class); + HttpResponse httpResponse = TestHttpResponse.create("/accInfo/openAccAll", response, OpenAccAllPersonResponse.class); Mockito.when(apiClient.post( - Mockito.eq("openAccAllPerson"), + Mockito.eq("/accInfo/openAccAll"), Mockito.any(HttpHeaders.class), Mockito.any(RequestBody.class), Mockito.eq(OpenAccAllPersonResponse.class))) @@ -429,7 +431,7 @@ class AccountServiceTest { System.out.println(Json.toJson(result)); String resultJson = Json.toJson(result); - Assertions.assertEquals("", resultJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"original_serialno\":\"setOriginalSerialNo\",\"account_no\":\"setAccountNo\",\"customer_no\":\"setCustomerNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", resultJson); } void extractedOpenAccAllPersonRequestParams(OpenAccAllPersonRequest request) { @@ -469,11 +471,13 @@ class AccountServiceTest { void extractedOpenAccAllPersonRequestFileListNestParams(OpenAccAllPersonRequest.FileList nest) { nest.setFileNo("setFileNo"); nest.setFileType("setFileType"); + nest.setFilePage(1); } void extractedOpenAccAllPersonRequestFileListNestAssertions(OpenAccAllPersonRequest.FileList nest) { Assertions.assertEquals("setFileNo", nest.getFileNo()); Assertions.assertEquals("setFileType", nest.getFileType()); + Assertions.assertEquals(1, nest.getFilePage()); } void extractedOpenAccAllPersonRequestAssertions(OpenAccAllPersonRequest request) { @@ -538,7 +542,7 @@ class AccountServiceTest { System.out.println(Json.toJson(request)); String requestJson = Json.toJson(request); - Assertions.assertEquals("", requestJson); + Assertions.assertEquals("{\"channel_no\":\"setChannelNo\",\"app_no\":\"setAppNo\",\"serial_no\":\"setSerialNo\",\"account_no\":\"setAccountNo\",\"primary_account\":\"setPrimaryAccount\",\"trans_date\":\"setTransDate\",\"trans_tradetime\":\"setTransTradeTime\"}", requestJson); DelPrimAccResponse response = new DelPrimAccResponse(); extractedDelPrimAccResponseParams(response); @@ -546,11 +550,11 @@ class AccountServiceTest { System.out.println(Json.toJson(response)); String responseJson = Json.toJson(response); - Assertions.assertEquals("", responseJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", responseJson); - HttpResponse httpResponse = TestHttpResponse.create("delPrimAcc", response, DelPrimAccResponse.class); + HttpResponse httpResponse = TestHttpResponse.create("/accInfo/delPrimAcc", response, DelPrimAccResponse.class); Mockito.when(apiClient.post( - Mockito.eq("delPrimAcc"), + Mockito.eq("/accInfo/delPrimAcc"), Mockito.any(HttpHeaders.class), Mockito.any(RequestBody.class), Mockito.eq(DelPrimAccResponse.class))) @@ -560,7 +564,7 @@ class AccountServiceTest { System.out.println(Json.toJson(result)); String resultJson = Json.toJson(result); - Assertions.assertEquals("", resultJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", resultJson); } void extractedDelPrimAccRequestParams(DelPrimAccRequest request) { @@ -605,7 +609,7 @@ class AccountServiceTest { System.out.println(Json.toJson(request)); String requestJson = Json.toJson(request); - Assertions.assertEquals("", requestJson); + Assertions.assertEquals("{\"channel_no\":\"setChannelNo\",\"app_no\":\"setAppNo\",\"serial_no\":\"setSerialNo\",\"account_name\":\"setAccountName\",\"account_class\":\"setAccountClass\",\"account_property\":\"setAccountProperty\",\"id_type\":\"setIdType\",\"id_no\":\"setIdNo\",\"id_startdate\":\"setIdStartDate\",\"id_enddate\":\"setIdEndDate\",\"sign_no\":\"setSignNo\",\"sign_name\":\"setSignName\",\"id_address\":\"setIdAddress\",\"mobile\":\"setMobile\",\"orgcodes\":\"setOrgcodes\",\"ratcodes\":\"setRatcodes\",\"zsopscope\":\"setZsopscope\",\"primary_account\":\"setPrimaryAccount\",\"bank_no\":\"setBankNo\",\"bank_name\":\"setBankName\",\"industry\":\"setIndustry\",\"trade_no\":\"setTradeNo\",\"verify_code\":\"setVerifyCode\",\"company_id_type\":\"setCompanyIdType\",\"company_id_no\":\"setCompanyIdNo\",\"company_id_name\":\"setCompanyIdName\",\"company_opto\":\"setCompanyOpto\",\"controller_id_type\":\"setControllerIdType\",\"controller_id_no\":\"setControllerIdNo\",\"controller_id_name\":\"setControllerIdName\",\"controller_opto\":\"setControllerOpto\",\"leader_id_type\":\"setLeaderIdType\",\"leader_id_no\":\"setLeaderIdNo\",\"leader_id_name\":\"setLeaderIdName\",\"leader_mobile\":\"setLeaderMobile\",\"leader_opto\":\"setLeaderOpto\",\"operator_id_type\":\"setOperatorIdType\",\"operator_id_no\":\"setOperatorIdNo\",\"operator_id_name\":\"setOperatorIdName\",\"operator_mobile\":\"setOperatorMobile\",\"operator_opto\":\"setOperatorOpto\",\"bene_name\":\"setBeneName\",\"bene_sex\":\"setBeneSex\",\"bene_nationality\":\"setBeneNationality\",\"bene_is_shareholider\":\"setBeneIsShareholider\",\"bene_ratio\":\"setBeneRatio\",\"bene_addr\":\"setBeneAddr\",\"bene_id_type\":\"setBeneIdType\",\"bene_id_no\":\"setBeneIdNo\",\"bene_opto\":\"setBeneOpto\",\"bene_owner\":\"setBeneOwner\",\"file_list\":[{\"file_no\":\"setFileNo\",\"file_type\":\"setFileType\",\"file_page\":1}],\"open_longitude\":\"setOpenLongitude\",\"open_dimensions\":\"setOpenDimensions\",\"open_ip\":\"setOpenIp\",\"open_date\":\"setOpenDate\",\"open_tradetime\":\"setOpenTradeTime\"}", requestJson); OpenAccCompanyResponse response = new OpenAccCompanyResponse(); extractedOpenAccCompanyResponseParams(response); @@ -613,11 +617,11 @@ class AccountServiceTest { System.out.println(Json.toJson(response)); String responseJson = Json.toJson(response); - Assertions.assertEquals("", responseJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"account_no\":\"setAccountNo\",\"customer_no\":\"setCustomerNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", responseJson); - HttpResponse httpResponse = TestHttpResponse.create("openAccCompany", response, OpenAccCompanyResponse.class); + HttpResponse httpResponse = TestHttpResponse.create("/accInfo/openAcc", response, OpenAccCompanyResponse.class); Mockito.when(apiClient.post( - Mockito.eq("openAccCompany"), + Mockito.eq("/accInfo/openAcc"), Mockito.any(HttpHeaders.class), Mockito.any(RequestBody.class), Mockito.eq(OpenAccCompanyResponse.class))) @@ -627,7 +631,7 @@ class AccountServiceTest { System.out.println(Json.toJson(result)); String resultJson = Json.toJson(result); - Assertions.assertEquals("", resultJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"account_no\":\"setAccountNo\",\"customer_no\":\"setCustomerNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", resultJson); } void extractedOpenAccCompanyRequestParams(OpenAccCompanyRequest request) { @@ -695,11 +699,13 @@ class AccountServiceTest { void extractedOpenAccCompanyRequestFileListNestParams(OpenAccCompanyRequest.FileList nest) { nest.setFileNo("setFileNo"); nest.setFileType("setFileType"); + nest.setFilePage(1); } void extractedOpenAccCompanyRequestFileListNestAssertions(OpenAccCompanyRequest.FileList nest) { Assertions.assertEquals("setFileNo", nest.getFileNo()); Assertions.assertEquals("setFileType", nest.getFileType()); + Assertions.assertEquals(1, nest.getFilePage()); } void extractedOpenAccCompanyRequestAssertions(OpenAccCompanyRequest request) { @@ -790,7 +796,7 @@ class AccountServiceTest { System.out.println(Json.toJson(request)); String requestJson = Json.toJson(request); - Assertions.assertEquals("", requestJson); + Assertions.assertEquals("{\"channel_no\":\"setChannelNo\",\"app_no\":\"setAppNo\",\"serial_no\":\"setSerialNo\",\"account_no\":\"setAccountNo\",\"relation_acct\":\"setRelationAcct\",\"trans_date\":\"setTransDate\"}", requestJson); QueryBalanceResponse response = new QueryBalanceResponse(); extractedQueryBalanceResponseParams(response); @@ -798,11 +804,11 @@ class AccountServiceTest { System.out.println(Json.toJson(response)); String responseJson = Json.toJson(response); - Assertions.assertEquals("", responseJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"account_name\":\"setAccountName\",\"id_type\":\"setIdType\",\"id_no\":\"setIdNo\",\"mobile\":\"setMobile\",\"detail_list\":[{\"account_no\":\"setAccountNo\",\"account_relation\":\"setAccountRelation\",\"account_class\":\"setAccountClass\",\"cur_balance\":\"setCurBalance\",\"avail_balance\":\"setAvailBalance\",\"withdraw_balance\":\"setWithdrawBalance\",\"pre_balance\":\"setPreBalance\"}],\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", responseJson); - HttpResponse httpResponse = TestHttpResponse.create("queryBalance", response, QueryBalanceResponse.class); + HttpResponse httpResponse = TestHttpResponse.create("/accInfo/queryBalance", response, QueryBalanceResponse.class); Mockito.when(apiClient.post( - Mockito.eq("queryBalance"), + Mockito.eq("/accInfo/queryBalance"), Mockito.any(HttpHeaders.class), Mockito.any(RequestBody.class), Mockito.eq(QueryBalanceResponse.class))) @@ -812,7 +818,7 @@ class AccountServiceTest { System.out.println(Json.toJson(result)); String resultJson = Json.toJson(result); - Assertions.assertEquals("", resultJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"account_name\":\"setAccountName\",\"id_type\":\"setIdType\",\"id_no\":\"setIdNo\",\"mobile\":\"setMobile\",\"detail_list\":[{\"account_no\":\"setAccountNo\",\"account_relation\":\"setAccountRelation\",\"account_class\":\"setAccountClass\",\"cur_balance\":\"setCurBalance\",\"avail_balance\":\"setAvailBalance\",\"withdraw_balance\":\"setWithdrawBalance\",\"pre_balance\":\"setPreBalance\"}],\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", resultJson); } void extractedQueryBalanceRequestParams(QueryBalanceRequest request) { @@ -889,7 +895,7 @@ class AccountServiceTest { System.out.println(Json.toJson(request)); String requestJson = Json.toJson(request); - Assertions.assertEquals("", requestJson); + Assertions.assertEquals("{\"channel_no\":\"setChannelNo\",\"app_no\":\"setAppNo\",\"serial_no\":\"setSerialNo\",\"card_no\":\"setCardNo\",\"trans_date\":\"setTransDate\",\"trans_tradetime\":\"setTransTradeTime\"}", requestJson); QueryCardInfoResponse response = new QueryCardInfoResponse(); extractedQueryCardInfoResponseParams(response); @@ -897,11 +903,11 @@ class AccountServiceTest { System.out.println(Json.toJson(response)); String responseJson = Json.toJson(response); - Assertions.assertEquals("", responseJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"bank_no\":\"setBankNo\",\"bank_name\":\"setBankName\",\"card_type\":\"setCardType\",\"pay_bank_no\":\"setPayBankNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", responseJson); - HttpResponse httpResponse = TestHttpResponse.create("queryCardInfo", response, QueryCardInfoResponse.class); + HttpResponse httpResponse = TestHttpResponse.create("/accInfo/queryCardInfo", response, QueryCardInfoResponse.class); Mockito.when(apiClient.post( - Mockito.eq("queryCardInfo"), + Mockito.eq("/accInfo/queryCardInfo"), Mockito.any(HttpHeaders.class), Mockito.any(RequestBody.class), Mockito.eq(QueryCardInfoResponse.class))) @@ -911,7 +917,7 @@ class AccountServiceTest { System.out.println(Json.toJson(result)); String resultJson = Json.toJson(result); - Assertions.assertEquals("", resultJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"bank_no\":\"setBankNo\",\"bank_name\":\"setBankName\",\"card_type\":\"setCardType\",\"pay_bank_no\":\"setPayBankNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", resultJson); } void extractedQueryCardInfoRequestParams(QueryCardInfoRequest request) { @@ -962,7 +968,7 @@ class AccountServiceTest { System.out.println(Json.toJson(request)); String requestJson = Json.toJson(request); - Assertions.assertEquals("", requestJson); + Assertions.assertEquals("{\"channel_no\":\"setChannelNo\",\"app_no\":\"setAppNo\",\"serial_no\":\"setSerialNo\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"account_class\":\"setAccountClass\",\"trans_date\":\"setTransDate\",\"trans_tradetime\":\"setTransTradeTime\"}", requestJson); OpenAccSubResponse response = new OpenAccSubResponse(); extractedOpenAccSubResponseParams(response); @@ -970,11 +976,11 @@ class AccountServiceTest { System.out.println(Json.toJson(response)); String responseJson = Json.toJson(response); - Assertions.assertEquals("", responseJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sub_account_no\":\"setSubAccountNo\",\"sub_account_name\":\"setSubAccountName\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", responseJson); - HttpResponse httpResponse = TestHttpResponse.create("openAccSub", response, OpenAccSubResponse.class); + HttpResponse httpResponse = TestHttpResponse.create("/accInfo/openAccSub", response, OpenAccSubResponse.class); Mockito.when(apiClient.post( - Mockito.eq("openAccSub"), + Mockito.eq("/accInfo/openAccSub"), Mockito.any(HttpHeaders.class), Mockito.any(RequestBody.class), Mockito.eq(OpenAccSubResponse.class))) @@ -984,7 +990,7 @@ class AccountServiceTest { System.out.println(Json.toJson(result)); String resultJson = Json.toJson(result); - Assertions.assertEquals("", resultJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sub_account_no\":\"setSubAccountNo\",\"sub_account_name\":\"setSubAccountName\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", resultJson); } void extractedOpenAccSubRequestParams(OpenAccSubRequest request) { @@ -1035,7 +1041,7 @@ class AccountServiceTest { System.out.println(Json.toJson(request)); String requestJson = Json.toJson(request); - Assertions.assertEquals("", requestJson); + Assertions.assertEquals("{\"channel_no\":\"setChannelNo\",\"app_no\":\"setAppNo\",\"serial_no\":\"setSerialNo\",\"account_name\":\"setAccountName\",\"id_type\":\"setIdType\",\"id_no\":\"setIdNo\",\"id_startdate\":\"setIdStartDate\",\"id_enddate\":\"setIdEndDate\",\"sign_no\":\"setSignNo\",\"sign_name\":\"setSignName\",\"id_address\":\"setIdAddress\",\"sex\":\"setSex\",\"ethnic\":\"setEthnic\",\"job\":\"setJob\",\"job_note\":\"setJobNote\",\"mobile\":\"setMobile\",\"verify_code\":\"setVerifyCode\",\"file_list\":[{\"file_no\":\"setFileNo\",\"file_type\":\"setFileType\",\"file_page\":1}],\"open_longitude\":\"setOpenLongitude\",\"open_dimensions\":\"setOpenDimensions\",\"open_ip\":\"setOpenIp\",\"open_date\":\"setOpenDate\",\"open_tradetime\":\"setOpenTradeTime\"}", requestJson); CreateAccountResponse response = new CreateAccountResponse(); extractedCreateAccountResponseParams(response); @@ -1043,11 +1049,11 @@ class AccountServiceTest { System.out.println(Json.toJson(response)); String responseJson = Json.toJson(response); - Assertions.assertEquals("", responseJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"original_serialno\":\"setOriginalSerialNo\",\"account_no\":\"setAccountNo\",\"customer_no\":\"setCustomerNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", responseJson); - HttpResponse httpResponse = TestHttpResponse.create("createAccount", response, CreateAccountResponse.class); + HttpResponse httpResponse = TestHttpResponse.create("/accInfo/v2/createAccount", response, CreateAccountResponse.class); Mockito.when(apiClient.post( - Mockito.eq("createAccount"), + Mockito.eq("/accInfo/v2/createAccount"), Mockito.any(HttpHeaders.class), Mockito.any(RequestBody.class), Mockito.eq(CreateAccountResponse.class))) @@ -1057,7 +1063,7 @@ class AccountServiceTest { System.out.println(Json.toJson(result)); String resultJson = Json.toJson(result); - Assertions.assertEquals("", resultJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"original_serialno\":\"setOriginalSerialNo\",\"account_no\":\"setAccountNo\",\"customer_no\":\"setCustomerNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", resultJson); } void extractedCreateAccountRequestParams(CreateAccountRequest request) { @@ -1091,11 +1097,13 @@ class AccountServiceTest { void extractedCreateAccountRequestFileListNestParams(CreateAccountRequest.FileList nest) { nest.setFileNo("setFileNo"); nest.setFileType("setFileType"); + nest.setFilePage(1); } void extractedCreateAccountRequestFileListNestAssertions(CreateAccountRequest.FileList nest) { Assertions.assertEquals("setFileNo", nest.getFileNo()); Assertions.assertEquals("setFileType", nest.getFileType()); + Assertions.assertEquals(1, nest.getFilePage()); } void extractedCreateAccountRequestAssertions(CreateAccountRequest request) { @@ -1154,7 +1162,7 @@ class AccountServiceTest { System.out.println(Json.toJson(request)); String requestJson = Json.toJson(request); - Assertions.assertEquals("", requestJson); + Assertions.assertEquals("{\"channel_no\":\"setChannelNo\",\"app_no\":\"setAppNo\",\"serial_no\":\"setSerialNo\",\"account_name\":\"setAccountName\",\"account_class\":\"setAccountClass\",\"account_property\":\"setAccountProperty\",\"id_type\":\"setIdType\",\"id_no\":\"setIdNo\",\"id_startdate\":\"setIdStartDate\",\"id_enddate\":\"setIdEndDate\",\"sign_no\":\"setSignNo\",\"sign_name\":\"setSignName\",\"id_address\":\"setIdAddress\",\"sex\":\"setSex\",\"ethnic\":\"setEthnic\",\"job\":\"setJob\",\"job_note\":\"setJobNote\",\"mobile\":\"setMobile\",\"primary_account\":\"setPrimaryAccount\",\"bank_no\":\"setBankNo\",\"bank_name\":\"setBankName\",\"trade_no\":\"setTradeNo\",\"verify_code\":\"setVerifyCode\",\"file_list\":[{\"file_no\":\"setFileNo\",\"file_type\":\"setFileType\",\"file_page\":1}],\"open_longitude\":\"setOpenLongitude\",\"open_dimensions\":\"setOpenDimensions\",\"open_ip\":\"setOpenIp\",\"open_date\":\"setOpenDate\",\"open_tradetime\":\"setOpenTradeTime\"}", requestJson); OpenAccPersonResponse response = new OpenAccPersonResponse(); extractedOpenAccPersonResponseParams(response); @@ -1162,11 +1170,11 @@ class AccountServiceTest { System.out.println(Json.toJson(response)); String responseJson = Json.toJson(response); - Assertions.assertEquals("", responseJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"original_serialno\":\"setOriginalSerialNo\",\"account_no\":\"setAccountNo\",\"customer_no\":\"setCustomerNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", responseJson); - HttpResponse httpResponse = TestHttpResponse.create("openAccPerson", response, OpenAccPersonResponse.class); + HttpResponse httpResponse = TestHttpResponse.create("/accInfo/openAcc", response, OpenAccPersonResponse.class); Mockito.when(apiClient.post( - Mockito.eq("openAccPerson"), + Mockito.eq("/accInfo/openAcc"), Mockito.any(HttpHeaders.class), Mockito.any(RequestBody.class), Mockito.eq(OpenAccPersonResponse.class))) @@ -1176,7 +1184,7 @@ class AccountServiceTest { System.out.println(Json.toJson(result)); String resultJson = Json.toJson(result); - Assertions.assertEquals("", resultJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"original_serialno\":\"setOriginalSerialNo\",\"account_no\":\"setAccountNo\",\"customer_no\":\"setCustomerNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", resultJson); } void extractedOpenAccPersonRequestParams(OpenAccPersonRequest request) { @@ -1216,11 +1224,13 @@ class AccountServiceTest { void extractedOpenAccPersonRequestFileListNestParams(OpenAccPersonRequest.FileList nest) { nest.setFileNo("setFileNo"); nest.setFileType("setFileType"); + nest.setFilePage(1); } void extractedOpenAccPersonRequestFileListNestAssertions(OpenAccPersonRequest.FileList nest) { Assertions.assertEquals("setFileNo", nest.getFileNo()); Assertions.assertEquals("setFileType", nest.getFileType()); + Assertions.assertEquals(1, nest.getFilePage()); } void extractedOpenAccPersonRequestAssertions(OpenAccPersonRequest request) { @@ -1285,7 +1295,7 @@ class AccountServiceTest { System.out.println(Json.toJson(request)); String requestJson = Json.toJson(request); - Assertions.assertEquals("", requestJson); + Assertions.assertEquals("{\"channel_no\":\"setChannelNo\",\"app_no\":\"setAppNo\",\"serial_no\":\"setSerialNo\",\"account_no\":\"setAccountNo\",\"account_property\":\"setAccountProperty\",\"id_type\":\"setIdType\",\"id_no\":\"setIdNo\",\"mobile\":\"setMobile\",\"primary_account\":\"setPrimaryAccount\",\"bank_no\":\"setBankNo\",\"bank_name\":\"setBankName\",\"set_default\":\"setSetDefault\",\"trade_no\":\"setTradeNo\",\"verify_code\":\"setVerifyCode\",\"trans_date\":\"setTransDate\",\"trans_tradetime\":\"setTransTradeTime\"}", requestJson); AddPrimAccPersonResponse response = new AddPrimAccPersonResponse(); extractedAddPrimAccPersonResponseParams(response); @@ -1293,11 +1303,11 @@ class AccountServiceTest { System.out.println(Json.toJson(response)); String responseJson = Json.toJson(response); - Assertions.assertEquals("", responseJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", responseJson); - HttpResponse httpResponse = TestHttpResponse.create("addPrimAccPerson", response, AddPrimAccPersonResponse.class); + HttpResponse httpResponse = TestHttpResponse.create("/accInfo/addPrimAcc", response, AddPrimAccPersonResponse.class); Mockito.when(apiClient.post( - Mockito.eq("addPrimAccPerson"), + Mockito.eq("/accInfo/addPrimAcc"), Mockito.any(HttpHeaders.class), Mockito.any(RequestBody.class), Mockito.eq(AddPrimAccPersonResponse.class))) @@ -1307,7 +1317,7 @@ class AccountServiceTest { System.out.println(Json.toJson(result)); String resultJson = Json.toJson(result); - Assertions.assertEquals("", resultJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", resultJson); } void extractedAddPrimAccPersonRequestParams(AddPrimAccPersonRequest request) { @@ -1370,7 +1380,7 @@ class AccountServiceTest { System.out.println(Json.toJson(request)); String requestJson = Json.toJson(request); - Assertions.assertEquals("", requestJson); + Assertions.assertEquals("{\"channel_no\":\"setChannelNo\",\"app_no\":\"setAppNo\",\"serial_no\":\"setSerialNo\",\"account_no\":\"setAccountNo\",\"primary_account\":\"setPrimaryAccount\",\"trans_date\":\"setTransDate\",\"trans_tradetime\":\"setTransTradeTime\"}", requestJson); SetPrimAccResponse response = new SetPrimAccResponse(); extractedSetPrimAccResponseParams(response); @@ -1378,11 +1388,11 @@ class AccountServiceTest { System.out.println(Json.toJson(response)); String responseJson = Json.toJson(response); - Assertions.assertEquals("", responseJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", responseJson); - HttpResponse httpResponse = TestHttpResponse.create("setPrimAcc", response, SetPrimAccResponse.class); + HttpResponse httpResponse = TestHttpResponse.create("/accInfo/setPrimAcc", response, SetPrimAccResponse.class); Mockito.when(apiClient.post( - Mockito.eq("setPrimAcc"), + Mockito.eq("/accInfo/setPrimAcc"), Mockito.any(HttpHeaders.class), Mockito.any(RequestBody.class), Mockito.eq(SetPrimAccResponse.class))) @@ -1392,7 +1402,7 @@ class AccountServiceTest { System.out.println(Json.toJson(result)); String resultJson = Json.toJson(result); - Assertions.assertEquals("", resultJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", resultJson); } void extractedSetPrimAccRequestParams(SetPrimAccRequest request) { @@ -1437,7 +1447,7 @@ class AccountServiceTest { System.out.println(Json.toJson(request)); String requestJson = Json.toJson(request); - Assertions.assertEquals("", requestJson); + Assertions.assertEquals("{\"channel_no\":\"setChannelNo\",\"app_no\":\"setAppNo\",\"serial_no\":\"setSerialNo\",\"trade_no\":\"setTradeNo\",\"verify_code\":\"setVerifyCode\",\"trans_date\":\"setTransDate\",\"trans_tradetime\":\"setTransTradeTime\"}", requestJson); ClosedAccResponse response = new ClosedAccResponse(); extractedClosedAccResponseParams(response); @@ -1445,11 +1455,11 @@ class AccountServiceTest { System.out.println(Json.toJson(response)); String responseJson = Json.toJson(response); - Assertions.assertEquals("", responseJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", responseJson); - HttpResponse httpResponse = TestHttpResponse.create("closedAcc", response, ClosedAccResponse.class); + HttpResponse httpResponse = TestHttpResponse.create("/accInfo/closedAcc", response, ClosedAccResponse.class); Mockito.when(apiClient.post( - Mockito.eq("closedAcc"), + Mockito.eq("/accInfo/closedAcc"), Mockito.any(HttpHeaders.class), Mockito.any(RequestBody.class), Mockito.eq(ClosedAccResponse.class))) @@ -1459,7 +1469,7 @@ class AccountServiceTest { System.out.println(Json.toJson(result)); String resultJson = Json.toJson(result); - Assertions.assertEquals("", resultJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", resultJson); } void extractedClosedAccRequestParams(ClosedAccRequest request) { @@ -1504,7 +1514,7 @@ class AccountServiceTest { System.out.println(Json.toJson(request)); String requestJson = Json.toJson(request); - Assertions.assertEquals("", requestJson); + Assertions.assertEquals("{\"channel_no\":\"setChannelNo\",\"serial_no\":\"setSerialNo\",\"account_class\":\"setAccountClass\",\"account_relation\":\"setAccountRelation\",\"account_name\":\"setAccountName\",\"balance_direction\":\"setBalanceDirection\",\"red_balance\":\"setRedBalance\",\"id_type\":\"setIdType\",\"id_no\":\"setIdNo\",\"id_startdate\":\"setIdStartdate\",\"id_enddate\":\"setIdEnddate\",\"mobile\":\"setMobile\",\"industry\":\"setIndustry\",\"company_id_type\":\"setCompanyIdType\",\"company_id_no\":\"setCompanyIdNo\",\"company_id_name\":\"setCompanyIdName\",\"company_opto\":\"setCompanyOpto\",\"controller_id_type\":\"setControllerIdType\",\"controller_id_no\":\"setControllerIdNo\",\"controller_id_name\":\"setControllerIdName\",\"controller_opto\":\"setControllerOpto\",\"leader_id_type\":\"setLeaderIdType\",\"leader_id_no\":\"setLeaderIdNo\",\"leader_id_name\":\"setLeaderIdName\",\"leader_mobile\":\"setLeaderMobile\",\"leader_opto\":\"setLeaderOpto\",\"operator_id_type\":\"setOperatorIdType\",\"operator_id_no\":\"setOperatorIdNo\",\"operator_id_name\":\"setOperatorIdName\",\"operator_mobile\":\"setOperatorMobile\",\"operator_opto\":\"setOperatorOpto\",\"bene_name\":\"setBeneName\",\"bene_sex\":\"setBeneSex\",\"bene_nationality\":\"setBeneNationality\",\"bene_is_shareholider\":\"setBeneIsShareholider\",\"bene_ratio\":\"setBeneRatio\",\"bene_addr\":\"setBeneAddr\",\"bene_id_type\":\"setBeneIdType\",\"bene_id_no\":\"setBeneIdNo\",\"bene_opto\":\"setBeneOpto\",\"bene_owner\":\"setBeneOwner\",\"zsopscope\":\"setZsopscope\"}", requestJson); OpenAccInnerResponse response = new OpenAccInnerResponse(); extractedOpenAccInnerResponseParams(response); @@ -1512,11 +1522,11 @@ class AccountServiceTest { System.out.println(Json.toJson(response)); String responseJson = Json.toJson(response); - Assertions.assertEquals("", responseJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", responseJson); - HttpResponse httpResponse = TestHttpResponse.create("openAccInner", response, OpenAccInnerResponse.class); + HttpResponse httpResponse = TestHttpResponse.create("/accInfo/openAccInner", response, OpenAccInnerResponse.class); Mockito.when(apiClient.post( - Mockito.eq("openAccInner"), + Mockito.eq("/accInfo/openAccInner"), Mockito.any(HttpHeaders.class), Mockito.any(RequestBody.class), Mockito.eq(OpenAccInnerResponse.class))) @@ -1526,7 +1536,7 @@ class AccountServiceTest { System.out.println(Json.toJson(result)); String resultJson = Json.toJson(result); - Assertions.assertEquals("", resultJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", resultJson); } void extractedOpenAccInnerRequestParams(OpenAccInnerRequest request) { @@ -1645,7 +1655,7 @@ class AccountServiceTest { System.out.println(Json.toJson(request)); String requestJson = Json.toJson(request); - Assertions.assertEquals("", requestJson); + Assertions.assertEquals("{\"channel_no\":\"setChannelNo\",\"app_no\":\"setAppNo\",\"serial_no\":\"setSerialNo\",\"account_no\":\"setAccountNo\",\"trans_date\":\"setTransDate\",\"trans_tradetime\":\"setTransTradeTime\"}", requestJson); InqPrimAccResponse response = new InqPrimAccResponse(); extractedInqPrimAccResponseParams(response); @@ -1653,11 +1663,11 @@ class AccountServiceTest { System.out.println(Json.toJson(response)); String responseJson = Json.toJson(response); - Assertions.assertEquals("", responseJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"account_no\":\"setAccountNo\",\"id_type\":\"setIdType\",\"id_no\":\"setIdNo\",\"cur_balance\":100.0,\"avail_balance\":100.0,\"withdraw_balance\":100.0,\"pre_balance\":100.0,\"detail_list\":[{\"mobile\":\"setMobile\",\"primary_account\":\"setPrimaryAccount\"}],\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", responseJson); - HttpResponse httpResponse = TestHttpResponse.create("inqPrimAcc", response, InqPrimAccResponse.class); + HttpResponse httpResponse = TestHttpResponse.create("/accInfo/inqPrimAcc", response, InqPrimAccResponse.class); Mockito.when(apiClient.post( - Mockito.eq("inqPrimAcc"), + Mockito.eq("/accInfo/inqPrimAcc"), Mockito.any(HttpHeaders.class), Mockito.any(RequestBody.class), Mockito.eq(InqPrimAccResponse.class))) @@ -1667,7 +1677,7 @@ class AccountServiceTest { System.out.println(Json.toJson(result)); String resultJson = Json.toJson(result); - Assertions.assertEquals("", resultJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"account_no\":\"setAccountNo\",\"id_type\":\"setIdType\",\"id_no\":\"setIdNo\",\"cur_balance\":100.0,\"avail_balance\":100.0,\"withdraw_balance\":100.0,\"pre_balance\":100.0,\"detail_list\":[{\"mobile\":\"setMobile\",\"primary_account\":\"setPrimaryAccount\"}],\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", resultJson); } void extractedInqPrimAccRequestParams(InqPrimAccRequest request) { @@ -1740,7 +1750,7 @@ class AccountServiceTest { System.out.println(Json.toJson(request)); String requestJson = Json.toJson(request); - Assertions.assertEquals("", requestJson); + Assertions.assertEquals("{\"channel_no\":\"setChannelNo\",\"app_no\":\"setAppNo\",\"serial_no\":\"setSerialNo\",\"trade_no\":\"setTradeNo\",\"verify_code\":\"setVerifyCode\",\"account_property\":\"setAccountProperty\",\"id_type\":\"setIdType\",\"id_no\":\"setIdNo\",\"id_startdate\":\"setIdStartDate\",\"id_enddate\":\"setIdEndDate\",\"sign_name\":\"setSignName\",\"sign_no\":\"setSignNo\",\"mobile\":\"setMobile\",\"primary_account\":\"setPrimaryAccount\",\"bank_no\":\"setBankNo\",\"bank_name\":\"setBankName\",\"bank_address\":\"setBankAddress\",\"bank_cityno\":\"setBankCityno\",\"industry\":\"setIndustry\",\"company_id_type\":\"setCompanyIdType\",\"company_id_no\":\"setCompanyIdNo\",\"company_id_name\":\"setCompanyIdName\",\"company_opto\":\"setCompanyOpto\",\"controller_id_type\":\"setControllerIdType\",\"controller_id_no\":\"setControllerIdNo\",\"controller_id_name\":\"setControllerIdName\",\"controller_opto\":\"setControllerOpto\",\"leader_id_type\":\"setLeaderIdType\",\"leader_id_no\":\"setLeaderIdNo\",\"leader_id_name\":\"setLeaderIdName\",\"leader_mobile\":\"setLeaderMobile\",\"leader_opto\":\"setLeaderOpto\",\"operator_id_type\":\"setOperatorIdType\",\"operator_id_no\":\"setOperatorIdNo\",\"operator_id_name\":\"setOperatorIdName\",\"operator_mobile\":\"setOperatorMobile\",\"operator_opto\":\"setOperatorOpto\",\"bene_name\":\"setBeneName\",\"bene_sex\":\"setBeneSex\",\"bene_nationality\":\"setBeneNationality\",\"bene_is_shareholider\":\"setBeneIsShareholider\",\"bene_ratio\":\"setBeneRatio\",\"bene_addr\":\"setBeneAddr\",\"bene_id_type\":\"setBeneIdType\",\"bene_id_no\":\"setBeneIdNo\",\"bene_opto\":\"setBeneOpto\",\"bene_owner\":\"setBeneOwner\",\"file_list\":[{\"file_no\":\"setFileNo\",\"file_type\":\"setFileType\",\"file_page\":\"setFilePage\"}],\"trans_date\":\"setTransDate\",\"trans_tradetime\":\"setTransTradeTime\",\"trans_teller\":\"setTransTeller\"}", requestJson); ModAccCompanyResponse response = new ModAccCompanyResponse(); extractedModAccCompanyResponseParams(response); @@ -1748,11 +1758,11 @@ class AccountServiceTest { System.out.println(Json.toJson(response)); String responseJson = Json.toJson(response); - Assertions.assertEquals("", responseJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"account_no\":\"setAccountNo\",\"customer_no\":\"setCustomerNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", responseJson); - HttpResponse httpResponse = TestHttpResponse.create("modAccCompany", response, ModAccCompanyResponse.class); + HttpResponse httpResponse = TestHttpResponse.create("/accInfo/modAcc", response, ModAccCompanyResponse.class); Mockito.when(apiClient.post( - Mockito.eq("modAccCompany"), + Mockito.eq("/accInfo/modAcc"), Mockito.any(HttpHeaders.class), Mockito.any(RequestBody.class), Mockito.eq(ModAccCompanyResponse.class))) @@ -1762,7 +1772,7 @@ class AccountServiceTest { System.out.println(Json.toJson(result)); String resultJson = Json.toJson(result); - Assertions.assertEquals("", resultJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"account_no\":\"setAccountNo\",\"customer_no\":\"setCustomerNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", resultJson); } void extractedModAccCompanyRequestParams(ModAccCompanyRequest request) { @@ -1915,7 +1925,7 @@ class AccountServiceTest { System.out.println(Json.toJson(request)); String requestJson = Json.toJson(request); - Assertions.assertEquals("", requestJson); + Assertions.assertEquals("{\"channel_no\":\"setChannelNo\",\"app_no\":\"setAppNo\",\"serial_no\":\"setSerialNo\",\"trade_no\":\"setTradeNo\",\"verify_code\":\"setVerifyCode\",\"account_property\":\"setAccountProperty\",\"id_type\":\"setIdType\",\"id_no\":\"setIdNo\",\"id_startdate\":\"setIdStartDate\",\"id_enddate\":\"setIdEndDate\",\"sign_name\":\"setSignName\",\"sign_no\":\"setSignNo\",\"mobile\":\"setMobile\",\"primary_account\":\"setPrimaryAccount\",\"bank_no\":\"setBankNo\",\"bank_name\":\"setBankName\",\"file_list\":[{\"file_no\":\"setFileNo\",\"file_type\":\"setFileType\",\"file_page\":\"setFilePage\"}],\"trans_date\":\"setTransDate\",\"trans_tradetime\":\"setTransTradeTime\",\"trans_teller\":\"setTransTeller\"}", requestJson); ModAccPersonResponse response = new ModAccPersonResponse(); extractedModAccPersonResponseParams(response); @@ -1923,11 +1933,11 @@ class AccountServiceTest { System.out.println(Json.toJson(response)); String responseJson = Json.toJson(response); - Assertions.assertEquals("", responseJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"account_no\":\"setAccountNo\",\"customer_no\":\"setCustomerNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", responseJson); - HttpResponse httpResponse = TestHttpResponse.create("modAccPerson", response, ModAccPersonResponse.class); + HttpResponse httpResponse = TestHttpResponse.create("/accInfo/modAcc", response, ModAccPersonResponse.class); Mockito.when(apiClient.post( - Mockito.eq("modAccPerson"), + Mockito.eq("/accInfo/modAcc"), Mockito.any(HttpHeaders.class), Mockito.any(RequestBody.class), Mockito.eq(ModAccPersonResponse.class))) @@ -1937,7 +1947,7 @@ class AccountServiceTest { System.out.println(Json.toJson(result)); String resultJson = Json.toJson(result); - Assertions.assertEquals("", resultJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"account_no\":\"setAccountNo\",\"customer_no\":\"setCustomerNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", resultJson); } void extractedModAccPersonRequestParams(ModAccPersonRequest request) { 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 6c31b75..4379467 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 @@ -237,7 +237,7 @@ 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)) { + } else if (method.getParameterTypes()[0].isAssignableFrom(int.class)) { print(String.format(fmt, "1", method.getName().replace("set", "get")) .replace("\"", "")); } else if (method.getParameterTypes()[0].isAssignableFrom(Long.class)) {