Merge branch 'mikelis135-TryCatchTestForFetchFeeForAllPaymentMethod'

biodunalfet · biodunalfet · commit 6136d47352d9 · 2019-10-18T19:41:55.000+01:00
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/ussd/UssdPresenter.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/ussd/UssdPresenter.java
@@ -26,6 +26,8 @@
 
 import javax.inject.Inject;
 
+import static com.flutterwave.raveandroid.RaveConstants.transactionError;
+
 public class UssdPresenter implements UssdContract.UserActionsListener {
     private Context context;
     public UssdContract.View mView;
@@ -101,15 +103,15 @@ public void onSuccess(FeeCheckResponse response) {
                 try {
                     mView.displayFee(response.getData().getCharge_amount(), payload);
                 } catch (Exception e) {
-                    mView.showFetchFeeFailed("An error occurred while retrieving transaction fee");
+                    mView.showFetchFeeFailed(transactionError);
                 }
             }
 
             @Override
             public void onError(String message) {
                 mView.showProgressIndicator(false);
                 Log.e(RaveConstants.RAVEPAY, message);
-                mView.showFetchFeeFailed("An error occurred while retrieving transaction fee");
+                mView.showFetchFeeFailed(transactionError);
             }
         });
     }
diff --git a/raveandroid/src/test/java/com/flutterwave/raveandroid/account/AccountPresenterTest.java b/raveandroid/src/test/java/com/flutterwave/raveandroid/account/AccountPresenterTest.java
@@ -73,6 +73,7 @@
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doCallRealMethod;
 import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -325,6 +326,21 @@ public void fetchFee_onSuccess_displayFeeCalledWithCorrectParams() {
 
     }
 
+    @Test
+    public void fetchFee_onSuccess_exceptionThrown_showFetchFeeFailedCalledWithCorrectParams() {
+
+        accountPresenter.fetchFee(generatePayload(), false);
+
+        doThrow(new NullPointerException()).when(view).displayFee(any(String.class), any(Payload.class), any(Boolean.class));
+
+        ArgumentCaptor<Callbacks.OnGetFeeRequestComplete> captor = ArgumentCaptor.forClass(Callbacks.OnGetFeeRequestComplete.class);
+        verify(networkRequest).getFee(any(FeeCheckRequestBody.class), captor.capture());
+        captor.getAllValues().get(0).onSuccess(generateFeeCheckResponse());
+
+        verify(view, times(1)).showFetchFeeFailed(transactionError);
+
+    }
+
     @Test
     public void getBanks_onSuccess_showBanksCalledWithCorrectParams() {
 
diff --git a/raveandroid/src/test/java/com/flutterwave/raveandroid/card/CardPresenterTest.java b/raveandroid/src/test/java/com/flutterwave/raveandroid/card/CardPresenterTest.java
@@ -49,13 +49,15 @@
 import static com.flutterwave.raveandroid.RaveConstants.fieldEmail;
 import static com.flutterwave.raveandroid.RaveConstants.fieldcardNoStripped;
 import static com.flutterwave.raveandroid.RaveConstants.invalidChargeCode;
+import static com.flutterwave.raveandroid.RaveConstants.transactionError;
 import static com.flutterwave.raveandroid.RaveConstants.unknownAuthmsg;
 import static com.flutterwave.raveandroid.RaveConstants.unknownResCodemsg;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyObject;
 import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -238,6 +240,21 @@ public void fetchFee_onSuccess_displayFeeCalled() {
 
     }
 
+    @Test
+    public void fetchFee_onSuccess_exceptionThrown_showFetchFeeFailedCalledWithCorrectParams() {
+
+        cardPresenter.fetchFee(generatePayload(), 1);
+
+        doThrow(new NullPointerException()).when(view).displayFee(any(String.class), any(Payload.class), any(Integer.class));
+
+        ArgumentCaptor<Callbacks.OnGetFeeRequestComplete> captor = ArgumentCaptor.forClass(Callbacks.OnGetFeeRequestComplete.class);
+        verify(networkRequest).getFee(any(FeeCheckRequestBody.class), captor.capture());
+        captor.getAllValues().get(0).onSuccess(generateFeeCheckResponse());
+
+        verify(view, times(1)).showFetchFeeFailed(transactionError);
+
+    }
+
     @Test
     public void chargeCard_onSuccessWithPIN_onPinAuthModelSuggestedCalled() {
 
diff --git a/raveandroid/src/test/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyPresenterTest.java b/raveandroid/src/test/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyPresenterTest.java
@@ -46,11 +46,13 @@
 import static com.flutterwave.raveandroid.RaveConstants.networkPosition;
 import static com.flutterwave.raveandroid.RaveConstants.noResponse;
 import static com.flutterwave.raveandroid.RaveConstants.success;
+import static com.flutterwave.raveandroid.RaveConstants.transactionError;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyObject;
 import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -117,6 +119,21 @@ public void fetchFee_onSuccess_displayFeeCalled() {
 
     }
 
+    @Test
+    public void fetchFee_onSuccess_exceptionThrown_showFetchFeeFailedCalledWithCorrectParams() {
+
+        ghMobileMoneyPresenter.fetchFee(generatePayload());
+
+        doThrow(new NullPointerException()).when(view).displayFee(any(String.class), any(Payload.class));
+
+        ArgumentCaptor<Callbacks.OnGetFeeRequestComplete> captor = ArgumentCaptor.forClass(Callbacks.OnGetFeeRequestComplete.class);
+        verify(networkRequest).getFee(any(FeeCheckRequestBody.class), captor.capture());
+        captor.getAllValues().get(0).onSuccess(generateFeeCheckResponse());
+
+        verify(view, times(1)).showFetchFeeFailed(transactionError);
+
+    }
+
 
     @Test
     public void chargeGhMobileMoney_onSuccess_requeryTxCalled() {
diff --git a/raveandroid/src/test/java/com/flutterwave/raveandroid/mpesa/MpesaPresenterTest.java b/raveandroid/src/test/java/com/flutterwave/raveandroid/mpesa/MpesaPresenterTest.java
@@ -42,11 +42,13 @@
 import static com.flutterwave.raveandroid.RaveConstants.fieldPhone;
 import static com.flutterwave.raveandroid.RaveConstants.noResponse;
 import static com.flutterwave.raveandroid.RaveConstants.success;
+import static com.flutterwave.raveandroid.RaveConstants.transactionError;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyObject;
 import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -110,6 +112,20 @@ public void fetchFee_onSuccess_displayFeeCalled() {
 
     }
 
+    @Test
+    public void fetchFee_onSuccess_exceptionThrown_showFetchFeeFailedCalledWithCorrectParams() {
+
+        mpesaPresenter.fetchFee(generatePayload());
+
+        doThrow(new NullPointerException()).when(view).displayFee(any(String.class), any(Payload.class));
+
+        ArgumentCaptor<Callbacks.OnGetFeeRequestComplete> captor = ArgumentCaptor.forClass(Callbacks.OnGetFeeRequestComplete.class);
+        verify(networkRequest).getFee(any(FeeCheckRequestBody.class), captor.capture());
+        captor.getAllValues().get(0).onSuccess(generateFeeCheckResponse());
+
+        verify(view, times(1)).showFetchFeeFailed(transactionError);
+
+    }
 
     @Test
     public void chargeMpesa_onSuccess_requeryTxCalled() {
diff --git a/raveandroid/src/test/java/com/flutterwave/raveandroid/rwfmobilemoney/RwfMobileMoneyPresenterTest.java b/raveandroid/src/test/java/com/flutterwave/raveandroid/rwfmobilemoney/RwfMobileMoneyPresenterTest.java
@@ -112,6 +112,21 @@ public void fetchFee_onSuccess_displayFeeCalled() {
 
     }
 
+    @Test
+    public void fetchFee_onSuccess_exceptionThrown_showFetchFeeFailedCalledWithCorrectParams() {
+
+        presenter.fetchFee(generatePayload());
+
+        doThrow(new NullPointerException()).when(view).displayFee(any(String.class), any(Payload.class));
+
+        ArgumentCaptor<Callbacks.OnGetFeeRequestComplete> captor = ArgumentCaptor.forClass(Callbacks.OnGetFeeRequestComplete.class);
+        verify(networkRequest).getFee(any(FeeCheckRequestBody.class), captor.capture());
+        captor.getAllValues().get(0).onSuccess(generateFeeCheckResponse());
+
+        verify(view, times(1)).showFetchFeeFailed(transactionError);
+
+    }
+
     @Test
     public void fetchFee_onSuccess_exceptionThrown_showFetchFeeFailed() throws NullPointerException {
 
diff --git a/raveandroid/src/test/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyPresenterTest.java b/raveandroid/src/test/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyPresenterTest.java
@@ -42,11 +42,13 @@
 import static com.flutterwave.raveandroid.RaveConstants.fieldPhone;
 import static com.flutterwave.raveandroid.RaveConstants.noResponse;
 import static com.flutterwave.raveandroid.RaveConstants.success;
+import static com.flutterwave.raveandroid.RaveConstants.transactionError;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyObject;
 import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -110,6 +112,20 @@ public void fetchFee_onSuccess_displayFeeCalled() {
 
     }
 
+    @Test
+    public void fetchFee_onSuccess_exceptionThrown_showFetchFeeFailedCalledWithCorrectParams() {
+
+        presenter.fetchFee(generatePayload());
+
+        doThrow(new NullPointerException()).when(view).displayFee(any(String.class), any(Payload.class));
+
+        ArgumentCaptor<Callbacks.OnGetFeeRequestComplete> captor = ArgumentCaptor.forClass(Callbacks.OnGetFeeRequestComplete.class);
+        verify(networkRequest).getFee(any(FeeCheckRequestBody.class), captor.capture());
+        captor.getAllValues().get(0).onSuccess(generateFeeCheckResponse());
+
+        verify(view, times(1)).showFetchFeeFailed(transactionError);
+
+    }
 
     @Test
     public void chargeUgMobileMoney_onSuccess_requeryTxCalled() {
diff --git a/raveandroid/src/test/java/com/flutterwave/raveandroid/uk/UkPresenterTest.java b/raveandroid/src/test/java/com/flutterwave/raveandroid/uk/UkPresenterTest.java
@@ -123,6 +123,21 @@ public void fetchFee_onSuccess_displayFeeCalledWithCorrectParams() {
 
     }
 
+    @Test
+    public void fetchFee_onSuccess_exceptionThrown_showFetchFeeFailedCalledWithCorrectParams() {
+
+        ukPresenter.fetchFee(generatePayload());
+
+        doThrow(new NullPointerException()).when(view).displayFee(any(String.class), any(Payload.class));
+
+        ArgumentCaptor<Callbacks.OnGetFeeRequestComplete> captor = ArgumentCaptor.forClass(Callbacks.OnGetFeeRequestComplete.class);
+        verify(networkRequest).getFee(any(FeeCheckRequestBody.class), captor.capture());
+        captor.getAllValues().get(0).onSuccess(generateFeeCheckResponse());
+
+        verify(view, times(1)).showFetchFeeFailed(transactionError);
+
+    }
+
     @Test(expected = Exception.class)
     public void fetchFee_onSuccess_displayFeeException_showFetchFeeFailedCalledWithCorrectParams() {
 

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,8 @@`
`26`	`26`
`27`	`27`	`import javax.inject.Inject;`
`28`	`28`
	`29`	`+import static com.flutterwave.raveandroid.RaveConstants.transactionError;`
	`30`	`+`
`29`	`31`	`public class UssdPresenter implements UssdContract.UserActionsListener {`
`30`	`32`	`private Context context;`
`31`	`33`	`public UssdContract.View mView;`
`@@ -101,15 +103,15 @@ public void onSuccess(FeeCheckResponse response) {`
`101`	`103`	`try {`
`102`	`104`	`mView.displayFee(response.getData().getCharge_amount(), payload);`
`103`	`105`	`} catch (Exception e) {`
`104`		`- mView.showFetchFeeFailed("An error occurred while retrieving transaction fee");`
	`106`	`+ mView.showFetchFeeFailed(transactionError);`
`105`	`107`	`}`
`106`	`108`	`}`
`107`	`109`
`108`	`110`	`@Override`
`109`	`111`	`public void onError(String message) {`
`110`	`112`	`mView.showProgressIndicator(false);`
`111`	`113`	`Log.e(RaveConstants.RAVEPAY, message);`
`112`		`- mView.showFetchFeeFailed("An error occurred while retrieving transaction fee");`
	`114`	`+ mView.showFetchFeeFailed(transactionError);`
`113`	`115`	`}`
`114`	`116`	`});`
`115`	`117`	`}`