|
@@ -6,12 +6,12 @@ import org.junit.rules.ExpectedException;
|
6
|
6
|
import static org.junit.Assert.assertEquals;
|
7
|
7
|
|
8
|
8
|
public class PhoneNumberTest {
|
9
|
|
- private final static String wrongLengthExceptionMessage = "Number must be 10 or 11 digits";
|
10
|
|
- private final static String numberIs11DigitsButDoesNotStartWith1ExceptionMessage =
|
|
9
|
+ private static String wrongLengthExceptionMessage = "Number must be 10 or 11 digits";
|
|
10
|
+ private static String numberIs11DigitsButDoesNotStartWith1ExceptionMessage =
|
11
|
11
|
"Can only have 11 digits if number starts with '1'";
|
12
|
|
- private final static String illegalCharacterExceptionMessage =
|
|
12
|
+ private static String illegalCharacterExceptionMessage =
|
13
|
13
|
"Illegal character in phone number. Only digits, spaces, parentheses, hyphens or dots accepted.";
|
14
|
|
- private final static String illegalAreaOrExchangeCodeMessage =
|
|
14
|
+ private static String illegalAreaOrExchangeCodeMessage =
|
15
|
15
|
"Illegal Area Or Exchange Code. Only 2-9 are valid digits";
|
16
|
16
|
|
17
|
17
|
@Rule
|
|
@@ -19,8 +19,8 @@ public class PhoneNumberTest {
|
19
|
19
|
|
20
|
20
|
@Test
|
21
|
21
|
public void cleansTheNumber() {
|
22
|
|
- final String expectedNumber = "2234567890";
|
23
|
|
- final String actualNumber = new PhoneNumber("(223) 456-7890").getNumber();
|
|
22
|
+ String expectedNumber = "2234567890";
|
|
23
|
+ String actualNumber = new PhoneNumber("(223) 456-7890").getNumber();
|
24
|
24
|
|
25
|
25
|
assertEquals(
|
26
|
26
|
expectedNumber, actualNumber
|
|
@@ -30,8 +30,8 @@ public class PhoneNumberTest {
|
30
|
30
|
@Ignore("Remove to run test")
|
31
|
31
|
@Test
|
32
|
32
|
public void cleansNumbersWithDots() {
|
33
|
|
- final String expectedNumber = "2234567890";
|
34
|
|
- final String actualNumber = new PhoneNumber("223.456.7890").getNumber();
|
|
33
|
+ String expectedNumber = "2234567890";
|
|
34
|
+ String actualNumber = new PhoneNumber("223.456.7890").getNumber();
|
35
|
35
|
|
36
|
36
|
assertEquals(
|
37
|
37
|
expectedNumber, actualNumber
|
|
@@ -41,8 +41,8 @@ public class PhoneNumberTest {
|
41
|
41
|
@Ignore("Remove to run test")
|
42
|
42
|
@Test
|
43
|
43
|
public void cleansNumbersWithMultipleSpaces() {
|
44
|
|
- final String expectedNumber = "2234567890";
|
45
|
|
- final String actualNumber = new PhoneNumber("223 456 7890 ").getNumber();
|
|
44
|
+ String expectedNumber = "2234567890";
|
|
45
|
+ String actualNumber = new PhoneNumber("223 456 7890 ").getNumber();
|
46
|
46
|
|
47
|
47
|
assertEquals(
|
48
|
48
|
expectedNumber, actualNumber
|
|
@@ -68,8 +68,8 @@ public class PhoneNumberTest {
|
68
|
68
|
@Ignore("Remove to run test")
|
69
|
69
|
@Test
|
70
|
70
|
public void validWhen11DigitsAndStartingWith1() {
|
71
|
|
- final String expectedNumber = "2234567890";
|
72
|
|
- final String actualNumber = new PhoneNumber("12234567890").getNumber();
|
|
71
|
+ String expectedNumber = "2234567890";
|
|
72
|
+ String actualNumber = new PhoneNumber("12234567890").getNumber();
|
73
|
73
|
|
74
|
74
|
assertEquals(
|
75
|
75
|
expectedNumber, actualNumber
|
|
@@ -79,8 +79,8 @@ public class PhoneNumberTest {
|
79
|
79
|
@Ignore("Remove to run test")
|
80
|
80
|
@Test
|
81
|
81
|
public void validWhen11DigitsAndStartingWith1EvenWithPunctuation() {
|
82
|
|
- final String expectedNumber = "2234567890";
|
83
|
|
- final String actualNumber = new PhoneNumber("+1 (223) 456-7890").getNumber();
|
|
82
|
+ String expectedNumber = "2234567890";
|
|
83
|
+ String actualNumber = new PhoneNumber("+1 (223) 456-7890").getNumber();
|
84
|
84
|
|
85
|
85
|
assertEquals(
|
86
|
86
|
expectedNumber, actualNumber
|