Supply bt_cvv_invalid with the security code name

braintree · Nov 28, 2016 · 8054fde · 8054fde
1 parent 4f01197
commit 8054fde
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/Drop-In/src/main/java/com/braintreepayments/api/dropin/view/EditCardView.java b/Drop-In/src/main/java/com/braintreepayments/api/dropin/view/EditCardView.java
@@ -107,7 +107,10 @@ public void setErrors(ErrorWithResponse errors) {
             }
 
             if (formErrors.errorFor("cvv") != null) {
-                mCardForm.setCvvError(getContext().getString(R.string.bt_cvv_invalid));
+
+                mCardForm.setCvvError(getContext().getString(R.string.bt_cvv_invalid,
+                        getContext().getString(
+                                mCardForm.getCardEditText().getCardType().getSecurityCodeName())));
             }
 
             if (formErrors.errorFor("billingAddress") != null) {

diff --git a/Drop-In/src/test/java/com/braintreepayments/api/dropin/AddCardActivityUnitTest.java b/Drop-In/src/test/java/com/braintreepayments/api/dropin/AddCardActivityUnitTest.java
@@ -322,7 +322,10 @@ public void cardValidationErrorsAreShownToTheUser() {
                 mEditCardView.getCardForm().getCardEditText().getTextInputLayoutParent().getError());
         assertEquals(RuntimeEnvironment.application.getString(R.string.bt_expiration_invalid),
                 mEditCardView.getCardForm().getExpirationDateEditText().getTextInputLayoutParent().getError());
-        assertEquals(RuntimeEnvironment.application.getString(R.string.bt_cvv_invalid),
+        assertEquals(RuntimeEnvironment.application.getString(R.string.bt_cvv_invalid,
+                RuntimeEnvironment.application.getString(
+                        mEditCardView.getCardForm().getCardEditText().getCardType()
+                                .getSecurityCodeName())),
                 mEditCardView.getCardForm().getCvvEditText().getTextInputLayoutParent().getError());
         assertEquals(RuntimeEnvironment.application.getString(R.string.bt_postal_code_invalid),
                 mEditCardView.getCardForm().getPostalCodeEditText().getTextInputLayoutParent().getError());

diff --git a/Drop-In/src/test/java/com/braintreepayments/api/dropin/view/EditCardViewUnitTest.java b/Drop-In/src/test/java/com/braintreepayments/api/dropin/view/EditCardViewUnitTest.java
@@ -250,7 +250,9 @@ public void setErrors_displaysCardErrors() {
                 mView.getCardForm().getCardEditText().getTextInputLayoutParent().getError());
         assertEquals(RuntimeEnvironment.application.getString(R.string.bt_expiration_invalid),
                 mView.getCardForm().getExpirationDateEditText().getTextInputLayoutParent().getError());
-        assertEquals(RuntimeEnvironment.application.getString(R.string.bt_cvv_invalid),
+        assertEquals(RuntimeEnvironment.application.getString(R.string.bt_cvv_invalid,
+                RuntimeEnvironment.application.getString(mView.getCardForm().getCardEditText()
+                        .getCardType().getSecurityCodeName())),
                 mView.getCardForm().getCvvEditText().getTextInputLayoutParent().getError());
         assertEquals(RuntimeEnvironment.application.getString(R.string.bt_postal_code_invalid),
                 mView.getCardForm().getPostalCodeEditText().getTextInputLayoutParent().getError());