From f346bdbe370a01778c544750b5c0d6979b3cb52e Mon Sep 17 00:00:00 2001 From: mia-li-001 Date: Sat, 31 Oct 2026 19:35:50 -0500 Subject: [PATCH 1/2] Extracted duplicated stubbings in ClientTest into a helper --- src/test/java/com/bitpay/sdk/ClientTest.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/test/java/com/bitpay/sdk/ClientTest.java b/src/test/java/com/bitpay/sdk/ClientTest.java index 32bbb275..fc24e03c 100644 --- a/src/test/java/com/bitpay/sdk/ClientTest.java +++ b/src/test/java/com/bitpay/sdk/ClientTest.java @@ -663,8 +663,7 @@ public void it_should_create_refund() throws BitPayApiException, BitPayGenericEx Mockito.when(this.bitPayClient.post("refunds/", createRefundJsonRequest, true)) .thenReturn( this.getHttpResponseWithSpecificBody(getPreparedJsonDataFromFile("createRefundResponse.json"))); - Mockito.when(this.guidGenerator.execute()).thenReturn(EXAMPLE_UUID); - Mockito.when(this.accessTokens.getAccessToken(Facade.MERCHANT)).thenReturn(merchantToken); + setupTokenContainerGetAccessTokenAndExecuteStubs(Facade.MERCHANT, merchantToken); Client testedClass = this.getTestedClass(); // when @@ -1556,8 +1555,7 @@ public void it_should_test_updatePayoutRecipient() throws BitPayApiException, Bi payoutRecipient.setLabel(label); payoutRecipient.setToken(PAYOUT_ACCESS_TOKEN); - Mockito.when(this.guidGenerator.execute()).thenReturn(EXAMPLE_UUID); - Mockito.when(this.accessTokens.getAccessToken(Facade.PAYOUT)).thenReturn(PAYOUT_ACCESS_TOKEN); + setupTokenContainerGetAccessTokenAndExecuteStubs(Facade.PAYOUT, PAYOUT_ACCESS_TOKEN); Mockito.when(this.bitPayClient.update( "recipients/" + RECIPIENT_ID, getPreparedJsonDataFromFile("updatePayoutRecipientRequest.json") @@ -2104,4 +2102,12 @@ private Client getTestedClass() { this.guidGenerator ); } + + private void setupTokenContainerGetAccessTokenAndExecuteStubs( + Facade getAccessTokenArg1, + String getAccessTokenReturnValue + ) throws BitPayGenericException { + Mockito.when(this.guidGenerator.execute()).thenReturn(EXAMPLE_UUID); + Mockito.when(this.accessTokens.getAccessToken(getAccessTokenArg1)).thenReturn(getAccessTokenReturnValue); + } } From eb5c2c49b96b36ecc97590485cec8f3bea5ec195 Mon Sep 17 00:00:00 2001 From: mia-li-001 Date: Thu, 19 Nov 2026 12:57:07 -0600 Subject: [PATCH 2/2] Renamed the helper in ClientTest to stubGuidAndAccessToken --- src/test/java/com/bitpay/sdk/ClientTest.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/test/java/com/bitpay/sdk/ClientTest.java b/src/test/java/com/bitpay/sdk/ClientTest.java index fc24e03c..d5bc7642 100644 --- a/src/test/java/com/bitpay/sdk/ClientTest.java +++ b/src/test/java/com/bitpay/sdk/ClientTest.java @@ -663,7 +663,7 @@ public void it_should_create_refund() throws BitPayApiException, BitPayGenericEx Mockito.when(this.bitPayClient.post("refunds/", createRefundJsonRequest, true)) .thenReturn( this.getHttpResponseWithSpecificBody(getPreparedJsonDataFromFile("createRefundResponse.json"))); - setupTokenContainerGetAccessTokenAndExecuteStubs(Facade.MERCHANT, merchantToken); + this.stubGuidAndAccessToken(Facade.MERCHANT, merchantToken); Client testedClass = this.getTestedClass(); // when @@ -1555,7 +1555,7 @@ public void it_should_test_updatePayoutRecipient() throws BitPayApiException, Bi payoutRecipient.setLabel(label); payoutRecipient.setToken(PAYOUT_ACCESS_TOKEN); - setupTokenContainerGetAccessTokenAndExecuteStubs(Facade.PAYOUT, PAYOUT_ACCESS_TOKEN); + this.stubGuidAndAccessToken(Facade.PAYOUT, PAYOUT_ACCESS_TOKEN); Mockito.when(this.bitPayClient.update( "recipients/" + RECIPIENT_ID, getPreparedJsonDataFromFile("updatePayoutRecipientRequest.json") @@ -2103,11 +2103,11 @@ private Client getTestedClass() { ); } - private void setupTokenContainerGetAccessTokenAndExecuteStubs( - Facade getAccessTokenArg1, - String getAccessTokenReturnValue + private void stubGuidAndAccessToken( + Facade facade, + String accessToken ) throws BitPayGenericException { Mockito.when(this.guidGenerator.execute()).thenReturn(EXAMPLE_UUID); - Mockito.when(this.accessTokens.getAccessToken(getAccessTokenArg1)).thenReturn(getAccessTokenReturnValue); + Mockito.when(this.accessTokens.getAccessToken(facade)).thenReturn(accessToken); } }