Browse Source

Finally finished

Brian He 6 years ago
parent
commit
1a80ebb162
1 changed files with 24 additions and 14 deletions
  1. 24
    14
      src/test/java/com/zipcodewilmington/phonebook/PhoneBookTest.java

+ 24
- 14
src/test/java/com/zipcodewilmington/phonebook/PhoneBookTest.java View File

18
         String name = "Person 1";
18
         String name = "Person 1";
19
         String number = "1234567";
19
         String number = "1234567";
20
         phoneBookTest.addEntry(name, number);
20
         phoneBookTest.addEntry(name, number);
21
-        String expected = number;
21
+        String expected = "[1234567]";
22
         String actual = phoneBookTest.lookUp(name);
22
         String actual = phoneBookTest.lookUp(name);
23
         Assert.assertEquals(expected, actual);
23
         Assert.assertEquals(expected, actual);
24
 
24
 
29
         String name = "Person 2";
29
         String name = "Person 2";
30
         String number = "87654321";
30
         String number = "87654321";
31
         phoneBookTest.addEntry(name, number);
31
         phoneBookTest.addEntry(name, number);
32
-        String expected = number;
32
+        String expected = "[87654321]";
33
         String actual = phoneBookTest.lookUp(name);
33
         String actual = phoneBookTest.lookUp(name);
34
         Assert.assertEquals(expected, actual);
34
         Assert.assertEquals(expected, actual);
35
     }
35
     }
36
 
36
 
37
-    @Test
37
+    @Test(expected = NullPointerException.class)
38
     public void removeEntryTest() {
38
     public void removeEntryTest() {
39
         String name = "Person 1";
39
         String name = "Person 1";
40
         String number = "8942418";
40
         String number = "8942418";
41
+        phoneBookTest.addEntry(name, number);
41
         phoneBookTest.removeEntry(name);
42
         phoneBookTest.removeEntry(name);
42
-        String expected = null;
43
-        String actual = phoneBookTest.lookUp(name);
44
-        Assert.assertEquals(expected, actual);
43
+        phoneBookTest.lookUp(name);
45
 
44
 
46
     }
45
     }
47
 
46
 
48
-    @Test
47
+    @Test(expected = NullPointerException.class)
49
     public void removeEntryTest2() {
48
     public void removeEntryTest2() {
50
         String name = "Person 2";
49
         String name = "Person 2";
51
         String number = "12387874";
50
         String number = "12387874";
51
+        phoneBookTest.addEntry(name, number);
52
         phoneBookTest.removeEntry(name);
52
         phoneBookTest.removeEntry(name);
53
-        String expected = null;
54
-        String actual = phoneBookTest.lookUp(name);
55
-        Assert.assertEquals(expected, actual);
53
+        phoneBookTest.lookUp(name);
56
     }
54
     }
57
 
55
 
58
     @Test
56
     @Test
76
     public void listAllTest() {
74
     public void listAllTest() {
77
         String name = "Person 1";
75
         String name = "Person 1";
78
         String number = "1234567";
76
         String number = "1234567";
79
-        phoneBookTest.addEntry(name, number);
80
         String name2 = "Person 2";
77
         String name2 = "Person 2";
81
         String number2 = "2345678";
78
         String number2 = "2345678";
82
-        phoneBookTest.addEntry(name2, number2);
83
         String name3 = "Person 3";
79
         String name3 = "Person 3";
84
         String number3 = "34567898";
80
         String number3 = "34567898";
85
-        phoneBookTest.addEntry(name3, number3);
86
-        String expected = "Person 11234567\nPerson 22345678\nPerson 334567898\n";
81
+        String number4 = "5343677";
82
+        phoneBookTest.addEntry(name, number);
83
+        phoneBookTest.addEntry(name2, number2);
84
+        phoneBookTest.addEntry(name3, number3, number4);
85
+        String expected = "Person 1[1234567]\nPerson 2[2345678]\nPerson 3[34567898, 5343677]\n";
86
+        System.out.println(expected);
87
         String actual = phoneBookTest.listAll();
87
         String actual = phoneBookTest.listAll();
88
         Assert.assertEquals(expected, actual);
88
         Assert.assertEquals(expected, actual);
89
     }
89
     }
111
     @Test
111
     @Test
112
     public void removeOneNumberTest() {
112
     public void removeOneNumberTest() {
113
         String name = "Brian";
113
         String name = "Brian";
114
+        String number = "1234567";
115
+        String number2 = "2345678";
116
+        String number3 = "3456789";
117
+        phoneBookTest.addEntry(name, number, number2, number3);
118
+        phoneBookTest.removeOneNumber(name, number2);
119
+        String expected = "[1234567, 3456789]";
120
+        String actual = phoneBookTest.lookUp(name);
121
+        Assert.assertEquals(expected, actual);
122
+
114
 
123
 
115
     }
124
     }
125
+
116
 }
126
 }