Merge 8ae7904b20d7f5f1fe13e1847ed171f995fdc7e7 into 0665dd6f3de2bb92a7f856bde34efac87df0531f

src/main/java/com/zipcodewilmington/exceptions/InvalidPhoneNumberFormatException.java

@@ -4,4 +4,11 @@ package com.zipcodewilmington.exceptions;
  * Created by leon on 5/10/17.
  */ // Checked Exception
 public final class InvalidPhoneNumberFormatException extends Exception {
+    public InvalidPhoneNumberFormatException(){
+        super();
+    }
+
+    public InvalidPhoneNumberFormatException(String message){
+        super(message);
+    }
 }

src/main/java/com/zipcodewilmington/phone/PhoneNumber.java

@@ -17,7 +17,7 @@ public final class PhoneNumber {
     protected PhoneNumber(String phoneNumber) throws InvalidPhoneNumberFormatException {
         //validate phone number with format `(###)-###-####`
         if (!phoneNumber.matches("\\(\\d{3}\\)-\\d{3}-\\d{4}")) {
-            throw new InvalidPhoneNumberFormatException();
+            throw new InvalidPhoneNumberFormatException("invalid phone number format");
         }
         this.phoneNumberString = phoneNumber;
     }

src/main/java/com/zipcodewilmington/phone/PhoneNumberFactory.java

@@ -1,7 +1,10 @@
 package com.zipcodewilmington.phone;
 
+import com.sun.javafx.binding.StringFormatter;
 import com.zipcodewilmington.exceptions.InvalidPhoneNumberFormatException;
+import com.zipcodewilmington.tools.RandomNumberFactory;
 
+import java.util.Random;
 import java.util.logging.Logger;
 
 /**
@@ -20,14 +23,23 @@ public final class PhoneNumberFactory {
      * @return array of randomly generated PhoneNumber objects
      */ //TODO - Implement logic
     public static PhoneNumber[] createRandomPhoneNumberArray(int phoneNumberCount) {
-        return null;
+        PhoneNumber[] number = new PhoneNumber[phoneNumberCount];
+        for (int i = 0; i < number.length; i++) {
+            number[i] = createRandomPhoneNumber();
+        }
+        return number;
     }
 
     /**
      * @return an instance of PhoneNumber with randomly generated phone number value
      */ //TODO - Implement logic
     public static PhoneNumber createRandomPhoneNumber() {
-        return createPhoneNumberSafely(-1, -1, -1);
+
+        int areaCode = RandomNumberFactory.createInteger(100, 999);
+        int centralOfficeCode = RandomNumberFactory.createInteger(100, 999);
+        int phoneLine = RandomNumberFactory.createInteger(1000, 9999);
+
+        return createPhoneNumberSafely(areaCode, centralOfficeCode, phoneLine);
     }
 
 
@@ -38,7 +50,27 @@ public final class PhoneNumberFactory {
      * @return a new phone number object
      */ //TODO - if input is valid, return respective PhoneNumber object, else return null
     public static PhoneNumber createPhoneNumberSafely(int areaCode, int centralOfficeCode, int phoneLineCode) {
-        return createPhoneNumber(null);
+        //StringFormatter.format(%2)
+
+        StringBuilder sb = new StringBuilder();
+    //        sb.append("(");
+    //        sb.append(String.format("%02d", areaCode));
+    //        sb.append(")");
+    //        sb.append("-");
+    //        sb.append(String.format("%02d", centralOfficeCode));
+    //        sb.append("-");
+    //        sb.append(String.format("%03d", phoneLineCode));
+
+           sb.append("(" + areaCode + ")" + "-" + centralOfficeCode + "-" + phoneLineCode);
+        String s = sb.toString();
+        try {
+            return createPhoneNumber(s);
+        } catch (InvalidPhoneNumberFormatException e) {
+            logger.info("invalid phoneNumber");
+
+        }
+
+        return null;
     }
 
     /**
@@ -46,7 +78,8 @@ public final class PhoneNumberFactory {
      * @return a new phone number object
      * @throws InvalidPhoneNumberFormatException - thrown if phoneNumberString does not match acceptable format
      */ // TODO - Add throws statement to method signature
-    public static PhoneNumber createPhoneNumber(String phoneNumberString) {
-        return null;
+    public static PhoneNumber createPhoneNumber(String phoneNumberString) throws InvalidPhoneNumberFormatException {
+        PhoneNumber phoneNumber = new PhoneNumber(phoneNumberString);
+        return phoneNumber;
     }
 }

src/test/java/com/zipcodewilmington/PhoneNumberFactoryTest.java

@@ -83,7 +83,7 @@ public class PhoneNumberFactoryTest {
             // : Given
             // : When
             PhoneNumber phoneNumber = PhoneNumberFactory.createRandomPhoneNumber();
-
+            
             // : Then
             Assert.assertTrue(phoneNumber != null);
         }