complete

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

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

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

@@ -8,8 +8,14 @@ import com.zipcodewilmington.exceptions.InvalidPhoneNumberFormatException;
 public final class PhoneNumber {
     private final String phoneNumberString;
 
+//    String stringRepresentation = "(302)-312-5555";
+//    PhoneNumber phoneNumber = new PhoneNumber(stringRepresentation);
+//    String areaCode = phoneNumber.getAreaCode();
+//    String centralOfficeCode = phoneNumber.getCentralOfficeCode();
+//    String phoneLineCode = phoneNumber.getPhoneLineCode();
+
     // default constructor is uncallable
-    private PhoneNumber() throws InvalidPhoneNumberFormatException {
+    public PhoneNumber() throws InvalidPhoneNumberFormatException {
         this(null);
     }
 

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

@@ -1,6 +1,7 @@
 package com.zipcodewilmington.phone;
 
 import com.zipcodewilmington.exceptions.InvalidPhoneNumberFormatException;
+import com.zipcodewilmington.tools.RandomNumberFactory;
 
 import java.util.logging.Logger;
 
@@ -10,43 +11,77 @@ import java.util.logging.Logger;
 public final class PhoneNumberFactory {
     private static final Logger logger = Logger.getGlobal();
 
-    private PhoneNumberFactory() {
+    private PhoneNumberFactory() throws InvalidPhoneNumberFormatException {
         /** This constructor is private
          *  This class is uninstantiable */
     }
+//    String stringRepresentation = "(302)-312-5555";
+//    PhoneNumber phoneNumber = new PhoneNumber(stringRepresentation);
+//    String areaCode = phoneNumber.getAreaCode();
+//    String centralOfficeCode = phoneNumber.getCentralOfficeCode();
+//    String phoneLineCode = phoneNumber.getPhoneLineCode();
+
 
     /**
      * @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;
-    }
+        PhoneNumber[] phoneBook = new PhoneNumber[phoneNumberCount];
 
-    /**
-     * @return an instance of PhoneNumber with randomly generated phone number value
-     */ //TODO - Implement logic
-    public static PhoneNumber createRandomPhoneNumber() {
-        return createPhoneNumberSafely(-1, -1, -1);
-    }
+        for (int i = 1; i <= phoneNumberCount; i++) {
 
+            phoneBook[i - 1] = createRandomPhoneNumber( );
 
-    /**
-     * @param areaCode          - 3 digit code
-     * @param centralOfficeCode - 3 digit code
-     * @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);
+        }
+        return phoneBook;
     }
 
-    /**
-     * @param phoneNumberString - some String corresponding to a phone number whose format is `(###)-###-####`
-     * @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;
+
+        /**
+         * @return an instance of PhoneNumber with randomly generated phone number value
+         */ //TODO - Implement logic
+        public static PhoneNumber createRandomPhoneNumber ( ) {
+
+
+            int aC = RandomNumberFactory.createInteger( 100, 999 );
+            int cOc = RandomNumberFactory.createInteger( 100, 999 );
+            int pLc = RandomNumberFactory.createInteger( 1000, 9999 );
+
+            return createPhoneNumberSafely( aC, cOc, pLc );
+        }
+
+
+        /**
+         * @param areaCode          - 3 digit code
+         * @param centralOfficeCode - 3 digit code
+         * @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){
+            String ph = "(" + areaCode + ")" + "-" + centralOfficeCode + "-" + phoneLineCode;
+
+            try {
+                return createPhoneNumber( ph );
+
+            } catch
+                    (InvalidPhoneNumberFormatException e) {
+                logger.info(ph + " is not a valid phone number!");
+                return null;
+            }
+        }
+
+        /**
+         * @param phoneNumberString - some String corresponding to a phone number whose format is `(###)-###-####`
+         * @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 ph) throws InvalidPhoneNumberFormatException {
+            PhoneNumber phoneNumber;
+            logger.finest("Attempting to create a new PhoneNumber object with a value of " + ph );
+            return phoneNumber = new PhoneNumber( ph );
+        }
+
+
     }
-}
+

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

@@ -21,42 +21,45 @@ public class PhoneNumberFactoryTest {
     }
 
     @Test
-    public void testCreatePhoneNumberSafely() {
+    public void testCreatePhoneNumberSafely() throws InvalidPhoneNumberFormatException {
         // : Given
         int areaCode = 0;
         int centralOfficeCode = 0;
         int phoneLineCode = 0;
 
         // : When
-        PhoneNumber phoneNumber = PhoneNumberFactory.createPhoneNumberSafely(areaCode, centralOfficeCode, phoneLineCode);
+        PhoneNumber phoneNumber = null;
+        phoneNumber = PhoneNumberFactory.createPhoneNumberSafely(areaCode, centralOfficeCode, phoneLineCode);
 
         // : Then
         Assert.assertEquals(null, phoneNumber);
     }
 
     @Test
-    public void testGetAreaCode() {
+    public void testGetAreaCode() throws InvalidPhoneNumberFormatException {
         // : Given
         Integer areaCode = 302;
         int centralOfficeCode = 312;
         int phoneLineCode = 5555;
 
         // : When
-        PhoneNumber phoneNumber = PhoneNumberFactory.createPhoneNumberSafely(areaCode, centralOfficeCode, phoneLineCode);
+        PhoneNumber phoneNumber = null;
+        phoneNumber = PhoneNumberFactory.createPhoneNumberSafely(areaCode, centralOfficeCode, phoneLineCode);
 
         // : Then
         Assert.assertEquals(phoneNumber.getAreaCode(), areaCode.toString());
     }
 
     @Test
-    public void testGetCentralOfficeCode() {
+    public void testGetCentralOfficeCode() throws InvalidPhoneNumberFormatException {
         // : Given
         int areaCode = 302;
         Integer centralOfficeCode = 312;
         int phoneLineCode = 5555;
 
         // : When
-        PhoneNumber phoneNumber = PhoneNumberFactory.createPhoneNumberSafely(areaCode, centralOfficeCode, phoneLineCode);
+        PhoneNumber phoneNumber = null;
+        phoneNumber = PhoneNumberFactory.createPhoneNumberSafely(areaCode, centralOfficeCode, phoneLineCode);
 
         // : Then
         Assert.assertEquals(phoneNumber.getCentralOfficeCode(), centralOfficeCode.toString());
@@ -64,25 +67,27 @@ public class PhoneNumberFactoryTest {
 
 
     @Test
-    public void testPhoneLineCode() {
+    public void testPhoneLineCode() throws InvalidPhoneNumberFormatException {
         // : Given
         int areaCode = 302;
         int centralOfficeCode = 312;
         Integer phoneLineCode = 5555;
 
         // : When
-        PhoneNumber phoneNumber = PhoneNumberFactory.createPhoneNumberSafely(areaCode, centralOfficeCode, phoneLineCode);
+        PhoneNumber phoneNumber = null;
+        phoneNumber = PhoneNumberFactory.createPhoneNumberSafely(areaCode, centralOfficeCode, phoneLineCode);
 
         // : Then
         Assert.assertEquals(phoneNumber.getPhoneLineCode(), phoneLineCode.toString());
     }
 
     @Test
-    public void testCreateRandomPhoneNumber() {
+    public void testCreateRandomPhoneNumber() throws InvalidPhoneNumberFormatException {
         for (int i = 0; i < 999; i++) {
             // : Given
             // : When
-            PhoneNumber phoneNumber = PhoneNumberFactory.createRandomPhoneNumber();
+            PhoneNumber phoneNumber = null;
+            phoneNumber = PhoneNumberFactory.createRandomPhoneNumber();
 
             // : Then
             Assert.assertTrue(phoneNumber != null);