From bea9a8abb35a571ab0381f4ceeb671c4420d49f6 Mon Sep 17 00:00:00 2001 From: Vadim Korotchenko Date: Fri, 25 Nov 2016 14:42:28 -0800 Subject: [PATCH 1/6] created transfer method endpoint for widget --- .../hyperwallet/clientsdk/Hyperwallet.java | 37 ++ .../clientsdk/util/HyperwalletApiClient.java | 20 +- .../clientsdk/HyperwalletTest.java | 472 +++++++++++++----- 3 files changed, 396 insertions(+), 133 deletions(-) diff --git a/src/main/java/com/hyperwallet/clientsdk/Hyperwallet.java b/src/main/java/com/hyperwallet/clientsdk/Hyperwallet.java index 8fc55ea29..1c1723395 100644 --- a/src/main/java/com/hyperwallet/clientsdk/Hyperwallet.java +++ b/src/main/java/com/hyperwallet/clientsdk/Hyperwallet.java @@ -9,6 +9,7 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.HashMap; import java.util.Locale; import java.util.TimeZone; @@ -927,6 +928,37 @@ public HyperwalletList listWebhookEvents(Hyperwa return apiClient.get(url, new TypeReference>() {}); } + //-------------------------------------- + // Transfer Methods + //-------------------------------------- + + /** + * Create a Transfer Method + * + * @param jsonCacheToken JSON cache token + * @param transferMethod Transfer Method object to create + * @return HyperwalletTransferMethod Transfer Method object created + */ + public HyperwalletTransferMethod createTransferMethod(String jsonCacheToken, HyperwalletTransferMethod transferMethod) { + + if (transferMethod == null || StringUtils.isEmpty(transferMethod.getUserToken())) { + throw new HyperwalletException("User token is required"); + } + if (StringUtils.isEmpty(jsonCacheToken)) { + throw new HyperwalletException("JSON token is required"); + } + transferMethod = copy(transferMethod); + + transferMethod.setToken(null); + transferMethod.setStatus(null); + transferMethod.setCreatedOn(null); + + HashMap headers = new HashMap(); + headers.put("Json-Cache-Token", jsonCacheToken); + + return apiClient.post(url + "/users/"+transferMethod.getUserToken()+"/transfer-methods", transferMethod, HyperwalletTransferMethod.class, headers); + } + //-------------------------------------- // Internal utils //-------------------------------------- @@ -998,4 +1030,9 @@ private HyperwalletStatusTransition copy(HyperwalletStatusTransition statusTrans return statusTransition; } + private HyperwalletTransferMethod copy(HyperwalletTransferMethod transferMethod) { + transferMethod = HyperwalletJsonUtil.fromJson(HyperwalletJsonUtil.toJson(transferMethod), HyperwalletTransferMethod.class); + return transferMethod; + } + } diff --git a/src/main/java/com/hyperwallet/clientsdk/util/HyperwalletApiClient.java b/src/main/java/com/hyperwallet/clientsdk/util/HyperwalletApiClient.java index 0e26b2e5d..c0f9d5fc9 100644 --- a/src/main/java/com/hyperwallet/clientsdk/util/HyperwalletApiClient.java +++ b/src/main/java/com/hyperwallet/clientsdk/util/HyperwalletApiClient.java @@ -4,10 +4,11 @@ import cc.protea.util.http.Response; import com.fasterxml.jackson.core.type.TypeReference; import com.hyperwallet.clientsdk.HyperwalletException; -import com.hyperwallet.clientsdk.model.*; +import com.hyperwallet.clientsdk.model.HyperwalletErrorList; import javax.xml.bind.DatatypeConverter; import java.io.IOException; +import java.util.HashMap; public class HyperwalletApiClient { @@ -68,6 +69,23 @@ public T post(final String url, final Object bodyObject, final Class type } } + public T post(final String url, final Object bodyObject, final Class type, HashMap header) { + Response response = null; + try { + String body = convert(bodyObject); + Request request = getService(url, false).setBody(body); + + for (String key: header.keySet()) { + request = request.addHeader(key, header.get(key)); + } + + response = request.postResource(); + return processResponse(response, type); + } catch (IOException e) { + throw new HyperwalletException(e); + } + } + protected T processResponse(final Response response, final Class type) { checkErrorResponse(response); if (response.getResponseCode() == 204) { diff --git a/src/test/java/com/hyperwallet/clientsdk/HyperwalletTest.java b/src/test/java/com/hyperwallet/clientsdk/HyperwalletTest.java index c9a805134..8b091fd04 100644 --- a/src/test/java/com/hyperwallet/clientsdk/HyperwalletTest.java +++ b/src/test/java/com/hyperwallet/clientsdk/HyperwalletTest.java @@ -14,9 +14,13 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.HashMap; import java.util.Locale; import java.util.TimeZone; +import static org.mockito.Matchers.*; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import static org.testng.Assert.fail; import static org.hamcrest.MatcherAssert.assertThat; @@ -115,13 +119,13 @@ public void testCreateUser_withoutProgramToken() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - Mockito.when(mockApiClient.post(Mockito.anyString(), Mockito.anyObject(), Mockito.any(Class.class))).thenReturn(userResponse); + when(mockApiClient.post(anyString(), anyObject(), Mockito.any(Class.class))).thenReturn(userResponse); HyperwalletUser resp = client.createUser(user); assertThat(resp, is(equalTo(userResponse))); ArgumentCaptor argument = ArgumentCaptor.forClass(HyperwalletUser.class); - Mockito.verify(mockApiClient).post(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users"), argument.capture(), Mockito.eq(user.getClass())); + verify(mockApiClient).post(eq("https://api.sandbox.hyperwallet.com/rest/v3/users"), argument.capture(), eq(user.getClass())); HyperwalletUser apiClientUser = argument.getValue(); assertThat(apiClientUser, is(notNullValue())); @@ -143,13 +147,13 @@ public void testCreateUser_withProgramTokenAddedByDefault() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password", "test-program-token"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - Mockito.when(mockApiClient.post(Mockito.anyString(), Mockito.anyObject(), Mockito.any(Class.class))).thenReturn(userResponse); + when(mockApiClient.post(anyString(), anyObject(), Mockito.any(Class.class))).thenReturn(userResponse); HyperwalletUser resp = client.createUser(user); assertThat(resp, is(equalTo(userResponse))); ArgumentCaptor argument = ArgumentCaptor.forClass(HyperwalletUser.class); - Mockito.verify(mockApiClient).post(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users"), argument.capture(), Mockito.eq(user.getClass())); + verify(mockApiClient).post(eq("https://api.sandbox.hyperwallet.com/rest/v3/users"), argument.capture(), eq(user.getClass())); HyperwalletUser apiClientUser = argument.getValue(); assertThat(apiClientUser, is(notNullValue())); @@ -172,13 +176,13 @@ public void testCreateUser_withProgramTokenInUserObject() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password", "test-program-token"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - Mockito.when(mockApiClient.post(Mockito.anyString(), Mockito.anyObject(), Mockito.any(Class.class))).thenReturn(userResponse); + when(mockApiClient.post(anyString(), anyObject(), Mockito.any(Class.class))).thenReturn(userResponse); HyperwalletUser resp = client.createUser(user); assertThat(resp, is(equalTo(userResponse))); ArgumentCaptor argument = ArgumentCaptor.forClass(HyperwalletUser.class); - Mockito.verify(mockApiClient).post(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users"), argument.capture(), Mockito.eq(user.getClass())); + verify(mockApiClient).post(eq("https://api.sandbox.hyperwallet.com/rest/v3/users"), argument.capture(), eq(user.getClass())); HyperwalletUser apiClientUser = argument.getValue(); assertThat(apiClientUser, is(notNullValue())); @@ -210,12 +214,12 @@ public void testGetUser_successful() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(Class.class))).thenReturn(userResponse); + when(mockApiClient.get(anyString(), Mockito.any(Class.class))).thenReturn(userResponse); HyperwalletUser resp = client.getUser("test-user-token"); assertThat(resp, is(equalTo(userResponse))); - Mockito.verify(mockApiClient).get("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token", userResponse.getClass()); + verify(mockApiClient).get("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token", userResponse.getClass()); } @Test @@ -261,12 +265,12 @@ public void testUpdateUser_successful() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - Mockito.when(mockApiClient.put(Mockito.anyString(), Mockito.anyObject(), Mockito.any(Class.class))).thenReturn(userResponse); + when(mockApiClient.put(anyString(), anyObject(), Mockito.any(Class.class))).thenReturn(userResponse); HyperwalletUser resp = client.updateUser(user); assertThat(resp, is(equalTo(userResponse))); - Mockito.verify(mockApiClient).put("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token", user, user.getClass()); + verify(mockApiClient).put("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token", user, user.getClass()); } @Test @@ -276,12 +280,12 @@ public void testListUsers_noParameters() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listUsers(); assertThat(resp, is(equalTo(response))); - Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users"), Mockito.any(TypeReference.class)); + verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users"), Mockito.any(TypeReference.class)); } @Test @@ -299,12 +303,12 @@ public void testListUsers_withParameters() throws Exception { .createdAfter(convertStringToDate("2016-06-29T17:58:26Z")) .createdBefore(convertStringToDate("2016-06-29T17:58:26Z")); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listUsers(options); assertThat(resp, is(equalTo(response))); - Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users?createdAfter=2016-06-29T17:58:26Z&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5&limit=10"), Mockito.any(TypeReference.class)); + verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users?createdAfter=2016-06-29T17:58:26Z&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5&limit=10"), Mockito.any(TypeReference.class)); } @Test @@ -320,12 +324,12 @@ public void testListUsers_withSomeParameters() throws Exception { .offset(5) .createdBefore(convertStringToDate("2016-06-29T17:58:26Z")); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listUsers(options); assertThat(resp, is(equalTo(response))); - Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users?createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); + verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users?createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); } //-------------------------------------- @@ -402,13 +406,13 @@ public void testCreatePrepaidCard_noType() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - Mockito.when(mockApiClient.post(Mockito.anyString(), Mockito.anyObject(), Mockito.any(Class.class))).thenReturn(prepaidCardResponse); + when(mockApiClient.post(anyString(), anyObject(), Mockito.any(Class.class))).thenReturn(prepaidCardResponse); HyperwalletPrepaidCard resp = client.createPrepaidCard(prepaidCard); assertThat(resp, is(equalTo(prepaidCardResponse))); ArgumentCaptor argument = ArgumentCaptor.forClass(HyperwalletPrepaidCard.class); - Mockito.verify(mockApiClient).post(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards"), argument.capture(), Mockito.eq(prepaidCard.getClass())); + verify(mockApiClient).post(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards"), argument.capture(), eq(prepaidCard.getClass())); HyperwalletPrepaidCard apiClientPrepaidCard = argument.getValue(); assertThat(apiClientPrepaidCard, is(notNullValue())); @@ -443,13 +447,13 @@ public void testCreatePrepaidCard_withType() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - Mockito.when(mockApiClient.post(Mockito.anyString(), Mockito.anyObject(), Mockito.any(Class.class))).thenReturn(prepaidCardResponse); + when(mockApiClient.post(anyString(), anyObject(), Mockito.any(Class.class))).thenReturn(prepaidCardResponse); HyperwalletPrepaidCard resp = client.createPrepaidCard(prepaidCard); assertThat(resp, is(equalTo(prepaidCardResponse))); ArgumentCaptor argument = ArgumentCaptor.forClass(HyperwalletPrepaidCard.class); - Mockito.verify(mockApiClient).post(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards"), argument.capture(), Mockito.eq(prepaidCard.getClass())); + verify(mockApiClient).post(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards"), argument.capture(), eq(prepaidCard.getClass())); HyperwalletPrepaidCard apiClientPrepaidCard = argument.getValue(); assertThat(apiClientPrepaidCard, is(notNullValue())); @@ -501,12 +505,12 @@ public void testGetPrepaidCard_successful() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(Class.class))).thenReturn(prepaidCardResponse); + when(mockApiClient.get(anyString(), Mockito.any(Class.class))).thenReturn(prepaidCardResponse); HyperwalletPrepaidCard resp = client.getPrepaidCard("test-user-token", "test-prepaid-card-token"); assertThat(resp, is(equalTo(prepaidCardResponse))); - Mockito.verify(mockApiClient).get("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token", prepaidCardResponse.getClass()); + verify(mockApiClient).get("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token", prepaidCardResponse.getClass()); } @Test @@ -531,12 +535,12 @@ public void testListPrepaidCards_noParameters() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listPrepaidCards("test-user-token"); assertThat(resp, is(equalTo(response))); - Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards"), Mockito.any(TypeReference.class)); + verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards"), Mockito.any(TypeReference.class)); } @Test @@ -569,12 +573,12 @@ public void testListPrepaidCards_withParameters() throws Exception { .createdAfter(convertStringToDate("2016-06-29T17:58:26Z")) .createdBefore(convertStringToDate("2016-06-29T17:58:26Z")); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listPrepaidCards("test-user-token", options); assertThat(resp, is(equalTo(response))); - Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards?createdAfter=2016-06-29T17:58:26Z&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5&limit=10"), Mockito.any(TypeReference.class)); + verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards?createdAfter=2016-06-29T17:58:26Z&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5&limit=10"), Mockito.any(TypeReference.class)); } @Test @@ -590,12 +594,12 @@ public void testListPrepaidCards_withSomeParameters() throws Exception { .offset(5) .createdBefore(convertStringToDate("2016-06-29T17:58:26Z")); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listPrepaidCards("test-user-token", options); assertThat(resp, is(equalTo(response))); - Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards?createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); + verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards?createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); } @Test(dataProvider = "prepaidCardStatusTransitions") @@ -649,14 +653,14 @@ public void testPrepaidCardStatusTransitionMethods_successful(String methodName, Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - Mockito.when(mockApiClient.post(Mockito.anyString(), Mockito.anyObject(), Mockito.any(Class.class))).thenReturn(statusTransitionResponse); + when(mockApiClient.post(anyString(), anyObject(), Mockito.any(Class.class))).thenReturn(statusTransitionResponse); Method method = client.getClass().getMethod(methodName + "PrepaidCard", String.class, String.class); HyperwalletStatusTransition resp = (HyperwalletStatusTransition)method.invoke(client, "test-user-token", "test-prepaid-card-token"); assertThat(resp, is(equalTo(statusTransitionResponse))); ArgumentCaptor argument = ArgumentCaptor.forClass(HyperwalletStatusTransition.class); - Mockito.verify(mockApiClient).post(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/status-transitions"), argument.capture(), Mockito.eq(statusTransitionResponse.getClass())); + verify(mockApiClient).post(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/status-transitions"), argument.capture(), eq(statusTransitionResponse.getClass())); HyperwalletStatusTransition apiClientStatusTransition = argument.getValue(); assertThat(apiClientStatusTransition, is(notNullValue())); @@ -739,13 +743,13 @@ public void testCreatePrepaidCardStatusTransition_successful() throws Exception Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - Mockito.when(mockApiClient.post(Mockito.anyString(), Mockito.anyObject(), Mockito.any(Class.class))).thenReturn(transitionResponse); + when(mockApiClient.post(anyString(), anyObject(), Mockito.any(Class.class))).thenReturn(transitionResponse); HyperwalletStatusTransition resp = client.createPrepaidCardStatusTransition("test-user-token", "test-prepaid-card-token", transition); assertThat(resp, is(equalTo(transitionResponse))); ArgumentCaptor argument = ArgumentCaptor.forClass(HyperwalletStatusTransition.class); - Mockito.verify(mockApiClient).post(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/status-transitions"), argument.capture(), Mockito.eq(transition.getClass())); + verify(mockApiClient).post(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/status-transitions"), argument.capture(), eq(transition.getClass())); HyperwalletStatusTransition apiClientTransition = argument.getValue(); assertThat(apiClientTransition, is(notNullValue())); @@ -807,12 +811,12 @@ public void testGetPrepaidCardStatusTransition_successful() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(Class.class))).thenReturn(transitionResponse); + when(mockApiClient.get(anyString(), Mockito.any(Class.class))).thenReturn(transitionResponse); HyperwalletStatusTransition resp = client.getPrepaidCardStatusTransition("test-user-token", "test-prepaid-card-token", "test-status-transition-token"); assertThat(resp, is(equalTo(transitionResponse))); - Mockito.verify(mockApiClient).get("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/status-transitions/test-status-transition-token", transitionResponse.getClass()); + verify(mockApiClient).get("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/status-transitions/test-status-transition-token", transitionResponse.getClass()); } @Test @@ -852,12 +856,12 @@ public void testListPrepaidCardStatusTransitions_noParameters() throws Exception Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listPrepaidCardStatusTransitions("test-user-token", "test-prepaid-card-token"); assertThat(resp, is(equalTo(response))); - Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/status-transitions"), Mockito.any(TypeReference.class)); + verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/status-transitions"), Mockito.any(TypeReference.class)); } @Test @@ -905,12 +909,12 @@ public void testListPrepaidCardStatisTransitions_withParameters() throws Excepti .createdAfter(convertStringToDate("2016-06-29T17:58:26Z")) .createdBefore(convertStringToDate("2016-06-29T17:58:26Z")); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listPrepaidCardStatusTransitions("test-user-token", "test-prepaid-card-token", options); assertThat(resp, is(equalTo(response))); - Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/status-transitions?createdAfter=2016-06-29T17:58:26Z&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5&limit=10"), Mockito.any(TypeReference.class)); + verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/status-transitions?createdAfter=2016-06-29T17:58:26Z&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5&limit=10"), Mockito.any(TypeReference.class)); } @Test @@ -926,12 +930,12 @@ public void testListPrepaidCardStatusTransitions_withSomeParameters() throws Exc .offset(5) .createdBefore(convertStringToDate("2016-06-29T17:58:26Z")); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listPrepaidCardStatusTransitions("test-user-token", "test-prepaid-card-token", options); assertThat(resp, is(equalTo(response))); - Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/status-transitions?createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); + verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/status-transitions?createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); } //-------------------------------------- @@ -1002,13 +1006,13 @@ public void testCreateBankAccount_successful() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - Mockito.when(mockApiClient.post(Mockito.anyString(), Mockito.anyObject(), Mockito.any(Class.class))).thenReturn(bankAccountResponse); + when(mockApiClient.post(anyString(), anyObject(), Mockito.any(Class.class))).thenReturn(bankAccountResponse); HyperwalletBankAccount resp = client.createBankAccount(bankAccount); assertThat(resp, is(equalTo(bankAccountResponse))); ArgumentCaptor argument = ArgumentCaptor.forClass(HyperwalletBankAccount.class); - Mockito.verify(mockApiClient).post(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts"), argument.capture(), Mockito.eq(bankAccount.getClass())); + verify(mockApiClient).post(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts"), argument.capture(), eq(bankAccount.getClass())); HyperwalletBankAccount apiClientBankAccount = argument.getValue(); assertThat(apiClientBankAccount, is(notNullValue())); @@ -1054,12 +1058,12 @@ public void testGetBankAccount_successful() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(Class.class))).thenReturn(bankAccountResponse); + when(mockApiClient.get(anyString(), Mockito.any(Class.class))).thenReturn(bankAccountResponse); HyperwalletBankAccount resp = client.getBankAccount("test-user-token", "test-prepaid-card-token"); assertThat(resp, is(equalTo(bankAccountResponse))); - Mockito.verify(mockApiClient).get("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts/test-prepaid-card-token", bankAccountResponse.getClass()); + verify(mockApiClient).get("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts/test-prepaid-card-token", bankAccountResponse.getClass()); } @@ -1125,13 +1129,13 @@ public void testUpdateBankAccount_successful() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - Mockito.when(mockApiClient.put(Mockito.anyString(), Mockito.anyObject(), Mockito.any(Class.class))).thenReturn(bankAccountResponse); + when(mockApiClient.put(anyString(), anyObject(), Mockito.any(Class.class))).thenReturn(bankAccountResponse); HyperwalletBankAccount resp = client.updateBankAccount(bankAccount); assertThat(resp, is(equalTo(bankAccountResponse))); ArgumentCaptor argument = ArgumentCaptor.forClass(HyperwalletBankAccount.class); - Mockito.verify(mockApiClient).put(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts/test-bank-account-token"), argument.capture(), Mockito.eq(bankAccount.getClass())); + verify(mockApiClient).put(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts/test-bank-account-token"), argument.capture(), eq(bankAccount.getClass())); HyperwalletBankAccount apiClientBankAccount = argument.getValue(); assertThat(apiClientBankAccount, is(notNullValue())); @@ -1160,12 +1164,12 @@ public void testListBankAccounts_noParameters() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listBankAccounts("test-user-token"); assertThat(resp, is(equalTo(response))); - Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts"), Mockito.any(TypeReference.class)); + verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts"), Mockito.any(TypeReference.class)); } @Test @@ -1198,12 +1202,12 @@ public void testListBankAccounts_withParameters() throws Exception { .createdAfter(convertStringToDate("2016-06-29T17:58:26Z")) .createdBefore(convertStringToDate("2016-06-29T17:58:26Z")); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listBankAccounts("test-user-token", options); assertThat(resp, is(equalTo(response))); - Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts?createdAfter=2016-06-29T17:58:26Z&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5&limit=10"), Mockito.any(TypeReference.class)); + verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts?createdAfter=2016-06-29T17:58:26Z&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5&limit=10"), Mockito.any(TypeReference.class)); } @Test @@ -1219,12 +1223,12 @@ public void testListBankAccounts_withSomeParameters() throws Exception { .offset(5) .createdBefore(convertStringToDate("2016-06-29T17:58:26Z")); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listBankAccounts("test-user-token", options); assertThat(resp, is(equalTo(response))); - Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts?createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); + verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts?createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); } @Test @@ -1264,13 +1268,13 @@ public void testDeactivateBankAccount_successful() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - Mockito.when(mockApiClient.post(Mockito.anyString(), Mockito.anyObject(), Mockito.any(Class.class))).thenReturn(statusTransitionResponse); + when(mockApiClient.post(anyString(), anyObject(), Mockito.any(Class.class))).thenReturn(statusTransitionResponse); HyperwalletStatusTransition resp = client.deactivateBankAccount("test-user-token", "test-bank-account-token"); assertThat(resp, is(equalTo(statusTransitionResponse))); ArgumentCaptor argument = ArgumentCaptor.forClass(HyperwalletStatusTransition.class); - Mockito.verify(mockApiClient).post(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts/test-bank-account-token/status-transitions"), argument.capture(), Mockito.eq(statusTransitionResponse.getClass())); + verify(mockApiClient).post(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts/test-bank-account-token/status-transitions"), argument.capture(), eq(statusTransitionResponse.getClass())); HyperwalletStatusTransition apiClientStatusTransition = argument.getValue(); assertThat(apiClientStatusTransition, is(notNullValue())); @@ -1353,13 +1357,13 @@ public void testCreateBankAccountStatusTransition_successful() throws Exception Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - Mockito.when(mockApiClient.post(Mockito.anyString(), Mockito.anyObject(), Mockito.any(Class.class))).thenReturn(transitionResponse); + when(mockApiClient.post(anyString(), anyObject(), Mockito.any(Class.class))).thenReturn(transitionResponse); HyperwalletStatusTransition resp = client.createBankAccountStatusTransition("test-user-token", "test-bank-account-token", transition); assertThat(resp, is(equalTo(transitionResponse))); ArgumentCaptor argument = ArgumentCaptor.forClass(HyperwalletStatusTransition.class); - Mockito.verify(mockApiClient).post(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts/test-bank-account-token/status-transitions"), argument.capture(), Mockito.eq(transition.getClass())); + verify(mockApiClient).post(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts/test-bank-account-token/status-transitions"), argument.capture(), eq(transition.getClass())); HyperwalletStatusTransition apiClientTransition = argument.getValue(); assertThat(apiClientTransition, is(notNullValue())); @@ -1407,12 +1411,12 @@ public void testListBankAccountStatusTransitions_noParameters() throws Exception Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listBankAccountStatusTransitions("test-user-token", "test-bank-account-token"); assertThat(resp, is(equalTo(response))); - Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts/test-bank-account-token/status-transitions"), Mockito.any(TypeReference.class)); + verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts/test-bank-account-token/status-transitions"), Mockito.any(TypeReference.class)); } @Test @@ -1460,12 +1464,12 @@ public void testListBankAccountStatisTransitions_withParameters() throws Excepti .createdAfter(convertStringToDate("2016-06-29T17:58:26Z")) .createdBefore(convertStringToDate("2016-06-29T17:58:26Z")); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listBankAccountStatusTransitions("test-user-token", "test-bank-account-token", options); assertThat(resp, is(equalTo(response))); - Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts/test-bank-account-token/status-transitions?createdAfter=2016-06-29T17:58:26Z&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5&limit=10"), Mockito.any(TypeReference.class)); + verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts/test-bank-account-token/status-transitions?createdAfter=2016-06-29T17:58:26Z&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5&limit=10"), Mockito.any(TypeReference.class)); } @Test @@ -1481,12 +1485,12 @@ public void testListBankAccountStatusTransitions_withSomeParameters() throws Exc .offset(5) .createdBefore(convertStringToDate("2016-06-29T17:58:26Z")); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listBankAccountStatusTransitions("test-user-token", "test-bank-account-token", options); assertThat(resp, is(equalTo(response))); - Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts/test-bank-account-token/status-transitions?createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); + verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts/test-bank-account-token/status-transitions?createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); } //-------------------------------------- @@ -1515,12 +1519,12 @@ public void testListBalancesForUser_noParameters() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listBalancesForUser("test-user-token"); assertThat(resp, is(equalTo(response))); - Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/balances"), Mockito.any(TypeReference.class)); + verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/balances"), Mockito.any(TypeReference.class)); } @Test @@ -1552,12 +1556,12 @@ public void testListBalancesForUser_withParameters() throws Exception { .limit(10) .currency("test-currency"); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listBalancesForUser("test-user-token", options); assertThat(resp, is(equalTo(response))); - Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/balances?currency=test-currency&sortBy=test-sort-by&offset=5&limit=10"), Mockito.any(TypeReference.class)); + verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/balances?currency=test-currency&sortBy=test-sort-by&offset=5&limit=10"), Mockito.any(TypeReference.class)); } @Test @@ -1572,12 +1576,12 @@ public void testListBalancesForUser_withSomeParameters() throws Exception { .sortBy("test-sort-by") .offset(5); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listBalancesForUser("test-user-token", options); assertThat(resp, is(equalTo(response))); - Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/balances?sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); + verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/balances?sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); } @@ -1618,12 +1622,12 @@ public void testListBalancesForProgramAccount_noParameters() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listBalancesForAccount("test-prg-token", "test-acct-token"); assertThat(resp, is(equalTo(response))); - Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/programs/test-prg-token/accounts/test-acct-token/balances"), Mockito.any(TypeReference.class)); + verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/programs/test-prg-token/accounts/test-acct-token/balances"), Mockito.any(TypeReference.class)); } @Test @@ -1670,12 +1674,12 @@ public void testListBalancesForProgramAccount_withParameters() throws Exception .limit(10) .currency("test-currency"); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listBalancesForAccount("test-prg-token", "test-acct-token", options); assertThat(resp, is(equalTo(response))); - Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/programs/test-prg-token/accounts/test-acct-token/balances?currency=test-currency&sortBy=test-sort-by&offset=5&limit=10"), Mockito.any(TypeReference.class)); + verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/programs/test-prg-token/accounts/test-acct-token/balances?currency=test-currency&sortBy=test-sort-by&offset=5&limit=10"), Mockito.any(TypeReference.class)); } @Test @@ -1690,12 +1694,12 @@ public void testListBalancesForProgramAccount_withSomeParameters() throws Except .sortBy("test-sort-by") .offset(5); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listBalancesForAccount("test-prg-token", "test-acct-token", options); assertThat(resp, is(equalTo(response))); - Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/programs/test-prg-token/accounts/test-acct-token/balances?sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); + verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/programs/test-prg-token/accounts/test-acct-token/balances?sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); } @Test @@ -1735,12 +1739,12 @@ public void testListBalancesForPrepaidCard_noParameters() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listBalancesForPrepaidCard("test-user-token", "test-prepaid-card-token"); assertThat(resp, is(equalTo(response))); - Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/balances"), Mockito.any(TypeReference.class)); + verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/balances"), Mockito.any(TypeReference.class)); } @Test @@ -1786,12 +1790,12 @@ public void testListBalancesForPrepaidCard_withParameters() throws Exception { .offset(5) .limit(10); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listBalancesForPrepaidCard("test-user-token", "test-prepaid-card-token", options); assertThat(resp, is(equalTo(response))); - Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/balances?sortBy=test-sort-by&offset=5&limit=10"), Mockito.any(TypeReference.class)); + verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/balances?sortBy=test-sort-by&offset=5&limit=10"), Mockito.any(TypeReference.class)); } @Test @@ -1806,12 +1810,12 @@ public void testListBalancesForPrepaidCard_withSomeParameters() throws Exception .sortBy("test-sort-by") .offset(5); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listBalancesForPrepaidCard("test-user-token", "test-prepaid-card-token", options); assertThat(resp, is(equalTo(response))); - Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/balances?sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); + verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/balances?sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); } //-------------------------------------- @@ -1862,13 +1866,13 @@ public void testCreatePayment_withoutProgramToken() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - Mockito.when(mockApiClient.post(Mockito.anyString(), Mockito.anyObject(), Mockito.any(Class.class))).thenReturn(paymentResponse); + when(mockApiClient.post(anyString(), anyObject(), Mockito.any(Class.class))).thenReturn(paymentResponse); HyperwalletPayment resp = client.createPayment(payment); assertThat(resp, is(equalTo(paymentResponse))); ArgumentCaptor argument = ArgumentCaptor.forClass(HyperwalletPayment.class); - Mockito.verify(mockApiClient).post(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/payments"), argument.capture(), Mockito.eq(payment.getClass())); + verify(mockApiClient).post(eq("https://api.sandbox.hyperwallet.com/rest/v3/payments"), argument.capture(), eq(payment.getClass())); HyperwalletPayment apiClientPayment = argument.getValue(); assertThat(apiClientPayment, is(notNullValue())); @@ -1888,13 +1892,13 @@ public void testCreatePayment_withProgramTokenAddedByDefault() throws Exception Hyperwallet client = new Hyperwallet("test-username", "test-password", "test-program-token"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - Mockito.when(mockApiClient.post(Mockito.anyString(), Mockito.anyObject(), Mockito.any(Class.class))).thenReturn(paymentResponse); + when(mockApiClient.post(anyString(), anyObject(), Mockito.any(Class.class))).thenReturn(paymentResponse); HyperwalletPayment resp = client.createPayment(payment); assertThat(resp, is(equalTo(paymentResponse))); ArgumentCaptor argument = ArgumentCaptor.forClass(HyperwalletPayment.class); - Mockito.verify(mockApiClient).post(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/payments"), argument.capture(), Mockito.eq(payment.getClass())); + verify(mockApiClient).post(eq("https://api.sandbox.hyperwallet.com/rest/v3/payments"), argument.capture(), eq(payment.getClass())); HyperwalletPayment apiClientPayment = argument.getValue(); assertThat(apiClientPayment, is(notNullValue())); @@ -1915,13 +1919,13 @@ public void testCreatePayment_withProgramTokenInPaymentObject() throws Exception Hyperwallet client = new Hyperwallet("test-username", "test-password", "test-program-token"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - Mockito.when(mockApiClient.post(Mockito.anyString(), Mockito.anyObject(), Mockito.any(Class.class))).thenReturn(paymentResponse); + when(mockApiClient.post(anyString(), anyObject(), Mockito.any(Class.class))).thenReturn(paymentResponse); HyperwalletPayment resp = client.createPayment(payment); assertThat(resp, is(equalTo(paymentResponse))); ArgumentCaptor argument = ArgumentCaptor.forClass(HyperwalletPayment.class); - Mockito.verify(mockApiClient).post(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/payments"), argument.capture(), Mockito.eq(payment.getClass())); + verify(mockApiClient).post(eq("https://api.sandbox.hyperwallet.com/rest/v3/payments"), argument.capture(), eq(payment.getClass())); HyperwalletPayment apiClientPayment = argument.getValue(); assertThat(apiClientPayment, is(notNullValue())); @@ -1952,12 +1956,12 @@ public void testGetPayment_successful() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(Class.class))).thenReturn(paymentResponse); + when(mockApiClient.get(anyString(), Mockito.any(Class.class))).thenReturn(paymentResponse); HyperwalletPayment resp = client.getPayment("test-payment-token"); assertThat(resp, is(equalTo(paymentResponse))); - Mockito.verify(mockApiClient).get("https://api.sandbox.hyperwallet.com/rest/v3/payments/test-payment-token", paymentResponse.getClass()); + verify(mockApiClient).get("https://api.sandbox.hyperwallet.com/rest/v3/payments/test-payment-token", paymentResponse.getClass()); } @Test @@ -1967,12 +1971,12 @@ public void testListPayments_noParameters() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listPayments(); assertThat(resp, is(equalTo(response))); - Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/payments"), Mockito.any(TypeReference.class)); + verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/payments"), Mockito.any(TypeReference.class)); } @Test @@ -1990,12 +1994,12 @@ public void testListPayments_withParameters() throws Exception { .createdAfter(convertStringToDate("2016-06-29T17:58:26Z")) .createdBefore(convertStringToDate("2016-06-29T17:58:26Z")); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listPayments(options); assertThat(resp, is(equalTo(response))); - Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/payments?createdAfter=2016-06-29T17:58:26Z&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5&limit=10"), Mockito.any(TypeReference.class)); + verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/payments?createdAfter=2016-06-29T17:58:26Z&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5&limit=10"), Mockito.any(TypeReference.class)); } @Test @@ -2011,12 +2015,12 @@ public void testListPayments_withSomeParameters() throws Exception { .offset(5) .createdBefore(convertStringToDate("2016-06-29T17:58:26Z")); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listPayments(options); assertThat(resp, is(equalTo(response))); - Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/payments?createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); + verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/payments?createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); } //-------------------------------------- @@ -2045,12 +2049,12 @@ public void testGetProgram_successful() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(Class.class))).thenReturn(programResponse); + when(mockApiClient.get(anyString(), Mockito.any(Class.class))).thenReturn(programResponse); HyperwalletProgram resp = client.getProgram("test-program-token"); assertThat(resp, is(equalTo(programResponse))); - Mockito.verify(mockApiClient).get("https://api.sandbox.hyperwallet.com/rest/v3/programs/test-program-token", programResponse.getClass()); + verify(mockApiClient).get("https://api.sandbox.hyperwallet.com/rest/v3/programs/test-program-token", programResponse.getClass()); } //-------------------------------------- @@ -2094,12 +2098,12 @@ public void testGetProgramAccount_successful() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(Class.class))).thenReturn(accountResponse); + when(mockApiClient.get(anyString(), Mockito.any(Class.class))).thenReturn(accountResponse); HyperwalletAccount resp = client.getProgramAccount("test-program-token", "test-account-token"); assertThat(resp, is(equalTo(accountResponse))); - Mockito.verify(mockApiClient).get("https://api.sandbox.hyperwallet.com/rest/v3/programs/test-program-token/accounts/test-account-token", accountResponse.getClass()); + verify(mockApiClient).get("https://api.sandbox.hyperwallet.com/rest/v3/programs/test-program-token/accounts/test-account-token", accountResponse.getClass()); } //-------------------------------------- @@ -2188,12 +2192,12 @@ public void testGetTransferMethodConfiguration_successful() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(Class.class))).thenReturn(configResponse); + when(mockApiClient.get(anyString(), Mockito.any(Class.class))).thenReturn(configResponse); HyperwalletTransferMethodConfiguration resp = client.getTransferMethodConfiguration("test-user-token", "test-country", "test-currency", HyperwalletTransferMethod.Type.BANK_ACCOUNT, HyperwalletUser.ProfileType.INDIVIDUAL); assertThat(resp, is(equalTo(configResponse))); - Mockito.verify(mockApiClient).get("https://api.sandbox.hyperwallet.com/rest/v3/transfer-method-configurations?userToken=test-user-token&country=test-country¤cy=test-currency&type=BANK_ACCOUNT&profileType=INDIVIDUAL", configResponse.getClass()); + verify(mockApiClient).get("https://api.sandbox.hyperwallet.com/rest/v3/transfer-method-configurations?userToken=test-user-token&country=test-country¤cy=test-currency&type=BANK_ACCOUNT&profileType=INDIVIDUAL", configResponse.getClass()); } @Test @@ -2218,12 +2222,12 @@ public void testListTransferMethodConfigurations_noParameters_successful() throw Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listTransferMethodConfigurations("test-user-token"); assertThat(resp, is(equalTo(response))); - Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/transfer-method-configurations?userToken=test-user-token"), Mockito.any(TypeReference.class)); + verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/transfer-method-configurations?userToken=test-user-token"), Mockito.any(TypeReference.class)); } @Test @@ -2256,12 +2260,12 @@ public void testListTransferMethodConfigurations_withParameters_successful() thr .createdAfter(convertStringToDate("2016-06-29T17:58:26Z")) .createdBefore(convertStringToDate("2016-06-29T17:58:26Z")); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listTransferMethodConfigurations("test-user-token", options); assertThat(resp, is(equalTo(response))); - Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/transfer-method-configurations?userToken=test-user-token&createdAfter=2016-06-29T17:58:26Z&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5&limit=10"), Mockito.any(TypeReference.class)); + verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/transfer-method-configurations?userToken=test-user-token&createdAfter=2016-06-29T17:58:26Z&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5&limit=10"), Mockito.any(TypeReference.class)); } @Test @@ -2277,12 +2281,12 @@ public void testListTransferMethodConfigurations_withSomeParameters() throws Exc .offset(5) .createdBefore(convertStringToDate("2016-06-29T17:58:26Z")); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listTransferMethodConfigurations("test-user-token", options); assertThat(resp, is(equalTo(response))); - Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/transfer-method-configurations?userToken=test-user-token&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); + verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/transfer-method-configurations?userToken=test-user-token&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); } //-------------------------------------- @@ -2326,12 +2330,12 @@ public void testListReceiptsForProgramAccount_noParameters() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listReceiptsForProgramAccount("test-program-token", "test-account-token"); assertThat(resp, is(equalTo(response))); - Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/programs/test-program-token/accounts/test-account-token/receipts"), Mockito.any(TypeReference.class)); + verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/programs/test-program-token/accounts/test-account-token/receipts"), Mockito.any(TypeReference.class)); } @Test @@ -2380,12 +2384,12 @@ public void testListReceiptsForProgramAccount_withParameters() throws Exception .createdAfter(convertStringToDate("2016-06-29T17:58:26Z")) .createdBefore(convertStringToDate("2016-06-29T17:58:26Z")); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listReceiptsForProgramAccount("test-program-token", "test-account-token", options); assertThat(resp, is(equalTo(response))); - Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/programs/test-program-token/accounts/test-account-token/receipts?createdAfter=2016-06-29T17:58:26Z&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5&limit=10&type=ANNUAL_FEE"), Mockito.any(TypeReference.class)); + verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/programs/test-program-token/accounts/test-account-token/receipts?createdAfter=2016-06-29T17:58:26Z&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5&limit=10&type=ANNUAL_FEE"), Mockito.any(TypeReference.class)); } @Test @@ -2401,12 +2405,12 @@ public void testListReceiptsForProgramAccount_withSomeParameters() throws Except .offset(5) .createdBefore(convertStringToDate("2016-06-29T17:58:26Z")); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listReceiptsForProgramAccount("test-program-token", "test-account-token", options); assertThat(resp, is(equalTo(response))); - Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/programs/test-program-token/accounts/test-account-token/receipts?createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); + verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/programs/test-program-token/accounts/test-account-token/receipts?createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); } @Test @@ -2431,12 +2435,12 @@ public void testListReceiptsForUser_noParameters() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listReceiptsForUser("test-user-token"); assertThat(resp, is(equalTo(response))); - Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/receipts"), Mockito.any(TypeReference.class)); + verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/receipts"), Mockito.any(TypeReference.class)); } @Test @@ -2470,12 +2474,12 @@ public void testListReceiptsForUser_withParameters() throws Exception { .createdAfter(convertStringToDate("2016-06-29T17:58:26Z")) .createdBefore(convertStringToDate("2016-06-29T17:58:26Z")); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listReceiptsForUser("test-user-token", options); assertThat(resp, is(equalTo(response))); - Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/receipts?createdAfter=2016-06-29T17:58:26Z&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5&limit=10&type=ANNUAL_FEE"), Mockito.any(TypeReference.class)); + verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/receipts?createdAfter=2016-06-29T17:58:26Z&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5&limit=10&type=ANNUAL_FEE"), Mockito.any(TypeReference.class)); } @Test @@ -2491,12 +2495,12 @@ public void testListReceiptsForUser_withSomeParameters() throws Exception { .offset(5) .createdBefore(convertStringToDate("2016-06-29T17:58:26Z")); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listReceiptsForUser("test-user-token", options); assertThat(resp, is(equalTo(response))); - Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/receipts?createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); + verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/receipts?createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); } @Test @@ -2536,12 +2540,12 @@ public void testListReceiptsForPrepaidCard_noParameters() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listReceiptsForPrepaidCard("test-user-token", "test-prepaid-card-token"); assertThat(resp, is(equalTo(response))); - Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/receipts"), Mockito.any(TypeReference.class)); + verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/receipts"), Mockito.any(TypeReference.class)); } @Test @@ -2590,12 +2594,12 @@ public void testListReceiptsForPrepaidCard_withParameters() throws Exception { .createdAfter(convertStringToDate("2016-06-29T17:58:26Z")) .createdBefore(convertStringToDate("2016-06-29T17:58:26Z")); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listReceiptsForPrepaidCard("test-user-token", "test-prepaid-card-token", options); assertThat(resp, is(equalTo(response))); - Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/receipts?createdAfter=2016-06-29T17:58:26Z&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5&limit=10&type=ANNUAL_FEE"), Mockito.any(TypeReference.class)); + verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/receipts?createdAfter=2016-06-29T17:58:26Z&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5&limit=10&type=ANNUAL_FEE"), Mockito.any(TypeReference.class)); } @Test @@ -2611,12 +2615,12 @@ public void testListReceiptsForPrepaidCard_withSomeParameters() throws Exception .offset(5) .createdBefore(convertStringToDate("2016-06-29T17:58:26Z")); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listReceiptsForPrepaidCard("test-user-token", "test-prepaid-card-token", options); assertThat(resp, is(equalTo(response))); - Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/receipts?createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); + verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/receipts?createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); } //-------------------------------------- @@ -2645,12 +2649,12 @@ public void testGetWebhookEvent_Successful() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(Class.class))).thenReturn(event); + when(mockApiClient.get(anyString(), Mockito.any(Class.class))).thenReturn(event); HyperwalletWebhookNotification resp = client.getWebhookEvent("test-webhook-token"); assertThat(resp, is(equalTo(event))); - Mockito.verify(mockApiClient).get("https://api.sandbox.hyperwallet.com/rest/v3/webhook-notifications/test-webhook-token", event.getClass()); + verify(mockApiClient).get("https://api.sandbox.hyperwallet.com/rest/v3/webhook-notifications/test-webhook-token", event.getClass()); } @Test @@ -2660,12 +2664,12 @@ public void testListWebhookEvents_noParameters() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listWebhookEvents(); assertThat(resp, is(equalTo(response))); - Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/webhook-notifications"), Mockito.any(TypeReference.class)); + verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/webhook-notifications"), Mockito.any(TypeReference.class)); } @Test @@ -2684,12 +2688,12 @@ public void testListWebhookEvents_withParameters() throws Exception { .createdAfter(convertStringToDate("2016-08-24T13:56:26Z")) .createdBefore(convertStringToDate("2016-08-24T13:56:26Z")); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listWebhookEvents(options); assertThat(resp, is(equalTo(response))); - Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/webhook-notifications?createdAfter=2016-08-24T13:56:26Z&createdBefore=2016-08-24T13:56:26Z&sortBy=test-sort-by&offset=5&limit=10&type=USERS.PREPAID_CARDS.CREATED"), Mockito.any(TypeReference.class)); + verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/webhook-notifications?createdAfter=2016-08-24T13:56:26Z&createdBefore=2016-08-24T13:56:26Z&sortBy=test-sort-by&offset=5&limit=10&type=USERS.PREPAID_CARDS.CREATED"), Mockito.any(TypeReference.class)); } @Test @@ -2705,12 +2709,12 @@ public void testListWebhookEvents_withSomeParameters() throws Exception { .offset(5) .createdBefore(convertStringToDate("2016-08-24T13:56:26Z")); - Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listWebhookEvents(options); assertThat(resp, is(equalTo(response))); - Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/webhook-notifications?createdBefore=2016-08-24T13:56:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); + verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/webhook-notifications?createdBefore=2016-08-24T13:56:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); } @@ -2783,5 +2787,209 @@ public Object[][] createPrepaidCardStatusTransitions() { }; } + //-------------------------------------- + // Transfer Method + //-------------------------------------- + + @Test + public void testTransferMethod_noTransferMethod() { + Hyperwallet client = new Hyperwallet("test-username", "test-password"); + String jsonCacheToken = "token123-123-123"; + try { + client.createTransferMethod(jsonCacheToken, null); + fail("Expect HyperwalletException"); + } catch (HyperwalletException e) { + assertThat(e.getErrorCode(), is(nullValue())); + assertThat(e.getResponse(), is(nullValue())); + assertThat(e.getErrorMessage(), is(equalTo("User token is required"))); + assertThat(e.getMessage(), is(equalTo("User token is required"))); + assertThat(e.getHyperwalletErrors(), is(nullValue())); + } + } + + @Test + public void testCreateTransferMethod_noJsonCacheToken() { + { + HyperwalletTransferMethod transferMethod = new HyperwalletTransferMethod(); + transferMethod.setUserToken("test123123"); + + Hyperwallet client = new Hyperwallet("test-username", "test-password"); + try { + client.createTransferMethod(null, transferMethod); + fail("Expect HyperwalletException"); + } catch (HyperwalletException e) { + assertThat(e.getErrorCode(), is(nullValue())); + assertThat(e.getResponse(), is(nullValue())); + assertThat(e.getErrorMessage(), is(equalTo("JSON token is required"))); + assertThat(e.getMessage(), is(equalTo("JSON token is required"))); + assertThat(e.getHyperwalletErrors(), is(nullValue())); + } + } + } + + @Test + public void testCreateTransferMethod_noUseroken() { + HyperwalletTransferMethod transferMethod = new HyperwalletTransferMethod(); + + Hyperwallet client = new Hyperwallet("test-username", "test-password"); + String jsonCacheToken = "token123-123-123"; + try { + client.createTransferMethod(jsonCacheToken, transferMethod); + fail("Expect HyperwalletException"); + } catch (HyperwalletException e) { + assertThat(e.getErrorCode(), is(nullValue())); + assertThat(e.getResponse(), is(nullValue())); + assertThat(e.getErrorMessage(), is(equalTo("User token is required"))); + assertThat(e.getMessage(), is(equalTo("User token is required"))); + assertThat(e.getHyperwalletErrors(), is(nullValue())); + } + } + + @Test + public void testCreateTransferMethod_Completed() throws Exception{ + HyperwalletTransferMethod transferMethod = new HyperwalletTransferMethod(); + transferMethod + .token("test-token") + .type(HyperwalletTransferMethod.Type.BANK_ACCOUNT) + .status(HyperwalletTransferMethod.Status.ACTIVATED) + .createdOn(new Date()) + .transferMethodCountry("test-transfer-method-country") + .transferMethodCurrency("test-transfer-method-currency") + .bankName("test-bank-name") + .bankId("test-bank-id") + .branchName("test-branch-name") + .branchId("test-branch-id") + .bankAccountId("test-bank-account-id") + .bankAccountRelationship(HyperwalletTransferMethod.BankAccountRelationship.SELF) + .bankAccountPurpose("test-bank-account-purpose") + .branchAddressLine1("test-branch-address-line1") + .branchAddressLine2("test-branch-address-line2") + .branchCity("test-branch-city") + .branchStateProvince("test-branch-state-province") + .branchCountry("test-branch-country") + .branchPostalCode("test-branch-postal-code") + .wireInstructions("test-wire-instructions") + .intermediaryBankId("test-intermediary-bank-id") + .intermediaryBankName("test-intermediary-bank-name") + .intermediaryBankAccountId("test-intermediary-bank-account-id") + .intermediaryBankAddressLine1("test-intermediary-bank-address-line1") + .intermediaryBankAddressLine2("test-intermediary-bank-address-line2") + .intermediaryBankCity("test-intermediary-bank-city") + .intermediaryBankStateProvince("test-intermediary-bank-state-province") + .intermediaryBankCountry("test-intermediary-bank-country") + .intermediaryBankPostalCode("test-intermediary-bank-postal-code") + .cardType(HyperwalletTransferMethod.CardType.VIRTUAL) + .cardPackage("test-card-package") + .cardNumber("test-card-number") + .cardBrand(HyperwalletPrepaidCard.Brand.VISA) + .dateOfExpiry(new Date()) + .userToken("test-user-token") + .profileType(HyperwalletUser.ProfileType.INDIVIDUAL) + .businessName("test-business-name") + .businessRegistrationId("test-business-registration-id") + .businessRegistrationStateProvince("test-business-registration-state-province") + .businessRegistrationCountry("test-business-registration-country") + .businessContactRole(HyperwalletUser.BusinessContactRole.OWNER) + .firstName("test-first-name") + .middleName("test-middle-name") + .lastName("test-last-name") + .dateOfBirth(new Date()) + .countryOfBirth("test-country-of-birth") + .countryOfNationality("test-country-of-nationality") + .gender(HyperwalletUser.Gender.MALE) + .phoneNumber("test-phone-number") + .mobileNumber("test-mobile-number") + .email("test-email") + .governmentId("test-government-id") + .passportId("test-passport-id") + .driversLicenseId("test-drivers-license-id") + .addressLine1("test-address-line1") + .addressLine2("test-address-line2") + .city("test-city") + .stateProvince("test-state-province") + .postalCode("test-postal-code") + .country("test-country"); + + HyperwalletTransferMethod transferMethodResponse = new HyperwalletTransferMethod(); + + Hyperwallet client = new Hyperwallet("test-username", "test-password"); + HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); + + when(mockApiClient.post(anyString(), anyObject(), Mockito.any(Class.class), Mockito.any(HashMap.class))).thenReturn(transferMethodResponse); + + String jsonCacheToken = "token123-123-123"; + HyperwalletTransferMethod resp = client.createTransferMethod(jsonCacheToken, transferMethod); + assertThat(resp, is(equalTo(transferMethodResponse))); + + HashMap headers = new HashMap(); + headers.put("Json-Cache-Token", jsonCacheToken); + + ArgumentCaptor argument = ArgumentCaptor.forClass(HyperwalletTransferMethod.class); + verify(mockApiClient).post(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/transfer-methods"), argument.capture(), eq(transferMethod.getClass()), (HashMap) anyMapOf(String.class, String.class)); + + HyperwalletTransferMethod apiClientTransferMethod = argument.getValue(); + + assertThat(apiClientTransferMethod, is(notNullValue())); + assertThat(apiClientTransferMethod.getToken(), is(nullValue())); + assertThat(apiClientTransferMethod.getStatus(), is(nullValue())); + assertThat(apiClientTransferMethod.getCreatedOn(), is(nullValue())); + + assertThat(apiClientTransferMethod.getCountry(), is(equalTo("test-country"))); + assertThat(apiClientTransferMethod.getType(), is(equalTo(HyperwalletTransferMethod.Type.BANK_ACCOUNT))); + assertThat(apiClientTransferMethod.getTransferMethodCountry(), is(equalTo("test-transfer-method-country"))); + assertThat(apiClientTransferMethod.getTransferMethodCurrency(), is(equalTo("test-transfer-method-currency"))); + assertThat(apiClientTransferMethod.getBankName(), is(equalTo("test-bank-name"))); + assertThat(apiClientTransferMethod.getBankId(), is(equalTo("test-bank-id"))); + assertThat(apiClientTransferMethod.getBranchName(), is(equalTo("test-branch-name"))); + assertThat(apiClientTransferMethod.getBranchId(), is(equalTo("test-branch-id"))); + assertThat(apiClientTransferMethod.getBankAccountId(), is(equalTo("test-bank-account-id"))); + assertThat(apiClientTransferMethod.getBankAccountRelationship(), is(equalTo(HyperwalletTransferMethod.BankAccountRelationship.SELF))); + assertThat(apiClientTransferMethod.getBankAccountPurpose(), is(equalTo("test-bank-account-purpose"))); + assertThat(apiClientTransferMethod.getBranchAddressLine1(), is(equalTo("test-branch-address-line1"))); + assertThat(apiClientTransferMethod.getBranchAddressLine2(), is(equalTo("test-branch-address-line2"))); + assertThat(apiClientTransferMethod.getBranchCity(), is(equalTo("test-branch-city"))); + assertThat(apiClientTransferMethod.getBranchStateProvince(), is(equalTo("test-branch-state-province"))); + assertThat(apiClientTransferMethod.getBranchCountry(), is(equalTo("test-branch-country"))); + assertThat(apiClientTransferMethod.getBranchPostalCode(), is(equalTo("test-branch-postal-code"))); + assertThat(apiClientTransferMethod.getWireInstructions(), is(equalTo("test-wire-instructions"))); + assertThat(apiClientTransferMethod.getIntermediaryBankId(), is(equalTo("test-intermediary-bank-id"))); + assertThat(apiClientTransferMethod.getIntermediaryBankName(), is(equalTo("test-intermediary-bank-name"))); + assertThat(apiClientTransferMethod.getIntermediaryBankAccountId(), is(equalTo("test-intermediary-bank-account-id"))); + assertThat(apiClientTransferMethod.getIntermediaryBankAddressLine1(), is(equalTo("test-intermediary-bank-address-line1"))); + assertThat(apiClientTransferMethod.getIntermediaryBankAddressLine2(), is(equalTo("test-intermediary-bank-address-line2"))); + assertThat(apiClientTransferMethod.getIntermediaryBankCity(), is(equalTo("test-intermediary-bank-city"))); + assertThat(apiClientTransferMethod.getIntermediaryBankStateProvince(), is(equalTo("test-intermediary-bank-state-province"))); + assertThat(apiClientTransferMethod.getIntermediaryBankCountry(), is(equalTo("test-intermediary-bank-country"))); + assertThat(apiClientTransferMethod.getIntermediaryBankPostalCode(), is(equalTo("test-intermediary-bank-postal-code"))); + assertThat(apiClientTransferMethod.getCardType(), is(equalTo(HyperwalletTransferMethod.CardType.VIRTUAL))); + assertThat(apiClientTransferMethod.getCardPackage(), is(equalTo("test-card-package"))); + assertThat(apiClientTransferMethod.getCardNumber(), is(equalTo("test-card-number"))); + assertThat(apiClientTransferMethod.getCardBrand(), is(equalTo(HyperwalletPrepaidCard.Brand.VISA))); + assertThat(apiClientTransferMethod.getUserToken(), is(equalTo("test-user-token"))); + assertThat(apiClientTransferMethod.getProfileType(), is(equalTo(HyperwalletUser.ProfileType.INDIVIDUAL))); + assertThat(apiClientTransferMethod.getBusinessName(), is(equalTo("test-business-name"))); + assertThat(apiClientTransferMethod.getBusinessRegistrationId(), is(equalTo("test-business-registration-id"))); + assertThat(apiClientTransferMethod.getBusinessRegistrationStateProvince(), is(equalTo("test-business-registration-state-province"))); + assertThat(apiClientTransferMethod.getBusinessRegistrationCountry(), is(equalTo("test-business-registration-country"))); + assertThat(apiClientTransferMethod.getBusinessContactRole(), is(equalTo(HyperwalletUser.BusinessContactRole.OWNER))); + assertThat(apiClientTransferMethod.getFirstName(), is(equalTo("test-first-name"))); + assertThat(apiClientTransferMethod.getMiddleName(), is(equalTo("test-middle-name"))); + assertThat(apiClientTransferMethod.getLastName(), is(equalTo("test-last-name"))); + assertThat(apiClientTransferMethod.getCountryOfBirth(), is(equalTo("test-country-of-birth"))); + assertThat(apiClientTransferMethod.getCountryOfNationality(), is(equalTo("test-country-of-nationality"))); + assertThat(apiClientTransferMethod.getGender(), is(equalTo(HyperwalletUser.Gender.MALE))); + assertThat(apiClientTransferMethod.getMobileNumber(), is(equalTo("test-mobile-number"))); + assertThat(apiClientTransferMethod.getEmail(), is(equalTo("test-email"))); + assertThat(apiClientTransferMethod.getGovernmentId(), is(equalTo("test-government-id"))); + assertThat(apiClientTransferMethod.getPassportId(), is(equalTo("test-passport-id"))); + assertThat(apiClientTransferMethod.getDriversLicenseId(), is(equalTo("test-drivers-license-id"))); + assertThat(apiClientTransferMethod.getAddressLine1(), is(equalTo("test-address-line1"))); + assertThat(apiClientTransferMethod.getAddressLine2(), is(equalTo("test-address-line2"))); + assertThat(apiClientTransferMethod.getCity(), is(equalTo("test-city"))); + assertThat(apiClientTransferMethod.getStateProvince(), is(equalTo("test-state-province"))); + assertThat(apiClientTransferMethod.getPostalCode(), is(equalTo("test-postal-code"))); + assertThat(apiClientTransferMethod.getCountry(), is(equalTo("test-country"))); + } + } From 88dcbc7c5382ff2883a30a142650f64ad95f52c2 Mon Sep 17 00:00:00 2001 From: Vadim Korotchenko Date: Fri, 25 Nov 2016 14:49:30 -0800 Subject: [PATCH 2/6] remove unused code and refactored some test code --- .../clientsdk/HyperwalletTest.java | 138 +++++++++--------- 1 file changed, 70 insertions(+), 68 deletions(-) diff --git a/src/test/java/com/hyperwallet/clientsdk/HyperwalletTest.java b/src/test/java/com/hyperwallet/clientsdk/HyperwalletTest.java index 8b091fd04..61c374358 100644 --- a/src/test/java/com/hyperwallet/clientsdk/HyperwalletTest.java +++ b/src/test/java/com/hyperwallet/clientsdk/HyperwalletTest.java @@ -18,14 +18,13 @@ import java.util.Locale; import java.util.TimeZone; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.*; import static org.mockito.Matchers.*; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.testng.Assert.fail; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.*; - /** * @author fkrauthan */ @@ -2847,68 +2846,7 @@ public void testCreateTransferMethod_noUseroken() { @Test public void testCreateTransferMethod_Completed() throws Exception{ - HyperwalletTransferMethod transferMethod = new HyperwalletTransferMethod(); - transferMethod - .token("test-token") - .type(HyperwalletTransferMethod.Type.BANK_ACCOUNT) - .status(HyperwalletTransferMethod.Status.ACTIVATED) - .createdOn(new Date()) - .transferMethodCountry("test-transfer-method-country") - .transferMethodCurrency("test-transfer-method-currency") - .bankName("test-bank-name") - .bankId("test-bank-id") - .branchName("test-branch-name") - .branchId("test-branch-id") - .bankAccountId("test-bank-account-id") - .bankAccountRelationship(HyperwalletTransferMethod.BankAccountRelationship.SELF) - .bankAccountPurpose("test-bank-account-purpose") - .branchAddressLine1("test-branch-address-line1") - .branchAddressLine2("test-branch-address-line2") - .branchCity("test-branch-city") - .branchStateProvince("test-branch-state-province") - .branchCountry("test-branch-country") - .branchPostalCode("test-branch-postal-code") - .wireInstructions("test-wire-instructions") - .intermediaryBankId("test-intermediary-bank-id") - .intermediaryBankName("test-intermediary-bank-name") - .intermediaryBankAccountId("test-intermediary-bank-account-id") - .intermediaryBankAddressLine1("test-intermediary-bank-address-line1") - .intermediaryBankAddressLine2("test-intermediary-bank-address-line2") - .intermediaryBankCity("test-intermediary-bank-city") - .intermediaryBankStateProvince("test-intermediary-bank-state-province") - .intermediaryBankCountry("test-intermediary-bank-country") - .intermediaryBankPostalCode("test-intermediary-bank-postal-code") - .cardType(HyperwalletTransferMethod.CardType.VIRTUAL) - .cardPackage("test-card-package") - .cardNumber("test-card-number") - .cardBrand(HyperwalletPrepaidCard.Brand.VISA) - .dateOfExpiry(new Date()) - .userToken("test-user-token") - .profileType(HyperwalletUser.ProfileType.INDIVIDUAL) - .businessName("test-business-name") - .businessRegistrationId("test-business-registration-id") - .businessRegistrationStateProvince("test-business-registration-state-province") - .businessRegistrationCountry("test-business-registration-country") - .businessContactRole(HyperwalletUser.BusinessContactRole.OWNER) - .firstName("test-first-name") - .middleName("test-middle-name") - .lastName("test-last-name") - .dateOfBirth(new Date()) - .countryOfBirth("test-country-of-birth") - .countryOfNationality("test-country-of-nationality") - .gender(HyperwalletUser.Gender.MALE) - .phoneNumber("test-phone-number") - .mobileNumber("test-mobile-number") - .email("test-email") - .governmentId("test-government-id") - .passportId("test-passport-id") - .driversLicenseId("test-drivers-license-id") - .addressLine1("test-address-line1") - .addressLine2("test-address-line2") - .city("test-city") - .stateProvince("test-state-province") - .postalCode("test-postal-code") - .country("test-country"); + HyperwalletTransferMethod transferMethod = createPrePopulatedTransferMethod(); HyperwalletTransferMethod transferMethodResponse = new HyperwalletTransferMethod(); @@ -2921,9 +2859,6 @@ public void testCreateTransferMethod_Completed() throws Exception{ HyperwalletTransferMethod resp = client.createTransferMethod(jsonCacheToken, transferMethod); assertThat(resp, is(equalTo(transferMethodResponse))); - HashMap headers = new HashMap(); - headers.put("Json-Cache-Token", jsonCacheToken); - ArgumentCaptor argument = ArgumentCaptor.forClass(HyperwalletTransferMethod.class); verify(mockApiClient).post(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/transfer-methods"), argument.capture(), eq(transferMethod.getClass()), (HashMap) anyMapOf(String.class, String.class)); @@ -2991,5 +2926,72 @@ public void testCreateTransferMethod_Completed() throws Exception{ assertThat(apiClientTransferMethod.getCountry(), is(equalTo("test-country"))); } + private HyperwalletTransferMethod createPrePopulatedTransferMethod() { + HyperwalletTransferMethod transferMethod = new HyperwalletTransferMethod(); + transferMethod + .token("test-token") + .type(HyperwalletTransferMethod.Type.BANK_ACCOUNT) + .status(HyperwalletTransferMethod.Status.ACTIVATED) + .createdOn(new Date()) + .transferMethodCountry("test-transfer-method-country") + .transferMethodCurrency("test-transfer-method-currency") + .bankName("test-bank-name") + .bankId("test-bank-id") + .branchName("test-branch-name") + .branchId("test-branch-id") + .bankAccountId("test-bank-account-id") + .bankAccountRelationship(HyperwalletTransferMethod.BankAccountRelationship.SELF) + .bankAccountPurpose("test-bank-account-purpose") + .branchAddressLine1("test-branch-address-line1") + .branchAddressLine2("test-branch-address-line2") + .branchCity("test-branch-city") + .branchStateProvince("test-branch-state-province") + .branchCountry("test-branch-country") + .branchPostalCode("test-branch-postal-code") + .wireInstructions("test-wire-instructions") + .intermediaryBankId("test-intermediary-bank-id") + .intermediaryBankName("test-intermediary-bank-name") + .intermediaryBankAccountId("test-intermediary-bank-account-id") + .intermediaryBankAddressLine1("test-intermediary-bank-address-line1") + .intermediaryBankAddressLine2("test-intermediary-bank-address-line2") + .intermediaryBankCity("test-intermediary-bank-city") + .intermediaryBankStateProvince("test-intermediary-bank-state-province") + .intermediaryBankCountry("test-intermediary-bank-country") + .intermediaryBankPostalCode("test-intermediary-bank-postal-code") + .cardType(HyperwalletTransferMethod.CardType.VIRTUAL) + .cardPackage("test-card-package") + .cardNumber("test-card-number") + .cardBrand(HyperwalletPrepaidCard.Brand.VISA) + .dateOfExpiry(new Date()) + .userToken("test-user-token") + .profileType(HyperwalletUser.ProfileType.INDIVIDUAL) + .businessName("test-business-name") + .businessRegistrationId("test-business-registration-id") + .businessRegistrationStateProvince("test-business-registration-state-province") + .businessRegistrationCountry("test-business-registration-country") + .businessContactRole(HyperwalletUser.BusinessContactRole.OWNER) + .firstName("test-first-name") + .middleName("test-middle-name") + .lastName("test-last-name") + .dateOfBirth(new Date()) + .countryOfBirth("test-country-of-birth") + .countryOfNationality("test-country-of-nationality") + .gender(HyperwalletUser.Gender.MALE) + .phoneNumber("test-phone-number") + .mobileNumber("test-mobile-number") + .email("test-email") + .governmentId("test-government-id") + .passportId("test-passport-id") + .driversLicenseId("test-drivers-license-id") + .addressLine1("test-address-line1") + .addressLine2("test-address-line2") + .city("test-city") + .stateProvince("test-state-province") + .postalCode("test-postal-code") + .country("test-country"); + + return transferMethod; + } + } From 579e5c306f0a372333f4eb9a0bf8f0ecd127b952 Mon Sep 17 00:00:00 2001 From: Vadim Korotchenko Date: Fri, 25 Nov 2016 15:23:45 -0800 Subject: [PATCH 3/6] added tests for post call with custom headers as well as refactor code --- .../clientsdk/util/HyperwalletApiClient.java | 6 +- .../clientsdk/HyperwalletTest.java | 275 +++++++++--------- .../util/HyperwalletApiClientTest.java | 102 +++++++ 3 files changed, 242 insertions(+), 141 deletions(-) diff --git a/src/main/java/com/hyperwallet/clientsdk/util/HyperwalletApiClient.java b/src/main/java/com/hyperwallet/clientsdk/util/HyperwalletApiClient.java index c0f9d5fc9..3a97f7889 100644 --- a/src/main/java/com/hyperwallet/clientsdk/util/HyperwalletApiClient.java +++ b/src/main/java/com/hyperwallet/clientsdk/util/HyperwalletApiClient.java @@ -75,8 +75,10 @@ public T post(final String url, final Object bodyObject, final Class type String body = convert(bodyObject); Request request = getService(url, false).setBody(body); - for (String key: header.keySet()) { - request = request.addHeader(key, header.get(key)); + if (header != null) { + for (String key : header.keySet()) { + request = request.addHeader(key, header.get(key)); + } } response = request.postResource(); diff --git a/src/test/java/com/hyperwallet/clientsdk/HyperwalletTest.java b/src/test/java/com/hyperwallet/clientsdk/HyperwalletTest.java index 61c374358..2eaa3b19a 100644 --- a/src/test/java/com/hyperwallet/clientsdk/HyperwalletTest.java +++ b/src/test/java/com/hyperwallet/clientsdk/HyperwalletTest.java @@ -18,12 +18,10 @@ import java.util.Locale; import java.util.TimeZone; +import static org.testng.Assert.fail; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.*; -import static org.mockito.Matchers.*; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; -import static org.testng.Assert.fail; /** * @author fkrauthan @@ -118,13 +116,13 @@ public void testCreateUser_withoutProgramToken() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - when(mockApiClient.post(anyString(), anyObject(), Mockito.any(Class.class))).thenReturn(userResponse); + Mockito.when(mockApiClient.post(Mockito.anyString(), Mockito.anyObject(), Mockito.any(Class.class))).thenReturn(userResponse); HyperwalletUser resp = client.createUser(user); assertThat(resp, is(equalTo(userResponse))); ArgumentCaptor argument = ArgumentCaptor.forClass(HyperwalletUser.class); - verify(mockApiClient).post(eq("https://api.sandbox.hyperwallet.com/rest/v3/users"), argument.capture(), eq(user.getClass())); + Mockito.verify(mockApiClient).post(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users"), argument.capture(), Mockito.eq(user.getClass())); HyperwalletUser apiClientUser = argument.getValue(); assertThat(apiClientUser, is(notNullValue())); @@ -146,13 +144,13 @@ public void testCreateUser_withProgramTokenAddedByDefault() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password", "test-program-token"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - when(mockApiClient.post(anyString(), anyObject(), Mockito.any(Class.class))).thenReturn(userResponse); + Mockito.when(mockApiClient.post(Mockito.anyString(), Mockito.anyObject(), Mockito.any(Class.class))).thenReturn(userResponse); HyperwalletUser resp = client.createUser(user); assertThat(resp, is(equalTo(userResponse))); ArgumentCaptor argument = ArgumentCaptor.forClass(HyperwalletUser.class); - verify(mockApiClient).post(eq("https://api.sandbox.hyperwallet.com/rest/v3/users"), argument.capture(), eq(user.getClass())); + Mockito.verify(mockApiClient).post(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users"), argument.capture(), Mockito.eq(user.getClass())); HyperwalletUser apiClientUser = argument.getValue(); assertThat(apiClientUser, is(notNullValue())); @@ -175,13 +173,13 @@ public void testCreateUser_withProgramTokenInUserObject() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password", "test-program-token"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - when(mockApiClient.post(anyString(), anyObject(), Mockito.any(Class.class))).thenReturn(userResponse); + Mockito.when(mockApiClient.post(Mockito.anyString(), Mockito.anyObject(), Mockito.any(Class.class))).thenReturn(userResponse); HyperwalletUser resp = client.createUser(user); assertThat(resp, is(equalTo(userResponse))); ArgumentCaptor argument = ArgumentCaptor.forClass(HyperwalletUser.class); - verify(mockApiClient).post(eq("https://api.sandbox.hyperwallet.com/rest/v3/users"), argument.capture(), eq(user.getClass())); + Mockito.verify(mockApiClient).post(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users"), argument.capture(), Mockito.eq(user.getClass())); HyperwalletUser apiClientUser = argument.getValue(); assertThat(apiClientUser, is(notNullValue())); @@ -213,12 +211,12 @@ public void testGetUser_successful() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - when(mockApiClient.get(anyString(), Mockito.any(Class.class))).thenReturn(userResponse); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(Class.class))).thenReturn(userResponse); HyperwalletUser resp = client.getUser("test-user-token"); assertThat(resp, is(equalTo(userResponse))); - verify(mockApiClient).get("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token", userResponse.getClass()); + Mockito.verify(mockApiClient).get("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token", userResponse.getClass()); } @Test @@ -264,12 +262,12 @@ public void testUpdateUser_successful() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - when(mockApiClient.put(anyString(), anyObject(), Mockito.any(Class.class))).thenReturn(userResponse); + Mockito.when(mockApiClient.put(Mockito.anyString(), Mockito.anyObject(), Mockito.any(Class.class))).thenReturn(userResponse); HyperwalletUser resp = client.updateUser(user); assertThat(resp, is(equalTo(userResponse))); - verify(mockApiClient).put("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token", user, user.getClass()); + Mockito.verify(mockApiClient).put("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token", user, user.getClass()); } @Test @@ -279,12 +277,12 @@ public void testListUsers_noParameters() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listUsers(); assertThat(resp, is(equalTo(response))); - verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users"), Mockito.any(TypeReference.class)); + Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users"), Mockito.any(TypeReference.class)); } @Test @@ -302,12 +300,12 @@ public void testListUsers_withParameters() throws Exception { .createdAfter(convertStringToDate("2016-06-29T17:58:26Z")) .createdBefore(convertStringToDate("2016-06-29T17:58:26Z")); - when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listUsers(options); assertThat(resp, is(equalTo(response))); - verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users?createdAfter=2016-06-29T17:58:26Z&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5&limit=10"), Mockito.any(TypeReference.class)); + Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users?createdAfter=2016-06-29T17:58:26Z&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5&limit=10"), Mockito.any(TypeReference.class)); } @Test @@ -323,12 +321,12 @@ public void testListUsers_withSomeParameters() throws Exception { .offset(5) .createdBefore(convertStringToDate("2016-06-29T17:58:26Z")); - when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listUsers(options); assertThat(resp, is(equalTo(response))); - verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users?createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); + Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users?createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); } //-------------------------------------- @@ -405,13 +403,13 @@ public void testCreatePrepaidCard_noType() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - when(mockApiClient.post(anyString(), anyObject(), Mockito.any(Class.class))).thenReturn(prepaidCardResponse); + Mockito.when(mockApiClient.post(Mockito.anyString(), Mockito.anyObject(), Mockito.any(Class.class))).thenReturn(prepaidCardResponse); HyperwalletPrepaidCard resp = client.createPrepaidCard(prepaidCard); assertThat(resp, is(equalTo(prepaidCardResponse))); ArgumentCaptor argument = ArgumentCaptor.forClass(HyperwalletPrepaidCard.class); - verify(mockApiClient).post(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards"), argument.capture(), eq(prepaidCard.getClass())); + Mockito.verify(mockApiClient).post(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards"), argument.capture(), Mockito.eq(prepaidCard.getClass())); HyperwalletPrepaidCard apiClientPrepaidCard = argument.getValue(); assertThat(apiClientPrepaidCard, is(notNullValue())); @@ -446,13 +444,13 @@ public void testCreatePrepaidCard_withType() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - when(mockApiClient.post(anyString(), anyObject(), Mockito.any(Class.class))).thenReturn(prepaidCardResponse); + Mockito.when(mockApiClient.post(Mockito.anyString(), Mockito.anyObject(), Mockito.any(Class.class))).thenReturn(prepaidCardResponse); HyperwalletPrepaidCard resp = client.createPrepaidCard(prepaidCard); assertThat(resp, is(equalTo(prepaidCardResponse))); ArgumentCaptor argument = ArgumentCaptor.forClass(HyperwalletPrepaidCard.class); - verify(mockApiClient).post(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards"), argument.capture(), eq(prepaidCard.getClass())); + Mockito.verify(mockApiClient).post(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards"), argument.capture(), Mockito.eq(prepaidCard.getClass())); HyperwalletPrepaidCard apiClientPrepaidCard = argument.getValue(); assertThat(apiClientPrepaidCard, is(notNullValue())); @@ -504,12 +502,12 @@ public void testGetPrepaidCard_successful() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - when(mockApiClient.get(anyString(), Mockito.any(Class.class))).thenReturn(prepaidCardResponse); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(Class.class))).thenReturn(prepaidCardResponse); HyperwalletPrepaidCard resp = client.getPrepaidCard("test-user-token", "test-prepaid-card-token"); assertThat(resp, is(equalTo(prepaidCardResponse))); - verify(mockApiClient).get("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token", prepaidCardResponse.getClass()); + Mockito.verify(mockApiClient).get("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token", prepaidCardResponse.getClass()); } @Test @@ -534,12 +532,12 @@ public void testListPrepaidCards_noParameters() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listPrepaidCards("test-user-token"); assertThat(resp, is(equalTo(response))); - verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards"), Mockito.any(TypeReference.class)); + Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards"), Mockito.any(TypeReference.class)); } @Test @@ -572,12 +570,12 @@ public void testListPrepaidCards_withParameters() throws Exception { .createdAfter(convertStringToDate("2016-06-29T17:58:26Z")) .createdBefore(convertStringToDate("2016-06-29T17:58:26Z")); - when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listPrepaidCards("test-user-token", options); assertThat(resp, is(equalTo(response))); - verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards?createdAfter=2016-06-29T17:58:26Z&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5&limit=10"), Mockito.any(TypeReference.class)); + Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards?createdAfter=2016-06-29T17:58:26Z&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5&limit=10"), Mockito.any(TypeReference.class)); } @Test @@ -593,12 +591,12 @@ public void testListPrepaidCards_withSomeParameters() throws Exception { .offset(5) .createdBefore(convertStringToDate("2016-06-29T17:58:26Z")); - when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listPrepaidCards("test-user-token", options); assertThat(resp, is(equalTo(response))); - verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards?createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); + Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards?createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); } @Test(dataProvider = "prepaidCardStatusTransitions") @@ -652,14 +650,14 @@ public void testPrepaidCardStatusTransitionMethods_successful(String methodName, Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - when(mockApiClient.post(anyString(), anyObject(), Mockito.any(Class.class))).thenReturn(statusTransitionResponse); + Mockito.when(mockApiClient.post(Mockito.anyString(), Mockito.anyObject(), Mockito.any(Class.class))).thenReturn(statusTransitionResponse); Method method = client.getClass().getMethod(methodName + "PrepaidCard", String.class, String.class); HyperwalletStatusTransition resp = (HyperwalletStatusTransition)method.invoke(client, "test-user-token", "test-prepaid-card-token"); assertThat(resp, is(equalTo(statusTransitionResponse))); ArgumentCaptor argument = ArgumentCaptor.forClass(HyperwalletStatusTransition.class); - verify(mockApiClient).post(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/status-transitions"), argument.capture(), eq(statusTransitionResponse.getClass())); + Mockito.verify(mockApiClient).post(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/status-transitions"), argument.capture(), Mockito.eq(statusTransitionResponse.getClass())); HyperwalletStatusTransition apiClientStatusTransition = argument.getValue(); assertThat(apiClientStatusTransition, is(notNullValue())); @@ -742,13 +740,13 @@ public void testCreatePrepaidCardStatusTransition_successful() throws Exception Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - when(mockApiClient.post(anyString(), anyObject(), Mockito.any(Class.class))).thenReturn(transitionResponse); + Mockito.when(mockApiClient.post(Mockito.anyString(), Mockito.anyObject(), Mockito.any(Class.class))).thenReturn(transitionResponse); HyperwalletStatusTransition resp = client.createPrepaidCardStatusTransition("test-user-token", "test-prepaid-card-token", transition); assertThat(resp, is(equalTo(transitionResponse))); ArgumentCaptor argument = ArgumentCaptor.forClass(HyperwalletStatusTransition.class); - verify(mockApiClient).post(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/status-transitions"), argument.capture(), eq(transition.getClass())); + Mockito.verify(mockApiClient).post(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/status-transitions"), argument.capture(), Mockito.eq(transition.getClass())); HyperwalletStatusTransition apiClientTransition = argument.getValue(); assertThat(apiClientTransition, is(notNullValue())); @@ -810,12 +808,12 @@ public void testGetPrepaidCardStatusTransition_successful() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - when(mockApiClient.get(anyString(), Mockito.any(Class.class))).thenReturn(transitionResponse); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(Class.class))).thenReturn(transitionResponse); HyperwalletStatusTransition resp = client.getPrepaidCardStatusTransition("test-user-token", "test-prepaid-card-token", "test-status-transition-token"); assertThat(resp, is(equalTo(transitionResponse))); - verify(mockApiClient).get("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/status-transitions/test-status-transition-token", transitionResponse.getClass()); + Mockito.verify(mockApiClient).get("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/status-transitions/test-status-transition-token", transitionResponse.getClass()); } @Test @@ -855,12 +853,12 @@ public void testListPrepaidCardStatusTransitions_noParameters() throws Exception Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listPrepaidCardStatusTransitions("test-user-token", "test-prepaid-card-token"); assertThat(resp, is(equalTo(response))); - verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/status-transitions"), Mockito.any(TypeReference.class)); + Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/status-transitions"), Mockito.any(TypeReference.class)); } @Test @@ -908,12 +906,12 @@ public void testListPrepaidCardStatisTransitions_withParameters() throws Excepti .createdAfter(convertStringToDate("2016-06-29T17:58:26Z")) .createdBefore(convertStringToDate("2016-06-29T17:58:26Z")); - when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listPrepaidCardStatusTransitions("test-user-token", "test-prepaid-card-token", options); assertThat(resp, is(equalTo(response))); - verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/status-transitions?createdAfter=2016-06-29T17:58:26Z&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5&limit=10"), Mockito.any(TypeReference.class)); + Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/status-transitions?createdAfter=2016-06-29T17:58:26Z&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5&limit=10"), Mockito.any(TypeReference.class)); } @Test @@ -929,12 +927,12 @@ public void testListPrepaidCardStatusTransitions_withSomeParameters() throws Exc .offset(5) .createdBefore(convertStringToDate("2016-06-29T17:58:26Z")); - when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listPrepaidCardStatusTransitions("test-user-token", "test-prepaid-card-token", options); assertThat(resp, is(equalTo(response))); - verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/status-transitions?createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); + Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/status-transitions?createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); } //-------------------------------------- @@ -1005,13 +1003,13 @@ public void testCreateBankAccount_successful() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - when(mockApiClient.post(anyString(), anyObject(), Mockito.any(Class.class))).thenReturn(bankAccountResponse); + Mockito.when(mockApiClient.post(Mockito.anyString(), Mockito.anyObject(), Mockito.any(Class.class))).thenReturn(bankAccountResponse); HyperwalletBankAccount resp = client.createBankAccount(bankAccount); assertThat(resp, is(equalTo(bankAccountResponse))); ArgumentCaptor argument = ArgumentCaptor.forClass(HyperwalletBankAccount.class); - verify(mockApiClient).post(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts"), argument.capture(), eq(bankAccount.getClass())); + Mockito.verify(mockApiClient).post(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts"), argument.capture(), Mockito.eq(bankAccount.getClass())); HyperwalletBankAccount apiClientBankAccount = argument.getValue(); assertThat(apiClientBankAccount, is(notNullValue())); @@ -1057,12 +1055,12 @@ public void testGetBankAccount_successful() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - when(mockApiClient.get(anyString(), Mockito.any(Class.class))).thenReturn(bankAccountResponse); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(Class.class))).thenReturn(bankAccountResponse); HyperwalletBankAccount resp = client.getBankAccount("test-user-token", "test-prepaid-card-token"); assertThat(resp, is(equalTo(bankAccountResponse))); - verify(mockApiClient).get("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts/test-prepaid-card-token", bankAccountResponse.getClass()); + Mockito.verify(mockApiClient).get("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts/test-prepaid-card-token", bankAccountResponse.getClass()); } @@ -1128,13 +1126,13 @@ public void testUpdateBankAccount_successful() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - when(mockApiClient.put(anyString(), anyObject(), Mockito.any(Class.class))).thenReturn(bankAccountResponse); + Mockito.when(mockApiClient.put(Mockito.anyString(), Mockito.anyObject(), Mockito.any(Class.class))).thenReturn(bankAccountResponse); HyperwalletBankAccount resp = client.updateBankAccount(bankAccount); assertThat(resp, is(equalTo(bankAccountResponse))); ArgumentCaptor argument = ArgumentCaptor.forClass(HyperwalletBankAccount.class); - verify(mockApiClient).put(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts/test-bank-account-token"), argument.capture(), eq(bankAccount.getClass())); + Mockito.verify(mockApiClient).put(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts/test-bank-account-token"), argument.capture(), Mockito.eq(bankAccount.getClass())); HyperwalletBankAccount apiClientBankAccount = argument.getValue(); assertThat(apiClientBankAccount, is(notNullValue())); @@ -1163,12 +1161,12 @@ public void testListBankAccounts_noParameters() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listBankAccounts("test-user-token"); assertThat(resp, is(equalTo(response))); - verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts"), Mockito.any(TypeReference.class)); + Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts"), Mockito.any(TypeReference.class)); } @Test @@ -1201,12 +1199,12 @@ public void testListBankAccounts_withParameters() throws Exception { .createdAfter(convertStringToDate("2016-06-29T17:58:26Z")) .createdBefore(convertStringToDate("2016-06-29T17:58:26Z")); - when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listBankAccounts("test-user-token", options); assertThat(resp, is(equalTo(response))); - verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts?createdAfter=2016-06-29T17:58:26Z&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5&limit=10"), Mockito.any(TypeReference.class)); + Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts?createdAfter=2016-06-29T17:58:26Z&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5&limit=10"), Mockito.any(TypeReference.class)); } @Test @@ -1222,12 +1220,12 @@ public void testListBankAccounts_withSomeParameters() throws Exception { .offset(5) .createdBefore(convertStringToDate("2016-06-29T17:58:26Z")); - when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listBankAccounts("test-user-token", options); assertThat(resp, is(equalTo(response))); - verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts?createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); + Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts?createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); } @Test @@ -1267,13 +1265,13 @@ public void testDeactivateBankAccount_successful() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - when(mockApiClient.post(anyString(), anyObject(), Mockito.any(Class.class))).thenReturn(statusTransitionResponse); + Mockito.when(mockApiClient.post(Mockito.anyString(), Mockito.anyObject(), Mockito.any(Class.class))).thenReturn(statusTransitionResponse); HyperwalletStatusTransition resp = client.deactivateBankAccount("test-user-token", "test-bank-account-token"); assertThat(resp, is(equalTo(statusTransitionResponse))); ArgumentCaptor argument = ArgumentCaptor.forClass(HyperwalletStatusTransition.class); - verify(mockApiClient).post(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts/test-bank-account-token/status-transitions"), argument.capture(), eq(statusTransitionResponse.getClass())); + Mockito.verify(mockApiClient).post(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts/test-bank-account-token/status-transitions"), argument.capture(), Mockito.eq(statusTransitionResponse.getClass())); HyperwalletStatusTransition apiClientStatusTransition = argument.getValue(); assertThat(apiClientStatusTransition, is(notNullValue())); @@ -1356,13 +1354,13 @@ public void testCreateBankAccountStatusTransition_successful() throws Exception Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - when(mockApiClient.post(anyString(), anyObject(), Mockito.any(Class.class))).thenReturn(transitionResponse); + Mockito.when(mockApiClient.post(Mockito.anyString(), Mockito.anyObject(), Mockito.any(Class.class))).thenReturn(transitionResponse); HyperwalletStatusTransition resp = client.createBankAccountStatusTransition("test-user-token", "test-bank-account-token", transition); assertThat(resp, is(equalTo(transitionResponse))); ArgumentCaptor argument = ArgumentCaptor.forClass(HyperwalletStatusTransition.class); - verify(mockApiClient).post(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts/test-bank-account-token/status-transitions"), argument.capture(), eq(transition.getClass())); + Mockito.verify(mockApiClient).post(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts/test-bank-account-token/status-transitions"), argument.capture(), Mockito.eq(transition.getClass())); HyperwalletStatusTransition apiClientTransition = argument.getValue(); assertThat(apiClientTransition, is(notNullValue())); @@ -1410,12 +1408,12 @@ public void testListBankAccountStatusTransitions_noParameters() throws Exception Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listBankAccountStatusTransitions("test-user-token", "test-bank-account-token"); assertThat(resp, is(equalTo(response))); - verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts/test-bank-account-token/status-transitions"), Mockito.any(TypeReference.class)); + Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts/test-bank-account-token/status-transitions"), Mockito.any(TypeReference.class)); } @Test @@ -1463,12 +1461,12 @@ public void testListBankAccountStatisTransitions_withParameters() throws Excepti .createdAfter(convertStringToDate("2016-06-29T17:58:26Z")) .createdBefore(convertStringToDate("2016-06-29T17:58:26Z")); - when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listBankAccountStatusTransitions("test-user-token", "test-bank-account-token", options); assertThat(resp, is(equalTo(response))); - verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts/test-bank-account-token/status-transitions?createdAfter=2016-06-29T17:58:26Z&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5&limit=10"), Mockito.any(TypeReference.class)); + Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts/test-bank-account-token/status-transitions?createdAfter=2016-06-29T17:58:26Z&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5&limit=10"), Mockito.any(TypeReference.class)); } @Test @@ -1484,12 +1482,12 @@ public void testListBankAccountStatusTransitions_withSomeParameters() throws Exc .offset(5) .createdBefore(convertStringToDate("2016-06-29T17:58:26Z")); - when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listBankAccountStatusTransitions("test-user-token", "test-bank-account-token", options); assertThat(resp, is(equalTo(response))); - verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts/test-bank-account-token/status-transitions?createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); + Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/bank-accounts/test-bank-account-token/status-transitions?createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); } //-------------------------------------- @@ -1518,12 +1516,12 @@ public void testListBalancesForUser_noParameters() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listBalancesForUser("test-user-token"); assertThat(resp, is(equalTo(response))); - verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/balances"), Mockito.any(TypeReference.class)); + Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/balances"), Mockito.any(TypeReference.class)); } @Test @@ -1555,12 +1553,12 @@ public void testListBalancesForUser_withParameters() throws Exception { .limit(10) .currency("test-currency"); - when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listBalancesForUser("test-user-token", options); assertThat(resp, is(equalTo(response))); - verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/balances?currency=test-currency&sortBy=test-sort-by&offset=5&limit=10"), Mockito.any(TypeReference.class)); + Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/balances?currency=test-currency&sortBy=test-sort-by&offset=5&limit=10"), Mockito.any(TypeReference.class)); } @Test @@ -1575,12 +1573,12 @@ public void testListBalancesForUser_withSomeParameters() throws Exception { .sortBy("test-sort-by") .offset(5); - when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listBalancesForUser("test-user-token", options); assertThat(resp, is(equalTo(response))); - verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/balances?sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); + Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/balances?sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); } @@ -1621,12 +1619,12 @@ public void testListBalancesForProgramAccount_noParameters() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listBalancesForAccount("test-prg-token", "test-acct-token"); assertThat(resp, is(equalTo(response))); - verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/programs/test-prg-token/accounts/test-acct-token/balances"), Mockito.any(TypeReference.class)); + Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/programs/test-prg-token/accounts/test-acct-token/balances"), Mockito.any(TypeReference.class)); } @Test @@ -1673,12 +1671,12 @@ public void testListBalancesForProgramAccount_withParameters() throws Exception .limit(10) .currency("test-currency"); - when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listBalancesForAccount("test-prg-token", "test-acct-token", options); assertThat(resp, is(equalTo(response))); - verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/programs/test-prg-token/accounts/test-acct-token/balances?currency=test-currency&sortBy=test-sort-by&offset=5&limit=10"), Mockito.any(TypeReference.class)); + Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/programs/test-prg-token/accounts/test-acct-token/balances?currency=test-currency&sortBy=test-sort-by&offset=5&limit=10"), Mockito.any(TypeReference.class)); } @Test @@ -1693,12 +1691,12 @@ public void testListBalancesForProgramAccount_withSomeParameters() throws Except .sortBy("test-sort-by") .offset(5); - when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listBalancesForAccount("test-prg-token", "test-acct-token", options); assertThat(resp, is(equalTo(response))); - verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/programs/test-prg-token/accounts/test-acct-token/balances?sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); + Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/programs/test-prg-token/accounts/test-acct-token/balances?sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); } @Test @@ -1738,12 +1736,12 @@ public void testListBalancesForPrepaidCard_noParameters() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listBalancesForPrepaidCard("test-user-token", "test-prepaid-card-token"); assertThat(resp, is(equalTo(response))); - verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/balances"), Mockito.any(TypeReference.class)); + Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/balances"), Mockito.any(TypeReference.class)); } @Test @@ -1789,12 +1787,12 @@ public void testListBalancesForPrepaidCard_withParameters() throws Exception { .offset(5) .limit(10); - when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listBalancesForPrepaidCard("test-user-token", "test-prepaid-card-token", options); assertThat(resp, is(equalTo(response))); - verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/balances?sortBy=test-sort-by&offset=5&limit=10"), Mockito.any(TypeReference.class)); + Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/balances?sortBy=test-sort-by&offset=5&limit=10"), Mockito.any(TypeReference.class)); } @Test @@ -1809,12 +1807,12 @@ public void testListBalancesForPrepaidCard_withSomeParameters() throws Exception .sortBy("test-sort-by") .offset(5); - when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listBalancesForPrepaidCard("test-user-token", "test-prepaid-card-token", options); assertThat(resp, is(equalTo(response))); - verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/balances?sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); + Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/balances?sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); } //-------------------------------------- @@ -1865,13 +1863,13 @@ public void testCreatePayment_withoutProgramToken() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - when(mockApiClient.post(anyString(), anyObject(), Mockito.any(Class.class))).thenReturn(paymentResponse); + Mockito.when(mockApiClient.post(Mockito.anyString(), Mockito.anyObject(), Mockito.any(Class.class))).thenReturn(paymentResponse); HyperwalletPayment resp = client.createPayment(payment); assertThat(resp, is(equalTo(paymentResponse))); ArgumentCaptor argument = ArgumentCaptor.forClass(HyperwalletPayment.class); - verify(mockApiClient).post(eq("https://api.sandbox.hyperwallet.com/rest/v3/payments"), argument.capture(), eq(payment.getClass())); + Mockito.verify(mockApiClient).post(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/payments"), argument.capture(), Mockito.eq(payment.getClass())); HyperwalletPayment apiClientPayment = argument.getValue(); assertThat(apiClientPayment, is(notNullValue())); @@ -1891,13 +1889,13 @@ public void testCreatePayment_withProgramTokenAddedByDefault() throws Exception Hyperwallet client = new Hyperwallet("test-username", "test-password", "test-program-token"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - when(mockApiClient.post(anyString(), anyObject(), Mockito.any(Class.class))).thenReturn(paymentResponse); + Mockito.when(mockApiClient.post(Mockito.anyString(), Mockito.anyObject(), Mockito.any(Class.class))).thenReturn(paymentResponse); HyperwalletPayment resp = client.createPayment(payment); assertThat(resp, is(equalTo(paymentResponse))); ArgumentCaptor argument = ArgumentCaptor.forClass(HyperwalletPayment.class); - verify(mockApiClient).post(eq("https://api.sandbox.hyperwallet.com/rest/v3/payments"), argument.capture(), eq(payment.getClass())); + Mockito.verify(mockApiClient).post(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/payments"), argument.capture(), Mockito.eq(payment.getClass())); HyperwalletPayment apiClientPayment = argument.getValue(); assertThat(apiClientPayment, is(notNullValue())); @@ -1918,13 +1916,13 @@ public void testCreatePayment_withProgramTokenInPaymentObject() throws Exception Hyperwallet client = new Hyperwallet("test-username", "test-password", "test-program-token"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - when(mockApiClient.post(anyString(), anyObject(), Mockito.any(Class.class))).thenReturn(paymentResponse); + Mockito.when(mockApiClient.post(Mockito.anyString(), Mockito.anyObject(), Mockito.any(Class.class))).thenReturn(paymentResponse); HyperwalletPayment resp = client.createPayment(payment); assertThat(resp, is(equalTo(paymentResponse))); ArgumentCaptor argument = ArgumentCaptor.forClass(HyperwalletPayment.class); - verify(mockApiClient).post(eq("https://api.sandbox.hyperwallet.com/rest/v3/payments"), argument.capture(), eq(payment.getClass())); + Mockito.verify(mockApiClient).post(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/payments"), argument.capture(), Mockito.eq(payment.getClass())); HyperwalletPayment apiClientPayment = argument.getValue(); assertThat(apiClientPayment, is(notNullValue())); @@ -1955,12 +1953,12 @@ public void testGetPayment_successful() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - when(mockApiClient.get(anyString(), Mockito.any(Class.class))).thenReturn(paymentResponse); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(Class.class))).thenReturn(paymentResponse); HyperwalletPayment resp = client.getPayment("test-payment-token"); assertThat(resp, is(equalTo(paymentResponse))); - verify(mockApiClient).get("https://api.sandbox.hyperwallet.com/rest/v3/payments/test-payment-token", paymentResponse.getClass()); + Mockito.verify(mockApiClient).get("https://api.sandbox.hyperwallet.com/rest/v3/payments/test-payment-token", paymentResponse.getClass()); } @Test @@ -1970,12 +1968,12 @@ public void testListPayments_noParameters() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listPayments(); assertThat(resp, is(equalTo(response))); - verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/payments"), Mockito.any(TypeReference.class)); + Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/payments"), Mockito.any(TypeReference.class)); } @Test @@ -1993,12 +1991,12 @@ public void testListPayments_withParameters() throws Exception { .createdAfter(convertStringToDate("2016-06-29T17:58:26Z")) .createdBefore(convertStringToDate("2016-06-29T17:58:26Z")); - when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listPayments(options); assertThat(resp, is(equalTo(response))); - verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/payments?createdAfter=2016-06-29T17:58:26Z&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5&limit=10"), Mockito.any(TypeReference.class)); + Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/payments?createdAfter=2016-06-29T17:58:26Z&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5&limit=10"), Mockito.any(TypeReference.class)); } @Test @@ -2014,12 +2012,12 @@ public void testListPayments_withSomeParameters() throws Exception { .offset(5) .createdBefore(convertStringToDate("2016-06-29T17:58:26Z")); - when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listPayments(options); assertThat(resp, is(equalTo(response))); - verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/payments?createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); + Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/payments?createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); } //-------------------------------------- @@ -2048,12 +2046,12 @@ public void testGetProgram_successful() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - when(mockApiClient.get(anyString(), Mockito.any(Class.class))).thenReturn(programResponse); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(Class.class))).thenReturn(programResponse); HyperwalletProgram resp = client.getProgram("test-program-token"); assertThat(resp, is(equalTo(programResponse))); - verify(mockApiClient).get("https://api.sandbox.hyperwallet.com/rest/v3/programs/test-program-token", programResponse.getClass()); + Mockito.verify(mockApiClient).get("https://api.sandbox.hyperwallet.com/rest/v3/programs/test-program-token", programResponse.getClass()); } //-------------------------------------- @@ -2097,12 +2095,12 @@ public void testGetProgramAccount_successful() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - when(mockApiClient.get(anyString(), Mockito.any(Class.class))).thenReturn(accountResponse); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(Class.class))).thenReturn(accountResponse); HyperwalletAccount resp = client.getProgramAccount("test-program-token", "test-account-token"); assertThat(resp, is(equalTo(accountResponse))); - verify(mockApiClient).get("https://api.sandbox.hyperwallet.com/rest/v3/programs/test-program-token/accounts/test-account-token", accountResponse.getClass()); + Mockito.verify(mockApiClient).get("https://api.sandbox.hyperwallet.com/rest/v3/programs/test-program-token/accounts/test-account-token", accountResponse.getClass()); } //-------------------------------------- @@ -2191,12 +2189,12 @@ public void testGetTransferMethodConfiguration_successful() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - when(mockApiClient.get(anyString(), Mockito.any(Class.class))).thenReturn(configResponse); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(Class.class))).thenReturn(configResponse); HyperwalletTransferMethodConfiguration resp = client.getTransferMethodConfiguration("test-user-token", "test-country", "test-currency", HyperwalletTransferMethod.Type.BANK_ACCOUNT, HyperwalletUser.ProfileType.INDIVIDUAL); assertThat(resp, is(equalTo(configResponse))); - verify(mockApiClient).get("https://api.sandbox.hyperwallet.com/rest/v3/transfer-method-configurations?userToken=test-user-token&country=test-country¤cy=test-currency&type=BANK_ACCOUNT&profileType=INDIVIDUAL", configResponse.getClass()); + Mockito.verify(mockApiClient).get("https://api.sandbox.hyperwallet.com/rest/v3/transfer-method-configurations?userToken=test-user-token&country=test-country¤cy=test-currency&type=BANK_ACCOUNT&profileType=INDIVIDUAL", configResponse.getClass()); } @Test @@ -2221,12 +2219,12 @@ public void testListTransferMethodConfigurations_noParameters_successful() throw Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listTransferMethodConfigurations("test-user-token"); assertThat(resp, is(equalTo(response))); - verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/transfer-method-configurations?userToken=test-user-token"), Mockito.any(TypeReference.class)); + Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/transfer-method-configurations?userToken=test-user-token"), Mockito.any(TypeReference.class)); } @Test @@ -2259,12 +2257,12 @@ public void testListTransferMethodConfigurations_withParameters_successful() thr .createdAfter(convertStringToDate("2016-06-29T17:58:26Z")) .createdBefore(convertStringToDate("2016-06-29T17:58:26Z")); - when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listTransferMethodConfigurations("test-user-token", options); assertThat(resp, is(equalTo(response))); - verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/transfer-method-configurations?userToken=test-user-token&createdAfter=2016-06-29T17:58:26Z&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5&limit=10"), Mockito.any(TypeReference.class)); + Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/transfer-method-configurations?userToken=test-user-token&createdAfter=2016-06-29T17:58:26Z&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5&limit=10"), Mockito.any(TypeReference.class)); } @Test @@ -2280,12 +2278,12 @@ public void testListTransferMethodConfigurations_withSomeParameters() throws Exc .offset(5) .createdBefore(convertStringToDate("2016-06-29T17:58:26Z")); - when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listTransferMethodConfigurations("test-user-token", options); assertThat(resp, is(equalTo(response))); - verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/transfer-method-configurations?userToken=test-user-token&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); + Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/transfer-method-configurations?userToken=test-user-token&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); } //-------------------------------------- @@ -2329,12 +2327,12 @@ public void testListReceiptsForProgramAccount_noParameters() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listReceiptsForProgramAccount("test-program-token", "test-account-token"); assertThat(resp, is(equalTo(response))); - verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/programs/test-program-token/accounts/test-account-token/receipts"), Mockito.any(TypeReference.class)); + Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/programs/test-program-token/accounts/test-account-token/receipts"), Mockito.any(TypeReference.class)); } @Test @@ -2383,12 +2381,12 @@ public void testListReceiptsForProgramAccount_withParameters() throws Exception .createdAfter(convertStringToDate("2016-06-29T17:58:26Z")) .createdBefore(convertStringToDate("2016-06-29T17:58:26Z")); - when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listReceiptsForProgramAccount("test-program-token", "test-account-token", options); assertThat(resp, is(equalTo(response))); - verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/programs/test-program-token/accounts/test-account-token/receipts?createdAfter=2016-06-29T17:58:26Z&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5&limit=10&type=ANNUAL_FEE"), Mockito.any(TypeReference.class)); + Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/programs/test-program-token/accounts/test-account-token/receipts?createdAfter=2016-06-29T17:58:26Z&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5&limit=10&type=ANNUAL_FEE"), Mockito.any(TypeReference.class)); } @Test @@ -2404,12 +2402,12 @@ public void testListReceiptsForProgramAccount_withSomeParameters() throws Except .offset(5) .createdBefore(convertStringToDate("2016-06-29T17:58:26Z")); - when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listReceiptsForProgramAccount("test-program-token", "test-account-token", options); assertThat(resp, is(equalTo(response))); - verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/programs/test-program-token/accounts/test-account-token/receipts?createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); + Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/programs/test-program-token/accounts/test-account-token/receipts?createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); } @Test @@ -2434,12 +2432,12 @@ public void testListReceiptsForUser_noParameters() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listReceiptsForUser("test-user-token"); assertThat(resp, is(equalTo(response))); - verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/receipts"), Mockito.any(TypeReference.class)); + Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/receipts"), Mockito.any(TypeReference.class)); } @Test @@ -2473,12 +2471,12 @@ public void testListReceiptsForUser_withParameters() throws Exception { .createdAfter(convertStringToDate("2016-06-29T17:58:26Z")) .createdBefore(convertStringToDate("2016-06-29T17:58:26Z")); - when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listReceiptsForUser("test-user-token", options); assertThat(resp, is(equalTo(response))); - verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/receipts?createdAfter=2016-06-29T17:58:26Z&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5&limit=10&type=ANNUAL_FEE"), Mockito.any(TypeReference.class)); + Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/receipts?createdAfter=2016-06-29T17:58:26Z&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5&limit=10&type=ANNUAL_FEE"), Mockito.any(TypeReference.class)); } @Test @@ -2494,12 +2492,12 @@ public void testListReceiptsForUser_withSomeParameters() throws Exception { .offset(5) .createdBefore(convertStringToDate("2016-06-29T17:58:26Z")); - when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listReceiptsForUser("test-user-token", options); assertThat(resp, is(equalTo(response))); - verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/receipts?createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); + Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/receipts?createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); } @Test @@ -2539,12 +2537,12 @@ public void testListReceiptsForPrepaidCard_noParameters() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listReceiptsForPrepaidCard("test-user-token", "test-prepaid-card-token"); assertThat(resp, is(equalTo(response))); - verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/receipts"), Mockito.any(TypeReference.class)); + Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/receipts"), Mockito.any(TypeReference.class)); } @Test @@ -2593,12 +2591,12 @@ public void testListReceiptsForPrepaidCard_withParameters() throws Exception { .createdAfter(convertStringToDate("2016-06-29T17:58:26Z")) .createdBefore(convertStringToDate("2016-06-29T17:58:26Z")); - when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listReceiptsForPrepaidCard("test-user-token", "test-prepaid-card-token", options); assertThat(resp, is(equalTo(response))); - verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/receipts?createdAfter=2016-06-29T17:58:26Z&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5&limit=10&type=ANNUAL_FEE"), Mockito.any(TypeReference.class)); + Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/receipts?createdAfter=2016-06-29T17:58:26Z&createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5&limit=10&type=ANNUAL_FEE"), Mockito.any(TypeReference.class)); } @Test @@ -2614,12 +2612,12 @@ public void testListReceiptsForPrepaidCard_withSomeParameters() throws Exception .offset(5) .createdBefore(convertStringToDate("2016-06-29T17:58:26Z")); - when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listReceiptsForPrepaidCard("test-user-token", "test-prepaid-card-token", options); assertThat(resp, is(equalTo(response))); - verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/receipts?createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); + Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/prepaid-cards/test-prepaid-card-token/receipts?createdBefore=2016-06-29T17:58:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); } //-------------------------------------- @@ -2648,12 +2646,12 @@ public void testGetWebhookEvent_Successful() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - when(mockApiClient.get(anyString(), Mockito.any(Class.class))).thenReturn(event); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(Class.class))).thenReturn(event); HyperwalletWebhookNotification resp = client.getWebhookEvent("test-webhook-token"); assertThat(resp, is(equalTo(event))); - verify(mockApiClient).get("https://api.sandbox.hyperwallet.com/rest/v3/webhook-notifications/test-webhook-token", event.getClass()); + Mockito.verify(mockApiClient).get("https://api.sandbox.hyperwallet.com/rest/v3/webhook-notifications/test-webhook-token", event.getClass()); } @Test @@ -2663,12 +2661,12 @@ public void testListWebhookEvents_noParameters() throws Exception { Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listWebhookEvents(); assertThat(resp, is(equalTo(response))); - verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/webhook-notifications"), Mockito.any(TypeReference.class)); + Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/webhook-notifications"), Mockito.any(TypeReference.class)); } @Test @@ -2687,12 +2685,12 @@ public void testListWebhookEvents_withParameters() throws Exception { .createdAfter(convertStringToDate("2016-08-24T13:56:26Z")) .createdBefore(convertStringToDate("2016-08-24T13:56:26Z")); - when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listWebhookEvents(options); assertThat(resp, is(equalTo(response))); - verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/webhook-notifications?createdAfter=2016-08-24T13:56:26Z&createdBefore=2016-08-24T13:56:26Z&sortBy=test-sort-by&offset=5&limit=10&type=USERS.PREPAID_CARDS.CREATED"), Mockito.any(TypeReference.class)); + Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/webhook-notifications?createdAfter=2016-08-24T13:56:26Z&createdBefore=2016-08-24T13:56:26Z&sortBy=test-sort-by&offset=5&limit=10&type=USERS.PREPAID_CARDS.CREATED"), Mockito.any(TypeReference.class)); } @Test @@ -2708,12 +2706,12 @@ public void testListWebhookEvents_withSomeParameters() throws Exception { .offset(5) .createdBefore(convertStringToDate("2016-08-24T13:56:26Z")); - when(mockApiClient.get(anyString(), Mockito.any(TypeReference.class))).thenReturn(response); + Mockito.when(mockApiClient.get(Mockito.anyString(), Mockito.any(TypeReference.class))).thenReturn(response); HyperwalletList resp = client.listWebhookEvents(options); assertThat(resp, is(equalTo(response))); - verify(mockApiClient).get(eq("https://api.sandbox.hyperwallet.com/rest/v3/webhook-notifications?createdBefore=2016-08-24T13:56:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); + Mockito.verify(mockApiClient).get(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/webhook-notifications?createdBefore=2016-08-24T13:56:26Z&sortBy=test-sort-by&offset=5"), Mockito.any(TypeReference.class)); } @@ -2853,14 +2851,14 @@ public void testCreateTransferMethod_Completed() throws Exception{ Hyperwallet client = new Hyperwallet("test-username", "test-password"); HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); - when(mockApiClient.post(anyString(), anyObject(), Mockito.any(Class.class), Mockito.any(HashMap.class))).thenReturn(transferMethodResponse); + Mockito.when(mockApiClient.post(Mockito.anyString(), Mockito.anyObject(), Mockito.any(Class.class), Mockito.any(HashMap.class))).thenReturn(transferMethodResponse); String jsonCacheToken = "token123-123-123"; HyperwalletTransferMethod resp = client.createTransferMethod(jsonCacheToken, transferMethod); assertThat(resp, is(equalTo(transferMethodResponse))); ArgumentCaptor argument = ArgumentCaptor.forClass(HyperwalletTransferMethod.class); - verify(mockApiClient).post(eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/transfer-methods"), argument.capture(), eq(transferMethod.getClass()), (HashMap) anyMapOf(String.class, String.class)); + Mockito.verify(mockApiClient).post(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/transfer-methods"), argument.capture(), Mockito.eq(transferMethod.getClass()), (HashMap) Mockito.anyMapOf(String.class, String.class)); HyperwalletTransferMethod apiClientTransferMethod = argument.getValue(); @@ -2989,7 +2987,6 @@ private HyperwalletTransferMethod createPrePopulatedTransferMethod() { .stateProvince("test-state-province") .postalCode("test-postal-code") .country("test-country"); - return transferMethod; } diff --git a/src/test/java/com/hyperwallet/clientsdk/util/HyperwalletApiClientTest.java b/src/test/java/com/hyperwallet/clientsdk/util/HyperwalletApiClientTest.java index fea563f33..7d4719b3b 100644 --- a/src/test/java/com/hyperwallet/clientsdk/util/HyperwalletApiClientTest.java +++ b/src/test/java/com/hyperwallet/clientsdk/util/HyperwalletApiClientTest.java @@ -19,6 +19,8 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; +import java.util.HashMap; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.*; @@ -666,4 +668,104 @@ public void testPost_500Response() { } } + @Test + public void testPost_WithHeaders() throws Exception { + TestBody requestBody = new TestBody(); + requestBody.test1 = "value1"; + requestBody.getInclusions().add("test1"); + + mockServer.when( + HttpRequest.request() + .withMethod("POST") + .withPath("/test") + .withQueryStringParameter("test-query", "test-value") + .withHeader("Authorization", "Basic dGVzdC11c2VybmFtZTp0ZXN0LXBhc3N3b3Jk") + .withHeader("Accept", "application/json") + .withHeader("Content-Type", "application/json") + .withHeader("User-Agent", "Hyperwallet Java SDK v1.0") + .withBody(StringBody.exact("{\"test1\":\"value1\"}")), + Times.exactly(1) + ).respond( + HttpResponse.response() + .withStatusCode(200) + .withHeader("Content-Type", "application/json") + .withBody("{ \"test1\": \"value1\" }") + ); + HashMap headers = new HashMap(); + headers.put("Json-Cache-Token", "token123-123-123"); + + TestBody body = hyperwalletApiClient.post(baseUrl + "/test?test-query=test-value", requestBody, TestBody.class, headers); + assertThat(body, is(notNullValue())); + assertThat(body.test1, is(equalTo("value1"))); + assertThat(body.test2, is(nullValue())); + } + + + + @Test + public void testPost_OverwriteHeaders() throws Exception { + TestBody requestBody = new TestBody(); + requestBody.test1 = "value1"; + requestBody.getInclusions().add("test1"); + + mockServer.when( + HttpRequest.request() + .withMethod("POST") + .withPath("/test") + .withQueryStringParameter("test-query", "test-value") + .withHeader("Authorization", "Basic wrong_password") + .withHeader("Accept", "application/json") + .withHeader("Content-Type", "application/json") + .withHeader("User-Agent", "Hyperwallet Java SDK v1.0") + .withBody(StringBody.exact("{\"test1\":\"value1\"}")), + Times.exactly(1) + ).respond( + HttpResponse.response() + .withStatusCode(400) + .withBody("{ \"errors\": [{ \"code\": \"test1\", \"fieldName\": \"test2\", \"message\": \"test3\" }, { \"code\": \"test4\", \"message\": \"test5\" }] }") + ); + HashMap headers = new HashMap(); + headers.put("Authorization", "Basic wrong_password"); + + + try { + hyperwalletApiClient.post(baseUrl + "/test?test-query=test-value", requestBody, TestBody.class, headers); + fail("Expected HyperwalletException"); + } catch (HyperwalletException e) { + assertThat(e.getErrorCode(), is(equalTo("test1"))); + assertThat(e.getErrorMessage(), is(equalTo("test3"))); + assertThat(e.getResponse(), is(notNullValue())); + } + } + + @Test + public void testPost_NullHeaders() throws Exception { + TestBody requestBody = new TestBody(); + requestBody.test1 = "value1"; + requestBody.getInclusions().add("test1"); + + mockServer.when( + HttpRequest.request() + .withMethod("POST") + .withPath("/test") + .withQueryStringParameter("test-query", "test-value") + .withHeader("Authorization", "Basic dGVzdC11c2VybmFtZTp0ZXN0LXBhc3N3b3Jk") + .withHeader("Accept", "application/json") + .withHeader("Content-Type", "application/json") + .withHeader("User-Agent", "Hyperwallet Java SDK v1.0") + .withBody(StringBody.exact("{\"test1\":\"value1\"}")), + Times.exactly(1) + ).respond( + HttpResponse.response() + .withStatusCode(200) + .withHeader("Content-Type", "application/json") + .withBody("{ \"test1\": \"value1\" }") + ); + + TestBody body = hyperwalletApiClient.post(baseUrl + "/test?test-query=test-value", requestBody, TestBody.class, null); + assertThat(body, is(notNullValue())); + assertThat(body.test1, is(equalTo("value1"))); + assertThat(body.test2, is(nullValue())); + } + } From 0a4dfeb84b0eef46cb89e06516b239c1c6d1c014 Mon Sep 17 00:00:00 2001 From: Vadim Korotchenko Date: Fri, 25 Nov 2016 15:55:46 -0800 Subject: [PATCH 4/6] added option to add empty transfer method and testing for 100% coverage --- .../hyperwallet/clientsdk/Hyperwallet.java | 29 ++++- .../clientsdk/HyperwalletTest.java | 107 +++++++++++++++++- .../util/HyperwalletApiClientTest.java | 25 +++- 3 files changed, 154 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/hyperwallet/clientsdk/Hyperwallet.java b/src/main/java/com/hyperwallet/clientsdk/Hyperwallet.java index 1c1723395..0e72f6a16 100644 --- a/src/main/java/com/hyperwallet/clientsdk/Hyperwallet.java +++ b/src/main/java/com/hyperwallet/clientsdk/Hyperwallet.java @@ -935,8 +935,8 @@ public HyperwalletList listWebhookEvents(Hyperwa /** * Create a Transfer Method * - * @param jsonCacheToken JSON cache token - * @param transferMethod Transfer Method object to create + * @param jsonCacheToken String JSON cache token + * @param transferMethod TransferMethod object to create * @return HyperwalletTransferMethod Transfer Method object created */ public HyperwalletTransferMethod createTransferMethod(String jsonCacheToken, HyperwalletTransferMethod transferMethod) { @@ -959,6 +959,31 @@ public HyperwalletTransferMethod createTransferMethod(String jsonCacheToken, Hyp return apiClient.post(url + "/users/"+transferMethod.getUserToken()+"/transfer-methods", transferMethod, HyperwalletTransferMethod.class, headers); } + + /** + * Create a Transfer Method + * + * @param jsonCacheToken String JSON cache token + * @param userToken String user token + * @return HyperwalletTransferMethod Transfer Method object created + */ + public HyperwalletTransferMethod createTransferMethod(String jsonCacheToken, String userToken) { + + if (StringUtils.isEmpty(userToken)) { + throw new HyperwalletException("User token is required"); + } + if (StringUtils.isEmpty(jsonCacheToken)) { + throw new HyperwalletException("JSON token is required"); + } + + HyperwalletTransferMethod transferMethod = new HyperwalletTransferMethod(); + transferMethod.setUserToken(userToken); + + HashMap headers = new HashMap(); + headers.put("Json-Cache-Token", jsonCacheToken); + + return apiClient.post(url + "/users/"+transferMethod.getUserToken()+"/transfer-methods", transferMethod, HyperwalletTransferMethod.class, headers); + } //-------------------------------------- // Internal utils //-------------------------------------- diff --git a/src/test/java/com/hyperwallet/clientsdk/HyperwalletTest.java b/src/test/java/com/hyperwallet/clientsdk/HyperwalletTest.java index 2eaa3b19a..cfa01d81e 100644 --- a/src/test/java/com/hyperwallet/clientsdk/HyperwalletTest.java +++ b/src/test/java/com/hyperwallet/clientsdk/HyperwalletTest.java @@ -18,10 +18,9 @@ import java.util.Locale; import java.util.TimeZone; -import static org.testng.Assert.fail; - import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.*; +import static org.testng.Assert.fail; /** * @author fkrauthan @@ -2793,7 +2792,7 @@ public void testTransferMethod_noTransferMethod() { Hyperwallet client = new Hyperwallet("test-username", "test-password"); String jsonCacheToken = "token123-123-123"; try { - client.createTransferMethod(jsonCacheToken, null); + client.createTransferMethod(jsonCacheToken, (HyperwalletTransferMethod)null); fail("Expect HyperwalletException"); } catch (HyperwalletException e) { assertThat(e.getErrorCode(), is(nullValue())); @@ -2825,7 +2824,7 @@ public void testCreateTransferMethod_noJsonCacheToken() { } @Test - public void testCreateTransferMethod_noUseroken() { + public void testCreateTransferMethod_noUserokenInTransferMethod() { HyperwalletTransferMethod transferMethod = new HyperwalletTransferMethod(); Hyperwallet client = new Hyperwallet("test-username", "test-password"); @@ -2842,6 +2841,106 @@ public void testCreateTransferMethod_noUseroken() { } } + @Test + public void testCreateTransferMethod_noUseroken() { + + Hyperwallet client = new Hyperwallet("test-username", "test-password"); + String jsonCacheToken = "token123-123-123"; + + try { + client.createTransferMethod(jsonCacheToken, ""); + fail("Expect HyperwalletException"); + } catch (HyperwalletException e) { + assertThat(e.getErrorCode(), is(nullValue())); + assertThat(e.getResponse(), is(nullValue())); + assertThat(e.getErrorMessage(), is(equalTo("User token is required"))); + assertThat(e.getMessage(), is(equalTo("User token is required"))); + assertThat(e.getHyperwalletErrors(), is(nullValue())); + } + } + + @Test + public void testCreateTransferMethod_CompletedUserToken() throws Exception{ + + HyperwalletTransferMethod transferMethodResponse = new HyperwalletTransferMethod(); + + Hyperwallet client = new Hyperwallet("test-username", "test-password"); + HyperwalletApiClient mockApiClient = createAndInjectHyperwalletApiClientMock(client); + + Mockito.when(mockApiClient.post(Mockito.anyString(), Mockito.anyObject(), Mockito.any(Class.class), Mockito.any(HashMap.class))).thenReturn(transferMethodResponse); + + String jsonCacheToken = "token123-123-123"; + String userToken = "test-user-token"; + HyperwalletTransferMethod resp = client.createTransferMethod(jsonCacheToken, userToken); + assertThat(resp, is(equalTo(transferMethodResponse))); + + ArgumentCaptor argument = ArgumentCaptor.forClass(HyperwalletTransferMethod.class); + Mockito.verify(mockApiClient).post(Mockito.eq("https://api.sandbox.hyperwallet.com/rest/v3/users/test-user-token/transfer-methods"), argument.capture(), Mockito.eq(resp.getClass()), (HashMap) Mockito.anyMapOf(String.class, String.class)); + + HyperwalletTransferMethod apiClientTransferMethod = argument.getValue(); + + assertThat(apiClientTransferMethod, is(notNullValue())); + assertThat(apiClientTransferMethod.getUserToken(), is(notNullValue())); + + assertThat(apiClientTransferMethod.getToken(), is(nullValue())); + assertThat(apiClientTransferMethod.getStatus(), is(nullValue())); + assertThat(apiClientTransferMethod.getCreatedOn(), is(nullValue())); + assertThat(apiClientTransferMethod.getCountry(), is(nullValue())); + assertThat(apiClientTransferMethod.getType(), is(nullValue())); + assertThat(apiClientTransferMethod.getTransferMethodCountry(), is(nullValue())); + assertThat(apiClientTransferMethod.getTransferMethodCurrency(), is(nullValue())); + assertThat(apiClientTransferMethod.getBankName(), is(nullValue())); + assertThat(apiClientTransferMethod.getBankId(), is(nullValue())); + assertThat(apiClientTransferMethod.getBranchName(), is(nullValue())); + assertThat(apiClientTransferMethod.getBranchId(), is(nullValue())); + assertThat(apiClientTransferMethod.getBankAccountId(), is(nullValue())); + assertThat(apiClientTransferMethod.getBankAccountRelationship(), is(nullValue())); + assertThat(apiClientTransferMethod.getBankAccountPurpose(), is(nullValue())); + assertThat(apiClientTransferMethod.getBranchAddressLine1(), is(nullValue())); + assertThat(apiClientTransferMethod.getBranchAddressLine2(), is(nullValue())); + assertThat(apiClientTransferMethod.getBranchCity(), is(nullValue())); + assertThat(apiClientTransferMethod.getBranchStateProvince(), is(nullValue())); + assertThat(apiClientTransferMethod.getBranchCountry(), is(nullValue())); + assertThat(apiClientTransferMethod.getBranchPostalCode(), is(nullValue())); + assertThat(apiClientTransferMethod.getWireInstructions(), is(nullValue())); + assertThat(apiClientTransferMethod.getIntermediaryBankId(), is(nullValue())); + assertThat(apiClientTransferMethod.getIntermediaryBankName(), is(nullValue())); + assertThat(apiClientTransferMethod.getIntermediaryBankAccountId(), is(nullValue())); + assertThat(apiClientTransferMethod.getIntermediaryBankAddressLine1(), is(nullValue())); + assertThat(apiClientTransferMethod.getIntermediaryBankAddressLine2(), is(nullValue())); + assertThat(apiClientTransferMethod.getIntermediaryBankCity(), is(nullValue())); + assertThat(apiClientTransferMethod.getIntermediaryBankStateProvince(), is(nullValue())); + assertThat(apiClientTransferMethod.getIntermediaryBankCountry(), is(nullValue())); + assertThat(apiClientTransferMethod.getIntermediaryBankPostalCode(), is(nullValue())); + assertThat(apiClientTransferMethod.getCardType(), is(nullValue())); + assertThat(apiClientTransferMethod.getCardPackage(), is(nullValue())); + assertThat(apiClientTransferMethod.getCardNumber(), is(nullValue())); + assertThat(apiClientTransferMethod.getCardBrand(), is(nullValue())); + assertThat(apiClientTransferMethod.getProfileType(), is(nullValue())); + assertThat(apiClientTransferMethod.getBusinessName(), is(nullValue())); + assertThat(apiClientTransferMethod.getBusinessRegistrationId(), is(nullValue())); + assertThat(apiClientTransferMethod.getBusinessRegistrationStateProvince(), is(nullValue())); + assertThat(apiClientTransferMethod.getBusinessRegistrationCountry(), is(nullValue())); + assertThat(apiClientTransferMethod.getBusinessContactRole(), is(nullValue())); + assertThat(apiClientTransferMethod.getFirstName(), is(nullValue())); + assertThat(apiClientTransferMethod.getMiddleName(), is(nullValue())); + assertThat(apiClientTransferMethod.getLastName(), is(nullValue())); + assertThat(apiClientTransferMethod.getCountryOfBirth(), is(nullValue())); + assertThat(apiClientTransferMethod.getCountryOfNationality(), is(nullValue())); + assertThat(apiClientTransferMethod.getGender(), is(nullValue())); + assertThat(apiClientTransferMethod.getMobileNumber(), is(nullValue())); + assertThat(apiClientTransferMethod.getEmail(), is(nullValue())); + assertThat(apiClientTransferMethod.getGovernmentId(), is(nullValue())); + assertThat(apiClientTransferMethod.getPassportId(), is(nullValue())); + assertThat(apiClientTransferMethod.getDriversLicenseId(), is(nullValue())); + assertThat(apiClientTransferMethod.getAddressLine1(), is(nullValue())); + assertThat(apiClientTransferMethod.getAddressLine2(), is(nullValue())); + assertThat(apiClientTransferMethod.getCity(), is(nullValue())); + assertThat(apiClientTransferMethod.getStateProvince(), is(nullValue())); + assertThat(apiClientTransferMethod.getPostalCode(), is(nullValue())); + assertThat(apiClientTransferMethod.getCountry(), is(nullValue())); + } + @Test public void testCreateTransferMethod_Completed() throws Exception{ HyperwalletTransferMethod transferMethod = createPrePopulatedTransferMethod(); diff --git a/src/test/java/com/hyperwallet/clientsdk/util/HyperwalletApiClientTest.java b/src/test/java/com/hyperwallet/clientsdk/util/HyperwalletApiClientTest.java index 7d4719b3b..010c06bbc 100644 --- a/src/test/java/com/hyperwallet/clientsdk/util/HyperwalletApiClientTest.java +++ b/src/test/java/com/hyperwallet/clientsdk/util/HyperwalletApiClientTest.java @@ -724,10 +724,10 @@ public void testPost_OverwriteHeaders() throws Exception { .withStatusCode(400) .withBody("{ \"errors\": [{ \"code\": \"test1\", \"fieldName\": \"test2\", \"message\": \"test3\" }, { \"code\": \"test4\", \"message\": \"test5\" }] }") ); + HashMap headers = new HashMap(); headers.put("Authorization", "Basic wrong_password"); - try { hyperwalletApiClient.post(baseUrl + "/test?test-query=test-value", requestBody, TestBody.class, headers); fail("Expected HyperwalletException"); @@ -768,4 +768,27 @@ public void testPost_NullHeaders() throws Exception { assertThat(body.test2, is(nullValue())); } + + @Test + public void testPost_noConnectionWithHeaders() { + TestBody requestBody = new TestBody(); + requestBody.test1 = "value1"; + requestBody.getInclusions().add("test1"); + + mockServer.stop(); + if (mockServer.isRunning()) { + fail("Mockserver still running"); + } + + HashMap headers = new HashMap(); + headers.put("Authorization", "Basic wrong_password"); + + try { + hyperwalletApiClient.post(baseUrl + "/test?test-query=test-value", requestBody, TestBody.class,headers); + fail("Expect HyperwalletException"); + } catch (HyperwalletException e) { + assertThat(e.getMessage(), is(equalTo("java.net.ConnectException: Connection refused"))); + } + } + } From 0dcf236f4e3999f59f346d85544f0c6a90ca72f0 Mon Sep 17 00:00:00 2001 From: Vadim Korotchenko Date: Fri, 25 Nov 2016 16:00:57 -0800 Subject: [PATCH 5/6] added test and fixed spelling error --- .../clientsdk/HyperwalletTest.java | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/test/java/com/hyperwallet/clientsdk/HyperwalletTest.java b/src/test/java/com/hyperwallet/clientsdk/HyperwalletTest.java index cfa01d81e..9774e0311 100644 --- a/src/test/java/com/hyperwallet/clientsdk/HyperwalletTest.java +++ b/src/test/java/com/hyperwallet/clientsdk/HyperwalletTest.java @@ -2823,6 +2823,24 @@ public void testCreateTransferMethod_noJsonCacheToken() { } } + @Test + public void testCreateTransferMethod_noJsonCacheTokenStringUserToken() { + { + + Hyperwallet client = new Hyperwallet("test-username", "test-password"); + try { + client.createTransferMethod("", "test-user-token"); + fail("Expect HyperwalletException"); + } catch (HyperwalletException e) { + assertThat(e.getErrorCode(), is(nullValue())); + assertThat(e.getResponse(), is(nullValue())); + assertThat(e.getErrorMessage(), is(equalTo("JSON token is required"))); + assertThat(e.getMessage(), is(equalTo("JSON token is required"))); + assertThat(e.getHyperwalletErrors(), is(nullValue())); + } + } + } + @Test public void testCreateTransferMethod_noUserokenInTransferMethod() { HyperwalletTransferMethod transferMethod = new HyperwalletTransferMethod(); @@ -2842,7 +2860,7 @@ public void testCreateTransferMethod_noUserokenInTransferMethod() { } @Test - public void testCreateTransferMethod_noUseroken() { + public void testCreateTransferMethod_noUserToken() { Hyperwallet client = new Hyperwallet("test-username", "test-password"); String jsonCacheToken = "token123-123-123"; From 0832584827a347f6913301d16675e92a2774ff66 Mon Sep 17 00:00:00 2001 From: Vadim Korotchenko Date: Fri, 25 Nov 2016 16:47:55 -0800 Subject: [PATCH 6/6] formatting for code review --- src/main/java/com/hyperwallet/clientsdk/Hyperwallet.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/hyperwallet/clientsdk/Hyperwallet.java b/src/main/java/com/hyperwallet/clientsdk/Hyperwallet.java index 0e72f6a16..5cd9e6f97 100644 --- a/src/main/java/com/hyperwallet/clientsdk/Hyperwallet.java +++ b/src/main/java/com/hyperwallet/clientsdk/Hyperwallet.java @@ -956,7 +956,7 @@ public HyperwalletTransferMethod createTransferMethod(String jsonCacheToken, Hyp HashMap headers = new HashMap(); headers.put("Json-Cache-Token", jsonCacheToken); - return apiClient.post(url + "/users/"+transferMethod.getUserToken()+"/transfer-methods", transferMethod, HyperwalletTransferMethod.class, headers); + return apiClient.post(url + "/users/" + transferMethod.getUserToken() + "/transfer-methods", transferMethod, HyperwalletTransferMethod.class, headers); } @@ -982,7 +982,7 @@ public HyperwalletTransferMethod createTransferMethod(String jsonCacheToken, Str HashMap headers = new HashMap(); headers.put("Json-Cache-Token", jsonCacheToken); - return apiClient.post(url + "/users/"+transferMethod.getUserToken()+"/transfer-methods", transferMethod, HyperwalletTransferMethod.class, headers); + return apiClient.post(url + "/users/" + transferMethod.getUserToken() + "/transfer-methods", transferMethod, HyperwalletTransferMethod.class, headers); } //-------------------------------------- // Internal utils