validator refactor and unit test

mikelis135 · mikelis135 · commit 5e10c56631ee · 2019-07-31T17:04:52.000+01:00
AccountNoValidator
BankCodeValidator
BanksMinimum100AccountPaymentValidator
BvnValidator
DateOfBirthValidator
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/validators/AccountNoValidator.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/validators/AccountNoValidator.java
@@ -1,14 +1,14 @@
 package com.flutterwave.raveandroid.validators;
 
-public class AccountNoValidator {
+import java.util.regex.Pattern;
 
-    public boolean isAccountNumberValid(String accNo) {
-        boolean isValid = true;
+public class AccountNoValidator {
 
-        if (!(accNo != null && accNo.length() == 10)) {
-            isValid = false;
+    public boolean isAccountNumberValid(String accountNo) {
+        if (accountNo != null) {
+            return Pattern.matches("\\d{10}", accountNo);
+        } else {
+            return false;
         }
-
-        return isValid;
     }
 }
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/validators/AmountValidator.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/validators/AmountValidator.java
@@ -1,5 +1,7 @@
 package com.flutterwave.raveandroid.validators;
 
+import java.util.regex.Pattern;
+
 public class AmountValidator {
 
     public boolean isAmountValid(Double amount) {
@@ -8,11 +10,9 @@ public boolean isAmountValid(Double amount) {
 
     public boolean isAmountValid(String amount) {
 
-        try {
-            Double.parseDouble(amount);
-            return true;
-        } catch (NumberFormatException e) {
-            e.printStackTrace();
+        if (amount != null && !amount.isEmpty()) {
+            return Pattern.matches("^[0-9]*$", amount);
+        } else {
             return false;
         }
 
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/validators/BankCodeValidator.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/validators/BankCodeValidator.java
@@ -1,14 +1,15 @@
 package com.flutterwave.raveandroid.validators;
 
+import java.util.regex.Pattern;
+
 public class BankCodeValidator {
 
     public boolean isBankCodeValid(String bankCode) {
 
-        boolean isValid = true;
-
         if (bankCode == null) {
-            isValid = false;
+            return false;
+        } else {
+            return Pattern.matches("\\d{3}", bankCode);
         }
-        return isValid;
     }
 }
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/validators/BanksMinimum100AccountPaymentValidator.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/validators/BanksMinimum100AccountPaymentValidator.java
@@ -2,11 +2,17 @@
 
 public class BanksMinimum100AccountPaymentValidator {
 
+    BankCodeValidator bankCodeValidator = new BankCodeValidator();
     public boolean isPaymentValid(String bankCode, Double amount) {
 
-        return (!bankCode.equalsIgnoreCase("058") &&
-                !bankCode.equalsIgnoreCase("011"))
-                || amount > 100;
+        boolean isBankCodeValid = bankCodeValidator.isBankCodeValid(bankCode);
 
+        if (isBankCodeValid) {
+            return (bankCode.equalsIgnoreCase("058") &&
+                    bankCode.equalsIgnoreCase("011"))
+                    || amount > 100;
+        } else {
+            return false;
+        }
     }
 }
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/validators/BvnValidator.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/validators/BvnValidator.java
@@ -1,14 +1,14 @@
 package com.flutterwave.raveandroid.validators;
 
+import java.util.regex.Pattern;
+
 public class BvnValidator {
 
     public boolean isBvnValid(String bvn) {
-        boolean isValid = true;
-
-        if (!(bvn != null && bvn.length() == 11)) {
-            isValid = false;
+        if (bvn != null) {
+            return Pattern.matches("\\d{11}", bvn);
+        } else {
+            return false;
         }
-
-        return isValid;
     }
 }
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/validators/CardExpiryValidator.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/validators/CardExpiryValidator.java
@@ -5,6 +5,11 @@
 public class CardExpiryValidator {
 
     public boolean isCardExpiryValid(String cardExpiry) {
-        return Pattern.matches("\\d\\d/\\d\\d", cardExpiry);
+        if (cardExpiry != null) {
+            return Pattern.matches("\\d\\d/\\d\\d", cardExpiry);
+        } else {
+            return false;
+        }
+
     }
 }
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/validators/DateOfBirthValidator.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/validators/DateOfBirthValidator.java
@@ -1,14 +1,14 @@
 package com.flutterwave.raveandroid.validators;
 
+import java.util.regex.Pattern;
+
 public class DateOfBirthValidator {
 
     public boolean isDateValid(String dateOfBirth) {
-
-        boolean isValid = true;
-
-        if (!(dateOfBirth != null && dateOfBirth.length() == 10)) {
+        if (dateOfBirth != null) {
+            return Pattern.matches("\\d\\d/\\d\\d/\\d\\d\\d\\d", dateOfBirth);
+        } else {
             return false;
         }
-        return isValid;
     }
 }
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/validators/EmailValidator.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/validators/EmailValidator.java
@@ -6,8 +6,12 @@
 public class EmailValidator {
 
     public boolean isEmailValid(String email) {
-        Pattern VALID_EMAIL_ADDRESS_REGEX = Pattern.compile("^[A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,6}$", Pattern.CASE_INSENSITIVE);
-        Matcher matcher = VALID_EMAIL_ADDRESS_REGEX.matcher(email);
-        return matcher.find();
+        if (email != null) {
+            Pattern VALID_EMAIL_ADDRESS_REGEX = Pattern.compile("^[A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,6}$", Pattern.CASE_INSENSITIVE);
+            Matcher matcher = VALID_EMAIL_ADDRESS_REGEX.matcher(email);
+            return matcher.find();
+        } else {
+            return false;
+        }
     }
 }
diff --git a/raveandroid/src/main/java/com/flutterwave/raveandroid/validators/PhoneValidator.java b/raveandroid/src/main/java/com/flutterwave/raveandroid/validators/PhoneValidator.java
@@ -5,8 +5,12 @@
 public class PhoneValidator {
 
     public boolean isPhoneValid(String phone) {
-        if (phone.length() > 1) {
-            return Pattern.matches("^[0-9]*$", phone);
+        if (phone != null) {
+            if (phone.length() > 1) {
+                return Pattern.matches("^[0-9]*$", phone);
+            } else {
+                return false;
+            }
         } else {
             return false;
         }
diff --git a/raveandroid/src/test/java/com/flutterwave/raveandroid/validators/AccountNoValidatorTest.java b/raveandroid/src/test/java/com/flutterwave/raveandroid/validators/AccountNoValidatorTest.java
@@ -0,0 +1,52 @@
+package com.flutterwave.raveandroid.validators;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+public class AccountNoValidatorTest {
+
+    AccountNoValidator SUT;
+
+    @Before
+    public void setUp() throws Exception {
+        SUT = new AccountNoValidator();
+    }
+
+    @Test
+    public void isAccountNumberValid_isCorrectAccounNoPassed_returnsTrue() {
+        String accountNo = "1234567890";
+        boolean isAccountNoValid = SUT.isAccountNumberValid(accountNo);
+        assertThat(true, is(isAccountNoValid));
+    }
+
+    @Test
+    public void isAccountNumberValid_isLettersPassed_returnsFalse() {
+        String accountNo = "account";
+        boolean isAccountNoValid = SUT.isAccountNumberValid(accountNo);
+        assertThat(false, is(isAccountNoValid));
+    }
+
+    @Test
+    public void isAccountNumberValid_isLessThan10Passed_returnsFalse() {
+        String accountNo = "12345";
+        boolean isAccountNoValid = SUT.isAccountNumberValid(accountNo);
+        assertThat(false, is(isAccountNoValid));
+    }
+
+    @Test
+    public void isAccountNumberValid_isMoreThan10Passed_returnsFalse() {
+        String accountNo = "1234567890123";
+        boolean isAccountNoValid = SUT.isAccountNumberValid(accountNo);
+        assertThat(false, is(isAccountNoValid));
+    }
+
+    @Test
+    public void isAccountNumberValid_isEmptyPassed_returnsFalse() {
+        String accountNo = "";
+        boolean isAccountNoValid = SUT.isAccountNumberValid(accountNo);
+        assertThat(false, is(isAccountNoValid));
+    }
+}
diff --git a/raveandroid/src/test/java/com/flutterwave/raveandroid/validators/AmountValidatorTest.java b/raveandroid/src/test/java/com/flutterwave/raveandroid/validators/AmountValidatorTest.java
@@ -33,10 +33,17 @@ public void isAmountValid_isNegativeAmountPassed_returnsFalse() {
     }
 
     @Test
-    public void isAmountValid_isEmptyAmountPassed_returnsFalse() {
+    public void isAmountValid_isLetterPassed_returnsFalse() {
         String amount = "accd";
         boolean isAmountValid = SUT.isAmountValid(amount);
         assertThat(false, is(isAmountValid));
     }
 
+    @Test
+    public void isAmountValid_isEmptyAmountPassed_returnsFalse() {
+        String amount = "";
+        boolean isAmountValid = SUT.isAmountValid(amount);
+        assertThat(false, is(isAmountValid));
+    }
+
 }
diff --git a/raveandroid/src/test/java/com/flutterwave/raveandroid/validators/BankCodeValidatorTest.java b/raveandroid/src/test/java/com/flutterwave/raveandroid/validators/BankCodeValidatorTest.java
@@ -0,0 +1,52 @@
+package com.flutterwave.raveandroid.validators;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+public class BankCodeValidatorTest {
+
+    BankCodeValidator SUT;
+
+    @Before
+    public void setUp() throws Exception {
+        SUT = new BankCodeValidator();
+    }
+
+    @Test
+    public void isBankCodeValid_notNull_returnsTrue() {
+        String bankCode = "123";
+        boolean isBankCodeValid = SUT.isBankCodeValid(bankCode);
+        assertThat(true, is(isBankCodeValid));
+    }
+
+    @Test
+    public void isBankCodeValid_is3DigitsPassed_returnsTrue() {
+        String bankCode = "123";
+        boolean isBankCodeValid = SUT.isBankCodeValid(bankCode);
+        assertThat(true, is(isBankCodeValid));
+    }
+
+    @Test
+    public void isBankCodeValid_isLessThan3Passed_returnsFalse() {
+        String bankCode = "12";
+        boolean isBankCodeValid = SUT.isBankCodeValid(bankCode);
+        assertThat(false, is(isBankCodeValid));
+    }
+
+    @Test
+    public void isBankCodeValid_isMoreThan3Passed_returnsTrue() {
+        String bankCode = "1234";
+        boolean isBankCodeValid = SUT.isBankCodeValid(bankCode);
+        assertThat(false, is(isBankCodeValid));
+    }
+
+    @Test
+    public void isBankCodeValid_isEmptyPassed_returnsTrue() {
+        String bankCode = "";
+        boolean isBankCodeValid = SUT.isBankCodeValid(bankCode);
+        assertThat(false, is(isBankCodeValid));
+    }
+}
diff --git a/raveandroid/src/test/java/com/flutterwave/raveandroid/validators/BanksMinimum100AccountPaymentValidatorTest.java b/raveandroid/src/test/java/com/flutterwave/raveandroid/validators/BanksMinimum100AccountPaymentValidatorTest.java
@@ -0,0 +1,62 @@
+package com.flutterwave.raveandroid.validators;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+public class BanksMinimum100AccountPaymentValidatorTest {
+
+    BanksMinimum100AccountPaymentValidator SUT;
+
+    @Before
+    public void setUp() throws Exception {
+        SUT = new BanksMinimum100AccountPaymentValidator();
+    }
+
+    @Test
+    public void isPaymentValid_isCorrectBankCodePassed_returnsTrue() {
+        String bankCode = "123";
+        Double amount = 101.0;
+
+        boolean isPaymentValid = SUT.isPaymentValid(bankCode, amount);
+        assertThat(true, is(isPaymentValid));
+    }
+
+    @Test
+    public void isPaymentValid_isWrongBankCodePassed_returnsFalse() {
+        String bankCode = "abc";
+        Double amount = 101.0;
+
+        boolean isPaymentValid = SUT.isPaymentValid(bankCode, amount);
+        assertThat(false, is(isPaymentValid));
+    }
+
+    @Test
+    public void isPaymentValid_isEmptyBankCodePassed_returnsFalse() {
+        String bankCode = "";
+        Double amount = 101.0;
+
+        boolean isPaymentValid = SUT.isPaymentValid(bankCode, amount);
+        assertThat(false, is(isPaymentValid));
+    }
+
+    @Test
+    public void isPaymentValid_isAmountEqualTo100CodePassed_returnsFalse() {
+        String bankCode = "123";
+        Double amount = 100.0;
+
+        boolean isPaymentValid = SUT.isPaymentValid(bankCode, amount);
+        assertThat(false, is(isPaymentValid));
+    }
+
+    @Test
+    public void isPaymentValid_isAmountLessThan100CodePassed_returnsFalse() {
+        String bankCode = "123";
+        Double amount = 1.0;
+
+        boolean isPaymentValid = SUT.isPaymentValid(bankCode, amount);
+        assertThat(false, is(isPaymentValid));
+    }
+}
diff --git a/raveandroid/src/test/java/com/flutterwave/raveandroid/validators/BvnValidatorTest.java b/raveandroid/src/test/java/com/flutterwave/raveandroid/validators/BvnValidatorTest.java
diff --git a/raveandroid/src/test/java/com/flutterwave/raveandroid/validators/DateOfBirthValidatorTest.java b/raveandroid/src/test/java/com/flutterwave/raveandroid/validators/DateOfBirthValidatorTest.java

Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,14 @@`
`1`	`1`	`package com.flutterwave.raveandroid.validators;`
`2`	`2`
`3`		`-public class AccountNoValidator {`
	`3`	`+import java.util.regex.Pattern;`
`4`	`4`
`5`		`- public boolean isAccountNumberValid(String accNo) {`
`6`		`- boolean isValid = true;`
	`5`	`+public class AccountNoValidator {`
`7`	`6`
`8`		`- if (!(accNo != null && accNo.length() == 10)) {`
`9`		`- isValid = false;`
	`7`	`+ public boolean isAccountNumberValid(String accountNo) {`
	`8`	`+ if (accountNo != null) {`
	`9`	`+ return Pattern.matches("\\d{10}", accountNo);`
	`10`	`+ } else {`
	`11`	`+ return false;`
`10`	`12`	`}`
`11`		`-`
`12`		`- return isValid;`
`13`	`13`	`}`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,15 @@`
`1`	`1`	`package com.flutterwave.raveandroid.validators;`
`2`	`2`
	`3`	`+import java.util.regex.Pattern;`
	`4`	`+`
`3`	`5`	`public class BankCodeValidator {`
`4`	`6`
`5`	`7`	`public boolean isBankCodeValid(String bankCode) {`
`6`	`8`
`7`		`- boolean isValid = true;`
`8`		`-`
`9`	`9`	`if (bankCode == null) {`
`10`		`- isValid = false;`
	`10`	`+ return false;`
	`11`	`+ } else {`
	`12`	`+ return Pattern.matches("\\d{3}", bankCode);`
`11`	`13`	`}`
`12`		`- return isValid;`
`13`	`14`	`}`
`14`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,11 @@`
`5`	`5`	`public class CardExpiryValidator {`
`6`	`6`
`7`	`7`	`public boolean isCardExpiryValid(String cardExpiry) {`
`8`		`- return Pattern.matches("\\d\\d/\\d\\d", cardExpiry);`
	`8`	`+ if (cardExpiry != null) {`
	`9`	`+ return Pattern.matches("\\d\\d/\\d\\d", cardExpiry);`
	`10`	`+ } else {`
	`11`	`+ return false;`
	`12`	`+ }`
	`13`	`+`
`9`	`14`	`}`
`10`	`15`	`}`