Daniel Horowitz 8 år sedan
förälder
incheckning
ac18df4f75

+ 21
- 8
src/main/java/com/zipcodewilmington/phone/PhoneNumberFactory.java Visa fil

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
 
5
 import java.util.logging.Logger;
6
 import java.util.logging.Logger;
6
 
7
 
19
      * @param phoneNumberCount - number of PhoneNumber objects to instantiate
20
      * @param phoneNumberCount - number of PhoneNumber objects to instantiate
20
      * @return array of randomly generated PhoneNumber objects
21
      * @return array of randomly generated PhoneNumber objects
21
      */ //TODO - Implement logic
22
      */ //TODO - Implement logic
22
-    public static PhoneNumber[] createRandomPhoneNumberArray(int phoneNumberCount) {
23
-        return null;
23
+    public static PhoneNumber[] createRandomPhoneNumberArray(int phoneNumberCount) throws InvalidPhoneNumberFormatException{
24
+        PhoneNumber[] phonebook = new PhoneNumber[phoneNumberCount];
25
+        for(int x =0; x < phonebook.length; x++) {
26
+            phonebook[x] = createRandomPhoneNumber();
27
+        }
28
+        return phonebook;
24
     }
29
     }
25
 
30
 
26
     /**
31
     /**
27
      * @return an instance of PhoneNumber with randomly generated phone number value
32
      * @return an instance of PhoneNumber with randomly generated phone number value
28
      */ //TODO - Implement logic
33
      */ //TODO - Implement logic
29
-    public static PhoneNumber createRandomPhoneNumber() {
30
-        return createPhoneNumberSafely(-1, -1, -1);
34
+    public static PhoneNumber createRandomPhoneNumber() throws InvalidPhoneNumberFormatException {
35
+
36
+        return createPhoneNumberSafely(RandomNumberFactory.createInteger(100,999), RandomNumberFactory.createInteger(100,999), RandomNumberFactory.createInteger(1000,9999));
31
     }
37
     }
32
 
38
 
33
 
39
 
37
      * @param phoneLineCode     - 4 digit code
43
      * @param phoneLineCode     - 4 digit code
38
      * @return a new phone number object
44
      * @return a new phone number object
39
      */ //TODO - if input is valid, return respective PhoneNumber object, else return null
45
      */ //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);
46
+    public static PhoneNumber createPhoneNumberSafely(int areaCode, int centralOfficeCode, int phoneLineCode) throws InvalidPhoneNumberFormatException {
47
+        String phoneNumber = "(" + areaCode + ")-" + centralOfficeCode + "-" +phoneLineCode;
48
+        try {
49
+            return createPhoneNumber(phoneNumber);
50
+        } catch (InvalidPhoneNumberFormatException e) {
51
+            return null;
52
+        }
42
     }
53
     }
43
 
54
 
55
+
44
     /**
56
     /**
45
      * @param phoneNumberString - some String corresponding to a phone number whose format is `(###)-###-####`
57
      * @param phoneNumberString - some String corresponding to a phone number whose format is `(###)-###-####`
46
      * @return a new phone number object
58
      * @return a new phone number object
47
      * @throws InvalidPhoneNumberFormatException - thrown if phoneNumberString does not match acceptable format
59
      * @throws InvalidPhoneNumberFormatException - thrown if phoneNumberString does not match acceptable format
48
      */ // TODO - Add throws statement to method signature
60
      */ // TODO - Add throws statement to method signature
49
-    public static PhoneNumber createPhoneNumber(String phoneNumberString) {
50
-        return null;
61
+    public static PhoneNumber createPhoneNumber(String phoneNumberString) throws InvalidPhoneNumberFormatException {
62
+
63
+        return new PhoneNumber(phoneNumberString);
51
     }
64
     }
52
 }
65
 }

+ 5
- 5
src/test/java/com/zipcodewilmington/PhoneNumberFactoryTest.java Visa fil

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