DTPAYETWO-759- Resolving merge issues

hyperwallet · Aug 7, 2023 · e0c31ea · e0c31ea
1 parent 25216cd
commit e0c31ea
Showing 1 changed file with 35 additions and 35 deletions.
diff --git a/src/test/java/com/hyperwallet/clientsdk/HyperwalletIT.java b/src/test/java/com/hyperwallet/clientsdk/HyperwalletIT.java
@@ -3377,8 +3377,41 @@ public void testGetPayPalAccountDefaultTransfer() throws Exception {
         String functionality = "getPayPalAccountDefaultTransfer";
         initMockServer(functionality);
 
+        HyperwalletPayPalAccount paypalAccount;
+        try {
+            paypalAccount = client.getPayPalAccount("usr-e7b61829-a73a-45dc-930e-afa8a56b923c", "trm-54b0db9c-5565-47f7-aee6-685e713595f4");
+        } catch (Exception e) {
+            mockServer.verify(parseRequest(functionality));
+            throw e;
+        }
+        List<HyperwalletLink> hyperwalletLinks = new ArrayList<>();
+        HyperwalletLink hyperwalletLink = new HyperwalletLink();
+        hyperwalletLink.setHref(
+                "https://api.sandbox.hyperwallet.com/rest/v4/users/usr-e7b61829-a73a-45dc-930e-afa8a56b923c/paypal-accounts/trm-54b0db9c-5565-47f7"
+                        + "-aee6-685e713595f4");
+        Map<String, String> mapParams = new HashMap<>();
+        mapParams.put("rel", "self");
+        hyperwalletLink.setParams(mapParams);
+        hyperwalletLinks.add(hyperwalletLink);
+
+        assertThat(paypalAccount.getToken(), is(equalTo("trm-54b0db9c-5565-47f7-aee6-685e713595f4")));
+        assertThat(paypalAccount.getStatus(), is(equalTo(HyperwalletPayPalAccount.Status.ACTIVATED)));
+        assertThat(paypalAccount.getType(), is(equalTo(HyperwalletPayPalAccount.Type.PAYPAL_ACCOUNT)));
+        assertThat(paypalAccount.getCreatedOn(), is(equalTo(dateFormat.parse("2022-05-01T00:00:00 UTC"))));
+        assertThat(paypalAccount.getTransferMethodCountry(), is(equalTo("US")));
+        assertThat(paypalAccount.getTransferMethodCurrency(), is(equalTo("USD")));
+        assertThat(paypalAccount.getEmail(), is(equalTo("user@domain.com")));
+        assertThat(paypalAccount.getIsDefaultTransferMethod(), is(equalTo(Boolean.TRUE)));
+        if (paypalAccount.getLinks() != null) {
+            HyperwalletLink actualHyperwalletLink = paypalAccount.getLinks().get(0);
+            HyperwalletLink expectedHyperwalletLink = hyperwalletLinks.get(0);
+            assertThat(actualHyperwalletLink.getHref(), is(equalTo(expectedHyperwalletLink.getHref())));
+            assertEquals(actualHyperwalletLink.getParams(), expectedHyperwalletLink.getParams());
+        }
+    }
+
     @Test
-    public void createPayPalAccountWithAccountId() throws Exception {
+    public void testCreatePayPalAccountWithAccountId() throws Exception {
         String functionality = "createPayPalAccountWithAccountId";
         initMockServer(functionality);
 
@@ -3422,7 +3455,7 @@ public void createPayPalAccountWithAccountId() throws Exception {
     }
 
     @Test
-    public void createVenmoAccountWithEmail() throws Exception {
+    public void testCreateVenmoAccountWithEmail() throws Exception {
         String functionality = "createVenmoAccountWithEmail";
         initMockServer(functionality);
 
@@ -3464,39 +3497,6 @@ public void createVenmoAccountWithEmail() throws Exception {
         }
     }
 
-        HyperwalletPayPalAccount paypalAccount;
-        try {
-            paypalAccount = client.getPayPalAccount("usr-e7b61829-a73a-45dc-930e-afa8a56b923c", "trm-54b0db9c-5565-47f7-aee6-685e713595f4");
-        } catch (Exception e) {
-            mockServer.verify(parseRequest(functionality));
-            throw e;
-        }
-        List<HyperwalletLink> hyperwalletLinks = new ArrayList<>();
-        HyperwalletLink hyperwalletLink = new HyperwalletLink();
-        hyperwalletLink.setHref(
-                "https://api.sandbox.hyperwallet.com/rest/v4/users/usr-e7b61829-a73a-45dc-930e-afa8a56b923c/paypal-accounts/trm-54b0db9c-5565-47f7"
-                        + "-aee6-685e713595f4");
-        Map<String, String> mapParams = new HashMap<>();
-        mapParams.put("rel", "self");
-        hyperwalletLink.setParams(mapParams);
-        hyperwalletLinks.add(hyperwalletLink);
-
-        assertThat(paypalAccount.getToken(), is(equalTo("trm-54b0db9c-5565-47f7-aee6-685e713595f4")));
-        assertThat(paypalAccount.getStatus(), is(equalTo(HyperwalletPayPalAccount.Status.ACTIVATED)));
-        assertThat(paypalAccount.getType(), is(equalTo(HyperwalletPayPalAccount.Type.PAYPAL_ACCOUNT)));
-        assertThat(paypalAccount.getCreatedOn(), is(equalTo(dateFormat.parse("2022-05-01T00:00:00 UTC"))));
-        assertThat(paypalAccount.getTransferMethodCountry(), is(equalTo("US")));
-        assertThat(paypalAccount.getTransferMethodCurrency(), is(equalTo("USD")));
-        assertThat(paypalAccount.getEmail(), is(equalTo("user@domain.com")));
-        assertThat(paypalAccount.getIsDefaultTransferMethod(), is(equalTo(Boolean.TRUE)));
-        if (paypalAccount.getLinks() != null) {
-            HyperwalletLink actualHyperwalletLink = paypalAccount.getLinks().get(0);
-            HyperwalletLink expectedHyperwalletLink = hyperwalletLinks.get(0);
-            assertThat(actualHyperwalletLink.getHref(), is(equalTo(expectedHyperwalletLink.getHref())));
-            assertEquals(actualHyperwalletLink.getParams(), expectedHyperwalletLink.getParams());
-        }
-    }
-
     private void initMockServerWithErrorResponse(String functionality) throws IOException {
         mockServer.reset();
         mockServer