Merge 7610968f9ec46d84bfcdd9cc8b2a0760abd7932c into 0665dd6f3de2bb92a7f856bde34efac87df0531f

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

@@ -1,7 +1,10 @@
 package com.zipcodewilmington.phone;
 
 import com.zipcodewilmington.exceptions.InvalidPhoneNumberFormatException;
+import com.zipcodewilmington.tools.RandomNumberFactory;
 
+import java.io.IOException;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
@@ -20,14 +23,19 @@ public final class PhoneNumberFactory {
      * @return array of randomly generated PhoneNumber objects
      */ //TODO - Implement logic
     public static PhoneNumber[] createRandomPhoneNumberArray(int phoneNumberCount) {
-        return null;
+        PhoneNumber[] phoneNumberArray = new PhoneNumber[phoneNumberCount];
+        for (int i = 0; i < phoneNumberArray.length; i++){
+            phoneNumberArray[i] =createRandomPhoneNumber();
+        }
+        return phoneNumberArray;
     }
 
     /**
      * @return an instance of PhoneNumber with randomly generated phone number value
      */ //TODO - Implement logic
-    public static PhoneNumber createRandomPhoneNumber() {
-        return createPhoneNumberSafely(-1, -1, -1);
+    public static PhoneNumber createRandomPhoneNumber(){
+        return createPhoneNumberSafely(RandomNumberFactory.createInteger(100,999),
+                RandomNumberFactory.createInteger(100,999), RandomNumberFactory.createInteger(1000, 9999));
     }
 
 
@@ -38,7 +46,13 @@ 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);
+        String safePhoneNumberString = String.format("(%3d)-%3d-%4d", areaCode,centralOfficeCode,phoneLineCode);
+        try{
+            return createPhoneNumber(safePhoneNumberString);
+        } catch (InvalidPhoneNumberFormatException ipfe){
+            logger.log(Level.SEVERE, "safePhoneNumberString is not a valid phone number");
+            return null;
+        }
     }
 
     /**
@@ -46,7 +60,9 @@ 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 newPhoneNumber = new PhoneNumber(phoneNumberString);
+           logger.log(Level.SEVERE,"Attempting to create a phone number object with the value of newPhoneNumber");
+           return newPhoneNumber;
     }
 }

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

@@ -78,7 +78,7 @@ public class PhoneNumberFactoryTest {
     }
 
     @Test
-    public void testCreateRandomPhoneNumber() {
+    public void testCreateRandomPhoneNumber(){
         for (int i = 0; i < 999; i++) {
             // : Given
             // : When