Task/hw 53039 receipt ppc ui tests

receipt/src/androidTest/java/com/hyperwallet/android/ui/receipt/ListUserReceiptsTest.java

@@ -110,7 +110,7 @@ public void testListReceipt_userHasMultipleTransactions() {
         onView(withId(R.id.list_receipts)).check(matches(atPosition(0,
                 hasDescendant(withText(com.hyperwallet.android.ui.receipt.R.string.credit)))));
         onView(withId(R.id.list_receipts)).check(
-                matches(atPosition(0, hasDescendant(withText("Payment")))));
+                matches(atPosition(0, hasDescendant(withText(R.string.payment)))));
         onView(withId(R.id.list_receipts)).check(
                 matches(atPosition(0, hasDescendant(withText("+ 20.00")))));
         onView(withId(R.id.list_receipts)).check(
@@ -120,7 +120,7 @@ public void testListReceipt_userHasMultipleTransactions() {
         onView(withId(R.id.list_receipts)).check(matches(atPosition(1,
                 hasDescendant(withText(com.hyperwallet.android.ui.receipt.R.string.credit)))));
         onView(withId(R.id.list_receipts)).check(
-                matches(atPosition(1, hasDescendant(withText("Payment")))));
+                matches(atPosition(1, hasDescendant(withText(R.string.payment)))));
         onView(withId(R.id.list_receipts)).check(
                 matches(atPosition(1, hasDescendant(withText("+ 25.00")))));
         onView(withId(R.id.list_receipts)).check(
@@ -130,7 +130,7 @@ public void testListReceipt_userHasMultipleTransactions() {
         onView(withId(R.id.list_receipts)).check(matches(atPosition(2,
                 hasDescendant(withText(com.hyperwallet.android.ui.receipt.R.string.debit)))));
         onView(withId(R.id.list_receipts)).check(
-                matches(atPosition(2, hasDescendant(withText("Card Activation Fee")))));
+                matches(atPosition(2, hasDescendant(withText(R.string.card_activation_fee)))));
         onView(withId(R.id.list_receipts)).check(
                 matches(atPosition(2, hasDescendant(withText("- 1.95")))));
         onView(withId(R.id.list_receipts)).check(
@@ -142,7 +142,7 @@ public void testListReceipt_userHasMultipleTransactions() {
         onView(withId(R.id.list_receipts)).check(matches(atPosition(3,
                 hasDescendant(withText(com.hyperwallet.android.ui.receipt.R.string.debit)))));
         onView(withId(R.id.list_receipts)).check(
-                matches(atPosition(3, hasDescendant(withText("Card Load")))));
+                matches(atPosition(3, hasDescendant(withText(R.string.transfer_to_prepaid_card)))));
         onView(withId(R.id.list_receipts)).check(
                 matches(atPosition(3, hasDescendant(withText("- 18.05")))));
         onView(withId(R.id.list_receipts)).check(
@@ -417,7 +417,7 @@ public void testListReceipt_checkDateTextOnLocaleChange() {
     @Test
     public void testListReceipt_displaysNetworkErrorDialogOnConnectionTimeout() {
         mMockWebServer.getServer().enqueue(new MockResponse().setResponseCode(HTTP_OK).setBody(sResourceManager
-                .getResourceContent("receipt_debit_response.json")).throttleBody(512, 15, TimeUnit.SECONDS));
+                .getResourceContent("receipt_debit_response.json")).throttleBody(512, 10, TimeUnit.SECONDS));
         mMockWebServer.mockResponse().withHttpResponseCode(HTTP_OK).withBody(sResourceManager
                 .getResourceContent("receipt_debit_response.json")).mock();
         mMockWebServer.mockResponse().withHttpResponseCode(HTTP_NO_CONTENT).withBody("").mock();

receipt/src/main/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptDataSource.java

@@ -31,6 +31,7 @@
 import com.hyperwallet.android.model.paging.HyperwalletPageList;
 import com.hyperwallet.android.model.receipt.Receipt;
 import com.hyperwallet.android.model.receipt.ReceiptQueryParam;
+import com.hyperwallet.android.ui.common.util.EspressoIdlingResource;
 import com.hyperwallet.android.ui.common.viewmodel.Event;
 import com.hyperwallet.android.util.DateUtil;
 
@@ -79,6 +80,7 @@ public void loadInitial(@NonNull final LoadInitialParams<Date> params,
                 .createdAfter(mCalendarYearBeforeNow.getTime())
                 .sortByCreatedOnDesc().build();
 
+        EspressoIdlingResource.increment();
         getHyperwallet().listPrepaidCardReceipts(mToken, queryParam,
                 new HyperwalletListener<HyperwalletPageList<Receipt>>() {
                     @Override
@@ -93,12 +95,14 @@ public void onSuccess(@Nullable HyperwalletPageList<Receipt> result) {
                         // reset
                         mLoadInitialCallback = null;
                         mLoadInitialParams = null;
+                        EspressoIdlingResource.decrement();
                     }
 
                     @Override
                     public void onFailure(HyperwalletException exception) {
                         mIsFetchingData.postValue(Boolean.FALSE);
                         mErrors.postValue(new Event<>(exception.getHyperwalletErrors()));
+                        EspressoIdlingResource.decrement();
                     }
 
                     @Override
@@ -130,6 +134,7 @@ public void loadAfter(@NonNull final LoadParams<Date> params, @NonNull final Loa
                 .limit(params.requestedLoadSize)
                 .sortByCreatedOnDesc().build();
 
+        EspressoIdlingResource.increment();
         getHyperwallet().listPrepaidCardReceipts(mToken, queryParam,
                 new HyperwalletListener<HyperwalletPageList<Receipt>>() {
                     @Override
@@ -144,12 +149,14 @@ public void onSuccess(@Nullable HyperwalletPageList<Receipt> result) {
                         // reset
                         mLoadAfterCallback = null;
                         mLoadAfterParams = null;
+                        EspressoIdlingResource.decrement();
                     }
 
                     @Override
                     public void onFailure(HyperwalletException exception) {
                         mIsFetchingData.postValue(Boolean.FALSE);
                         mErrors.postValue(new Event<>(exception.getHyperwalletErrors()));
+                        EspressoIdlingResource.decrement();
                     }
 
                     @Override

receipt/src/test/java/com/hyperwallet/android/ui/receipt/repository/PrepaidCardReceiptDataSourceTest.java

@@ -14,8 +14,10 @@
 import static org.mockito.Mockito.verify;
 
 import static com.hyperwallet.android.model.receipt.Receipt.Entries.CREDIT;
+import static com.hyperwallet.android.model.receipt.Receipt.Entries.DEBIT;
 import static com.hyperwallet.android.model.receipt.Receipt.ReceiptTypes.ADJUSTMENT;
 import static com.hyperwallet.android.model.receipt.Receipt.ReceiptTypes.DEPOSIT;
+import static com.hyperwallet.android.model.receipt.Receipt.ReceiptTypes.PREPAID_CARD_SALE;
 
 import androidx.paging.PageKeyedDataSource;
 
@@ -88,7 +90,7 @@ public void setUp() {
 
     @Test
     public void testLoadInitial_returnsReceipts() throws Exception {
-        String json = mExternalResourceManager.getResourceContent("prepaid_card_receipt_list.json");
+        String json = mExternalResourceManager.getResourceContent("prepaid_card_receipt_list_response.json");
         JSONObject jsonObject = new JSONObject(json);
         final HyperwalletPageList<Receipt> response = new HyperwalletPageList<>(jsonObject, Receipt.class);
 
@@ -118,9 +120,9 @@ public Object answer(InvocationOnMock invocation) {
         List<Receipt> receipts = mListArgumentCaptor.getValue();
         assertThat(receipts, Matchers.<Receipt>hasSize(7));
         assertThat(receipts.get(0).getJournalId(), is("FISVL_5240220"));
-        assertThat(receipts.get(0).getType(), is(DEPOSIT));
+        assertThat(receipts.get(0).getType(), is(PREPAID_CARD_SALE));
         assertThat(receipts.get(0).getCreatedOn(), is("2019-06-06T22:48:41"));
-        assertThat(receipts.get(0).getEntry(), is(CREDIT));
+        assertThat(receipts.get(0).getEntry(), is(DEBIT));
         assertThat(receipts.get(0).getDestinationToken(), is("trm-2e02da75-a36c-4723-b613-0b64e6f582d9"));
         assertThat(receipts.get(0).getAmount(), is("10.00"));
         assertThat(receipts.get(0).getCurrency(), is("USD"));
@@ -245,7 +247,7 @@ public Object answer(InvocationOnMock invocation) {
 
     @Test
     public void testLoadAfter_returnsReceipts() throws Exception {
-        String json = mExternalResourceManager.getResourceContent("prepaid_card_receipt_list.json");
+        String json = mExternalResourceManager.getResourceContent("prepaid_card_receipt_list_response.json");
         JSONObject jsonObject = new JSONObject(json);
         final HyperwalletPageList<Receipt> response = new HyperwalletPageList<>(jsonObject, Receipt.class);
 

receipt/src/test/resources/prepaid_card_receipt_credit_response.json

@@ -0,0 +1,24 @@
+{
+  "data": [
+    {
+      "journalId": "FISVL_5240220",
+      "type": "DEPOSIT",
+      "createdOn": "2019-06-06T22:48:41",
+      "entry": "CREDIT",
+      "destinationToken": "trm-2e02da75-a36c-4723-b613-0b64e6f582d9",
+      "amount": "15.00",
+      "currency": "CAD",
+      "details": {
+        "cardNumber": "************0673"
+      }
+    }
+  ],
+  "links": [
+    {
+      "params": {
+        "rel": "self"
+      },
+      "href": "https://qamaster-hyperwallet.aws.paylution.net/rest/v3/users/usr-e17ae43b-284d-4198-9585-f417943c624f/prepaid-cards/trm-2e02da75-a36c-4723-b613-0b64e6f582d9/receipts"
+    }
+  ]
+}

receipt/src/test/resources/prepaid_card_receipt_debit_response.json

@@ -0,0 +1,24 @@
+{
+  "data": [
+    {
+      "journalId": "FISA_5240222",
+      "type": "ADJUSTMENT",
+      "createdOn": "2019-06-01T22:49:17",
+      "entry": "DEBIT",
+      "sourceToken": "trm-2e02da75-a36c-4723-b613-0b64e6f582d9",
+      "amount": "8.90",
+      "currency": "USD",
+      "details": {
+        "cardNumber": "************0673"
+      }
+    }
+  ],
+  "links": [
+    {
+      "params": {
+        "rel": "self"
+      },
+      "href": "https://qamaster-hyperwallet.aws.paylution.net/rest/v3/users/usr-e17ae43b-284d-4198-9585-f417943c624f/prepaid-cards/trm-2e02da75-a36c-4723-b613-0b64e6f582d9/receipts"
+    }
+  ]
+}

receipt/src/test/resources/prepaid_card_receipt_list.json → receipt/src/test/resources/prepaid_card_receipt_list_response.json

@@ -2,14 +2,21 @@
   "data": [
     {
       "journalId": "FISVL_5240220",
-      "type": "DEPOSIT",
+      "type": "PREPAID_CARD_SALE",
       "createdOn": "2019-06-06T22:48:41",
-      "entry": "CREDIT",
+      "entry": "DEBIT",
       "destinationToken": "trm-2e02da75-a36c-4723-b613-0b64e6f582d9",
       "amount": "10.00",
+      "fee": "3.00",
       "currency": "USD",
       "details": {
-        "cardNumber": "************0673"
+        "cardNumber": "************0673",
+        "clientPaymentId": "AOxXefx9",
+        "payeeName": "A Person",
+        "website": "https://api.sandbox.hyperwallet.com",
+        "notes": "Sample prepaid card payment for the period of June 15th, 2019 to July 23, 2019",
+        "charityName": "Sample Charity",
+        "checkNumber": "Sample Check Number"
       }
     },
     {
@@ -27,7 +34,7 @@
     {
       "journalId": "FISA_5240222",
       "type": "ADJUSTMENT",
-      "createdOn": "2019-06-06T22:49:17",
+      "createdOn": "2019-06-01T22:49:17",
       "entry": "DEBIT",
       "sourceToken": "trm-2e02da75-a36c-4723-b613-0b64e6f582d9",
       "amount": "8.90",

receipt/src/test/resources/prepaid_card_receipt_unknown_type_response.json

@@ -0,0 +1,24 @@
+{
+  "data": [
+    {
+      "journalId": "FISVL_5240220",
+      "type": "CARD_WAIVER_FEE",
+      "createdOn": "2019-06-06T22:48:41",
+      "entry": "CREDIT",
+      "destinationToken": "trm-2e02da75-a36c-4723-b613-0b64e6f582d9",
+      "amount": "15.00",
+      "currency": "CAD",
+      "details": {
+        "cardNumber": "************0673"
+      }
+    }
+  ],
+  "links": [
+    {
+      "params": {
+        "rel": "self"
+      },
+      "href": "https://qamaster-hyperwallet.aws.paylution.net/rest/v3/users/usr-e17ae43b-284d-4198-9585-f417943c624f/prepaid-cards/trm-2e02da75-a36c-4723-b613-0b64e6f582d9/receipts"
+    }
+  ]
+}