cleaned code up for PasswordStrengthChecker

src/com/xpeppers/kata/PasswordStrengthChecker.java

@@ -6,36 +6,44 @@
 import java.util.List;
 
 public class PasswordStrengthChecker {
-
-    private List<Rule> rules;
-    private static List<Rule> BASIC_RULES = asList(
+
+    private static final List<Rule> BASIC_RULES = asList(
             new ContainsDigits(),
             new ContainsAlphabeticChars(),
             new LongerThan(7),
             new ContainsUpperCaseChars());
-
-    public static PasswordStrengthChecker basic() {
-        return build(false);
-    }
-
-    public static PasswordStrengthChecker forAdmin() {
-        return build(true);
-    }
+    private static final List<Rule> ADMIN_RULES = asList(
+            new LongerThan(10),
+            new ContainsSpecialChars());
+    private List<Rule> rules;
 
     public PasswordStrengthChecker(List<Rule> rules) {
         this.rules = new ArrayList<Rule>(rules);
     }
+    public static PasswordStrengthChecker createForBasicPassword() {
+        return buildPasswordStrengthChecker(false);
+    }
 
-    public boolean isAcceptable(String password) {
-        return rules.stream().allMatch(rule -> rule.isSatisfiedOn(password));
+    public static PasswordStrengthChecker createForAdminPassword() {
+        return buildPasswordStrengthChecker(true);
     }
 
-    private static PasswordStrengthChecker build(boolean isAdmin) {
-        List<Rule> rules = new ArrayList<Rule>(BASIC_RULES);
+    private static PasswordStrengthChecker buildPasswordStrengthChecker(boolean isAdmin) {
+        List<Rule> allRules = new ArrayList<Rule>(BASIC_RULES);
         if (isAdmin) {
-            rules.addAll(asList(new LongerThan(10), new ContainsSpecialChars()));
+            allRules.addAll(ADMIN_RULES);
         }
-        return new PasswordStrengthChecker(rules);
+        return new PasswordStrengthChecker(allRules);
+    }
+
+    public boolean accepts(String password) {
+        return rules.stream().allMatch(rule -> {
+            if (!rule.isSatisfiedOn(password)) {
+                System.out.println(rule.getFailedReasonMessage());
+                return false;
+            }
+                return true;            
+            });
     }
 
 }

src/com/xpeppers/kata/predicates/IsDigit.java

@@ -0,0 +1,8 @@
+package com.xpeppers.kata.predicates;
+
+public class IsDigit implements IntPredicate {
+    @Override
+    public boolean test(int asciiValue) {
+        return asciiValue >= 48 && asciiValue <= 57;
+    }
+}

src/com/xpeppers/kata/IsLowerCase.java → src/com/xpeppers/kata/predicates/IsLowerCase.java

@@ -1,4 +1,4 @@
-package com.xpeppers.kata;
+package com.xpeppers.kata.predicates;
 
 import java.util.function.IntPredicate;
 

src/com/xpeppers/kata/predicates/IsSpecialChar.java

@@ -0,0 +1,11 @@
+package src.com.xpeppers.kata.predicates;
+
+public class IsSpecialChar implements IntPredicate {
+    @Override
+    public boolean test(int asciiValue) {
+        return (asciiValue >= 33 && asciiValue <= 47) ||
+                (asciiValue >= 58 && asciiValue <= 64) ||
+                (asciiValue >= 91 && asciiValue <= 96) ||
+                (asciiValue >= 123 && asciiValue <= 126);
+    }
+}

src/com/xpeppers/kata/IsUpperCase.java → src/com/xpeppers/kata/predicates/IsUpperCase.java

@@ -1,4 +1,4 @@
-package com.xpeppers.kata;
+package com.xpeppers.kata.predicates;
 
 import java.util.function.IntPredicate;
 

src/com/xpeppers/kata/Predicates.java → src/com/xpeppers/kata/predicates/Predicates.java

@@ -1,4 +1,4 @@
-package com.xpeppers.kata;
+package com.xpeppers.kata.predicates;
 
 import java.util.function.IntPredicate;
 

src/com/xpeppers/kata/rules/ContainsAlphabeticChars.java

@@ -0,0 +1,16 @@
+package com.xpeppers.kata.rules;
+
+import static com.xpeppers.kata.Predicates.isLowerCase;
+import static com.xpeppers.kata.Predicates.isUpperCase;
+
+public class ContainsAlphabeticCharsRule implements IRule {
+    @Override
+    public boolean isSatisfiedOn(String password) {
+        return password.chars().anyMatch(isUpperCase().or(isLowerCase()));
+    }
+
+    @Override
+    public String getFailedReasonMessage() {
+        return "Your password contains no alphabetic letters";
+    }
+}

src/com/xpeppers/kata/rules/ContainsDigits.java

@@ -0,0 +1,15 @@
+package com.xpeppers.kata.rules;
+import java.util.function.IntPredicate;
+
+final class ContainsDigits implements IRule {
+    @Override
+    public boolean isSatisfiedOn(String string) {
+        return string.chars().anyMatch(new IsDigit());
+    }
+
+    @Override
+    public String getFailedReasonMessage() {
+        return "Your password contains no numbers";
+    }
+
+}

src/com/xpeppers/kata/rules/ContainsSpecialChars.java

@@ -0,0 +1,14 @@
+package com.xpeppers.kata.rules;
+import java.util.function.IntPredicate;
+
+public class ContainsSpecialChars implements IRule {
+    @Override
+    public boolean isSatisfiedOn(String password) {
+        return password.chars().anyMatch(new IsSpecialChar());
+    } 
+
+    @Override
+    public String getFailedReasonMessage() {
+        return "Your password contains no special characters";
+    } 
+}

src/com/xpeppers/kata/rules/ContainsUpperCaseChars.java

@@ -0,0 +1,14 @@
+package com.xpeppers.kata;
+
+public class ContainsUpperCaseChars implements IRule {
+
+    @Override
+    public boolean isSatisfiedOn(String password) {
+        return password.chars().anyMatch(new IsUpperCase());
+    }
+
+    @Override
+    public String getFailedReasonMessage() {
+        return "Your password has no uppercase letters";
+    }
+}

src/com/xpeppers/kata/rules/IRule.java

@@ -0,0 +1,9 @@
+package com.xpeppers.kata.rules;
+
+public interface IRule {
+
+    boolean isSatisfiedOn(String password);
+
+    String getFailedReasonMessage();
+
+}

src/com/xpeppers/kata/rules/LongerThan.java

@@ -0,0 +1,19 @@
+package com.xpeppers.kata.rules;
+
+public class LongerThan implements IRule {
+    private int size;
+
+    public LongerThan(int size) {
+        this.size = size;
+    }
+
+    @Override
+    public boolean isSatisfiedOn(String password) {
+        return password.length() > size;
+    }
+
+    @Override
+    public String getFailedReasonMessage() {
+        return "Your password is to short";
+    }
+}

test/com/xpeppers/kata/ContainsAlphabeticCharsTest.java

@@ -9,9 +9,13 @@
 public class ContainsAlphabeticCharsTest {
 
     @Test
-    public void test() {
+    public void password_with_alphabetic_chars() {
         assertTrue(new ContainsAlphabeticChars().isSatisfiedOn("a"));
         assertTrue(new ContainsAlphabeticChars().isSatisfiedOn("A"));
+    }
+
+    @Test
+    public void password_without_alphabetic_chars() {
         assertFalse(new ContainsAlphabeticChars().isSatisfiedOn("0"));
         assertFalse(new ContainsAlphabeticChars().isSatisfiedOn("!"));
     }

test/com/xpeppers/kata/ContainsDigitsTest.java

@@ -7,8 +7,12 @@
 public class ContainsDigitsTest {
 
     @Test
-    public void test() {
+    public void password_with_digits() {
         assertTrue(new ContainsDigits().isSatisfiedOn("1"));
+    }
+
+    @Test
+    public void password_without_digits() {
         assertFalse(new ContainsDigits().isSatisfiedOn("a"));
     }
 

test/com/xpeppers/kata/ContainsSpecialCharsTest.java

@@ -7,10 +7,13 @@
 public class ContainsSpecialCharsTest {
 
     @Test
-    public void test() {
+    public void password_with_special_character() {
         assertTrue(new ContainsSpecialChars().isSatisfiedOn("!"));
+    }
+
+    @Test
+    public void password_without_special_character() {
         assertFalse(new ContainsSpecialChars().isSatisfiedOn("A"));
         assertFalse(new ContainsSpecialChars().isSatisfiedOn("1"));
     }
-
 }

test/com/xpeppers/kata/LongerThanTest.java

@@ -9,8 +9,12 @@
 public class LongerThanTest {
 
     @Test
-    public void test() {
+    public void long_enough_password() {
         assertTrue(new LongerThan(1).isSatisfiedOn("12"));
+    }
+
+    @Test
+    public void too_short_password() {
         assertFalse(new LongerThan(1).isSatisfiedOn("1"));
     }
 

test/com/xpeppers/kata/PasswordStrengthCheckerExamples.java

@@ -7,7 +7,7 @@
 
 public class PasswordStrengthCheckerExamples {
 
-    private PasswordStrengthChecker checker = PasswordStrengthChecker.basic();
+    private PasswordStrengthChecker checker = PasswordStrengthChecker.createForBasicPassword();
 
     @Test
     public void at_least_one_uppercase_character() {
@@ -36,14 +36,14 @@ public void at_least_one_digit() {
 
     @Test
     public void longer_than_10_characters_for_admins() throws Exception {
-        PasswordStrengthChecker checker = PasswordStrengthChecker.forAdmin();
+        PasswordStrengthChecker checker = PasswordStrengthChecker.createForAdminPassword();
         assertTrue(checker.isAcceptable("123456789!A"));
         assertFalse(checker.isAcceptable("1234567A"));
     }
 
     @Test
     public void at_least_one_special_character_for_admins() throws Exception {
-        PasswordStrengthChecker checker = PasswordStrengthChecker.forAdmin();
+        PasswordStrengthChecker checker = PasswordStrengthChecker.createForAdminPassword();
         assertTrue(checker.isAcceptable("123456789A!"));
         assertFalse(checker.isAcceptable("1234567890A"));
     }