Merge 7586165ece89485b1a2be0a1612a0ff86458ab95 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.logging.Level;
 import java.util.logging.Logger;
 
 /**
@@ -19,15 +21,24 @@ 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 < phoneNumberCount; 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 {
+        try {
+            int areaCode = RandomNumberFactory.createInteger(100, 999);
+            int officeCode = RandomNumberFactory.createInteger(100, 999);
+            int phoneLine = RandomNumberFactory.createInteger(1000, 9999);
+            return createPhoneNumberSafely(areaCode, officeCode, phoneLine);
+        } catch (InvalidPhoneNumberFormatException e) {return null;}
     }
 
 
@@ -37,8 +48,18 @@ public final class PhoneNumberFactory {
      * @param phoneLineCode     - 4 digit code
      * @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);
+    public static PhoneNumber createPhoneNumberSafely(int areaCode, int centralOfficeCode, int phoneLineCode) throws InvalidPhoneNumberFormatException{
+        String tempString = "";
+        try {
+            // if (3 == String.valueOf(areaCode).length() && 3 == String.valueOf(centralOfficeCode).length() && 4 == String.valueOf(phoneLineCode).length()) {
+            tempString = String.valueOf(areaCode) + String.valueOf(centralOfficeCode) + String.valueOf(phoneLineCode);
+            return createPhoneNumber(tempString);
+            //     return createPhoneNumber(tempString);
+            // }
+        } catch (InvalidPhoneNumberFormatException inv) {
+            logger.log(Level.FINE, (tempString + "is not a valid phone number"));
+            return null;
+        }
     }
 
     /**
@@ -46,7 +67,21 @@ 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 {
+        StringBuilder sb = new StringBuilder();
+        try {
+            sb.append("(");
+            sb.append(phoneNumberString.substring(0, 3));
+            sb.append(")-");
+            sb.append(phoneNumberString.substring(3, 6));
+            sb.append("-");
+            sb.append(phoneNumberString.substring(6));
+            return new PhoneNumber(sb.toString());
+        } catch (InvalidPhoneNumberFormatException e) {
+            logger.log(Level.FINE, ("Attempting to create a new PhoneNumber object with a value of " + phoneNumberString));
+            return null;
+        }
     }
 }
+
+// 012-345-6789

src/main/java/com/zipcodewilmington/tools/RandomNumberFactory.java

@@ -11,7 +11,7 @@ public abstract class RandomNumberFactory {
 
     /** @return a random float between the specified min and max numeric range */
     public static Float createFloat(float min, float max) {
-        return random.nextFloat() * (max - min) + min;
+        return random.nextFloat() * (max - min) + 1;
     }
 
     /** @return a random integer between the specified min and max numeric range */

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

@@ -21,21 +21,21 @@ public class PhoneNumberFactoryTest {
     }
 
     @Test
-    public void testCreatePhoneNumberSafely() {
+    public void testCreatePhoneNumberSafely() throws InvalidPhoneNumberFormatException {
         // : Given
-        int areaCode = 0;
-        int centralOfficeCode = 0;
-        int phoneLineCode = 0;
+        int areaCode = 302;
+        int centralOfficeCode = 228;
+        int phoneLineCode = 5151;
 
         // : When
         PhoneNumber phoneNumber = PhoneNumberFactory.createPhoneNumberSafely(areaCode, centralOfficeCode, phoneLineCode);
 
         // : Then
-        Assert.assertEquals(null, phoneNumber);
+        Assert.assertEquals("(302)-228-5151", phoneNumber.toString());
     }
 
     @Test
-    public void testGetAreaCode() {
+    public void testGetAreaCode() throws InvalidPhoneNumberFormatException {
         // : Given
         Integer areaCode = 302;
         int centralOfficeCode = 312;
@@ -49,7 +49,7 @@ public class PhoneNumberFactoryTest {
     }
 
     @Test
-    public void testGetCentralOfficeCode() {
+    public void testGetCentralOfficeCode() throws InvalidPhoneNumberFormatException {
         // : Given
         int areaCode = 302;
         Integer centralOfficeCode = 312;
@@ -64,7 +64,7 @@ public class PhoneNumberFactoryTest {
 
 
     @Test
-    public void testPhoneLineCode() {
+    public void testPhoneLineCode() throws InvalidPhoneNumberFormatException {
         // : Given
         int areaCode = 302;
         int centralOfficeCode = 312;
@@ -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