From ae0085e965d5a8c52cb52164747c2f4c41d8125d Mon Sep 17 00:00:00 2001 From: 13009 Date: Thu, 20 Jun 2024 14:43:01 +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 | 1870 +++++++++-------- .../czcb/scfs/api/test/RefGenTestMethod.java | 149 +- 2 files changed, 1131 insertions(+), 888 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 f8dda52..d8d74e4 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 @@ -29,86 +29,20 @@ class AccountServiceTest { @Test void personOpenAccountThreeElementTest() { PersonOpenAccountThreeElementRequest request = new PersonOpenAccountThreeElementRequest(); - request.setOpenDimensions("setOpenDimensions"); - request.setTransTradeTime("setTransTradeTime"); - request.setChannelNo("setChannelNo"); - request.setAppNo("setAppNo"); - request.setSignNo("setSignNo"); - request.setIdAddress("setIdAddress"); - request.setSerialNo("setSerialNo"); - request.setIdNo("setIdNo"); - request.setAccountName("setAccountName"); - request.setIdType("setIdType"); - request.setIdEndDate("setIdEndDate"); - request.setMobile("setMobile"); - request.setVerifyCode("setVerifyCode"); - request.setEthnic("setEthnic"); - request.setFileList(Lists.list(new PersonOpenAccountThreeElementRequest.FileList().setFileType("1").setFileNo("1").setFilePage(1))); - request.setOpenLongitude("setOpenLongitude"); - request.setOpenIp("setOpenIp"); - request.setOpenDate("setOpenDate"); - request.setOpenTradeTime("setOpenTradeTime"); - request.setSignName("setSignName"); - request.setSex("setSex"); - request.setJob("setJob"); - request.setJobNote("setJobNote"); - request.setTransDate("setTransDate"); - request.setIdStartDate("setIdStartDate"); - - Assertions.assertEquals("setOpenDimensions", request.getOpenDimensions()); - Assertions.assertEquals("setTransTradeTime", request.getTransTradeTime()); - Assertions.assertEquals("setChannelNo", request.getChannelNo()); - Assertions.assertEquals("setAppNo", request.getAppNo()); - Assertions.assertEquals("setSignNo", request.getSignNo()); - Assertions.assertEquals("setIdAddress", request.getIdAddress()); - Assertions.assertEquals("setSerialNo", request.getSerialNo()); - Assertions.assertEquals("setIdNo", request.getIdNo()); - Assertions.assertEquals("setAccountName", request.getAccountName()); - Assertions.assertEquals("setIdType", request.getIdType()); - Assertions.assertEquals("setIdEndDate", request.getIdEndDate()); - Assertions.assertEquals("setMobile", request.getMobile()); - Assertions.assertEquals("setVerifyCode", request.getVerifyCode()); - Assertions.assertEquals("setEthnic", request.getEthnic()); - Assertions.assertNotNull(request.getFileList()); - Assertions.assertEquals(1, request.getFileList().size()); - Assertions.assertEquals("1", request.getFileList().get(0).getFileNo()); - Assertions.assertEquals(1, request.getFileList().get(0).getFilePage()); - Assertions.assertEquals("1", request.getFileList().get(0).getFileType()); - Assertions.assertEquals("setOpenLongitude", request.getOpenLongitude()); - Assertions.assertEquals("setOpenIp", request.getOpenIp()); - Assertions.assertEquals("setOpenDate", request.getOpenDate()); - Assertions.assertEquals("setOpenTradeTime", request.getOpenTradeTime()); - Assertions.assertEquals("setSignName", request.getSignName()); - Assertions.assertEquals("setSex", request.getSex()); - Assertions.assertEquals("setJob", request.getJob()); - Assertions.assertEquals("setJobNote", request.getJobNote()); - Assertions.assertEquals("setTransDate", request.getTransDate()); - Assertions.assertEquals("setIdStartDate", request.getIdStartDate()); + extractedPersonOpenAccountThreeElementRequestParams(request); + extractedPersonOpenAccountThreeElementRequestAssertions(request); + System.out.println(Json.toJson(request)); String requestJson = Json.toJson(request); - 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\":\"1\",\"file_type\":\"1\",\"file_page\":1}],\"open_longitude\":\"setOpenLongitude\",\"open_dimensions\":\"setOpenDimensions\",\"open_ip\":\"setOpenIp\",\"open_date\":\"setOpenDate\",\"open_tradetime\":\"setOpenTradeTime\",\"trans_date\":\"setTransDate\",\"trans_tradetime\":\"setTransTradeTime\"}", requestJson); + Assertions.assertEquals("", requestJson); PersonOpenAccountThreeElementResponse response = new PersonOpenAccountThreeElementResponse(); - response.setOriginalSerialNo("setOriginalSerialNo"); - response.setRecode("setRecode"); - response.setRecodeInfo("setRecodeInfo"); - response.setAccountNo("setAccountNo"); - response.setSysDate("setSysDate"); - response.setSysTime("setSysTime"); - response.setSysSerialNo("setSysSerialNo"); - response.setCustomerNo("setCustomerNo"); - - Assertions.assertEquals("setOriginalSerialNo", response.getOriginalSerialNo()); - Assertions.assertEquals("setRecode", response.getRecode()); - Assertions.assertEquals("setRecodeInfo", response.getRecodeInfo()); - Assertions.assertEquals("setAccountNo", response.getAccountNo()); - Assertions.assertEquals("setSysDate", response.getSysDate()); - Assertions.assertEquals("setSysTime", response.getSysTime()); - Assertions.assertEquals("setSysSerialNo", response.getSysSerialNo()); - Assertions.assertEquals("setCustomerNo", response.getCustomerNo()); + extractedPersonOpenAccountThreeElementResponseParams(response); + extractedPersonOpenAccountThreeElementResponseAssertions(response); + System.out.println(Json.toJson(response)); String responseJson = Json.toJson(response); - 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); + Assertions.assertEquals("", responseJson); HttpResponse httpResponse = TestHttpResponse.create("/account/v2/person-open-account-three-element", response, PersonOpenAccountThreeElementResponse.class); Mockito.when(apiClient.post( @@ -117,109 +51,109 @@ class AccountServiceTest { Mockito.any(RequestBody.class), Mockito.eq(PersonOpenAccountThreeElementResponse.class))) .thenReturn(httpResponse); + PersonOpenAccountThreeElementResponse result = service.personOpenAccountThreeElement(request); + System.out.println(Json.toJson(result)); String resultJson = Json.toJson(result); - 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); + Assertions.assertEquals("", resultJson); + } + + void extractedPersonOpenAccountThreeElementRequestParams(PersonOpenAccountThreeElementRequest request) { + request.setAppNo("setAppNo"); + request.setSerialNo("setSerialNo"); + request.setAccountName("setAccountName"); + request.setIdType("setIdType"); + request.setIdNo("setIdNo"); + request.setIdStartDate("setIdStartDate"); + request.setIdEndDate("setIdEndDate"); + request.setSignNo("setSignNo"); + request.setChannelNo("setChannelNo"); + request.setOpenTradeTime("setOpenTradeTime"); + request.setIdAddress("setIdAddress"); + request.setOpenIp("setOpenIp"); + request.setOpenDate("setOpenDate"); + request.setSex("setSex"); + request.setVerifyCode("setVerifyCode"); + request.setEthnic("setEthnic"); + request.setJobNote("setJobNote"); + request.setTransDate("setTransDate"); + request.setFileList(Lists.list()); + request.setSignName("setSignName"); + request.setOpenLongitude("setOpenLongitude"); + request.setJob("setJob"); + request.setMobile("setMobile"); + request.setOpenDimensions("setOpenDimensions"); + request.setTransTradeTime("setTransTradeTime"); + } + + void extractedPersonOpenAccountThreeElementRequestAssertions(PersonOpenAccountThreeElementRequest request) { + Assertions.assertEquals("setAppNo", request.getAppNo()); + Assertions.assertEquals("setSerialNo", request.getSerialNo()); + Assertions.assertEquals("setAccountName", request.getAccountName()); + Assertions.assertEquals("setIdType", request.getIdType()); + Assertions.assertEquals("setIdNo", request.getIdNo()); + Assertions.assertEquals("setIdStartDate", request.getIdStartDate()); + Assertions.assertEquals("setIdEndDate", request.getIdEndDate()); + Assertions.assertEquals("setSignNo", request.getSignNo()); + Assertions.assertEquals("setChannelNo", request.getChannelNo()); + Assertions.assertEquals("setOpenTradeTime", request.getOpenTradeTime()); + Assertions.assertEquals("setIdAddress", request.getIdAddress()); + Assertions.assertEquals("setOpenIp", request.getOpenIp()); + Assertions.assertEquals("setOpenDate", request.getOpenDate()); + Assertions.assertEquals("setSex", request.getSex()); + Assertions.assertEquals("setVerifyCode", request.getVerifyCode()); + Assertions.assertEquals("setEthnic", request.getEthnic()); + Assertions.assertEquals("setJobNote", request.getJobNote()); + Assertions.assertEquals("setTransDate", request.getTransDate()); + Assertions.assertNotNull(request.getFileList()); + Assertions.assertEquals("setSignName", request.getSignName()); + Assertions.assertEquals("setOpenLongitude", request.getOpenLongitude()); + Assertions.assertEquals("setJob", request.getJob()); + Assertions.assertEquals("setMobile", request.getMobile()); + Assertions.assertEquals("setOpenDimensions", request.getOpenDimensions()); + Assertions.assertEquals("setTransTradeTime", request.getTransTradeTime()); + } + + void extractedPersonOpenAccountThreeElementResponseParams(PersonOpenAccountThreeElementResponse response) { + response.setCustomerNo("setCustomerNo"); + response.setSysTime("setSysTime"); + response.setSysDate("setSysDate"); + response.setRecodeInfo("setRecodeInfo"); + response.setRecode("setRecode"); + response.setAccountNo("setAccountNo"); + response.setSysSerialNo("setSysSerialNo"); + response.setOriginalSerialNo("setOriginalSerialNo"); + } + + void extractedPersonOpenAccountThreeElementResponseAssertions(PersonOpenAccountThreeElementResponse response) { + Assertions.assertEquals("setCustomerNo", response.getCustomerNo()); + Assertions.assertEquals("setSysTime", response.getSysTime()); + Assertions.assertEquals("setSysDate", response.getSysDate()); + Assertions.assertEquals("setRecodeInfo", response.getRecodeInfo()); + Assertions.assertEquals("setRecode", response.getRecode()); + Assertions.assertEquals("setAccountNo", response.getAccountNo()); + Assertions.assertEquals("setSysSerialNo", response.getSysSerialNo()); + Assertions.assertEquals("setOriginalSerialNo", response.getOriginalSerialNo()); } @Test void personOpenAccountFourElementTest() { PersonOpenAccountFourElementRequest request = new PersonOpenAccountFourElementRequest(); - request.setOpenDimensions("setOpenDimensions"); - request.setTransTradeTime("setTransTradeTime"); - request.setAccountProperty("setAccountProperty"); - request.setPrimaryAccount("setPrimaryAccount"); - request.setChannelNo("setChannelNo"); - request.setAppNo("setAppNo"); - request.setSignNo("setSignNo"); - request.setIdAddress("setIdAddress"); - request.setSerialNo("setSerialNo"); - request.setIdNo("setIdNo"); - request.setAccountName("setAccountName"); - request.setIdType("setIdType"); - request.setIdEndDate("setIdEndDate"); - request.setMobile("setMobile"); - request.setVerifyCode("setVerifyCode"); - request.setEthnic("setEthnic"); - request.setFileList(Lists.list(new PersonOpenAccountFourElementRequest.FileList().setFileType("1").setFileNo("1").setFilePage(1))); - request.setOpenLongitude("setOpenLongitude"); - request.setOpenIp("setOpenIp"); - request.setOpenDate("setOpenDate"); - request.setOpenTradeTime("setOpenTradeTime"); - request.setSignName("setSignName"); - request.setSex("setSex"); - request.setJob("setJob"); - request.setJobNote("setJobNote"); - request.setTransDate("setTransDate"); - request.setIdStartDate("setIdStartDate"); - request.setBankNo("setBankNo"); - request.setAccountClass("setAccountClass"); - request.setBankName("setBankName"); - request.setTradeNo("setTradeNo"); - - Assertions.assertEquals("setOpenDimensions", request.getOpenDimensions()); - Assertions.assertEquals("setTransTradeTime", request.getTransTradeTime()); - Assertions.assertEquals("setAccountProperty", request.getAccountProperty()); - Assertions.assertEquals("setPrimaryAccount", request.getPrimaryAccount()); - Assertions.assertEquals("setChannelNo", request.getChannelNo()); - Assertions.assertEquals("setAppNo", request.getAppNo()); - Assertions.assertEquals("setSignNo", request.getSignNo()); - Assertions.assertEquals("setIdAddress", request.getIdAddress()); - Assertions.assertEquals("setSerialNo", request.getSerialNo()); - Assertions.assertEquals("setIdNo", request.getIdNo()); - Assertions.assertEquals("setAccountName", request.getAccountName()); - Assertions.assertEquals("setIdType", request.getIdType()); - Assertions.assertEquals("setIdEndDate", request.getIdEndDate()); - Assertions.assertEquals("setMobile", request.getMobile()); - Assertions.assertEquals("setVerifyCode", request.getVerifyCode()); - Assertions.assertEquals("setEthnic", request.getEthnic()); - Assertions.assertNotNull(request.getFileList()); - Assertions.assertEquals(1, request.getFileList().size()); - Assertions.assertEquals("1", request.getFileList().get(0).getFileNo()); - Assertions.assertEquals(1, request.getFileList().get(0).getFilePage()); - Assertions.assertEquals("1", request.getFileList().get(0).getFileType()); - Assertions.assertEquals("setOpenLongitude", request.getOpenLongitude()); - Assertions.assertEquals("setOpenIp", request.getOpenIp()); - Assertions.assertEquals("setOpenDate", request.getOpenDate()); - Assertions.assertEquals("setOpenTradeTime", request.getOpenTradeTime()); - Assertions.assertEquals("setSignName", request.getSignName()); - Assertions.assertEquals("setSex", request.getSex()); - Assertions.assertEquals("setJob", request.getJob()); - Assertions.assertEquals("setJobNote", request.getJobNote()); - Assertions.assertEquals("setTransDate", request.getTransDate()); - Assertions.assertEquals("setIdStartDate", request.getIdStartDate()); - Assertions.assertEquals("setBankNo", request.getBankNo()); - Assertions.assertEquals("setAccountClass", request.getAccountClass()); - Assertions.assertEquals("setBankName", request.getBankName()); - Assertions.assertEquals("setTradeNo", request.getTradeNo()); + extractedPersonOpenAccountFourElementRequestParams(request); + extractedPersonOpenAccountFourElementRequestAssertions(request); System.out.println(Json.toJson(request)); String requestJson = Json.toJson(request); - 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\":\"1\",\"file_type\":\"1\",\"file_page\":1}],\"open_longitude\":\"setOpenLongitude\",\"open_dimensions\":\"setOpenDimensions\",\"open_ip\":\"setOpenIp\",\"open_date\":\"setOpenDate\",\"open_tradetime\":\"setOpenTradeTime\",\"trans_date\":\"setTransDate\",\"trans_tradetime\":\"setTransTradeTime\"}", requestJson); + Assertions.assertEquals("", requestJson); PersonOpenAccountFourElementResponse response = new PersonOpenAccountFourElementResponse(); - response.setOriginalSerialNo("setOriginalSerialNo"); - response.setRecode("setRecode"); - response.setRecodeInfo("setRecodeInfo"); - response.setAccountNo("setAccountNo"); - response.setSysDate("setSysDate"); - response.setSysTime("setSysTime"); - response.setSysSerialNo("setSysSerialNo"); - response.setCustomerNo("setCustomerNo"); - - Assertions.assertEquals("setOriginalSerialNo", response.getOriginalSerialNo()); - Assertions.assertEquals("setRecode", response.getRecode()); - Assertions.assertEquals("setRecodeInfo", response.getRecodeInfo()); - Assertions.assertEquals("setAccountNo", response.getAccountNo()); - Assertions.assertEquals("setSysDate", response.getSysDate()); - Assertions.assertEquals("setSysTime", response.getSysTime()); - Assertions.assertEquals("setSysSerialNo", response.getSysSerialNo()); - Assertions.assertEquals("setCustomerNo", response.getCustomerNo()); + extractedPersonOpenAccountFourElementResponseParams(response); + extractedPersonOpenAccountFourElementResponseAssertions(response); System.out.println(Json.toJson(response)); String responseJson = Json.toJson(response); - 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); + Assertions.assertEquals("", responseJson); HttpResponse httpResponse = TestHttpResponse.create("/account/v2/person-open-account-four-element", response, PersonOpenAccountFourElementResponse.class); Mockito.when(apiClient.post( @@ -228,166 +162,121 @@ class AccountServiceTest { Mockito.any(RequestBody.class), Mockito.eq(PersonOpenAccountFourElementResponse.class))) .thenReturn(httpResponse); + PersonOpenAccountFourElementResponse result = service.personOpenAccountFourElement(request); System.out.println(Json.toJson(result)); String resultJson = Json.toJson(result); - 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); + Assertions.assertEquals("", resultJson); + } + + void extractedPersonOpenAccountFourElementRequestParams(PersonOpenAccountFourElementRequest request) { + request.setAppNo("setAppNo"); + request.setSerialNo("setSerialNo"); + request.setAccountName("setAccountName"); + request.setIdType("setIdType"); + request.setIdNo("setIdNo"); + request.setIdStartDate("setIdStartDate"); + request.setIdEndDate("setIdEndDate"); + request.setSignNo("setSignNo"); + request.setChannelNo("setChannelNo"); + request.setOpenTradeTime("setOpenTradeTime"); + request.setIdAddress("setIdAddress"); + request.setOpenIp("setOpenIp"); + request.setOpenDate("setOpenDate"); + request.setSex("setSex"); + request.setVerifyCode("setVerifyCode"); + request.setEthnic("setEthnic"); + request.setJobNote("setJobNote"); + request.setTransDate("setTransDate"); + request.setFileList(Lists.list()); + request.setSignName("setSignName"); + request.setOpenLongitude("setOpenLongitude"); + request.setJob("setJob"); + request.setMobile("setMobile"); + request.setAccountClass("setAccountClass"); + request.setTradeNo("setTradeNo"); + request.setBankName("setBankName"); + request.setBankNo("setBankNo"); + request.setOpenDimensions("setOpenDimensions"); + request.setTransTradeTime("setTransTradeTime"); + request.setAccountProperty("setAccountProperty"); + request.setPrimaryAccount("setPrimaryAccount"); + } + + void extractedPersonOpenAccountFourElementRequestAssertions(PersonOpenAccountFourElementRequest request) { + Assertions.assertEquals("setAppNo", request.getAppNo()); + Assertions.assertEquals("setSerialNo", request.getSerialNo()); + Assertions.assertEquals("setAccountName", request.getAccountName()); + Assertions.assertEquals("setIdType", request.getIdType()); + Assertions.assertEquals("setIdNo", request.getIdNo()); + Assertions.assertEquals("setIdStartDate", request.getIdStartDate()); + Assertions.assertEquals("setIdEndDate", request.getIdEndDate()); + Assertions.assertEquals("setSignNo", request.getSignNo()); + Assertions.assertEquals("setChannelNo", request.getChannelNo()); + Assertions.assertEquals("setOpenTradeTime", request.getOpenTradeTime()); + Assertions.assertEquals("setIdAddress", request.getIdAddress()); + Assertions.assertEquals("setOpenIp", request.getOpenIp()); + Assertions.assertEquals("setOpenDate", request.getOpenDate()); + Assertions.assertEquals("setSex", request.getSex()); + Assertions.assertEquals("setVerifyCode", request.getVerifyCode()); + Assertions.assertEquals("setEthnic", request.getEthnic()); + Assertions.assertEquals("setJobNote", request.getJobNote()); + Assertions.assertEquals("setTransDate", request.getTransDate()); + Assertions.assertNotNull(request.getFileList()); + Assertions.assertEquals("setSignName", request.getSignName()); + Assertions.assertEquals("setOpenLongitude", request.getOpenLongitude()); + Assertions.assertEquals("setJob", request.getJob()); + Assertions.assertEquals("setMobile", request.getMobile()); + Assertions.assertEquals("setAccountClass", request.getAccountClass()); + Assertions.assertEquals("setTradeNo", request.getTradeNo()); + Assertions.assertEquals("setBankName", request.getBankName()); + Assertions.assertEquals("setBankNo", request.getBankNo()); + Assertions.assertEquals("setOpenDimensions", request.getOpenDimensions()); + Assertions.assertEquals("setTransTradeTime", request.getTransTradeTime()); + Assertions.assertEquals("setAccountProperty", request.getAccountProperty()); + Assertions.assertEquals("setPrimaryAccount", request.getPrimaryAccount()); + } + + void extractedPersonOpenAccountFourElementResponseParams(PersonOpenAccountFourElementResponse response) { + response.setCustomerNo("setCustomerNo"); + response.setSysTime("setSysTime"); + response.setSysDate("setSysDate"); + response.setRecodeInfo("setRecodeInfo"); + response.setRecode("setRecode"); + response.setAccountNo("setAccountNo"); + response.setSysSerialNo("setSysSerialNo"); + response.setOriginalSerialNo("setOriginalSerialNo"); + } + + void extractedPersonOpenAccountFourElementResponseAssertions(PersonOpenAccountFourElementResponse response) { + Assertions.assertEquals("setCustomerNo", response.getCustomerNo()); + Assertions.assertEquals("setSysTime", response.getSysTime()); + Assertions.assertEquals("setSysDate", response.getSysDate()); + Assertions.assertEquals("setRecodeInfo", response.getRecodeInfo()); + Assertions.assertEquals("setRecode", response.getRecode()); + Assertions.assertEquals("setAccountNo", response.getAccountNo()); + Assertions.assertEquals("setSysSerialNo", response.getSysSerialNo()); + Assertions.assertEquals("setOriginalSerialNo", response.getOriginalSerialNo()); } @Test void openAccountCompanyTest() { OpenAccountCompanyRequest request = new OpenAccountCompanyRequest(); - request.setOpenDimensions("setOpenDimensions"); - request.setTransTradeTime("setTransTradeTime"); - request.setControllerIdName("setControllerIdName"); - request.setBeneNationality("setBeneNationality"); - request.setOperatorMobile("setOperatorMobile"); - request.setBeneIsShareholider("setBeneIsShareholider"); - request.setControllerIdNo("setControllerIdNo"); - request.setOperatorIdName("setOperatorIdName"); - request.setOperatorIdType("setOperatorIdType"); - request.setAccountProperty("setAccountProperty"); - request.setPrimaryAccount("setPrimaryAccount"); - request.setControllerOpto("setControllerOpto"); - request.setControllerIdType("setControllerIdType"); - request.setBeneOwner("setBeneOwner"); - request.setBeneIdType("setBeneIdType"); - request.setBeneIdNo("setBeneIdNo"); - request.setBeneAddr("setBeneAddr"); - request.setBeneOpto("setBeneOpto"); - request.setChannelNo("setChannelNo"); - request.setAppNo("setAppNo"); - request.setSignNo("setSignNo"); - request.setIdAddress("setIdAddress"); - request.setSerialNo("setSerialNo"); - request.setIdNo("setIdNo"); - request.setAccountName("setAccountName"); - request.setIdType("setIdType"); - request.setIdEndDate("setIdEndDate"); - request.setMobile("setMobile"); - request.setVerifyCode("setVerifyCode"); - request.setFileList(Lists.list(new OpenAccountCompanyRequest.FileList().setFileType("1").setFileNo("1").setFilePage(1))); - request.setOpenLongitude("setOpenLongitude"); - request.setOpenIp("setOpenIp"); - request.setOpenDate("setOpenDate"); - request.setOpenTradeTime("setOpenTradeTime"); - request.setSignName("setSignName"); - request.setTransDate("setTransDate"); - request.setIdStartDate("setIdStartDate"); - request.setBankNo("setBankNo"); - request.setAccountClass("setAccountClass"); - request.setBankName("setBankName"); - request.setTradeNo("setTradeNo"); - request.setOrgcodes("setOrgcodes"); - request.setLeaderOpto("setLeaderOpto"); - request.setLeaderIdNo("setLeaderIdNo"); - request.setOperatorOpto("setOperatorOpto"); - request.setBeneSex("setBeneSex"); - request.setCompanyOpto("setCompanyOpto"); - request.setCompanyIdNo("setCompanyIdNo"); - request.setLeaderMobile("setLeaderMobile"); - request.setBeneRatio("setBeneRatio"); - request.setRatcodes("setRatcodes"); - request.setZsopscope("setZsopscope"); - request.setCompanyIdName("setCompanyIdName"); - request.setLeaderIdType("setLeaderIdType"); - request.setIndustry("setIndustry"); - request.setCompanyIdType("setCompanyIdType"); - request.setLeaderIdName("setLeaderIdName"); - request.setOperatorIdNo("setOperatorIdNo"); - request.setBeneName("setBeneName"); - - Assertions.assertEquals("setOpenDimensions", request.getOpenDimensions()); - Assertions.assertEquals("setTransTradeTime", request.getTransTradeTime()); - Assertions.assertEquals("setControllerIdName", request.getControllerIdName()); - Assertions.assertEquals("setBeneNationality", request.getBeneNationality()); - Assertions.assertEquals("setOperatorMobile", request.getOperatorMobile()); - Assertions.assertEquals("setBeneIsShareholider", request.getBeneIsShareholider()); - Assertions.assertEquals("setControllerIdNo", request.getControllerIdNo()); - Assertions.assertEquals("setOperatorIdName", request.getOperatorIdName()); - Assertions.assertEquals("setOperatorIdType", request.getOperatorIdType()); - Assertions.assertEquals("setAccountProperty", request.getAccountProperty()); - Assertions.assertEquals("setPrimaryAccount", request.getPrimaryAccount()); - Assertions.assertEquals("setControllerOpto", request.getControllerOpto()); - Assertions.assertEquals("setControllerIdType", request.getControllerIdType()); - Assertions.assertEquals("setBeneOwner", request.getBeneOwner()); - Assertions.assertEquals("setBeneIdType", request.getBeneIdType()); - Assertions.assertEquals("setBeneIdNo", request.getBeneIdNo()); - Assertions.assertEquals("setBeneAddr", request.getBeneAddr()); - Assertions.assertEquals("setBeneOpto", request.getBeneOpto()); - Assertions.assertEquals("setChannelNo", request.getChannelNo()); - Assertions.assertEquals("setAppNo", request.getAppNo()); - Assertions.assertEquals("setSignNo", request.getSignNo()); - Assertions.assertEquals("setIdAddress", request.getIdAddress()); - Assertions.assertEquals("setSerialNo", request.getSerialNo()); - Assertions.assertEquals("setIdNo", request.getIdNo()); - Assertions.assertEquals("setAccountName", request.getAccountName()); - Assertions.assertEquals("setIdType", request.getIdType()); - Assertions.assertEquals("setIdEndDate", request.getIdEndDate()); - Assertions.assertEquals("setMobile", request.getMobile()); - Assertions.assertEquals("setVerifyCode", request.getVerifyCode()); - Assertions.assertNotNull(request.getFileList()); - Assertions.assertEquals(1, request.getFileList().size()); - Assertions.assertEquals("1", request.getFileList().get(0).getFileNo()); - Assertions.assertEquals(1, request.getFileList().get(0).getFilePage()); - Assertions.assertEquals("1", request.getFileList().get(0).getFileType()); - Assertions.assertEquals("setOpenLongitude", request.getOpenLongitude()); - Assertions.assertEquals("setOpenIp", request.getOpenIp()); - Assertions.assertEquals("setOpenDate", request.getOpenDate()); - Assertions.assertEquals("setOpenTradeTime", request.getOpenTradeTime()); - Assertions.assertEquals("setSignName", request.getSignName()); - Assertions.assertEquals("setTransDate", request.getTransDate()); - Assertions.assertEquals("setIdStartDate", request.getIdStartDate()); - Assertions.assertEquals("setBankNo", request.getBankNo()); - Assertions.assertEquals("setAccountClass", request.getAccountClass()); - Assertions.assertEquals("setBankName", request.getBankName()); - Assertions.assertEquals("setTradeNo", request.getTradeNo()); - Assertions.assertEquals("setOrgcodes", request.getOrgcodes()); - Assertions.assertEquals("setLeaderOpto", request.getLeaderOpto()); - Assertions.assertEquals("setLeaderIdNo", request.getLeaderIdNo()); - Assertions.assertEquals("setOperatorOpto", request.getOperatorOpto()); - Assertions.assertEquals("setBeneSex", request.getBeneSex()); - Assertions.assertEquals("setCompanyOpto", request.getCompanyOpto()); - Assertions.assertEquals("setCompanyIdNo", request.getCompanyIdNo()); - Assertions.assertEquals("setLeaderMobile", request.getLeaderMobile()); - Assertions.assertEquals("setBeneRatio", request.getBeneRatio()); - Assertions.assertEquals("setRatcodes", request.getRatcodes()); - Assertions.assertEquals("setZsopscope", request.getZsopscope()); - Assertions.assertEquals("setCompanyIdName", request.getCompanyIdName()); - Assertions.assertEquals("setLeaderIdType", request.getLeaderIdType()); - Assertions.assertEquals("setIndustry", request.getIndustry()); - Assertions.assertEquals("setCompanyIdType", request.getCompanyIdType()); - Assertions.assertEquals("setLeaderIdName", request.getLeaderIdName()); - Assertions.assertEquals("setOperatorIdNo", request.getOperatorIdNo()); - Assertions.assertEquals("setBeneName", request.getBeneName()); + extractedOpenAccountCompanyRequestParams(request); + extractedOpenAccountCompanyRequestAssertions(request); System.out.println(Json.toJson(request)); String requestJson = Json.toJson(request); - 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\":\"1\",\"file_type\":\"1\",\"file_page\":1}],\"open_longitude\":\"setOpenLongitude\",\"open_dimensions\":\"setOpenDimensions\",\"open_ip\":\"setOpenIp\",\"open_date\":\"setOpenDate\",\"open_tradetime\":\"setOpenTradeTime\",\"trans_date\":\"setTransDate\",\"trans_tradetime\":\"setTransTradeTime\"}", requestJson); + Assertions.assertEquals("", requestJson); OpenAccountCompanyResponse response = new OpenAccountCompanyResponse(); - response.setOriginalSerialNo("setOriginalSerialNo"); - response.setRecode("setRecode"); - response.setRecodeInfo("setRecodeInfo"); - response.setAccountNo("setAccountNo"); - response.setSysDate("setSysDate"); - response.setSysTime("setSysTime"); - response.setSysSerialNo("setSysSerialNo"); - response.setCustomerNo("setCustomerNo"); - - Assertions.assertEquals("setOriginalSerialNo", response.getOriginalSerialNo()); - Assertions.assertEquals("setRecode", response.getRecode()); - Assertions.assertEquals("setRecodeInfo", response.getRecodeInfo()); - Assertions.assertEquals("setAccountNo", response.getAccountNo()); - Assertions.assertEquals("setSysDate", response.getSysDate()); - Assertions.assertEquals("setSysTime", response.getSysTime()); - Assertions.assertEquals("setSysSerialNo", response.getSysSerialNo()); - Assertions.assertEquals("setCustomerNo", response.getCustomerNo()); + extractedOpenAccountCompanyResponseParams(response); + extractedOpenAccountCompanyResponseAssertions(response); System.out.println(Json.toJson(response)); String responseJson = Json.toJson(response); - 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); + Assertions.assertEquals("", responseJson); HttpResponse httpResponse = TestHttpResponse.create("/account/v2/company-open-account", response, OpenAccountCompanyResponse.class); Mockito.when(apiClient.post( @@ -396,88 +285,177 @@ class AccountServiceTest { Mockito.any(RequestBody.class), Mockito.eq(OpenAccountCompanyResponse.class))) .thenReturn(httpResponse); + OpenAccountCompanyResponse result = service.openAccountCompany(request); System.out.println(Json.toJson(result)); String resultJson = Json.toJson(result); - 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); + Assertions.assertEquals("", resultJson); + } + + void extractedOpenAccountCompanyRequestParams(OpenAccountCompanyRequest request) { + request.setBeneSex("setBeneSex"); + request.setRatcodes("setRatcodes"); + request.setLeaderMobile("setLeaderMobile"); + request.setBeneIdType("setBeneIdType"); + request.setBeneAddr("setBeneAddr"); + request.setOperatorIdNo("setOperatorIdNo"); + request.setBeneRatio("setBeneRatio"); + request.setOrgcodes("setOrgcodes"); + request.setBeneIdNo("setBeneIdNo"); + request.setBeneOpto("setBeneOpto"); + request.setLeaderIdNo("setLeaderIdNo"); + request.setCompanyIdType("setCompanyIdType"); + request.setLeaderIdType("setLeaderIdType"); + request.setZsopscope("setZsopscope"); + request.setCompanyIdNo("setCompanyIdNo"); + request.setCompanyIdName("setCompanyIdName"); + request.setOperatorOpto("setOperatorOpto"); + request.setLeaderOpto("setLeaderOpto"); + request.setCompanyOpto("setCompanyOpto"); + request.setLeaderIdName("setLeaderIdName"); + request.setIndustry("setIndustry"); + request.setBeneName("setBeneName"); + request.setBeneOwner("setBeneOwner"); + request.setAppNo("setAppNo"); + request.setSerialNo("setSerialNo"); + request.setAccountName("setAccountName"); + request.setIdType("setIdType"); + request.setIdNo("setIdNo"); + request.setIdStartDate("setIdStartDate"); + request.setIdEndDate("setIdEndDate"); + request.setSignNo("setSignNo"); + request.setChannelNo("setChannelNo"); + request.setOpenTradeTime("setOpenTradeTime"); + request.setIdAddress("setIdAddress"); + request.setOpenIp("setOpenIp"); + request.setOpenDate("setOpenDate"); + request.setVerifyCode("setVerifyCode"); + request.setTransDate("setTransDate"); + request.setFileList(Lists.list()); + request.setSignName("setSignName"); + request.setOpenLongitude("setOpenLongitude"); + request.setMobile("setMobile"); + request.setAccountClass("setAccountClass"); + request.setTradeNo("setTradeNo"); + request.setBankName("setBankName"); + request.setBankNo("setBankNo"); + request.setOpenDimensions("setOpenDimensions"); + request.setTransTradeTime("setTransTradeTime"); + request.setControllerIdNo("setControllerIdNo"); + request.setAccountProperty("setAccountProperty"); + request.setPrimaryAccount("setPrimaryAccount"); + request.setControllerIdType("setControllerIdType"); + request.setOperatorIdType("setOperatorIdType"); + request.setOperatorIdName("setOperatorIdName"); + request.setBeneNationality("setBeneNationality"); + request.setControllerIdName("setControllerIdName"); + request.setBeneIsShareholider("setBeneIsShareholider"); + request.setOperatorMobile("setOperatorMobile"); + request.setControllerOpto("setControllerOpto"); + } + + void extractedOpenAccountCompanyRequestAssertions(OpenAccountCompanyRequest request) { + Assertions.assertEquals("setBeneSex", request.getBeneSex()); + Assertions.assertEquals("setRatcodes", request.getRatcodes()); + Assertions.assertEquals("setLeaderMobile", request.getLeaderMobile()); + Assertions.assertEquals("setBeneIdType", request.getBeneIdType()); + Assertions.assertEquals("setBeneAddr", request.getBeneAddr()); + Assertions.assertEquals("setOperatorIdNo", request.getOperatorIdNo()); + Assertions.assertEquals("setBeneRatio", request.getBeneRatio()); + Assertions.assertEquals("setOrgcodes", request.getOrgcodes()); + Assertions.assertEquals("setBeneIdNo", request.getBeneIdNo()); + Assertions.assertEquals("setBeneOpto", request.getBeneOpto()); + Assertions.assertEquals("setLeaderIdNo", request.getLeaderIdNo()); + Assertions.assertEquals("setCompanyIdType", request.getCompanyIdType()); + Assertions.assertEquals("setLeaderIdType", request.getLeaderIdType()); + Assertions.assertEquals("setZsopscope", request.getZsopscope()); + Assertions.assertEquals("setCompanyIdNo", request.getCompanyIdNo()); + Assertions.assertEquals("setCompanyIdName", request.getCompanyIdName()); + Assertions.assertEquals("setOperatorOpto", request.getOperatorOpto()); + Assertions.assertEquals("setLeaderOpto", request.getLeaderOpto()); + Assertions.assertEquals("setCompanyOpto", request.getCompanyOpto()); + Assertions.assertEquals("setLeaderIdName", request.getLeaderIdName()); + Assertions.assertEquals("setIndustry", request.getIndustry()); + Assertions.assertEquals("setBeneName", request.getBeneName()); + Assertions.assertEquals("setBeneOwner", request.getBeneOwner()); + Assertions.assertEquals("setAppNo", request.getAppNo()); + Assertions.assertEquals("setSerialNo", request.getSerialNo()); + Assertions.assertEquals("setAccountName", request.getAccountName()); + Assertions.assertEquals("setIdType", request.getIdType()); + Assertions.assertEquals("setIdNo", request.getIdNo()); + Assertions.assertEquals("setIdStartDate", request.getIdStartDate()); + Assertions.assertEquals("setIdEndDate", request.getIdEndDate()); + Assertions.assertEquals("setSignNo", request.getSignNo()); + Assertions.assertEquals("setChannelNo", request.getChannelNo()); + Assertions.assertEquals("setOpenTradeTime", request.getOpenTradeTime()); + Assertions.assertEquals("setIdAddress", request.getIdAddress()); + Assertions.assertEquals("setOpenIp", request.getOpenIp()); + Assertions.assertEquals("setOpenDate", request.getOpenDate()); + Assertions.assertEquals("setVerifyCode", request.getVerifyCode()); + Assertions.assertEquals("setTransDate", request.getTransDate()); + Assertions.assertNotNull(request.getFileList()); + Assertions.assertEquals("setSignName", request.getSignName()); + Assertions.assertEquals("setOpenLongitude", request.getOpenLongitude()); + Assertions.assertEquals("setMobile", request.getMobile()); + Assertions.assertEquals("setAccountClass", request.getAccountClass()); + Assertions.assertEquals("setTradeNo", request.getTradeNo()); + Assertions.assertEquals("setBankName", request.getBankName()); + Assertions.assertEquals("setBankNo", request.getBankNo()); + Assertions.assertEquals("setOpenDimensions", request.getOpenDimensions()); + Assertions.assertEquals("setTransTradeTime", request.getTransTradeTime()); + Assertions.assertEquals("setControllerIdNo", request.getControllerIdNo()); + Assertions.assertEquals("setAccountProperty", request.getAccountProperty()); + Assertions.assertEquals("setPrimaryAccount", request.getPrimaryAccount()); + Assertions.assertEquals("setControllerIdType", request.getControllerIdType()); + Assertions.assertEquals("setOperatorIdType", request.getOperatorIdType()); + Assertions.assertEquals("setOperatorIdName", request.getOperatorIdName()); + Assertions.assertEquals("setBeneNationality", request.getBeneNationality()); + Assertions.assertEquals("setControllerIdName", request.getControllerIdName()); + Assertions.assertEquals("setBeneIsShareholider", request.getBeneIsShareholider()); + Assertions.assertEquals("setOperatorMobile", request.getOperatorMobile()); + Assertions.assertEquals("setControllerOpto", request.getControllerOpto()); + } + + void extractedOpenAccountCompanyResponseParams(OpenAccountCompanyResponse response) { + response.setCustomerNo("setCustomerNo"); + response.setSysTime("setSysTime"); + response.setSysDate("setSysDate"); + response.setRecodeInfo("setRecodeInfo"); + response.setRecode("setRecode"); + response.setAccountNo("setAccountNo"); + response.setSysSerialNo("setSysSerialNo"); + response.setOriginalSerialNo("setOriginalSerialNo"); + } + + void extractedOpenAccountCompanyResponseAssertions(OpenAccountCompanyResponse response) { + Assertions.assertEquals("setCustomerNo", response.getCustomerNo()); + Assertions.assertEquals("setSysTime", response.getSysTime()); + Assertions.assertEquals("setSysDate", response.getSysDate()); + Assertions.assertEquals("setRecodeInfo", response.getRecodeInfo()); + Assertions.assertEquals("setRecode", response.getRecode()); + Assertions.assertEquals("setAccountNo", response.getAccountNo()); + Assertions.assertEquals("setSysSerialNo", response.getSysSerialNo()); + Assertions.assertEquals("setOriginalSerialNo", response.getOriginalSerialNo()); } @Test void modAccPersonTest() { ModAccPersonRequest request = new ModAccPersonRequest(); - request.setTransTradeTime("setTransTradeTime"); - request.setAccountProperty("setAccountProperty"); - request.setPrimaryAccount("setPrimaryAccount"); - request.setTransTeller("setTransTeller"); - request.setChannelNo("setChannelNo"); - request.setAppNo("setAppNo"); - request.setSignNo("setSignNo"); - request.setSerialNo("setSerialNo"); - request.setIdNo("setIdNo"); - request.setIdType("setIdType"); - request.setIdEndDate("setIdEndDate"); - request.setMobile("setMobile"); - request.setVerifyCode("setVerifyCode"); - request.setFileList(Lists.list(new ModAccPersonRequest.FileList().setFileType("1").setFileNo("1").setFilePage("1"))); - request.setSignName("setSignName"); - request.setTransDate("setTransDate"); - request.setIdStartDate("setIdStartDate"); - request.setAccountNo("setAccountNo"); - request.setBankNo("setBankNo"); - request.setBankName("setBankName"); - request.setTradeNo("setTradeNo"); - - Assertions.assertEquals("setTransTradeTime", request.getTransTradeTime()); - Assertions.assertEquals("setAccountProperty", request.getAccountProperty()); - Assertions.assertEquals("setPrimaryAccount", request.getPrimaryAccount()); - Assertions.assertEquals("setTransTeller", request.getTransTeller()); - Assertions.assertEquals("setChannelNo", request.getChannelNo()); - Assertions.assertEquals("setAppNo", request.getAppNo()); - Assertions.assertEquals("setSignNo", request.getSignNo()); - Assertions.assertEquals("setSerialNo", request.getSerialNo()); - Assertions.assertEquals("setIdNo", request.getIdNo()); - Assertions.assertEquals("setIdType", request.getIdType()); - Assertions.assertEquals("setIdEndDate", request.getIdEndDate()); - Assertions.assertEquals("setMobile", request.getMobile()); - Assertions.assertEquals("setVerifyCode", request.getVerifyCode()); - Assertions.assertNotNull(request.getFileList()); - Assertions.assertEquals(1, request.getFileList().size()); - Assertions.assertEquals("1", request.getFileList().get(0).getFileNo()); - Assertions.assertEquals("1", request.getFileList().get(0).getFilePage()); - Assertions.assertEquals("1", request.getFileList().get(0).getFileType()); - Assertions.assertEquals("setSignName", request.getSignName()); - Assertions.assertEquals("setTransDate", request.getTransDate()); - Assertions.assertEquals("setIdStartDate", request.getIdStartDate()); - Assertions.assertEquals("setAccountNo", request.getAccountNo()); - Assertions.assertEquals("setBankNo", request.getBankNo()); - Assertions.assertEquals("setBankName", request.getBankName()); - Assertions.assertEquals("setTradeNo", request.getTradeNo()); + extractedModAccPersonRequestParams(request); + extractedModAccPersonRequestAssertions(request); System.out.println(Json.toJson(request)); String requestJson = Json.toJson(request); - 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\":[{\"file_no\":\"1\",\"file_type\":\"1\",\"file_page\":\"1\"}],\"trans_date\":\"setTransDate\",\"trans_tradetime\":\"setTransTradeTime\",\"trans_teller\":\"setTransTeller\"}", requestJson); + Assertions.assertEquals("", requestJson); ModAccPersonResponse response = new ModAccPersonResponse(); - response.setRecode("setRecode"); - response.setRecodeInfo("setRecodeInfo"); - response.setAccountNo("setAccountNo"); - response.setSysDate("setSysDate"); - response.setSysTime("setSysTime"); - response.setSysSerialNo("setSysSerialNo"); - response.setCustomerNo("setCustomerNo"); - - Assertions.assertEquals("setRecode", response.getRecode()); - Assertions.assertEquals("setRecodeInfo", response.getRecodeInfo()); - Assertions.assertEquals("setAccountNo", response.getAccountNo()); - Assertions.assertEquals("setSysDate", response.getSysDate()); - Assertions.assertEquals("setSysTime", response.getSysTime()); - Assertions.assertEquals("setSysSerialNo", response.getSysSerialNo()); - Assertions.assertEquals("setCustomerNo", response.getCustomerNo()); + extractedModAccPersonResponseParams(response); + extractedModAccPersonResponseAssertions(response); System.out.println(Json.toJson(response)); String responseJson = Json.toJson(response); - Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"account_no\":\"setAccountNo\",\"customer_no\":\"setCustomerNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", responseJson); + Assertions.assertEquals("", responseJson); HttpResponse httpResponse = TestHttpResponse.create("/account/v2/person-mod-account", response, ModAccPersonResponse.class); Mockito.when(apiClient.post( @@ -486,146 +464,95 @@ class AccountServiceTest { Mockito.any(RequestBody.class), Mockito.eq(ModAccPersonResponse.class))) .thenReturn(httpResponse); + ModAccPersonResponse result = service.modAccPerson(request); System.out.println(Json.toJson(result)); String resultJson = Json.toJson(result); - Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"account_no\":\"setAccountNo\",\"customer_no\":\"setCustomerNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", resultJson); + Assertions.assertEquals("", resultJson); + } + + void extractedModAccPersonRequestParams(ModAccPersonRequest request) { + request.setTransTeller("setTransTeller"); + request.setAppNo("setAppNo"); + request.setSerialNo("setSerialNo"); + request.setIdType("setIdType"); + request.setIdNo("setIdNo"); + request.setIdStartDate("setIdStartDate"); + request.setIdEndDate("setIdEndDate"); + request.setSignNo("setSignNo"); + request.setChannelNo("setChannelNo"); + request.setVerifyCode("setVerifyCode"); + request.setTransDate("setTransDate"); + request.setFileList(Lists.list()); + request.setSignName("setSignName"); + request.setMobile("setMobile"); + request.setAccountNo("setAccountNo"); + request.setTradeNo("setTradeNo"); + request.setBankName("setBankName"); + request.setBankNo("setBankNo"); + request.setTransTradeTime("setTransTradeTime"); + request.setAccountProperty("setAccountProperty"); + request.setPrimaryAccount("setPrimaryAccount"); + } + + void extractedModAccPersonRequestAssertions(ModAccPersonRequest request) { + Assertions.assertEquals("setTransTeller", request.getTransTeller()); + Assertions.assertEquals("setAppNo", request.getAppNo()); + Assertions.assertEquals("setSerialNo", request.getSerialNo()); + Assertions.assertEquals("setIdType", request.getIdType()); + Assertions.assertEquals("setIdNo", request.getIdNo()); + Assertions.assertEquals("setIdStartDate", request.getIdStartDate()); + Assertions.assertEquals("setIdEndDate", request.getIdEndDate()); + Assertions.assertEquals("setSignNo", request.getSignNo()); + Assertions.assertEquals("setChannelNo", request.getChannelNo()); + Assertions.assertEquals("setVerifyCode", request.getVerifyCode()); + Assertions.assertEquals("setTransDate", request.getTransDate()); + Assertions.assertNotNull(request.getFileList()); + Assertions.assertEquals("setSignName", request.getSignName()); + Assertions.assertEquals("setMobile", request.getMobile()); + Assertions.assertEquals("setAccountNo", request.getAccountNo()); + Assertions.assertEquals("setTradeNo", request.getTradeNo()); + Assertions.assertEquals("setBankName", request.getBankName()); + Assertions.assertEquals("setBankNo", request.getBankNo()); + Assertions.assertEquals("setTransTradeTime", request.getTransTradeTime()); + Assertions.assertEquals("setAccountProperty", request.getAccountProperty()); + Assertions.assertEquals("setPrimaryAccount", request.getPrimaryAccount()); + } + + void extractedModAccPersonResponseParams(ModAccPersonResponse response) { + response.setCustomerNo("setCustomerNo"); + response.setSysTime("setSysTime"); + response.setSysDate("setSysDate"); + response.setRecodeInfo("setRecodeInfo"); + response.setRecode("setRecode"); + response.setAccountNo("setAccountNo"); + response.setSysSerialNo("setSysSerialNo"); + } + + void extractedModAccPersonResponseAssertions(ModAccPersonResponse response) { + Assertions.assertEquals("setCustomerNo", response.getCustomerNo()); + Assertions.assertEquals("setSysTime", response.getSysTime()); + Assertions.assertEquals("setSysDate", response.getSysDate()); + Assertions.assertEquals("setRecodeInfo", response.getRecodeInfo()); + Assertions.assertEquals("setRecode", response.getRecode()); + Assertions.assertEquals("setAccountNo", response.getAccountNo()); + Assertions.assertEquals("setSysSerialNo", response.getSysSerialNo()); } @Test void modAccCompanyTest() { ModAccCompanyRequest request = new ModAccCompanyRequest(); - request.setTransTradeTime("setTransTradeTime"); - request.setControllerIdName("setControllerIdName"); - request.setBeneNationality("setBeneNationality"); - request.setOperatorMobile("setOperatorMobile"); - request.setBeneIsShareholider("setBeneIsShareholider"); - request.setControllerIdNo("setControllerIdNo"); - request.setOperatorIdName("setOperatorIdName"); - request.setOperatorIdType("setOperatorIdType"); - request.setAccountProperty("setAccountProperty"); - request.setPrimaryAccount("setPrimaryAccount"); - request.setControllerOpto("setControllerOpto"); - request.setControllerIdType("setControllerIdType"); - request.setTransTeller("setTransTeller"); - request.setBankAddress("setBankAddress"); - request.setBankCityno("setBankCityno"); - request.setBeneOwner("setBeneOwner"); - request.setBeneIdType("setBeneIdType"); - request.setBeneIdNo("setBeneIdNo"); - request.setBeneAddr("setBeneAddr"); - request.setBeneOpto("setBeneOpto"); - request.setChannelNo("setChannelNo"); - request.setAppNo("setAppNo"); - request.setSignNo("setSignNo"); - request.setSerialNo("setSerialNo"); - request.setIdNo("setIdNo"); - request.setIdType("setIdType"); - request.setIdEndDate("setIdEndDate"); - request.setMobile("setMobile"); - request.setVerifyCode("setVerifyCode"); - request.setFileList(Lists.list(new ModAccCompanyRequest.FileList().setFileType("1").setFileNo("1").setFilePage("1"))); - request.setSignName("setSignName"); - request.setTransDate("setTransDate"); - request.setIdStartDate("setIdStartDate"); - request.setAccountNo("setAccountNo"); - request.setBankNo("setBankNo"); - request.setBankName("setBankName"); - request.setTradeNo("setTradeNo"); - request.setLeaderOpto("setLeaderOpto"); - request.setLeaderIdNo("setLeaderIdNo"); - request.setOperatorOpto("setOperatorOpto"); - request.setBeneSex("setBeneSex"); - request.setCompanyOpto("setCompanyOpto"); - request.setCompanyIdNo("setCompanyIdNo"); - request.setLeaderMobile("setLeaderMobile"); - request.setBeneRatio("setBeneRatio"); - request.setCompanyIdName("setCompanyIdName"); - request.setLeaderIdType("setLeaderIdType"); - request.setIndustry("setIndustry"); - request.setCompanyIdType("setCompanyIdType"); - request.setLeaderIdName("setLeaderIdName"); - request.setOperatorIdNo("setOperatorIdNo"); - request.setBeneName("setBeneName"); - - Assertions.assertEquals("setTransTradeTime", request.getTransTradeTime()); - Assertions.assertEquals("setControllerIdName", request.getControllerIdName()); - Assertions.assertEquals("setBeneNationality", request.getBeneNationality()); - Assertions.assertEquals("setOperatorMobile", request.getOperatorMobile()); - Assertions.assertEquals("setBeneIsShareholider", request.getBeneIsShareholider()); - Assertions.assertEquals("setControllerIdNo", request.getControllerIdNo()); - Assertions.assertEquals("setOperatorIdName", request.getOperatorIdName()); - Assertions.assertEquals("setOperatorIdType", request.getOperatorIdType()); - Assertions.assertEquals("setAccountProperty", request.getAccountProperty()); - Assertions.assertEquals("setPrimaryAccount", request.getPrimaryAccount()); - Assertions.assertEquals("setControllerOpto", request.getControllerOpto()); - Assertions.assertEquals("setControllerIdType", request.getControllerIdType()); - Assertions.assertEquals("setTransTeller", request.getTransTeller()); - Assertions.assertEquals("setBankAddress", request.getBankAddress()); - Assertions.assertEquals("setBankCityno", request.getBankCityno()); - Assertions.assertEquals("setBeneOwner", request.getBeneOwner()); - Assertions.assertEquals("setBeneIdType", request.getBeneIdType()); - Assertions.assertEquals("setBeneIdNo", request.getBeneIdNo()); - Assertions.assertEquals("setBeneAddr", request.getBeneAddr()); - Assertions.assertEquals("setBeneOpto", request.getBeneOpto()); - Assertions.assertEquals("setChannelNo", request.getChannelNo()); - Assertions.assertEquals("setAppNo", request.getAppNo()); - Assertions.assertEquals("setSignNo", request.getSignNo()); - Assertions.assertEquals("setSerialNo", request.getSerialNo()); - Assertions.assertEquals("setIdNo", request.getIdNo()); - Assertions.assertEquals("setIdType", request.getIdType()); - Assertions.assertEquals("setIdEndDate", request.getIdEndDate()); - Assertions.assertEquals("setMobile", request.getMobile()); - Assertions.assertEquals("setVerifyCode", request.getVerifyCode()); - Assertions.assertNotNull(request.getFileList()); - Assertions.assertEquals(1, request.getFileList().size()); - Assertions.assertEquals("1", request.getFileList().get(0).getFileNo()); - Assertions.assertEquals("1", request.getFileList().get(0).getFilePage()); - Assertions.assertEquals("1", request.getFileList().get(0).getFileType()); - Assertions.assertEquals("setSignName", request.getSignName()); - Assertions.assertEquals("setTransDate", request.getTransDate()); - Assertions.assertEquals("setIdStartDate", request.getIdStartDate()); - Assertions.assertEquals("setAccountNo", request.getAccountNo()); - Assertions.assertEquals("setBankNo", request.getBankNo()); - Assertions.assertEquals("setBankName", request.getBankName()); - Assertions.assertEquals("setTradeNo", request.getTradeNo()); - Assertions.assertEquals("setLeaderOpto", request.getLeaderOpto()); - Assertions.assertEquals("setLeaderIdNo", request.getLeaderIdNo()); - Assertions.assertEquals("setOperatorOpto", request.getOperatorOpto()); - Assertions.assertEquals("setBeneSex", request.getBeneSex()); - Assertions.assertEquals("setCompanyOpto", request.getCompanyOpto()); - Assertions.assertEquals("setCompanyIdNo", request.getCompanyIdNo()); - Assertions.assertEquals("setLeaderMobile", request.getLeaderMobile()); - Assertions.assertEquals("setBeneRatio", request.getBeneRatio()); - Assertions.assertEquals("setCompanyIdName", request.getCompanyIdName()); - Assertions.assertEquals("setLeaderIdType", request.getLeaderIdType()); - Assertions.assertEquals("setIndustry", request.getIndustry()); - Assertions.assertEquals("setCompanyIdType", request.getCompanyIdType()); - Assertions.assertEquals("setLeaderIdName", request.getLeaderIdName()); - Assertions.assertEquals("setOperatorIdNo", request.getOperatorIdNo()); - Assertions.assertEquals("setBeneName", request.getBeneName()); + extractedModAccCompanyRequestParams(request); + extractedModAccCompanyRequestAssertions(request); System.out.println(Json.toJson(request)); String requestJson = Json.toJson(request); Assertions.assertEquals("", requestJson); ModAccCompanyResponse response = new ModAccCompanyResponse(); - response.setRecode("setRecode"); - response.setRecodeInfo("setRecodeInfo"); - response.setAccountNo("setAccountNo"); - response.setSysDate("setSysDate"); - response.setSysTime("setSysTime"); - response.setSysSerialNo("setSysSerialNo"); - response.setCustomerNo("setCustomerNo"); - - Assertions.assertEquals("setRecode", response.getRecode()); - Assertions.assertEquals("setRecodeInfo", response.getRecodeInfo()); - Assertions.assertEquals("setAccountNo", response.getAccountNo()); - Assertions.assertEquals("setSysDate", response.getSysDate()); - Assertions.assertEquals("setSysTime", response.getSysTime()); - Assertions.assertEquals("setSysSerialNo", response.getSysSerialNo()); - Assertions.assertEquals("setCustomerNo", response.getCustomerNo()); + extractedModAccCompanyResponseParams(response); + extractedModAccCompanyResponseAssertions(response); System.out.println(Json.toJson(response)); String responseJson = Json.toJson(response); @@ -638,6 +565,7 @@ class AccountServiceTest { Mockito.any(RequestBody.class), Mockito.eq(ModAccCompanyResponse.class))) .thenReturn(httpResponse); + ModAccCompanyResponse result = service.modAccCompany(request); System.out.println(Json.toJson(result)); @@ -645,51 +573,149 @@ class AccountServiceTest { Assertions.assertEquals("", resultJson); } + void extractedModAccCompanyRequestParams(ModAccCompanyRequest request) { + request.setTransTeller("setTransTeller"); + request.setBankCityno("setBankCityno"); + request.setBankAddress("setBankAddress"); + request.setBeneSex("setBeneSex"); + request.setLeaderMobile("setLeaderMobile"); + request.setBeneIdType("setBeneIdType"); + request.setBeneAddr("setBeneAddr"); + request.setOperatorIdNo("setOperatorIdNo"); + request.setBeneRatio("setBeneRatio"); + request.setBeneIdNo("setBeneIdNo"); + request.setBeneOpto("setBeneOpto"); + request.setLeaderIdNo("setLeaderIdNo"); + request.setCompanyIdType("setCompanyIdType"); + request.setLeaderIdType("setLeaderIdType"); + request.setCompanyIdNo("setCompanyIdNo"); + request.setCompanyIdName("setCompanyIdName"); + request.setOperatorOpto("setOperatorOpto"); + request.setLeaderOpto("setLeaderOpto"); + request.setCompanyOpto("setCompanyOpto"); + request.setLeaderIdName("setLeaderIdName"); + request.setIndustry("setIndustry"); + request.setBeneName("setBeneName"); + request.setBeneOwner("setBeneOwner"); + request.setAppNo("setAppNo"); + request.setSerialNo("setSerialNo"); + request.setIdType("setIdType"); + request.setIdNo("setIdNo"); + request.setIdStartDate("setIdStartDate"); + request.setIdEndDate("setIdEndDate"); + request.setSignNo("setSignNo"); + request.setChannelNo("setChannelNo"); + request.setVerifyCode("setVerifyCode"); + request.setTransDate("setTransDate"); + request.setFileList(Lists.list()); + request.setSignName("setSignName"); + request.setMobile("setMobile"); + request.setAccountNo("setAccountNo"); + request.setTradeNo("setTradeNo"); + request.setBankName("setBankName"); + request.setBankNo("setBankNo"); + request.setTransTradeTime("setTransTradeTime"); + request.setControllerIdNo("setControllerIdNo"); + request.setAccountProperty("setAccountProperty"); + request.setPrimaryAccount("setPrimaryAccount"); + request.setControllerIdType("setControllerIdType"); + request.setOperatorIdType("setOperatorIdType"); + request.setOperatorIdName("setOperatorIdName"); + request.setBeneNationality("setBeneNationality"); + request.setControllerIdName("setControllerIdName"); + request.setBeneIsShareholider("setBeneIsShareholider"); + request.setOperatorMobile("setOperatorMobile"); + request.setControllerOpto("setControllerOpto"); + } + + void extractedModAccCompanyRequestAssertions(ModAccCompanyRequest request) { + Assertions.assertEquals("setTransTeller", request.getTransTeller()); + Assertions.assertEquals("setBankCityno", request.getBankCityno()); + Assertions.assertEquals("setBankAddress", request.getBankAddress()); + Assertions.assertEquals("setBeneSex", request.getBeneSex()); + Assertions.assertEquals("setLeaderMobile", request.getLeaderMobile()); + Assertions.assertEquals("setBeneIdType", request.getBeneIdType()); + Assertions.assertEquals("setBeneAddr", request.getBeneAddr()); + Assertions.assertEquals("setOperatorIdNo", request.getOperatorIdNo()); + Assertions.assertEquals("setBeneRatio", request.getBeneRatio()); + Assertions.assertEquals("setBeneIdNo", request.getBeneIdNo()); + Assertions.assertEquals("setBeneOpto", request.getBeneOpto()); + Assertions.assertEquals("setLeaderIdNo", request.getLeaderIdNo()); + Assertions.assertEquals("setCompanyIdType", request.getCompanyIdType()); + Assertions.assertEquals("setLeaderIdType", request.getLeaderIdType()); + Assertions.assertEquals("setCompanyIdNo", request.getCompanyIdNo()); + Assertions.assertEquals("setCompanyIdName", request.getCompanyIdName()); + Assertions.assertEquals("setOperatorOpto", request.getOperatorOpto()); + Assertions.assertEquals("setLeaderOpto", request.getLeaderOpto()); + Assertions.assertEquals("setCompanyOpto", request.getCompanyOpto()); + Assertions.assertEquals("setLeaderIdName", request.getLeaderIdName()); + Assertions.assertEquals("setIndustry", request.getIndustry()); + Assertions.assertEquals("setBeneName", request.getBeneName()); + Assertions.assertEquals("setBeneOwner", request.getBeneOwner()); + Assertions.assertEquals("setAppNo", request.getAppNo()); + Assertions.assertEquals("setSerialNo", request.getSerialNo()); + Assertions.assertEquals("setIdType", request.getIdType()); + Assertions.assertEquals("setIdNo", request.getIdNo()); + Assertions.assertEquals("setIdStartDate", request.getIdStartDate()); + Assertions.assertEquals("setIdEndDate", request.getIdEndDate()); + Assertions.assertEquals("setSignNo", request.getSignNo()); + Assertions.assertEquals("setChannelNo", request.getChannelNo()); + Assertions.assertEquals("setVerifyCode", request.getVerifyCode()); + Assertions.assertEquals("setTransDate", request.getTransDate()); + Assertions.assertNotNull(request.getFileList()); + Assertions.assertEquals("setSignName", request.getSignName()); + Assertions.assertEquals("setMobile", request.getMobile()); + Assertions.assertEquals("setAccountNo", request.getAccountNo()); + Assertions.assertEquals("setTradeNo", request.getTradeNo()); + Assertions.assertEquals("setBankName", request.getBankName()); + Assertions.assertEquals("setBankNo", request.getBankNo()); + Assertions.assertEquals("setTransTradeTime", request.getTransTradeTime()); + Assertions.assertEquals("setControllerIdNo", request.getControllerIdNo()); + Assertions.assertEquals("setAccountProperty", request.getAccountProperty()); + Assertions.assertEquals("setPrimaryAccount", request.getPrimaryAccount()); + Assertions.assertEquals("setControllerIdType", request.getControllerIdType()); + Assertions.assertEquals("setOperatorIdType", request.getOperatorIdType()); + Assertions.assertEquals("setOperatorIdName", request.getOperatorIdName()); + Assertions.assertEquals("setBeneNationality", request.getBeneNationality()); + Assertions.assertEquals("setControllerIdName", request.getControllerIdName()); + Assertions.assertEquals("setBeneIsShareholider", request.getBeneIsShareholider()); + Assertions.assertEquals("setOperatorMobile", request.getOperatorMobile()); + Assertions.assertEquals("setControllerOpto", request.getControllerOpto()); + } + + void extractedModAccCompanyResponseParams(ModAccCompanyResponse response) { + response.setCustomerNo("setCustomerNo"); + response.setSysTime("setSysTime"); + response.setSysDate("setSysDate"); + response.setRecodeInfo("setRecodeInfo"); + response.setRecode("setRecode"); + response.setAccountNo("setAccountNo"); + response.setSysSerialNo("setSysSerialNo"); + } + + void extractedModAccCompanyResponseAssertions(ModAccCompanyResponse response) { + Assertions.assertEquals("setCustomerNo", response.getCustomerNo()); + Assertions.assertEquals("setSysTime", response.getSysTime()); + Assertions.assertEquals("setSysDate", response.getSysDate()); + Assertions.assertEquals("setRecodeInfo", response.getRecodeInfo()); + Assertions.assertEquals("setRecode", response.getRecode()); + Assertions.assertEquals("setAccountNo", response.getAccountNo()); + Assertions.assertEquals("setSysSerialNo", response.getSysSerialNo()); + } + @Test void queryBalanceTest() { QueryBalanceRequest request = new QueryBalanceRequest(); - request.setTransTradeTime("setTransTradeTime"); - request.setRelationAcct("setRelationAcct"); - request.setChannelNo("setChannelNo"); - request.setAppNo("setAppNo"); - request.setSerialNo("setSerialNo"); - request.setTransDate("setTransDate"); - request.setAccountNo("setAccountNo"); - - Assertions.assertEquals("setTransTradeTime", request.getTransTradeTime()); - Assertions.assertEquals("setRelationAcct", request.getRelationAcct()); - Assertions.assertEquals("setChannelNo", request.getChannelNo()); - Assertions.assertEquals("setAppNo", request.getAppNo()); - Assertions.assertEquals("setSerialNo", request.getSerialNo()); - Assertions.assertEquals("setTransDate", request.getTransDate()); - Assertions.assertEquals("setAccountNo", request.getAccountNo()); + extractedQueryBalanceRequestParams(request); + extractedQueryBalanceRequestAssertions(request); System.out.println(Json.toJson(request)); String requestJson = Json.toJson(request); Assertions.assertEquals("", requestJson); QueryBalanceResponse response = new QueryBalanceResponse(); - response.setDetailList(Lists.list()); - response.setIdNo("setIdNo"); - response.setAccountName("setAccountName"); - response.setIdType("setIdType"); - response.setMobile("setMobile"); - response.setRecode("setRecode"); - response.setRecodeInfo("setRecodeInfo"); - response.setSysDate("setSysDate"); - response.setSysTime("setSysTime"); - response.setSysSerialNo("setSysSerialNo"); - - Assertions.assertNotNull(response.getDetailList()); - Assertions.assertEquals("setIdNo", response.getIdNo()); - Assertions.assertEquals("setAccountName", response.getAccountName()); - Assertions.assertEquals("setIdType", response.getIdType()); - Assertions.assertEquals("setMobile", response.getMobile()); - Assertions.assertEquals("setRecode", response.getRecode()); - Assertions.assertEquals("setRecodeInfo", response.getRecodeInfo()); - Assertions.assertEquals("setSysDate", response.getSysDate()); - Assertions.assertEquals("setSysTime", response.getSysTime()); - Assertions.assertEquals("setSysSerialNo", response.getSysSerialNo()); + extractedQueryBalanceResponseParams(response); + extractedQueryBalanceResponseAssertions(response); System.out.println(Json.toJson(response)); String responseJson = Json.toJson(response); @@ -702,6 +728,7 @@ class AccountServiceTest { Mockito.any(RequestBody.class), Mockito.eq(QueryBalanceResponse.class))) .thenReturn(httpResponse); + QueryBalanceResponse result = service.queryBalance(request); System.out.println(Json.toJson(result)); @@ -709,47 +736,65 @@ class AccountServiceTest { Assertions.assertEquals("", resultJson); } + void extractedQueryBalanceRequestParams(QueryBalanceRequest request) { + request.setRelationAcct("setRelationAcct"); + request.setAppNo("setAppNo"); + request.setSerialNo("setSerialNo"); + request.setChannelNo("setChannelNo"); + request.setTransDate("setTransDate"); + request.setAccountNo("setAccountNo"); + request.setTransTradeTime("setTransTradeTime"); + } + + void extractedQueryBalanceRequestAssertions(QueryBalanceRequest request) { + Assertions.assertEquals("setRelationAcct", request.getRelationAcct()); + Assertions.assertEquals("setAppNo", request.getAppNo()); + Assertions.assertEquals("setSerialNo", request.getSerialNo()); + Assertions.assertEquals("setChannelNo", request.getChannelNo()); + Assertions.assertEquals("setTransDate", request.getTransDate()); + Assertions.assertEquals("setAccountNo", request.getAccountNo()); + Assertions.assertEquals("setTransTradeTime", request.getTransTradeTime()); + } + + void extractedQueryBalanceResponseParams(QueryBalanceResponse response) { + response.setDetailList(Lists.list()); + response.setAccountName("setAccountName"); + response.setIdType("setIdType"); + response.setIdNo("setIdNo"); + response.setMobile("setMobile"); + response.setSysTime("setSysTime"); + response.setSysDate("setSysDate"); + response.setRecodeInfo("setRecodeInfo"); + response.setRecode("setRecode"); + response.setSysSerialNo("setSysSerialNo"); + } + + void extractedQueryBalanceResponseAssertions(QueryBalanceResponse response) { + Assertions.assertNotNull(response.getDetailList()); + Assertions.assertEquals("setAccountName", response.getAccountName()); + Assertions.assertEquals("setIdType", response.getIdType()); + Assertions.assertEquals("setIdNo", response.getIdNo()); + Assertions.assertEquals("setMobile", response.getMobile()); + Assertions.assertEquals("setSysTime", response.getSysTime()); + Assertions.assertEquals("setSysDate", response.getSysDate()); + Assertions.assertEquals("setRecodeInfo", response.getRecodeInfo()); + Assertions.assertEquals("setRecode", response.getRecode()); + Assertions.assertEquals("setSysSerialNo", response.getSysSerialNo()); + } + @Test void queryCardInfoTest() { QueryCardInfoRequest request = new QueryCardInfoRequest(); - request.setTransTradeTime("setTransTradeTime"); - request.setCardNo("setCardNo"); - request.setChannelNo("setChannelNo"); - request.setAppNo("setAppNo"); - request.setSerialNo("setSerialNo"); - request.setTransDate("setTransDate"); - - Assertions.assertEquals("setTransTradeTime", request.getTransTradeTime()); - Assertions.assertEquals("setCardNo", request.getCardNo()); - Assertions.assertEquals("setChannelNo", request.getChannelNo()); - Assertions.assertEquals("setAppNo", request.getAppNo()); - Assertions.assertEquals("setSerialNo", request.getSerialNo()); - Assertions.assertEquals("setTransDate", request.getTransDate()); + extractedQueryCardInfoRequestParams(request); + extractedQueryCardInfoRequestAssertions(request); System.out.println(Json.toJson(request)); String requestJson = Json.toJson(request); Assertions.assertEquals("", requestJson); QueryCardInfoResponse response = new QueryCardInfoResponse(); - response.setPayBankNo("setPayBankNo"); - response.setCardType("setCardType"); - response.setRecode("setRecode"); - response.setRecodeInfo("setRecodeInfo"); - response.setSysDate("setSysDate"); - response.setSysTime("setSysTime"); - response.setSysSerialNo("setSysSerialNo"); - response.setBankNo("setBankNo"); - response.setBankName("setBankName"); - - Assertions.assertEquals("setPayBankNo", response.getPayBankNo()); - Assertions.assertEquals("setCardType", response.getCardType()); - Assertions.assertEquals("setRecode", response.getRecode()); - Assertions.assertEquals("setRecodeInfo", response.getRecodeInfo()); - Assertions.assertEquals("setSysDate", response.getSysDate()); - Assertions.assertEquals("setSysTime", response.getSysTime()); - Assertions.assertEquals("setSysSerialNo", response.getSysSerialNo()); - Assertions.assertEquals("setBankNo", response.getBankNo()); - Assertions.assertEquals("setBankName", response.getBankName()); + extractedQueryCardInfoResponseParams(response); + extractedQueryCardInfoResponseAssertions(response); System.out.println(Json.toJson(response)); String responseJson = Json.toJson(response); @@ -762,6 +807,7 @@ class AccountServiceTest { Mockito.any(RequestBody.class), Mockito.eq(QueryCardInfoResponse.class))) .thenReturn(httpResponse); + QueryCardInfoResponse result = service.queryCardInfo(request); System.out.println(Json.toJson(result)); @@ -769,59 +815,61 @@ class AccountServiceTest { Assertions.assertEquals("", resultJson); } + void extractedQueryCardInfoRequestParams(QueryCardInfoRequest request) { + request.setCardNo("setCardNo"); + request.setAppNo("setAppNo"); + request.setSerialNo("setSerialNo"); + request.setChannelNo("setChannelNo"); + request.setTransDate("setTransDate"); + request.setTransTradeTime("setTransTradeTime"); + } + + void extractedQueryCardInfoRequestAssertions(QueryCardInfoRequest request) { + Assertions.assertEquals("setCardNo", request.getCardNo()); + Assertions.assertEquals("setAppNo", request.getAppNo()); + Assertions.assertEquals("setSerialNo", request.getSerialNo()); + Assertions.assertEquals("setChannelNo", request.getChannelNo()); + Assertions.assertEquals("setTransDate", request.getTransDate()); + Assertions.assertEquals("setTransTradeTime", request.getTransTradeTime()); + } + + void extractedQueryCardInfoResponseParams(QueryCardInfoResponse response) { + response.setPayBankNo("setPayBankNo"); + response.setCardType("setCardType"); + response.setSysTime("setSysTime"); + response.setSysDate("setSysDate"); + response.setRecodeInfo("setRecodeInfo"); + response.setRecode("setRecode"); + response.setSysSerialNo("setSysSerialNo"); + response.setBankName("setBankName"); + response.setBankNo("setBankNo"); + } + + void extractedQueryCardInfoResponseAssertions(QueryCardInfoResponse response) { + Assertions.assertEquals("setPayBankNo", response.getPayBankNo()); + Assertions.assertEquals("setCardType", response.getCardType()); + Assertions.assertEquals("setSysTime", response.getSysTime()); + Assertions.assertEquals("setSysDate", response.getSysDate()); + Assertions.assertEquals("setRecodeInfo", response.getRecodeInfo()); + Assertions.assertEquals("setRecode", response.getRecode()); + Assertions.assertEquals("setSysSerialNo", response.getSysSerialNo()); + Assertions.assertEquals("setBankName", response.getBankName()); + Assertions.assertEquals("setBankNo", response.getBankNo()); + } + @Test void personBindTest() { PersonBindRequest request = new PersonBindRequest(); - request.setTransTradeTime("setTransTradeTime"); - request.setAccountProperty("setAccountProperty"); - request.setPrimaryAccount("setPrimaryAccount"); - request.setSetDefault("setSetDefault"); - request.setChannelNo("setChannelNo"); - request.setAppNo("setAppNo"); - request.setSerialNo("setSerialNo"); - request.setIdNo("setIdNo"); - request.setIdType("setIdType"); - request.setMobile("setMobile"); - request.setVerifyCode("setVerifyCode"); - request.setTransDate("setTransDate"); - request.setAccountNo("setAccountNo"); - request.setBankNo("setBankNo"); - request.setBankName("setBankName"); - request.setTradeNo("setTradeNo"); - - Assertions.assertEquals("setTransTradeTime", request.getTransTradeTime()); - Assertions.assertEquals("setAccountProperty", request.getAccountProperty()); - Assertions.assertEquals("setPrimaryAccount", request.getPrimaryAccount()); - Assertions.assertEquals("setSetDefault", request.getSetDefault()); - Assertions.assertEquals("setChannelNo", request.getChannelNo()); - Assertions.assertEquals("setAppNo", request.getAppNo()); - Assertions.assertEquals("setSerialNo", request.getSerialNo()); - Assertions.assertEquals("setIdNo", request.getIdNo()); - Assertions.assertEquals("setIdType", request.getIdType()); - Assertions.assertEquals("setMobile", request.getMobile()); - Assertions.assertEquals("setVerifyCode", request.getVerifyCode()); - Assertions.assertEquals("setTransDate", request.getTransDate()); - Assertions.assertEquals("setAccountNo", request.getAccountNo()); - Assertions.assertEquals("setBankNo", request.getBankNo()); - Assertions.assertEquals("setBankName", request.getBankName()); - Assertions.assertEquals("setTradeNo", request.getTradeNo()); + extractedPersonBindRequestParams(request); + extractedPersonBindRequestAssertions(request); System.out.println(Json.toJson(request)); String requestJson = Json.toJson(request); Assertions.assertEquals("", requestJson); PersonBindResponse response = new PersonBindResponse(); - response.setRecode("setRecode"); - response.setRecodeInfo("setRecodeInfo"); - response.setSysDate("setSysDate"); - response.setSysTime("setSysTime"); - response.setSysSerialNo("setSysSerialNo"); - - Assertions.assertEquals("setRecode", response.getRecode()); - Assertions.assertEquals("setRecodeInfo", response.getRecodeInfo()); - Assertions.assertEquals("setSysDate", response.getSysDate()); - Assertions.assertEquals("setSysTime", response.getSysTime()); - Assertions.assertEquals("setSysSerialNo", response.getSysSerialNo()); + extractedPersonBindResponseParams(response); + extractedPersonBindResponseAssertions(response); System.out.println(Json.toJson(response)); String responseJson = Json.toJson(response); @@ -834,6 +882,7 @@ class AccountServiceTest { Mockito.any(RequestBody.class), Mockito.eq(PersonBindResponse.class))) .thenReturn(httpResponse); + PersonBindResponse result = service.personBind(request); System.out.println(Json.toJson(result)); @@ -841,59 +890,73 @@ class AccountServiceTest { Assertions.assertEquals("", resultJson); } - @Test - void companyBindTest() { - CompanyBindRequest request = new CompanyBindRequest(); + void extractedPersonBindRequestParams(PersonBindRequest request) { + request.setSetDefault("setSetDefault"); + request.setAppNo("setAppNo"); + request.setSerialNo("setSerialNo"); + request.setIdType("setIdType"); + request.setIdNo("setIdNo"); + request.setChannelNo("setChannelNo"); + request.setVerifyCode("setVerifyCode"); + request.setTransDate("setTransDate"); + request.setMobile("setMobile"); + request.setAccountNo("setAccountNo"); + request.setTradeNo("setTradeNo"); + request.setBankName("setBankName"); + request.setBankNo("setBankNo"); request.setTransTradeTime("setTransTradeTime"); request.setAccountProperty("setAccountProperty"); request.setPrimaryAccount("setPrimaryAccount"); - request.setSetDefault("setSetDefault"); - request.setChannelNo("setChannelNo"); - request.setAppNo("setAppNo"); - request.setSerialNo("setSerialNo"); - request.setIdNo("setIdNo"); - request.setIdType("setIdType"); - request.setMobile("setMobile"); - request.setVerifyCode("setVerifyCode"); - request.setTransDate("setTransDate"); - request.setAccountNo("setAccountNo"); - request.setBankNo("setBankNo"); - request.setBankName("setBankName"); - request.setTradeNo("setTradeNo"); + } + void extractedPersonBindRequestAssertions(PersonBindRequest request) { + Assertions.assertEquals("setSetDefault", request.getSetDefault()); + Assertions.assertEquals("setAppNo", request.getAppNo()); + Assertions.assertEquals("setSerialNo", request.getSerialNo()); + Assertions.assertEquals("setIdType", request.getIdType()); + Assertions.assertEquals("setIdNo", request.getIdNo()); + Assertions.assertEquals("setChannelNo", request.getChannelNo()); + Assertions.assertEquals("setVerifyCode", request.getVerifyCode()); + Assertions.assertEquals("setTransDate", request.getTransDate()); + Assertions.assertEquals("setMobile", request.getMobile()); + Assertions.assertEquals("setAccountNo", request.getAccountNo()); + Assertions.assertEquals("setTradeNo", request.getTradeNo()); + Assertions.assertEquals("setBankName", request.getBankName()); + Assertions.assertEquals("setBankNo", request.getBankNo()); Assertions.assertEquals("setTransTradeTime", request.getTransTradeTime()); Assertions.assertEquals("setAccountProperty", request.getAccountProperty()); Assertions.assertEquals("setPrimaryAccount", request.getPrimaryAccount()); - Assertions.assertEquals("setSetDefault", request.getSetDefault()); - Assertions.assertEquals("setChannelNo", request.getChannelNo()); - Assertions.assertEquals("setAppNo", request.getAppNo()); - Assertions.assertEquals("setSerialNo", request.getSerialNo()); - Assertions.assertEquals("setIdNo", request.getIdNo()); - Assertions.assertEquals("setIdType", request.getIdType()); - Assertions.assertEquals("setMobile", request.getMobile()); - Assertions.assertEquals("setVerifyCode", request.getVerifyCode()); - Assertions.assertEquals("setTransDate", request.getTransDate()); - Assertions.assertEquals("setAccountNo", request.getAccountNo()); - Assertions.assertEquals("setBankNo", request.getBankNo()); - Assertions.assertEquals("setBankName", request.getBankName()); - Assertions.assertEquals("setTradeNo", request.getTradeNo()); + } + + void extractedPersonBindResponseParams(PersonBindResponse response) { + response.setSysTime("setSysTime"); + response.setSysDate("setSysDate"); + response.setRecodeInfo("setRecodeInfo"); + response.setRecode("setRecode"); + response.setSysSerialNo("setSysSerialNo"); + } + + void extractedPersonBindResponseAssertions(PersonBindResponse response) { + Assertions.assertEquals("setSysTime", response.getSysTime()); + Assertions.assertEquals("setSysDate", response.getSysDate()); + Assertions.assertEquals("setRecodeInfo", response.getRecodeInfo()); + Assertions.assertEquals("setRecode", response.getRecode()); + Assertions.assertEquals("setSysSerialNo", response.getSysSerialNo()); + } + + @Test + void companyBindTest() { + CompanyBindRequest request = new CompanyBindRequest(); + extractedCompanyBindRequestParams(request); + extractedCompanyBindRequestAssertions(request); System.out.println(Json.toJson(request)); String requestJson = Json.toJson(request); Assertions.assertEquals("", requestJson); CompanyBindResponse response = new CompanyBindResponse(); - response.setRecode("setRecode"); - response.setRecodeInfo("setRecodeInfo"); - response.setSysDate("setSysDate"); - response.setSysTime("setSysTime"); - response.setSysSerialNo("setSysSerialNo"); - - Assertions.assertEquals("setRecode", response.getRecode()); - Assertions.assertEquals("setRecodeInfo", response.getRecodeInfo()); - Assertions.assertEquals("setSysDate", response.getSysDate()); - Assertions.assertEquals("setSysTime", response.getSysTime()); - Assertions.assertEquals("setSysSerialNo", response.getSysSerialNo()); + extractedCompanyBindResponseParams(response); + extractedCompanyBindResponseAssertions(response); System.out.println(Json.toJson(response)); String responseJson = Json.toJson(response); @@ -906,6 +969,7 @@ class AccountServiceTest { Mockito.any(RequestBody.class), Mockito.eq(CompanyBindResponse.class))) .thenReturn(httpResponse); + CompanyBindResponse result = service.companyBind(request); System.out.println(Json.toJson(result)); @@ -913,55 +977,73 @@ class AccountServiceTest { Assertions.assertEquals("", resultJson); } + void extractedCompanyBindRequestParams(CompanyBindRequest request) { + request.setSetDefault("setSetDefault"); + request.setAppNo("setAppNo"); + request.setSerialNo("setSerialNo"); + request.setIdType("setIdType"); + request.setIdNo("setIdNo"); + request.setChannelNo("setChannelNo"); + request.setVerifyCode("setVerifyCode"); + request.setTransDate("setTransDate"); + request.setMobile("setMobile"); + request.setAccountNo("setAccountNo"); + request.setTradeNo("setTradeNo"); + request.setBankName("setBankName"); + request.setBankNo("setBankNo"); + request.setTransTradeTime("setTransTradeTime"); + request.setAccountProperty("setAccountProperty"); + request.setPrimaryAccount("setPrimaryAccount"); + } + + void extractedCompanyBindRequestAssertions(CompanyBindRequest request) { + Assertions.assertEquals("setSetDefault", request.getSetDefault()); + Assertions.assertEquals("setAppNo", request.getAppNo()); + Assertions.assertEquals("setSerialNo", request.getSerialNo()); + Assertions.assertEquals("setIdType", request.getIdType()); + Assertions.assertEquals("setIdNo", request.getIdNo()); + Assertions.assertEquals("setChannelNo", request.getChannelNo()); + Assertions.assertEquals("setVerifyCode", request.getVerifyCode()); + Assertions.assertEquals("setTransDate", request.getTransDate()); + Assertions.assertEquals("setMobile", request.getMobile()); + Assertions.assertEquals("setAccountNo", request.getAccountNo()); + Assertions.assertEquals("setTradeNo", request.getTradeNo()); + Assertions.assertEquals("setBankName", request.getBankName()); + Assertions.assertEquals("setBankNo", request.getBankNo()); + Assertions.assertEquals("setTransTradeTime", request.getTransTradeTime()); + Assertions.assertEquals("setAccountProperty", request.getAccountProperty()); + Assertions.assertEquals("setPrimaryAccount", request.getPrimaryAccount()); + } + + void extractedCompanyBindResponseParams(CompanyBindResponse response) { + response.setSysTime("setSysTime"); + response.setSysDate("setSysDate"); + response.setRecodeInfo("setRecodeInfo"); + response.setRecode("setRecode"); + response.setSysSerialNo("setSysSerialNo"); + } + + void extractedCompanyBindResponseAssertions(CompanyBindResponse response) { + Assertions.assertEquals("setSysTime", response.getSysTime()); + Assertions.assertEquals("setSysDate", response.getSysDate()); + Assertions.assertEquals("setRecodeInfo", response.getRecodeInfo()); + Assertions.assertEquals("setRecode", response.getRecode()); + Assertions.assertEquals("setSysSerialNo", response.getSysSerialNo()); + } + @Test void bankCardQueryTest() { BankCardQueryRequest request = new BankCardQueryRequest(); - request.setTransTradeTime("setTransTradeTime"); - request.setChannelNo("setChannelNo"); - request.setAppNo("setAppNo"); - request.setSerialNo("setSerialNo"); - request.setTransDate("setTransDate"); - request.setAccountNo("setAccountNo"); - - Assertions.assertEquals("setTransTradeTime", request.getTransTradeTime()); - Assertions.assertEquals("setChannelNo", request.getChannelNo()); - Assertions.assertEquals("setAppNo", request.getAppNo()); - Assertions.assertEquals("setSerialNo", request.getSerialNo()); - Assertions.assertEquals("setTransDate", request.getTransDate()); - Assertions.assertEquals("setAccountNo", request.getAccountNo()); + extractedBankCardQueryRequestParams(request); + extractedBankCardQueryRequestAssertions(request); System.out.println(Json.toJson(request)); String requestJson = Json.toJson(request); Assertions.assertEquals("", requestJson); BankCardQueryResponse response = new BankCardQueryResponse(); - response.setWithdrawBalance(new BigDecimal("1")); - response.setDetailList(Lists.list()); - response.setAvailBalance(new BigDecimal("1")); - response.setCurBalance(new BigDecimal("1")); - response.setPreBalance(new BigDecimal("1")); - response.setIdNo("setIdNo"); - response.setIdType("setIdType"); - response.setRecode("setRecode"); - response.setRecodeInfo("setRecodeInfo"); - response.setAccountNo("setAccountNo"); - response.setSysDate("setSysDate"); - response.setSysTime("setSysTime"); - response.setSysSerialNo("setSysSerialNo"); - - Assertions.assertEquals(new BigDecimal("1"), response.getWithdrawBalance()); - Assertions.assertNotNull(response.getDetailList()); - Assertions.assertEquals(new BigDecimal("1"), response.getAvailBalance()); - Assertions.assertEquals(new BigDecimal("1"), response.getCurBalance()); - Assertions.assertEquals(new BigDecimal("1"), response.getPreBalance()); - Assertions.assertEquals("setIdNo", response.getIdNo()); - Assertions.assertEquals("setIdType", response.getIdType()); - Assertions.assertEquals("setRecode", response.getRecode()); - Assertions.assertEquals("setRecodeInfo", response.getRecodeInfo()); - Assertions.assertEquals("setAccountNo", response.getAccountNo()); - Assertions.assertEquals("setSysDate", response.getSysDate()); - Assertions.assertEquals("setSysTime", response.getSysTime()); - Assertions.assertEquals("setSysSerialNo", response.getSysSerialNo()); + extractedBankCardQueryResponseParams(response); + extractedBankCardQueryResponseAssertions(response); System.out.println(Json.toJson(response)); String responseJson = Json.toJson(response); @@ -974,6 +1056,7 @@ class AccountServiceTest { Mockito.any(RequestBody.class), Mockito.eq(BankCardQueryResponse.class))) .thenReturn(httpResponse); + BankCardQueryResponse result = service.bankCardQuery(request); System.out.println(Json.toJson(result)); @@ -981,41 +1064,69 @@ class AccountServiceTest { Assertions.assertEquals("", resultJson); } + void extractedBankCardQueryRequestParams(BankCardQueryRequest request) { + request.setAppNo("setAppNo"); + request.setSerialNo("setSerialNo"); + request.setChannelNo("setChannelNo"); + request.setTransDate("setTransDate"); + request.setAccountNo("setAccountNo"); + request.setTransTradeTime("setTransTradeTime"); + } + + void extractedBankCardQueryRequestAssertions(BankCardQueryRequest request) { + Assertions.assertEquals("setAppNo", request.getAppNo()); + Assertions.assertEquals("setSerialNo", request.getSerialNo()); + Assertions.assertEquals("setChannelNo", request.getChannelNo()); + Assertions.assertEquals("setTransDate", request.getTransDate()); + Assertions.assertEquals("setAccountNo", request.getAccountNo()); + Assertions.assertEquals("setTransTradeTime", request.getTransTradeTime()); + } + + void extractedBankCardQueryResponseParams(BankCardQueryResponse response) { + response.setDetailList(Lists.list()); + response.setCurBalance(BigDecimal.valueOf(100.00)); + response.setAvailBalance(BigDecimal.valueOf(100.00)); + response.setPreBalance(BigDecimal.valueOf(100.00)); + response.setIdType("setIdType"); + response.setIdNo("setIdNo"); + response.setSysTime("setSysTime"); + response.setSysDate("setSysDate"); + response.setRecodeInfo("setRecodeInfo"); + response.setRecode("setRecode"); + response.setAccountNo("setAccountNo"); + response.setSysSerialNo("setSysSerialNo"); + response.setWithdrawBalance(BigDecimal.valueOf(100.00)); + } + + void extractedBankCardQueryResponseAssertions(BankCardQueryResponse response) { + Assertions.assertNotNull(response.getDetailList()); + Assertions.assertEquals(BigDecimal.valueOf(100.00), response.getCurBalance()); + Assertions.assertEquals(BigDecimal.valueOf(100.00), response.getAvailBalance()); + Assertions.assertEquals(BigDecimal.valueOf(100.00), response.getPreBalance()); + Assertions.assertEquals("setIdType", response.getIdType()); + Assertions.assertEquals("setIdNo", response.getIdNo()); + Assertions.assertEquals("setSysTime", response.getSysTime()); + Assertions.assertEquals("setSysDate", response.getSysDate()); + Assertions.assertEquals("setRecodeInfo", response.getRecodeInfo()); + Assertions.assertEquals("setRecode", response.getRecode()); + Assertions.assertEquals("setAccountNo", response.getAccountNo()); + Assertions.assertEquals("setSysSerialNo", response.getSysSerialNo()); + Assertions.assertEquals(BigDecimal.valueOf(100.00), response.getWithdrawBalance()); + } + @Test void unbindTest() { UnbindRequest request = new UnbindRequest(); - request.setTransTradeTime("setTransTradeTime"); - request.setPrimaryAccount("setPrimaryAccount"); - request.setChannelNo("setChannelNo"); - request.setAppNo("setAppNo"); - request.setSerialNo("setSerialNo"); - request.setTransDate("setTransDate"); - request.setAccountNo("setAccountNo"); - - Assertions.assertEquals("setTransTradeTime", request.getTransTradeTime()); - Assertions.assertEquals("setPrimaryAccount", request.getPrimaryAccount()); - Assertions.assertEquals("setChannelNo", request.getChannelNo()); - Assertions.assertEquals("setAppNo", request.getAppNo()); - Assertions.assertEquals("setSerialNo", request.getSerialNo()); - Assertions.assertEquals("setTransDate", request.getTransDate()); - Assertions.assertEquals("setAccountNo", request.getAccountNo()); + extractedUnbindRequestParams(request); + extractedUnbindRequestAssertions(request); System.out.println(Json.toJson(request)); String requestJson = Json.toJson(request); Assertions.assertEquals("", requestJson); UnbindResponse response = new UnbindResponse(); - response.setRecode("setRecode"); - response.setRecodeInfo("setRecodeInfo"); - response.setSysDate("setSysDate"); - response.setSysTime("setSysTime"); - response.setSysSerialNo("setSysSerialNo"); - - Assertions.assertEquals("setRecode", response.getRecode()); - Assertions.assertEquals("setRecodeInfo", response.getRecodeInfo()); - Assertions.assertEquals("setSysDate", response.getSysDate()); - Assertions.assertEquals("setSysTime", response.getSysTime()); - Assertions.assertEquals("setSysSerialNo", response.getSysSerialNo()); + extractedUnbindResponseParams(response); + extractedUnbindResponseAssertions(response); System.out.println(Json.toJson(response)); String responseJson = Json.toJson(response); @@ -1028,6 +1139,7 @@ class AccountServiceTest { Mockito.any(RequestBody.class), Mockito.eq(UnbindResponse.class))) .thenReturn(httpResponse); + UnbindResponse result = service.unbind(request); System.out.println(Json.toJson(result)); @@ -1035,43 +1147,55 @@ class AccountServiceTest { Assertions.assertEquals("", resultJson); } + void extractedUnbindRequestParams(UnbindRequest request) { + request.setAppNo("setAppNo"); + request.setSerialNo("setSerialNo"); + request.setChannelNo("setChannelNo"); + request.setTransDate("setTransDate"); + request.setAccountNo("setAccountNo"); + request.setTransTradeTime("setTransTradeTime"); + request.setPrimaryAccount("setPrimaryAccount"); + } + + void extractedUnbindRequestAssertions(UnbindRequest request) { + Assertions.assertEquals("setAppNo", request.getAppNo()); + Assertions.assertEquals("setSerialNo", request.getSerialNo()); + Assertions.assertEquals("setChannelNo", request.getChannelNo()); + Assertions.assertEquals("setTransDate", request.getTransDate()); + Assertions.assertEquals("setAccountNo", request.getAccountNo()); + Assertions.assertEquals("setTransTradeTime", request.getTransTradeTime()); + Assertions.assertEquals("setPrimaryAccount", request.getPrimaryAccount()); + } + + void extractedUnbindResponseParams(UnbindResponse response) { + response.setSysTime("setSysTime"); + response.setSysDate("setSysDate"); + response.setRecodeInfo("setRecodeInfo"); + response.setRecode("setRecode"); + response.setSysSerialNo("setSysSerialNo"); + } + + void extractedUnbindResponseAssertions(UnbindResponse response) { + Assertions.assertEquals("setSysTime", response.getSysTime()); + Assertions.assertEquals("setSysDate", response.getSysDate()); + Assertions.assertEquals("setRecodeInfo", response.getRecodeInfo()); + Assertions.assertEquals("setRecode", response.getRecode()); + Assertions.assertEquals("setSysSerialNo", response.getSysSerialNo()); + } + @Test void closedAccTest() { ClosedAccRequest request = new ClosedAccRequest(); - request.setTransTradeTime("setTransTradeTime"); - request.setChannelNo("setChannelNo"); - request.setAppNo("setAppNo"); - request.setSerialNo("setSerialNo"); - request.setVerifyCode("setVerifyCode"); - request.setTransDate("setTransDate"); - request.setAccountNo("setAccountNo"); - request.setTradeNo("setTradeNo"); - - Assertions.assertEquals("setTransTradeTime", request.getTransTradeTime()); - Assertions.assertEquals("setChannelNo", request.getChannelNo()); - Assertions.assertEquals("setAppNo", request.getAppNo()); - Assertions.assertEquals("setSerialNo", request.getSerialNo()); - Assertions.assertEquals("setVerifyCode", request.getVerifyCode()); - Assertions.assertEquals("setTransDate", request.getTransDate()); - Assertions.assertEquals("setAccountNo", request.getAccountNo()); - Assertions.assertEquals("setTradeNo", request.getTradeNo()); + extractedClosedAccRequestParams(request); + extractedClosedAccRequestAssertions(request); System.out.println(Json.toJson(request)); String requestJson = Json.toJson(request); Assertions.assertEquals("", requestJson); ClosedAccResponse response = new ClosedAccResponse(); - response.setRecode("setRecode"); - response.setRecodeInfo("setRecodeInfo"); - response.setSysDate("setSysDate"); - response.setSysTime("setSysTime"); - response.setSysSerialNo("setSysSerialNo"); - - Assertions.assertEquals("setRecode", response.getRecode()); - Assertions.assertEquals("setRecodeInfo", response.getRecodeInfo()); - Assertions.assertEquals("setSysDate", response.getSysDate()); - Assertions.assertEquals("setSysTime", response.getSysTime()); - Assertions.assertEquals("setSysSerialNo", response.getSysSerialNo()); + extractedClosedAccResponseParams(response); + extractedClosedAccResponseAssertions(response); System.out.println(Json.toJson(response)); String responseJson = Json.toJson(response); @@ -1084,6 +1208,7 @@ class AccountServiceTest { Mockito.any(RequestBody.class), Mockito.eq(ClosedAccResponse.class))) .thenReturn(httpResponse); + ClosedAccResponse result = service.closedAcc(request); System.out.println(Json.toJson(result)); @@ -1091,121 +1216,57 @@ class AccountServiceTest { Assertions.assertEquals("", resultJson); } + void extractedClosedAccRequestParams(ClosedAccRequest request) { + request.setAppNo("setAppNo"); + request.setSerialNo("setSerialNo"); + request.setChannelNo("setChannelNo"); + request.setVerifyCode("setVerifyCode"); + request.setTransDate("setTransDate"); + request.setAccountNo("setAccountNo"); + request.setTradeNo("setTradeNo"); + request.setTransTradeTime("setTransTradeTime"); + } + + void extractedClosedAccRequestAssertions(ClosedAccRequest request) { + Assertions.assertEquals("setAppNo", request.getAppNo()); + Assertions.assertEquals("setSerialNo", request.getSerialNo()); + Assertions.assertEquals("setChannelNo", request.getChannelNo()); + Assertions.assertEquals("setVerifyCode", request.getVerifyCode()); + Assertions.assertEquals("setTransDate", request.getTransDate()); + Assertions.assertEquals("setAccountNo", request.getAccountNo()); + Assertions.assertEquals("setTradeNo", request.getTradeNo()); + Assertions.assertEquals("setTransTradeTime", request.getTransTradeTime()); + } + + void extractedClosedAccResponseParams(ClosedAccResponse response) { + response.setSysTime("setSysTime"); + response.setSysDate("setSysDate"); + response.setRecodeInfo("setRecodeInfo"); + response.setRecode("setRecode"); + response.setSysSerialNo("setSysSerialNo"); + } + + void extractedClosedAccResponseAssertions(ClosedAccResponse response) { + Assertions.assertEquals("setSysTime", response.getSysTime()); + Assertions.assertEquals("setSysDate", response.getSysDate()); + Assertions.assertEquals("setRecodeInfo", response.getRecodeInfo()); + Assertions.assertEquals("setRecode", response.getRecode()); + Assertions.assertEquals("setSysSerialNo", response.getSysSerialNo()); + } + @Test void openAccInnerTest() { OpenAccInnerRequest request = new OpenAccInnerRequest(); - request.setTransTradeTime("setTransTradeTime"); - request.setControllerIdName("setControllerIdName"); - request.setBeneNationality("setBeneNationality"); - request.setOperatorMobile("setOperatorMobile"); - request.setBeneIsShareholider("setBeneIsShareholider"); - request.setControllerIdNo("setControllerIdNo"); - request.setOperatorIdName("setOperatorIdName"); - request.setOperatorIdType("setOperatorIdType"); - request.setControllerOpto("setControllerOpto"); - request.setControllerIdType("setControllerIdType"); - request.setAccountRelation("setAccountRelation"); - request.setBalanceDirection("setBalanceDirection"); - request.setIdStartdate("setIdStartdate"); - request.setRedBalance("setRedBalance"); - request.setIdEnddate("setIdEnddate"); - request.setBeneOwner("setBeneOwner"); - request.setBeneIdType("setBeneIdType"); - request.setBeneIdNo("setBeneIdNo"); - request.setBeneAddr("setBeneAddr"); - request.setBeneOpto("setBeneOpto"); - request.setChannelNo("setChannelNo"); - request.setAppNo("setAppNo"); - request.setSerialNo("setSerialNo"); - request.setIdNo("setIdNo"); - request.setAccountName("setAccountName"); - request.setIdType("setIdType"); - request.setMobile("setMobile"); - request.setTransDate("setTransDate"); - request.setAccountClass("setAccountClass"); - request.setLeaderOpto("setLeaderOpto"); - request.setLeaderIdNo("setLeaderIdNo"); - request.setOperatorOpto("setOperatorOpto"); - request.setBeneSex("setBeneSex"); - request.setCompanyOpto("setCompanyOpto"); - request.setCompanyIdNo("setCompanyIdNo"); - request.setLeaderMobile("setLeaderMobile"); - request.setBeneRatio("setBeneRatio"); - request.setZsopscope("setZsopscope"); - request.setCompanyIdName("setCompanyIdName"); - request.setLeaderIdType("setLeaderIdType"); - request.setIndustry("setIndustry"); - request.setCompanyIdType("setCompanyIdType"); - request.setLeaderIdName("setLeaderIdName"); - request.setOperatorIdNo("setOperatorIdNo"); - request.setBeneName("setBeneName"); - - Assertions.assertEquals("setTransTradeTime", request.getTransTradeTime()); - Assertions.assertEquals("setControllerIdName", request.getControllerIdName()); - Assertions.assertEquals("setBeneNationality", request.getBeneNationality()); - Assertions.assertEquals("setOperatorMobile", request.getOperatorMobile()); - Assertions.assertEquals("setBeneIsShareholider", request.getBeneIsShareholider()); - Assertions.assertEquals("setControllerIdNo", request.getControllerIdNo()); - Assertions.assertEquals("setOperatorIdName", request.getOperatorIdName()); - Assertions.assertEquals("setOperatorIdType", request.getOperatorIdType()); - Assertions.assertEquals("setControllerOpto", request.getControllerOpto()); - Assertions.assertEquals("setControllerIdType", request.getControllerIdType()); - Assertions.assertEquals("setAccountRelation", request.getAccountRelation()); - Assertions.assertEquals("setBalanceDirection", request.getBalanceDirection()); - Assertions.assertEquals("setIdStartdate", request.getIdStartdate()); - Assertions.assertEquals("setRedBalance", request.getRedBalance()); - Assertions.assertEquals("setIdEnddate", request.getIdEnddate()); - Assertions.assertEquals("setBeneOwner", request.getBeneOwner()); - Assertions.assertEquals("setBeneIdType", request.getBeneIdType()); - Assertions.assertEquals("setBeneIdNo", request.getBeneIdNo()); - Assertions.assertEquals("setBeneAddr", request.getBeneAddr()); - Assertions.assertEquals("setBeneOpto", request.getBeneOpto()); - Assertions.assertEquals("setChannelNo", request.getChannelNo()); - Assertions.assertEquals("setAppNo", request.getAppNo()); - Assertions.assertEquals("setSerialNo", request.getSerialNo()); - Assertions.assertEquals("setIdNo", request.getIdNo()); - Assertions.assertEquals("setAccountName", request.getAccountName()); - Assertions.assertEquals("setIdType", request.getIdType()); - Assertions.assertEquals("setMobile", request.getMobile()); - Assertions.assertEquals("setTransDate", request.getTransDate()); - Assertions.assertEquals("setAccountClass", request.getAccountClass()); - Assertions.assertEquals("setLeaderOpto", request.getLeaderOpto()); - Assertions.assertEquals("setLeaderIdNo", request.getLeaderIdNo()); - Assertions.assertEquals("setOperatorOpto", request.getOperatorOpto()); - Assertions.assertEquals("setBeneSex", request.getBeneSex()); - Assertions.assertEquals("setCompanyOpto", request.getCompanyOpto()); - Assertions.assertEquals("setCompanyIdNo", request.getCompanyIdNo()); - Assertions.assertEquals("setLeaderMobile", request.getLeaderMobile()); - Assertions.assertEquals("setBeneRatio", request.getBeneRatio()); - Assertions.assertEquals("setZsopscope", request.getZsopscope()); - Assertions.assertEquals("setCompanyIdName", request.getCompanyIdName()); - Assertions.assertEquals("setLeaderIdType", request.getLeaderIdType()); - Assertions.assertEquals("setIndustry", request.getIndustry()); - Assertions.assertEquals("setCompanyIdType", request.getCompanyIdType()); - Assertions.assertEquals("setLeaderIdName", request.getLeaderIdName()); - Assertions.assertEquals("setOperatorIdNo", request.getOperatorIdNo()); - Assertions.assertEquals("setBeneName", request.getBeneName()); + extractedOpenAccInnerRequestParams(request); + extractedOpenAccInnerRequestAssertions(request); System.out.println(Json.toJson(request)); String requestJson = Json.toJson(request); Assertions.assertEquals("", requestJson); OpenAccInnerResponse response = new OpenAccInnerResponse(); - response.setAccountName("setAccountName"); - response.setRecode("setRecode"); - response.setRecodeInfo("setRecodeInfo"); - response.setAccountNo("setAccountNo"); - response.setSysDate("setSysDate"); - response.setSysTime("setSysTime"); - response.setSysSerialNo("setSysSerialNo"); - - Assertions.assertEquals("setAccountName", response.getAccountName()); - Assertions.assertEquals("setRecode", response.getRecode()); - Assertions.assertEquals("setRecodeInfo", response.getRecodeInfo()); - Assertions.assertEquals("setAccountNo", response.getAccountNo()); - Assertions.assertEquals("setSysDate", response.getSysDate()); - Assertions.assertEquals("setSysTime", response.getSysTime()); - Assertions.assertEquals("setSysSerialNo", response.getSysSerialNo()); + extractedOpenAccInnerResponseParams(response); + extractedOpenAccInnerResponseAssertions(response); System.out.println(Json.toJson(response)); String responseJson = Json.toJson(response); @@ -1218,6 +1279,7 @@ class AccountServiceTest { Mockito.any(RequestBody.class), Mockito.eq(OpenAccInnerResponse.class))) .thenReturn(httpResponse); + OpenAccInnerResponse result = service.openAccInner(request); System.out.println(Json.toJson(result)); @@ -1225,4 +1287,120 @@ class AccountServiceTest { Assertions.assertEquals("", resultJson); } + void extractedOpenAccInnerRequestParams(OpenAccInnerRequest request) { + request.setRedBalance("setRedBalance"); + request.setIdEnddate("setIdEnddate"); + request.setIdStartdate("setIdStartdate"); + request.setBeneSex("setBeneSex"); + request.setLeaderMobile("setLeaderMobile"); + request.setBeneIdType("setBeneIdType"); + request.setBeneAddr("setBeneAddr"); + request.setOperatorIdNo("setOperatorIdNo"); + request.setBeneRatio("setBeneRatio"); + request.setBeneIdNo("setBeneIdNo"); + request.setBeneOpto("setBeneOpto"); + request.setLeaderIdNo("setLeaderIdNo"); + request.setCompanyIdType("setCompanyIdType"); + request.setLeaderIdType("setLeaderIdType"); + request.setZsopscope("setZsopscope"); + request.setCompanyIdNo("setCompanyIdNo"); + request.setCompanyIdName("setCompanyIdName"); + request.setOperatorOpto("setOperatorOpto"); + request.setLeaderOpto("setLeaderOpto"); + request.setCompanyOpto("setCompanyOpto"); + request.setLeaderIdName("setLeaderIdName"); + request.setIndustry("setIndustry"); + request.setBeneName("setBeneName"); + request.setBeneOwner("setBeneOwner"); + request.setAppNo("setAppNo"); + request.setSerialNo("setSerialNo"); + request.setAccountName("setAccountName"); + request.setIdType("setIdType"); + request.setIdNo("setIdNo"); + request.setChannelNo("setChannelNo"); + request.setTransDate("setTransDate"); + request.setMobile("setMobile"); + request.setAccountClass("setAccountClass"); + request.setBalanceDirection("setBalanceDirection"); + request.setAccountRelation("setAccountRelation"); + request.setTransTradeTime("setTransTradeTime"); + request.setControllerIdNo("setControllerIdNo"); + request.setControllerIdType("setControllerIdType"); + request.setOperatorIdType("setOperatorIdType"); + request.setOperatorIdName("setOperatorIdName"); + request.setBeneNationality("setBeneNationality"); + request.setControllerIdName("setControllerIdName"); + request.setBeneIsShareholider("setBeneIsShareholider"); + request.setOperatorMobile("setOperatorMobile"); + request.setControllerOpto("setControllerOpto"); + } + + void extractedOpenAccInnerRequestAssertions(OpenAccInnerRequest request) { + Assertions.assertEquals("setRedBalance", request.getRedBalance()); + Assertions.assertEquals("setIdEnddate", request.getIdEnddate()); + Assertions.assertEquals("setIdStartdate", request.getIdStartdate()); + Assertions.assertEquals("setBeneSex", request.getBeneSex()); + Assertions.assertEquals("setLeaderMobile", request.getLeaderMobile()); + Assertions.assertEquals("setBeneIdType", request.getBeneIdType()); + Assertions.assertEquals("setBeneAddr", request.getBeneAddr()); + Assertions.assertEquals("setOperatorIdNo", request.getOperatorIdNo()); + Assertions.assertEquals("setBeneRatio", request.getBeneRatio()); + Assertions.assertEquals("setBeneIdNo", request.getBeneIdNo()); + Assertions.assertEquals("setBeneOpto", request.getBeneOpto()); + Assertions.assertEquals("setLeaderIdNo", request.getLeaderIdNo()); + Assertions.assertEquals("setCompanyIdType", request.getCompanyIdType()); + Assertions.assertEquals("setLeaderIdType", request.getLeaderIdType()); + Assertions.assertEquals("setZsopscope", request.getZsopscope()); + Assertions.assertEquals("setCompanyIdNo", request.getCompanyIdNo()); + Assertions.assertEquals("setCompanyIdName", request.getCompanyIdName()); + Assertions.assertEquals("setOperatorOpto", request.getOperatorOpto()); + Assertions.assertEquals("setLeaderOpto", request.getLeaderOpto()); + Assertions.assertEquals("setCompanyOpto", request.getCompanyOpto()); + Assertions.assertEquals("setLeaderIdName", request.getLeaderIdName()); + Assertions.assertEquals("setIndustry", request.getIndustry()); + Assertions.assertEquals("setBeneName", request.getBeneName()); + Assertions.assertEquals("setBeneOwner", request.getBeneOwner()); + Assertions.assertEquals("setAppNo", request.getAppNo()); + Assertions.assertEquals("setSerialNo", request.getSerialNo()); + Assertions.assertEquals("setAccountName", request.getAccountName()); + Assertions.assertEquals("setIdType", request.getIdType()); + Assertions.assertEquals("setIdNo", request.getIdNo()); + Assertions.assertEquals("setChannelNo", request.getChannelNo()); + Assertions.assertEquals("setTransDate", request.getTransDate()); + Assertions.assertEquals("setMobile", request.getMobile()); + Assertions.assertEquals("setAccountClass", request.getAccountClass()); + Assertions.assertEquals("setBalanceDirection", request.getBalanceDirection()); + Assertions.assertEquals("setAccountRelation", request.getAccountRelation()); + Assertions.assertEquals("setTransTradeTime", request.getTransTradeTime()); + Assertions.assertEquals("setControllerIdNo", request.getControllerIdNo()); + Assertions.assertEquals("setControllerIdType", request.getControllerIdType()); + Assertions.assertEquals("setOperatorIdType", request.getOperatorIdType()); + Assertions.assertEquals("setOperatorIdName", request.getOperatorIdName()); + Assertions.assertEquals("setBeneNationality", request.getBeneNationality()); + Assertions.assertEquals("setControllerIdName", request.getControllerIdName()); + Assertions.assertEquals("setBeneIsShareholider", request.getBeneIsShareholider()); + Assertions.assertEquals("setOperatorMobile", request.getOperatorMobile()); + Assertions.assertEquals("setControllerOpto", request.getControllerOpto()); + } + + void extractedOpenAccInnerResponseParams(OpenAccInnerResponse response) { + response.setAccountName("setAccountName"); + response.setSysTime("setSysTime"); + response.setSysDate("setSysDate"); + response.setRecodeInfo("setRecodeInfo"); + response.setRecode("setRecode"); + response.setAccountNo("setAccountNo"); + response.setSysSerialNo("setSysSerialNo"); + } + + void extractedOpenAccInnerResponseAssertions(OpenAccInnerResponse response) { + Assertions.assertEquals("setAccountName", response.getAccountName()); + Assertions.assertEquals("setSysTime", response.getSysTime()); + Assertions.assertEquals("setSysDate", response.getSysDate()); + Assertions.assertEquals("setRecodeInfo", response.getRecodeInfo()); + Assertions.assertEquals("setRecode", response.getRecode()); + Assertions.assertEquals("setAccountNo", response.getAccountNo()); + Assertions.assertEquals("setSysSerialNo", response.getSysSerialNo()); + } + } \ No newline at end of file diff --git a/scfs-api-test/src/main/java/com/czcb/scfs/api/test/RefGenTestMethod.java b/scfs-api-test/src/main/java/com/czcb/scfs/api/test/RefGenTestMethod.java index 55ecb2e..05efea7 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 @@ -3,82 +3,147 @@ package com.czcb.scfs.api.test; import lombok.experimental.UtilityClass; import java.lang.reflect.Method; +import java.math.BigDecimal; +import java.util.List; @UtilityClass public class RefGenTestMethod { private static final String FMT_TEST = "@Test \nvoid %sTest() {\n"; - private static final String FMT_REQUEST = " %s request = new %s();\n"; - private static final String FMT_REQUEST_JSON = " String requestJson = Json.toJson(request);\n Assertions.assertEquals(\"\", requestJson);\n"; - private static final String FMT_RESPONSE = " %s response = new %s();\n"; - private static final String FMT_RESPONSE_JSON = " String responseJson = Json.toJson(response);\n Assertions.assertEquals(\"\", responseJson);"; - private static final String FMT_RESPONSE_RESULT_JSON = " String resultJson = Json.toJson(result);\n Assertions.assertEquals(\"\", resultJson);"; - private static final String FMT_REQUEST_METHOD = " request.%s(\"%s\");\n"; - private static final String FMT_RESPONSE_METHOD = " response.%s(\"%s\");\n"; - private static final String FMT_REQUEST_ASSERTIONS = " Assertions.assertEquals(\"%s\", request.%s());\n"; - private static final String FMT_RESPONSE_ASSERTIONS = " Assertions.assertEquals(\"%s\", response.%s());\n"; - private static final String FMT_REQUEST_MOCK = " HttpResponse<%s> httpResponse = TestHttpResponse.create(\"%s\", response, %s.class);\n"; - private static final String FMT_REQUEST_MOCK_REST = " %s result = service.%s(request);\n"; - private static final String FMT_REQUEST_MOCK_ITO = " Mockito.when(apiClient.post(\n" + + private static final String FMT_REQUEST = "\t%s request = new %s();\n"; + private static final String FMT_REQUEST_JSON = "\tString requestJson = Json.toJson(request);\n\tAssertions.assertEquals(\"\", requestJson);\n\n"; + private static final String FMT_RESPONSE = "\t%s response = new %s();\n"; + private static final String FMT_RESPONSE_JSON = "\tString responseJson = Json.toJson(response);\n\tAssertions.assertEquals(\"\", responseJson);\n\n"; + private static final String FMT_RESPONSE_RESULT_JSON = "\tString resultJson = Json.toJson(result);\n\tAssertions.assertEquals(\"\", resultJson);\n"; + private static final String FMT_REQUEST_METHOD = "\trequest.%s(\"%s\");\n"; + private static final String FMT_RESPONSE_METHOD = "\tresponse.%s(\"%s\");\n"; + private static final String FMT_REQUEST_ASSERTIONS = "\tAssertions.assertEquals(\"%s\", request.%s());\n"; + private static final String FMT_NOT_NULL_ASSERTIONS = "\tAssertions.assertNotNull(%s.%s());\n"; + private static final String FMT_RESPONSE_ASSERTIONS = "\tAssertions.assertEquals(\"%s\", response.%s());\n"; + private static final String FMT_REQUEST_MOCK = "\tHttpResponse<%s> httpResponse = TestHttpResponse.create(\"%s\", response, %s.class);\n"; + private static final String FMT_REQUEST_MOCK_REST = "\t%s result = service.%s(request);\n\n"; + private static final String FMT_REQUEST_MOCK_ITO = "\tMockito.when(apiClient.post(\n" + " Mockito.eq(\"%s\"),\n" + " Mockito.any(HttpHeaders.class),\n" + " Mockito.any(RequestBody.class),\n" + " Mockito.eq(%s.class)))\n" + - " .thenReturn(httpResponse);\n"; + " .thenReturn(httpResponse);\n\n"; - public static void gen(Class request, Class response, String methodName, String url) { - System.out.printf(FMT_TEST, methodName); - System.out.printf(FMT_REQUEST, request.getSimpleName(), request.getSimpleName()); + private static final String EXTRACTED_REQUEST = "\textracted%sParams(request);\n"; + private static final String EXTRACTED_REQUEST_ASSERTIONS = "\textracted%sAssertions(request);\n\n"; + 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) { + print("void extracted%sParams(%s request) {\n", request.getSimpleName(), request.getSimpleName()); Method[] methods = request.getMethods(); for (Method method : methods) { if (!method.getName().startsWith("set")) { continue; } - System.out.printf(FMT_REQUEST_METHOD, method.getName(), method.getName()); + + printParams(FMT_REQUEST_METHOD, method); } - System.out.println(); + print("}\n"); + } + + public static void genRequestAssertions(Class request) { + print("void extracted%sAssertions(%s request) {\n", request.getSimpleName(), request.getSimpleName()); + + Method[] methods = request.getMethods(); for (Method method : methods) { if (!method.getName().startsWith("set")) { continue; } - System.out.printf(FMT_REQUEST_ASSERTIONS, method.getName(), method.getName().replace("set", "get")); + + printAssertions(FMT_REQUEST_ASSERTIONS, method, true); } + print("}\n"); + } - System.out.println(); - System.out.println("System.out.println(Json.toJson(request));"); - System.out.printf(FMT_REQUEST_JSON); - System.out.println(); + public static void genResponseParams(Class response) { + print("void extracted%sParams(%s response) {\n", response.getSimpleName(), response.getSimpleName()); - System.out.printf(FMT_RESPONSE, response.getSimpleName(), response.getSimpleName()); - Method[] responseMethods = response.getMethods(); - for (Method method : responseMethods) { + Method[] methods = response.getMethods(); + for (Method method : methods) { if (!method.getName().startsWith("set")) { continue; } - System.out.printf(FMT_RESPONSE_METHOD, method.getName(), method.getName()); - } - System.out.println(); - for (Method method : responseMethods) { + printParams(FMT_RESPONSE_METHOD, method); + } + print("}\n"); + } + + public static void genResponseAssertions(Class response) { + print("void extracted%sAssertions(%s response) {\n", response.getSimpleName(), response.getSimpleName()); + + Method[] methods = response.getMethods(); + for (Method method : methods) { if (!method.getName().startsWith("set")) { continue; } - System.out.printf(FMT_RESPONSE_ASSERTIONS, method.getName(), method.getName().replace("set", "get")); + + printAssertions(FMT_RESPONSE_ASSERTIONS, method, false); } + print("}\n"); + } - System.out.println(); - System.out.println("System.out.println(Json.toJson(response));"); - System.out.printf(FMT_RESPONSE_JSON); - System.out.println("\n"); + public static void gen(Class request, Class response, String methodName, String url) { + print(FMT_TEST, methodName); + print(FMT_REQUEST, request.getSimpleName(), request.getSimpleName()); - System.out.printf(FMT_REQUEST_MOCK, response.getSimpleName(), url, response.getSimpleName()); - System.out.printf(FMT_REQUEST_MOCK_ITO, url, response.getSimpleName()); - System.out.printf(FMT_REQUEST_MOCK_REST, response.getSimpleName(), methodName); + print(EXTRACTED_REQUEST, request.getSimpleName()); + print(EXTRACTED_REQUEST_ASSERTIONS, request.getSimpleName()); - System.out.println(); - System.out.println("System.out.println(Json.toJson(result));"); - System.out.printf(FMT_RESPONSE_RESULT_JSON); - System.out.println("\n}"); + print("\tSystem.out.println(Json.toJson(request));\n"); + print(FMT_REQUEST_JSON); + + print(FMT_RESPONSE, response.getSimpleName(), response.getSimpleName()); + print(EXTRACTED_RESPONSE, response.getSimpleName()); + print(EXTRACTED_RESPONSE_ASSERTIONS, response.getSimpleName()); + + print("\tSystem.out.println(Json.toJson(response));\n"); + print(FMT_RESPONSE_JSON); + + print(FMT_REQUEST_MOCK, response.getSimpleName(), url, response.getSimpleName()); + print(FMT_REQUEST_MOCK_ITO, url, response.getSimpleName()); + print(FMT_REQUEST_MOCK_REST, response.getSimpleName(), methodName); + + print("\tSystem.out.println(Json.toJson(result));\n"); + print(FMT_RESPONSE_RESULT_JSON); + print("}\n"); + + genRequestParams(request); + genRequestAssertions(request); + genResponseParams(response); + genResponseAssertions(response); + } + + private static void print(String format, Object... args) { + System.out.printf(format, args); + } + + private static void printParams(String fmt, Method method) { + if (method.getParameterTypes()[0].isAssignableFrom(String.class)) { + print(fmt, method.getName(), method.getName()); + } else if (method.getParameterTypes()[0].isAssignableFrom(BigDecimal.class)) { + 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("\"", "")); + } + } + + private static void printAssertions(String fmt, Method method, boolean isRequest) { + if (method.getParameterTypes()[0].isAssignableFrom(String.class)) { + print(fmt, method.getName(), method.getName().replace("set", "get")); + } else if (method.getParameterTypes()[0].isAssignableFrom(BigDecimal.class)) { + print(String.format(fmt, "BigDecimal.valueOf(100.00)", method.getName().replace("set", "get")) + .replace("\"", "")); + } else if (method.getParameterTypes()[0].isAssignableFrom(List.class)) { + print(String.format(FMT_NOT_NULL_ASSERTIONS, isRequest ? "request" : "response", method.getName() + .replace("set", "get"))); + } } }