Browse Source

Finished Exceptions and Logging

Tommy Rogers 6 years ago
parent
commit
ef473c143f

+ 25
- 8
src/main/java/com/zipcodewilmington/phone/PhoneNumberFactory.java View File

1
 package com.zipcodewilmington.phone;
1
 package com.zipcodewilmington.phone;
2
 
2
 
3
 import com.zipcodewilmington.exceptions.InvalidPhoneNumberFormatException;
3
 import com.zipcodewilmington.exceptions.InvalidPhoneNumberFormatException;
4
+import com.zipcodewilmington.tools.RandomNumberFactory;
4
 
5
 
6
+import java.util.logging.Level;
5
 import java.util.logging.Logger;
7
 import java.util.logging.Logger;
6
 
8
 
7
 /**
9
 /**
8
  * Created by leon on 5/1/17.
10
  * Created by leon on 5/1/17.
9
  */
11
  */
10
-public final class PhoneNumberFactory {
12
+public final class PhoneNumberFactory extends RandomNumberFactory{
11
     private static final Logger logger = Logger.getGlobal();
13
     private static final Logger logger = Logger.getGlobal();
12
 
14
 
13
     private PhoneNumberFactory() {
15
     private PhoneNumberFactory() {
20
      * @return array of randomly generated PhoneNumber objects
22
      * @return array of randomly generated PhoneNumber objects
21
      */ //TODO - Implement logic
23
      */ //TODO - Implement logic
22
     public static PhoneNumber[] createRandomPhoneNumberArray(int phoneNumberCount) {
24
     public static PhoneNumber[] createRandomPhoneNumberArray(int phoneNumberCount) {
23
-        return null;
25
+        PhoneNumber[] phoneBook = new PhoneNumber[phoneNumberCount];
26
+        return  phoneBook;
24
     }
27
     }
25
 
28
 
26
     /**
29
     /**
27
      * @return an instance of PhoneNumber with randomly generated phone number value
30
      * @return an instance of PhoneNumber with randomly generated phone number value
28
      */ //TODO - Implement logic
31
      */ //TODO - Implement logic
29
-    public static PhoneNumber createRandomPhoneNumber() {
30
-        return createPhoneNumberSafely(-1, -1, -1);
32
+    public static PhoneNumber createRandomPhoneNumber () throws InvalidPhoneNumberFormatException {
33
+        int areaCode = createInteger(100,999);
34
+        int centralOfficeCode = createInteger(100, 999);
35
+        int phoneLineCode = createInteger(1000, 9999);
36
+
37
+        return createPhoneNumberSafely(areaCode, centralOfficeCode, phoneLineCode);
31
     }
38
     }
32
 
39
 
33
 
40
 
37
      * @param phoneLineCode     - 4 digit code
44
      * @param phoneLineCode     - 4 digit code
38
      * @return a new phone number object
45
      * @return a new phone number object
39
      */ //TODO - if input is valid, return respective PhoneNumber object, else return null
46
      */ //TODO - if input is valid, return respective PhoneNumber object, else return null
40
-    public static PhoneNumber createPhoneNumberSafely(int areaCode, int centralOfficeCode, int phoneLineCode) {
41
-        return createPhoneNumber(null);
47
+    public static PhoneNumber createPhoneNumberSafely(int areaCode, int centralOfficeCode, int phoneLineCode) throws InvalidPhoneNumberFormatException {
48
+        try {
49
+            return createPhoneNumber("(" + areaCode + ")-" + centralOfficeCode + "-" + phoneLineCode);
50
+        }
51
+        catch (InvalidPhoneNumberFormatException e)
52
+        {   logger.log(Level.WARNING,
53
+            areaCode + centralOfficeCode + phoneLineCode + " is not a valid phone number");
54
+            return null;
55
+        }
42
     }
56
     }
43
 
57
 
44
     /**
58
     /**
46
      * @return a new phone number object
60
      * @return a new phone number object
47
      * @throws InvalidPhoneNumberFormatException - thrown if phoneNumberString does not match acceptable format
61
      * @throws InvalidPhoneNumberFormatException - thrown if phoneNumberString does not match acceptable format
48
      */ // TODO - Add throws statement to method signature
62
      */ // TODO - Add throws statement to method signature
49
-    public static PhoneNumber createPhoneNumber(String phoneNumberString) {
50
-        return null;
63
+    public static PhoneNumber createPhoneNumber(String phoneNumberString) throws InvalidPhoneNumberFormatException {
64
+        logger.log(Level.INFO,
65
+                "Attempting to create a new PhoneNumber object with a value of " + phoneNumberString);
66
+        PhoneNumber newNumber = new PhoneNumber(phoneNumberString);
67
+        return newNumber;
51
     }
68
     }
52
 }
69
 }

+ 5
- 5
src/test/java/com/zipcodewilmington/PhoneNumberFactoryTest.java View File

21
     }
21
     }
22
 
22
 
23
     @Test
23
     @Test
24
-    public void testCreatePhoneNumberSafely() {
24
+    public void testCreatePhoneNumberSafely() throws InvalidPhoneNumberFormatException  {
25
         // : Given
25
         // : Given
26
         int areaCode = 0;
26
         int areaCode = 0;
27
         int centralOfficeCode = 0;
27
         int centralOfficeCode = 0;
35
     }
35
     }
36
 
36
 
37
     @Test
37
     @Test
38
-    public void testGetAreaCode() {
38
+    public void testGetAreaCode() throws InvalidPhoneNumberFormatException {
39
         // : Given
39
         // : Given
40
         Integer areaCode = 302;
40
         Integer areaCode = 302;
41
         int centralOfficeCode = 312;
41
         int centralOfficeCode = 312;
49
     }
49
     }
50
 
50
 
51
     @Test
51
     @Test
52
-    public void testGetCentralOfficeCode() {
52
+    public void testGetCentralOfficeCode() throws InvalidPhoneNumberFormatException {
53
         // : Given
53
         // : Given
54
         int areaCode = 302;
54
         int areaCode = 302;
55
         Integer centralOfficeCode = 312;
55
         Integer centralOfficeCode = 312;
64
 
64
 
65
 
65
 
66
     @Test
66
     @Test
67
-    public void testPhoneLineCode() {
67
+    public void testPhoneLineCode() throws InvalidPhoneNumberFormatException {
68
         // : Given
68
         // : Given
69
         int areaCode = 302;
69
         int areaCode = 302;
70
         int centralOfficeCode = 312;
70
         int centralOfficeCode = 312;
78
     }
78
     }
79
 
79
 
80
     @Test
80
     @Test
81
-    public void testCreateRandomPhoneNumber() {
81
+    public void testCreateRandomPhoneNumber() throws InvalidPhoneNumberFormatException {
82
         for (int i = 0; i < 999; i++) {
82
         for (int i = 0; i < 999; i++) {
83
             // : Given
83
             // : Given
84
             // : When
84
             // : When