Merge e0e539804c47c373179814e9a13cb526e328ceaf into 0665dd6f3de2bb92a7f856bde34efac87df0531f

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

@@ -1,7 +1,9 @@
 package com.zipcodewilmington.phone;
 
 import com.zipcodewilmington.exceptions.InvalidPhoneNumberFormatException;
+import com.zipcodewilmington.tools.RandomNumberFactory;
 
+import java.util.Random;
 import java.util.logging.Logger;
 
 /**
@@ -19,15 +21,20 @@ public final class PhoneNumberFactory {
      * @param phoneNumberCount - number of PhoneNumber objects to instantiate
      * @return array of randomly generated PhoneNumber objects
      */ //TODO - Implement logic
-    public static PhoneNumber[] createRandomPhoneNumberArray(int phoneNumberCount) {
-        return null;
+    public static PhoneNumber[] createRandomPhoneNumberArray(int phoneNumberCount) throws InvalidPhoneNumberFormatException {
+        PhoneNumber[] phoneNumbers = new PhoneNumber[phoneNumberCount];
+        for (int i = 0; i < phoneNumbers.length; i++){
+            phoneNumbers[i]= createRandomPhoneNumber();
+        }
+        return phoneNumbers;
     }
 
     /**
      * @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() throws InvalidPhoneNumberFormatException {
+        Random rand = new Random();
+       return createPhoneNumberSafely(RandomNumberFactory.createInteger(100, 999),RandomNumberFactory.createInteger(100, 999),RandomNumberFactory.createInteger(1000, 9999));
     }
 
 
@@ -38,7 +45,16 @@ 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);
+        StringBuilder sb = new StringBuilder();
+        sb.append(String.format("(%3d)-%3d-%4d", areaCode, centralOfficeCode, phoneLineCode));
+        try{
+            return createPhoneNumber(sb.toString());
+
+        }
+        catch (InvalidPhoneNumberFormatException e){
+            logger.config("(###)-###-#### is not a valid phone number");
+        }
+        return null;
     }
 
     /**
@@ -46,7 +62,39 @@ 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);
+        logger.config("Attempting to create a new PhoneNumber object with a value of (###)-###-####");
+       return phoneNumber;
     }
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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

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