Merge remote-tracking branch 'origin/dev' into dev
commit
0ce78652d2
|
|
@ -898,7 +898,7 @@ class PayServiceTest {
|
|||
|
||||
System.out.println(Json.toJson(response));
|
||||
String responseJson = Json.toJson(response);
|
||||
Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\",\"data\":[{\"account_class\":\"setAccountClass\",\"seq_no\":\"setSeqNo\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"core_account_no\":\"setCoreAccountNo\",\"trans_amount\":100.0,\"pay_path\":\"setPayPath\",\"opp_account_no\":\"setOppAccountNo\",\"opp_account_name\":\"setOppAccountName\",\"status\":\"setStatus\",\"failure_msg\":\"setFailureMsg\",\"failure_flag\":\"setFailureFlag\",\"redo_flag\":\"setRedoFlag\"}]}", responseJson);
|
||||
Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\",\"data\":[{\"account_class\":\"setAccountClass\",\"seq_no\":\"setSeqNo\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"trans_amount\":100.0,\"pay_path\":\"setPayPath\",\"opp_account_no\":\"setOppAccountNo\",\"opp_account_name\":\"setOppAccountName\",\"status\":\"setStatus\",\"failure_msg\":\"setFailureMsg\",\"failure_flag\":\"setFailureFlag\",\"redo_flag\":\"setRedoFlag\"}]}", responseJson);
|
||||
|
||||
HttpResponse<OfflineRechargeDetailQueryResponse> httpResponse = MockHttpResponse.create("/offline-recharge/details/query", response, OfflineRechargeDetailQueryResponse.class);
|
||||
Mockito.when(apiClient.post(
|
||||
|
|
@ -912,7 +912,7 @@ class PayServiceTest {
|
|||
|
||||
System.out.println(Json.toJson(result));
|
||||
String resultJson = Json.toJson(result);
|
||||
Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\",\"data\":[{\"account_class\":\"setAccountClass\",\"seq_no\":\"setSeqNo\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"core_account_no\":\"setCoreAccountNo\",\"trans_amount\":100.0,\"pay_path\":\"setPayPath\",\"opp_account_no\":\"setOppAccountNo\",\"opp_account_name\":\"setOppAccountName\",\"status\":\"setStatus\",\"failure_msg\":\"setFailureMsg\",\"failure_flag\":\"setFailureFlag\",\"redo_flag\":\"setRedoFlag\"}]}", resultJson);
|
||||
Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\",\"data\":[{\"account_class\":\"setAccountClass\",\"seq_no\":\"setSeqNo\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"trans_amount\":100.0,\"pay_path\":\"setPayPath\",\"opp_account_no\":\"setOppAccountNo\",\"opp_account_name\":\"setOppAccountName\",\"status\":\"setStatus\",\"failure_msg\":\"setFailureMsg\",\"failure_flag\":\"setFailureFlag\",\"redo_flag\":\"setRedoFlag\"}]}", resultJson);
|
||||
}
|
||||
|
||||
void extractedOfflineRechargeDetailQueryRequestParams(OfflineRechargeDetailQueryRequest request) {
|
||||
|
|
@ -1007,7 +1007,7 @@ class PayServiceTest {
|
|||
|
||||
System.out.println(Json.toJson(response));
|
||||
String responseJson = Json.toJson(response);
|
||||
Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\",\"data\":[{\"match_status\":\"setMatchStatus\",\"match_amount\":100.0,\"account_class\":\"setAccountClass\",\"seq_no\":\"setSeqNo\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"core_account_no\":\"setCoreAccountNo\",\"trans_amount\":100.0,\"pay_path\":\"setPayPath\",\"opp_account_no\":\"setOppAccountNo\",\"opp_account_name\":\"setOppAccountName\",\"trade_time\":\"setTradeTime\",\"status\":\"setStatus\",\"failure_msg\":\"setFailureMsg\",\"failure_flag\":\"setFailureFlag\",\"redo_flag\":\"setRedoFlag\"}]}", responseJson);
|
||||
Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\",\"data\":[{\"match_status\":\"setMatchStatus\",\"match_amount\":100.0,\"account_class\":\"setAccountClass\",\"seq_no\":\"setSeqNo\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"trans_amount\":100.0,\"pay_path\":\"setPayPath\",\"opp_account_no\":\"setOppAccountNo\",\"opp_account_name\":\"setOppAccountName\",\"trade_time\":\"setTradeTime\",\"status\":\"setStatus\",\"failure_msg\":\"setFailureMsg\",\"failure_flag\":\"setFailureFlag\",\"redo_flag\":\"setRedoFlag\"}]}", responseJson);
|
||||
|
||||
HttpResponse<OfflineRechargeDetailUnmatchedQueryResponse> httpResponse = MockHttpResponse.create("/offline-recharge/details/unmatched/query", response, OfflineRechargeDetailUnmatchedQueryResponse.class);
|
||||
Mockito.when(apiClient.post(
|
||||
|
|
@ -1021,7 +1021,7 @@ class PayServiceTest {
|
|||
|
||||
System.out.println(Json.toJson(result));
|
||||
String resultJson = Json.toJson(result);
|
||||
Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\",\"data\":[{\"match_status\":\"setMatchStatus\",\"match_amount\":100.0,\"account_class\":\"setAccountClass\",\"seq_no\":\"setSeqNo\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"core_account_no\":\"setCoreAccountNo\",\"trans_amount\":100.0,\"pay_path\":\"setPayPath\",\"opp_account_no\":\"setOppAccountNo\",\"opp_account_name\":\"setOppAccountName\",\"trade_time\":\"setTradeTime\",\"status\":\"setStatus\",\"failure_msg\":\"setFailureMsg\",\"failure_flag\":\"setFailureFlag\",\"redo_flag\":\"setRedoFlag\"}]}", resultJson);
|
||||
Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\",\"data\":[{\"match_status\":\"setMatchStatus\",\"match_amount\":100.0,\"account_class\":\"setAccountClass\",\"seq_no\":\"setSeqNo\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"trans_amount\":100.0,\"pay_path\":\"setPayPath\",\"opp_account_no\":\"setOppAccountNo\",\"opp_account_name\":\"setOppAccountName\",\"trade_time\":\"setTradeTime\",\"status\":\"setStatus\",\"failure_msg\":\"setFailureMsg\",\"failure_flag\":\"setFailureFlag\",\"redo_flag\":\"setRedoFlag\"}]}", resultJson);
|
||||
}
|
||||
|
||||
void extractedOfflineRechargeDetailUnmatchedQueryRequestParams(OfflineRechargeDetailUnmatchedQueryRequest request) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue