Convert Venmo tests to unit tests

braintree · Apr 30, 2016 · 9a3a688 · 9a3a688
1 parent 54add24
commit 9a3a688
Show file tree

Hide file tree

Showing 11 changed files with 483 additions and 599 deletions.
diff --git a/Braintree/src/androidTest/java/com/braintreepayments/api/VenmoTest.java b/Braintree/src/androidTest/java/com/braintreepayments/api/VenmoTest.java
diff --git a/Braintree/src/androidTest/java/com/braintreepayments/api/models/VenmoConfigurationTest.java b/Braintree/src/androidTest/java/com/braintreepayments/api/models/VenmoConfigurationTest.java
diff --git a/Braintree/src/main/java/com/braintreepayments/api/Venmo.java b/Braintree/src/main/java/com/braintreepayments/api/Venmo.java
@@ -79,11 +79,11 @@ static void authorizeAccount(BraintreeFragment fragment, Configuration configura
         String exceptionMessage = "";
         VenmoConfiguration venmoConfiguration = configuration.getPayWithVenmo();
         if(!venmoConfiguration.isAccessTokenValid()) {
-            exceptionMessage = "Venmo is not enabled in the control panel.";
+            exceptionMessage = "Venmo is not enabled";
         } else if (!Venmo.isVenmoInstalled(fragment.getApplicationContext())) {
-            exceptionMessage = "Venmo is not installed.";
+            exceptionMessage = "Venmo is not installed";
         } else if (!venmoConfiguration.isVenmoWhitelisted(fragment.getApplicationContext().getContentResolver())) {
-            exceptionMessage = "Venmo is not whitelisted.";
+            exceptionMessage = "Venmo is not whitelisted";
         }
 
         if(!TextUtils.isEmpty(exceptionMessage)) {

diff --git a/Braintree/src/main/java/com/braintreepayments/api/models/VenmoConfiguration.java b/Braintree/src/main/java/com/braintreepayments/api/models/VenmoConfiguration.java
@@ -10,7 +10,6 @@
 import com.braintreepayments.api.Venmo;
 
 import org.json.JSONObject;
-import org.w3c.dom.Text;
 
 /**
  * Contains the remote Pay with Venmo configuration for the Braintree SDK.
@@ -66,17 +65,14 @@ public boolean isAccessTokenValid() {
     }
 
     public boolean isVenmoWhitelisted(ContentResolver contentResolver) {
-        Cursor cursor = contentResolver
-                .query(VENMO_AUTHORITY_URI, null, null, null, null);
+        Cursor cursor = contentResolver.query(VENMO_AUTHORITY_URI, null, null, null, null);
 
-        boolean isVenmoWhiteListed =
-                cursor != null && cursor.moveToFirst() && "true".equals(cursor.getString(0));
+        boolean isVenmoWhiteListed = cursor != null && cursor.moveToFirst() && "true".equals(cursor.getString(0));
 
         if (cursor != null) {
             cursor.close();
         }
 
         return isVenmoWhiteListed;
     }
-
 }
diff --git a/Braintree/src/test/java/com/braintreepayments/api/MockFragmentBuilder.java b/Braintree/src/test/java/com/braintreepayments/api/MockFragmentBuilder.java
@@ -1,5 +1,7 @@
 package com.braintreepayments.api;
 
+import android.content.Context;
+
 import com.braintreepayments.api.interfaces.ConfigurationListener;
 import com.braintreepayments.api.interfaces.HttpResponseCallback;
 import com.braintreepayments.api.internal.BraintreeHttpClient;
@@ -18,11 +20,21 @@
 
 public class MockFragmentBuilder {
 
+    private Context mContext;
     private Authorization mAuthorization;
     private Configuration mConfiguration;
     private String mSuccessResponse;
     private Exception mErrorResponse;
 
+    public MockFragmentBuilder() {
+        mContext = RuntimeEnvironment.application;
+    }
+
+    public MockFragmentBuilder context(Context context) {
+        mContext = context;
+        return this;
+    }
+
     public MockFragmentBuilder authorization(Authorization authorization) {
         mAuthorization = authorization;
         return this;
@@ -45,7 +57,7 @@ public MockFragmentBuilder errorResponse(Exception exception) {
 
     public BraintreeFragment build() {
         BraintreeFragment fragment = mock(BraintreeFragment.class);
-        when(fragment.getApplicationContext()).thenReturn(RuntimeEnvironment.application);
+        when(fragment.getApplicationContext()).thenReturn(mContext);
         when(fragment.getAuthorization()).thenReturn(mAuthorization);
 
         doAnswer(new Answer() {