From 04f46b6cbf4c40920a3e64b4c530fe169383c57f Mon Sep 17 00:00:00 2001 From: 13009 Date: Thu, 20 Jun 2024 15:00:18 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=8D=95=E5=85=83=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E6=96=B9=E6=B3=95=E7=94=9F=E6=88=90=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2/account/AccountServiceTest.java | 129 +++++++----------- .../czcb/scfs/api/test/RefGenTestMethod.java | 8 +- 2 files changed, 51 insertions(+), 86 deletions(-) diff --git a/scfs-api-service/src/test/java/com/czcb/scfs/api/service/v2/account/AccountServiceTest.java b/scfs-api-service/src/test/java/com/czcb/scfs/api/service/v2/account/AccountServiceTest.java index d8d74e4..828c41a 100644 --- a/scfs-api-service/src/test/java/com/czcb/scfs/api/service/v2/account/AccountServiceTest.java +++ b/scfs-api-service/src/test/java/com/czcb/scfs/api/service/v2/account/AccountServiceTest.java @@ -32,17 +32,15 @@ class AccountServiceTest { extractedPersonOpenAccountThreeElementRequestParams(request); extractedPersonOpenAccountThreeElementRequestAssertions(request); - 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\":[],\"open_longitude\":\"setOpenLongitude\",\"open_dimensions\":\"setOpenDimensions\",\"open_ip\":\"setOpenIp\",\"open_date\":\"setOpenDate\",\"open_tradetime\":\"setOpenTradeTime\",\"trans_date\":\"setTransDate\",\"trans_tradetime\":\"setTransTradeTime\"}", requestJson); PersonOpenAccountThreeElementResponse response = new PersonOpenAccountThreeElementResponse(); extractedPersonOpenAccountThreeElementResponseParams(response); extractedPersonOpenAccountThreeElementResponseAssertions(response); - System.out.println(Json.toJson(response)); String responseJson = Json.toJson(response); - Assertions.assertEquals("", responseJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"original_serialno\":\"setOriginalSerialNo\",\"sys_serial_no\":\"setSysSerialNo\",\"account_no\":\"setAccountNo\",\"customer_no\":\"setCustomerNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", responseJson); HttpResponse httpResponse = TestHttpResponse.create("/account/v2/person-open-account-three-element", response, PersonOpenAccountThreeElementResponse.class); Mockito.when(apiClient.post( @@ -54,9 +52,8 @@ class AccountServiceTest { PersonOpenAccountThreeElementResponse result = service.personOpenAccountThreeElement(request); - System.out.println(Json.toJson(result)); String resultJson = Json.toJson(result); - Assertions.assertEquals("", resultJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"original_serialno\":\"setOriginalSerialNo\",\"sys_serial_no\":\"setSysSerialNo\",\"account_no\":\"setAccountNo\",\"customer_no\":\"setCustomerNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", resultJson); } void extractedPersonOpenAccountThreeElementRequestParams(PersonOpenAccountThreeElementRequest request) { @@ -143,17 +140,16 @@ class AccountServiceTest { extractedPersonOpenAccountFourElementRequestParams(request); extractedPersonOpenAccountFourElementRequestAssertions(request); - 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\":[],\"open_longitude\":\"setOpenLongitude\",\"open_dimensions\":\"setOpenDimensions\",\"open_ip\":\"setOpenIp\",\"open_date\":\"setOpenDate\",\"open_tradetime\":\"setOpenTradeTime\",\"trans_date\":\"setTransDate\",\"trans_tradetime\":\"setTransTradeTime\"}", requestJson); PersonOpenAccountFourElementResponse response = new PersonOpenAccountFourElementResponse(); extractedPersonOpenAccountFourElementResponseParams(response); extractedPersonOpenAccountFourElementResponseAssertions(response); - System.out.println(Json.toJson(response)); + String responseJson = Json.toJson(response); - Assertions.assertEquals("", responseJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"original_serialno\":\"setOriginalSerialNo\",\"sys_serial_no\":\"setSysSerialNo\",\"account_no\":\"setAccountNo\",\"customer_no\":\"setCustomerNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", responseJson); HttpResponse httpResponse = TestHttpResponse.create("/account/v2/person-open-account-four-element", response, PersonOpenAccountFourElementResponse.class); Mockito.when(apiClient.post( @@ -165,9 +161,8 @@ class AccountServiceTest { PersonOpenAccountFourElementResponse result = service.personOpenAccountFourElement(request); - System.out.println(Json.toJson(result)); String resultJson = Json.toJson(result); - Assertions.assertEquals("", resultJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"original_serialno\":\"setOriginalSerialNo\",\"sys_serial_no\":\"setSysSerialNo\",\"account_no\":\"setAccountNo\",\"customer_no\":\"setCustomerNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", resultJson); } void extractedPersonOpenAccountFourElementRequestParams(PersonOpenAccountFourElementRequest request) { @@ -266,17 +261,15 @@ class AccountServiceTest { extractedOpenAccountCompanyRequestParams(request); extractedOpenAccountCompanyRequestAssertions(request); - 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\":[],\"open_longitude\":\"setOpenLongitude\",\"open_dimensions\":\"setOpenDimensions\",\"open_ip\":\"setOpenIp\",\"open_date\":\"setOpenDate\",\"open_tradetime\":\"setOpenTradeTime\",\"trans_date\":\"setTransDate\",\"trans_tradetime\":\"setTransTradeTime\"}", requestJson); OpenAccountCompanyResponse response = new OpenAccountCompanyResponse(); extractedOpenAccountCompanyResponseParams(response); extractedOpenAccountCompanyResponseAssertions(response); - System.out.println(Json.toJson(response)); String responseJson = Json.toJson(response); - Assertions.assertEquals("", responseJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"original_serialno\":\"setOriginalSerialNo\",\"sys_serial_no\":\"setSysSerialNo\",\"account_no\":\"setAccountNo\",\"customer_no\":\"setCustomerNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", responseJson); HttpResponse httpResponse = TestHttpResponse.create("/account/v2/company-open-account", response, OpenAccountCompanyResponse.class); Mockito.when(apiClient.post( @@ -288,9 +281,8 @@ class AccountServiceTest { OpenAccountCompanyResponse result = service.openAccountCompany(request); - System.out.println(Json.toJson(result)); String resultJson = Json.toJson(result); - Assertions.assertEquals("", resultJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"original_serialno\":\"setOriginalSerialNo\",\"sys_serial_no\":\"setSysSerialNo\",\"account_no\":\"setAccountNo\",\"customer_no\":\"setCustomerNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", resultJson); } void extractedOpenAccountCompanyRequestParams(OpenAccountCompanyRequest request) { @@ -445,17 +437,15 @@ class AccountServiceTest { extractedModAccPersonRequestParams(request); extractedModAccPersonRequestAssertions(request); - 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\",\"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\":[],\"trans_date\":\"setTransDate\",\"trans_tradetime\":\"setTransTradeTime\",\"trans_teller\":\"setTransTeller\"}", requestJson); ModAccPersonResponse response = new ModAccPersonResponse(); extractedModAccPersonResponseParams(response); extractedModAccPersonResponseAssertions(response); - System.out.println(Json.toJson(response)); String responseJson = Json.toJson(response); - Assertions.assertEquals("", responseJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"account_no\":\"setAccountNo\",\"customer_no\":\"setCustomerNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", responseJson); HttpResponse httpResponse = TestHttpResponse.create("/account/v2/person-mod-account", response, ModAccPersonResponse.class); Mockito.when(apiClient.post( @@ -467,9 +457,8 @@ class AccountServiceTest { ModAccPersonResponse result = service.modAccPerson(request); - System.out.println(Json.toJson(result)); String resultJson = Json.toJson(result); - Assertions.assertEquals("", resultJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"account_no\":\"setAccountNo\",\"customer_no\":\"setCustomerNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", resultJson); } void extractedModAccPersonRequestParams(ModAccPersonRequest request) { @@ -546,17 +535,15 @@ class AccountServiceTest { extractedModAccCompanyRequestParams(request); extractedModAccCompanyRequestAssertions(request); - 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\",\"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\":[],\"trans_date\":\"setTransDate\",\"trans_tradetime\":\"setTransTradeTime\",\"trans_teller\":\"setTransTeller\"}", requestJson); ModAccCompanyResponse response = new ModAccCompanyResponse(); extractedModAccCompanyResponseParams(response); extractedModAccCompanyResponseAssertions(response); - System.out.println(Json.toJson(response)); String responseJson = Json.toJson(response); - Assertions.assertEquals("", responseJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"account_no\":\"setAccountNo\",\"customer_no\":\"setCustomerNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", responseJson); HttpResponse httpResponse = TestHttpResponse.create("/account/v2/company-mod-account", response, ModAccCompanyResponse.class); Mockito.when(apiClient.post( @@ -568,9 +555,8 @@ class AccountServiceTest { ModAccCompanyResponse result = service.modAccCompany(request); - System.out.println(Json.toJson(result)); String resultJson = Json.toJson(result); - Assertions.assertEquals("", resultJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"account_no\":\"setAccountNo\",\"customer_no\":\"setCustomerNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", resultJson); } void extractedModAccCompanyRequestParams(ModAccCompanyRequest request) { @@ -709,17 +695,16 @@ class AccountServiceTest { extractedQueryBalanceRequestParams(request); extractedQueryBalanceRequestAssertions(request); - 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\",\"trans_tradetime\":\"setTransTradeTime\"}", requestJson); QueryBalanceResponse response = new QueryBalanceResponse(); extractedQueryBalanceResponseParams(response); extractedQueryBalanceResponseAssertions(response); - System.out.println(Json.toJson(response)); + String responseJson = Json.toJson(response); - Assertions.assertEquals("", responseJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"account_name\":\"setAccountName\",\"id_type\":\"setIdType\",\"id_no\":\"setIdNo\",\"mobile\":\"setMobile\",\"detail_list\":[],\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", responseJson); HttpResponse httpResponse = TestHttpResponse.create("/account/v2/query-balance", response, QueryBalanceResponse.class); Mockito.when(apiClient.post( @@ -731,9 +716,8 @@ class AccountServiceTest { QueryBalanceResponse result = service.queryBalance(request); - System.out.println(Json.toJson(result)); String resultJson = Json.toJson(result); - Assertions.assertEquals("", resultJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"account_name\":\"setAccountName\",\"id_type\":\"setIdType\",\"id_no\":\"setIdNo\",\"mobile\":\"setMobile\",\"detail_list\":[],\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", resultJson); } void extractedQueryBalanceRequestParams(QueryBalanceRequest request) { @@ -788,17 +772,16 @@ class AccountServiceTest { extractedQueryCardInfoRequestParams(request); extractedQueryCardInfoRequestAssertions(request); - 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); extractedQueryCardInfoResponseAssertions(response); - System.out.println(Json.toJson(response)); + String responseJson = Json.toJson(response); - Assertions.assertEquals("", responseJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"bank_no\":\"setBankNo\",\"bank_name\":\"setBankName\",\"card_type\":\"setCardType\",\"pay_bank_no\":\"setPayBankNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", responseJson); HttpResponse httpResponse = TestHttpResponse.create("/card-bin/v2/query", response, QueryCardInfoResponse.class); Mockito.when(apiClient.post( @@ -810,9 +793,8 @@ class AccountServiceTest { QueryCardInfoResponse result = service.queryCardInfo(request); - System.out.println(Json.toJson(result)); String resultJson = Json.toJson(result); - Assertions.assertEquals("", resultJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"bank_no\":\"setBankNo\",\"bank_name\":\"setBankName\",\"card_type\":\"setCardType\",\"pay_bank_no\":\"setPayBankNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", resultJson); } void extractedQueryCardInfoRequestParams(QueryCardInfoRequest request) { @@ -863,17 +845,15 @@ class AccountServiceTest { extractedPersonBindRequestParams(request); extractedPersonBindRequestAssertions(request); - 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); PersonBindResponse response = new PersonBindResponse(); extractedPersonBindResponseParams(response); extractedPersonBindResponseAssertions(response); - System.out.println(Json.toJson(response)); String responseJson = Json.toJson(response); - Assertions.assertEquals("", responseJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", responseJson); HttpResponse httpResponse = TestHttpResponse.create("/bank-card/v2/person-bind", response, PersonBindResponse.class); Mockito.when(apiClient.post( @@ -885,9 +865,8 @@ class AccountServiceTest { PersonBindResponse result = service.personBind(request); - System.out.println(Json.toJson(result)); String resultJson = Json.toJson(result); - Assertions.assertEquals("", resultJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", resultJson); } void extractedPersonBindRequestParams(PersonBindRequest request) { @@ -950,17 +929,15 @@ class AccountServiceTest { extractedCompanyBindRequestParams(request); extractedCompanyBindRequestAssertions(request); - 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); CompanyBindResponse response = new CompanyBindResponse(); extractedCompanyBindResponseParams(response); extractedCompanyBindResponseAssertions(response); - - System.out.println(Json.toJson(response)); + String responseJson = Json.toJson(response); - Assertions.assertEquals("", responseJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", responseJson); HttpResponse httpResponse = TestHttpResponse.create("/bank-card/v2/company-bind", response, CompanyBindResponse.class); Mockito.when(apiClient.post( @@ -972,9 +949,8 @@ class AccountServiceTest { CompanyBindResponse result = service.companyBind(request); - System.out.println(Json.toJson(result)); String resultJson = Json.toJson(result); - Assertions.assertEquals("", resultJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", resultJson); } void extractedCompanyBindRequestParams(CompanyBindRequest request) { @@ -1037,17 +1013,15 @@ class AccountServiceTest { extractedBankCardQueryRequestParams(request); extractedBankCardQueryRequestAssertions(request); - 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); BankCardQueryResponse response = new BankCardQueryResponse(); extractedBankCardQueryResponseParams(response); extractedBankCardQueryResponseAssertions(response); - - System.out.println(Json.toJson(response)); + String responseJson = Json.toJson(response); - Assertions.assertEquals("", responseJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"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\":[],\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", responseJson); HttpResponse httpResponse = TestHttpResponse.create("/bank-card/v2/query", response, BankCardQueryResponse.class); Mockito.when(apiClient.post( @@ -1059,9 +1033,8 @@ class AccountServiceTest { BankCardQueryResponse result = service.bankCardQuery(request); - System.out.println(Json.toJson(result)); String resultJson = Json.toJson(result); - Assertions.assertEquals("", resultJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"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\":[],\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", resultJson); } void extractedBankCardQueryRequestParams(BankCardQueryRequest request) { @@ -1120,17 +1093,15 @@ class AccountServiceTest { extractedUnbindRequestParams(request); extractedUnbindRequestAssertions(request); - 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); UnbindResponse response = new UnbindResponse(); extractedUnbindResponseParams(response); extractedUnbindResponseAssertions(response); - - System.out.println(Json.toJson(response)); + String responseJson = Json.toJson(response); - Assertions.assertEquals("", responseJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", responseJson); HttpResponse httpResponse = TestHttpResponse.create("/bank-card/v2/unbind", response, UnbindResponse.class); Mockito.when(apiClient.post( @@ -1142,9 +1113,8 @@ class AccountServiceTest { UnbindResponse result = service.unbind(request); - System.out.println(Json.toJson(result)); String resultJson = Json.toJson(result); - Assertions.assertEquals("", resultJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", resultJson); } void extractedUnbindRequestParams(UnbindRequest request) { @@ -1189,17 +1159,16 @@ class AccountServiceTest { extractedClosedAccRequestParams(request); extractedClosedAccRequestAssertions(request); - System.out.println(Json.toJson(request)); String requestJson = Json.toJson(request); - Assertions.assertEquals("", requestJson); + Assertions.assertEquals("{\"channel_no\":\"setChannelNo\",\"app_no\":\"setAppNo\",\"account_no\":\"setAccountNo\",\"serial_no\":\"setSerialNo\",\"trade_no\":\"setTradeNo\",\"verify_code\":\"setVerifyCode\",\"trans_date\":\"setTransDate\",\"trans_tradetime\":\"setTransTradeTime\"}", requestJson); ClosedAccResponse response = new ClosedAccResponse(); extractedClosedAccResponseParams(response); extractedClosedAccResponseAssertions(response); - System.out.println(Json.toJson(response)); + String responseJson = Json.toJson(response); - Assertions.assertEquals("", responseJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", responseJson); HttpResponse httpResponse = TestHttpResponse.create("/account/v2/closed-account", response, ClosedAccResponse.class); Mockito.when(apiClient.post( @@ -1211,9 +1180,8 @@ class AccountServiceTest { ClosedAccResponse result = service.closedAcc(request); - System.out.println(Json.toJson(result)); String resultJson = Json.toJson(result); - Assertions.assertEquals("", resultJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", resultJson); } void extractedClosedAccRequestParams(ClosedAccRequest request) { @@ -1259,18 +1227,16 @@ class AccountServiceTest { OpenAccInnerRequest request = new OpenAccInnerRequest(); extractedOpenAccInnerRequestParams(request); extractedOpenAccInnerRequestAssertions(request); - - 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_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\",\"trans_date\":\"setTransDate\",\"trans_tradetime\":\"setTransTradeTime\"}", requestJson); OpenAccInnerResponse response = new OpenAccInnerResponse(); extractedOpenAccInnerResponseParams(response); extractedOpenAccInnerResponseAssertions(response); - System.out.println(Json.toJson(response)); String responseJson = Json.toJson(response); - Assertions.assertEquals("", responseJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", responseJson); HttpResponse httpResponse = TestHttpResponse.create("/account/v2/inner-open-account", response, OpenAccInnerResponse.class); Mockito.when(apiClient.post( @@ -1282,9 +1248,8 @@ class AccountServiceTest { OpenAccInnerResponse result = service.openAccInner(request); - System.out.println(Json.toJson(result)); String resultJson = Json.toJson(result); - Assertions.assertEquals("", resultJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", resultJson); } void extractedOpenAccInnerRequestParams(OpenAccInnerRequest 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 05efea7..ac2c1a6 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 @@ -33,7 +33,7 @@ public class RefGenTestMethod { private static final String EXTRACTED_RESPONSE = "\textracted%sParams(response);\n"; private static final String EXTRACTED_RESPONSE_ASSERTIONS = "\textracted%sAssertions(response);\n\n"; - public static void genRequestParams(Class request) { + private static void genRequestParams(Class request) { print("void extracted%sParams(%s request) {\n", request.getSimpleName(), request.getSimpleName()); Method[] methods = request.getMethods(); @@ -48,7 +48,7 @@ public class RefGenTestMethod { print("}\n"); } - public static void genRequestAssertions(Class request) { + private static void genRequestAssertions(Class request) { print("void extracted%sAssertions(%s request) {\n", request.getSimpleName(), request.getSimpleName()); Method[] methods = request.getMethods(); @@ -62,7 +62,7 @@ public class RefGenTestMethod { print("}\n"); } - public static void genResponseParams(Class response) { + private static void genResponseParams(Class response) { print("void extracted%sParams(%s response) {\n", response.getSimpleName(), response.getSimpleName()); Method[] methods = response.getMethods(); @@ -76,7 +76,7 @@ public class RefGenTestMethod { print("}\n"); } - public static void genResponseAssertions(Class response) { + private static void genResponseAssertions(Class response) { print("void extracted%sAssertions(%s response) {\n", response.getSimpleName(), response.getSimpleName()); Method[] methods = response.getMethods();