Browse Source

prettier unit tests

Carolynn Vansant 6 years ago
parent
commit
1acd89902f

+ 5
- 8
src/main/java/com/zipcodewilmington/phonebook/PhoneBook.java View File

21
     }
21
     }
22
 
22
 
23
     //add a name & number entry, add number
23
     //add a name & number entry, add number
24
-    public void inputEntry(String name, ArrayList<String> number) {
24
+    public void addEntry(String name, ArrayList<String> number) {
25
         if (!treeMap.containsKey(name)) {
25
         if (!treeMap.containsKey(name)) {
26
             treeMap.put(name, number);
26
             treeMap.put(name, number);
27
         }
27
         }
28
     }
28
     }
29
 
29
 
30
     //add numbers to existing entries
30
     //add numbers to existing entries
31
-    //no test cases yet
32
     public void addNumberToEntry(String name, String number) {
31
     public void addNumberToEntry(String name, String number) {
33
         for (Map.Entry<String, ArrayList<String>> entry : treeMap.entrySet()) {
32
         for (Map.Entry<String, ArrayList<String>> entry : treeMap.entrySet()) {
34
             if (name.equals(entry.getKey())) {
33
             if (name.equals(entry.getKey())) {
39
     }
38
     }
40
 
39
 
41
     //remove numbers from existing entries
40
     //remove numbers from existing entries
42
-    //no test cases yet
43
     public void removeNumberFromEntry(String name, String number) {
41
     public void removeNumberFromEntry(String name, String number) {
44
         for (Map.Entry<String, ArrayList<String>> entry : treeMap.entrySet()) {
42
         for (Map.Entry<String, ArrayList<String>> entry : treeMap.entrySet()) {
45
             if (entry.getKey().equals(name)) {
43
             if (entry.getKey().equals(name)) {
50
         }
48
         }
51
     }
49
     }
52
 
50
 
53
-    //remove a name & number entry
51
+    //remove entire entry
54
     public void removeEntry(String name) {
52
     public void removeEntry(String name) {
55
             treeMap.remove(name);
53
             treeMap.remove(name);
56
     }
54
     }
57
 
55
 
58
-    //find phone number lookup by name
56
+    //lookup: find phone number from name
59
     public ArrayList<String> lookup(String name) {
57
     public ArrayList<String> lookup(String name) {
60
         return treeMap.get(name);
58
         return treeMap.get(name);
61
     }
59
     }
62
 
60
 
63
-    //reverse lookup
61
+    //reverse lookup: find name from number
64
     public String reverseLookup (String number) {
62
     public String reverseLookup (String number) {
65
         String name = "";
63
         String name = "";
66
         for(Map.Entry<String, ArrayList<String>> entry: treeMap.entrySet()) {
64
         for(Map.Entry<String, ArrayList<String>> entry: treeMap.entrySet()) {
78
     public String display(){
76
     public String display(){
79
         StringBuilder printOut = new StringBuilder();
77
         StringBuilder printOut = new StringBuilder();
80
         for(Map.Entry<String, ArrayList<String>> entry: treeMap.entrySet()) {
78
         for(Map.Entry<String, ArrayList<String>> entry: treeMap.entrySet()) {
81
-            printOut
82
-                    .append(entry.getKey())
79
+            printOut.append(entry.getKey())
83
                     .append(" ")
80
                     .append(" ")
84
                     .append(entry.getValue().toString())
81
                     .append(entry.getValue().toString())
85
                     .append("\n");
82
                     .append("\n");

+ 29
- 55
src/test/java/com/zipcodewilmington/phonebook/PhoneBookTest.java View File

5
 import sun.nio.cs.ext.SJIS;
5
 import sun.nio.cs.ext.SJIS;
6
 
6
 
7
 import java.util.ArrayList;
7
 import java.util.ArrayList;
8
+import java.util.Arrays;
8
 import java.util.TreeMap;
9
 import java.util.TreeMap;
9
 
10
 
10
 /**
11
 /**
20
     @Test
21
     @Test
21
     public void testConstructorWithArgument() {
22
     public void testConstructorWithArgument() {
22
         PhoneBook book = new PhoneBook();
23
         PhoneBook book = new PhoneBook();
23
-        ArrayList<String> number = new ArrayList<String>();
24
-        number.add("302-555-2222");
25
-        number.add("302-555-3456");
26
-        book.inputEntry("Bob", number);
24
+        ArrayList<String> number = new ArrayList<String>(Arrays.asList("302-555-2222","302-555-3456"));
25
+        book.addEntry("Bob", number);
27
         Assert.assertNotNull(book);
26
         Assert.assertNotNull(book);
28
     }
27
     }
29
 
28
 
30
     @Test
29
     @Test
31
-    public void testInputEntry() {
30
+    public void testAddEntry() {
32
         //Given
31
         //Given
33
         PhoneBook book = new PhoneBook();
32
         PhoneBook book = new PhoneBook();
34
-
35
-        ArrayList<String> expectedAddition = new ArrayList<String>();
36
-        expectedAddition.add("302-555-2222");
37
-        expectedAddition.add("302-555-3456");
38
-
33
+        ArrayList<String> expectedAddition = new ArrayList<String>(Arrays.asList("302-555-2222","302-555-3456"));
39
         //When
34
         //When
40
-        book.inputEntry("Bob", expectedAddition);
35
+        book.addEntry("Bob", expectedAddition);
41
         ArrayList<String> actualAddition = new ArrayList<String>(book.lookup("Bob"));
36
         ArrayList<String> actualAddition = new ArrayList<String>(book.lookup("Bob"));
42
-
43
         //Then
37
         //Then
44
         Assert.assertEquals(expectedAddition, actualAddition);
38
         Assert.assertEquals(expectedAddition, actualAddition);
45
     }
39
     }
48
     public void addNumberToEntry() {
42
     public void addNumberToEntry() {
49
         //Given
43
         //Given
50
         PhoneBook book = new PhoneBook();
44
         PhoneBook book = new PhoneBook();
51
-        ArrayList<String> bobNumber = new ArrayList<String>();
52
-        bobNumber.add("302-555-2234");
53
-        book.inputEntry("Bob", bobNumber);
54
-        ArrayList<String> expectedAddition = new ArrayList<String>();
55
-        expectedAddition.add("302-555-2234");
56
-        expectedAddition.add("302-555-1111");
45
+        ArrayList<String> bobNumber = new ArrayList<String>(Arrays.asList("302-555-2234"));
46
+        book.addEntry("Bob", bobNumber);
47
+        //Expected
48
+        ArrayList<String> expectedAddition = new ArrayList<String>(Arrays.asList("302-555-2234","302-555-1111"));
57
         //When
49
         //When
58
         book.addNumberToEntry("Bob", "302-555-1111");
50
         book.addNumberToEntry("Bob", "302-555-1111");
59
         ArrayList<String> actualAddition = book.lookup("Bob");
51
         ArrayList<String> actualAddition = book.lookup("Bob");
65
     public void removeNumberFromEntry() {
57
     public void removeNumberFromEntry() {
66
         //Given
58
         //Given
67
         PhoneBook book = new PhoneBook();
59
         PhoneBook book = new PhoneBook();
68
-        ArrayList<String> bobNumber = new ArrayList<String>();
69
-        bobNumber.add("302-555-2234");
70
-        bobNumber.add("302-555-1111");
71
-        book.inputEntry("Bob", bobNumber);
72
-
73
-        ArrayList<String> expectedAfterDeletion = new ArrayList<String>();
74
-        expectedAfterDeletion.add("302-555-2234");
75
-
60
+        ArrayList<String> bobNumber = new ArrayList<String>(Arrays.asList("302-555-2234","302-555-1111"));
61
+        book.addEntry("Bob", bobNumber);
62
+        //Expected
63
+        ArrayList<String> expectedAfterDeletion = new ArrayList<String>(Arrays.asList("302-555-2234"));
76
         //When
64
         //When
77
         book.removeNumberFromEntry("Bob", "302-555-1111");
65
         book.removeNumberFromEntry("Bob", "302-555-1111");
78
         ArrayList<String> actualAfterDeletion = book.lookup("Bob");
66
         ArrayList<String> actualAfterDeletion = book.lookup("Bob");
85
 
73
 
86
         //Given
74
         //Given
87
         PhoneBook book = new PhoneBook();
75
         PhoneBook book = new PhoneBook();
88
-        ArrayList<String> bobNumber = new ArrayList<String>();
89
-        bobNumber.add("302-555-2222");
90
-        bobNumber.add("302-555-3456");
91
-        book.inputEntry("Bob", bobNumber);
76
+        ArrayList<String> bobNumber = new ArrayList<String>(Arrays.asList("302-555-2222","302-555-3456"));
77
+        book.addEntry("Bob", bobNumber);
78
+        //Expected
92
         String expectedValue = "";
79
         String expectedValue = "";
93
-
94
         //When
80
         //When
95
         book.removeEntry("Bob");
81
         book.removeEntry("Bob");
96
         String actualValue = book.display();
82
         String actualValue = book.display();
97
-
98
         //Then
83
         //Then
99
         Assert.assertEquals(expectedValue, actualValue);
84
         Assert.assertEquals(expectedValue, actualValue);
100
     }
85
     }
104
         //To test if lookup returns all of the person's phone numbers
89
         //To test if lookup returns all of the person's phone numbers
105
         //Given
90
         //Given
106
         PhoneBook book = new PhoneBook();
91
         PhoneBook book = new PhoneBook();
107
-        ArrayList<String> expectedNumber = new ArrayList<String>();
108
-        expectedNumber.add("302-555-2223");
109
-        expectedNumber.add("302-555-3456");
110
-        book.inputEntry("Bob", expectedNumber);
92
+        ArrayList<String> expectedNumber = new ArrayList<String>(Arrays.asList("302-555-2223","302-555-3456"));
93
+        book.addEntry("Bob", expectedNumber);
111
         //When
94
         //When
112
         ArrayList<String> actualNumber = new ArrayList<String>(book.lookup("Bob"));
95
         ArrayList<String> actualNumber = new ArrayList<String>(book.lookup("Bob"));
113
         //Then
96
         //Then
119
         //To test if lookup picks out the right person when there are multiple entries
102
         //To test if lookup picks out the right person when there are multiple entries
120
         //Given
103
         //Given
121
         PhoneBook book = new PhoneBook();
104
         PhoneBook book = new PhoneBook();
122
-        ArrayList<String> bobNumber = new ArrayList<String>();
123
-        bobNumber.add("302-555-2223");
124
-        book.inputEntry("Bob", bobNumber);
105
+        ArrayList<String> bobNumber = new ArrayList<String>(Arrays.asList("302-555-2223"));
106
+        book.addEntry("Bob", bobNumber);
125
         //Expected
107
         //Expected
126
-        ArrayList<String> expectedNumber = new ArrayList<String>();
127
-        expectedNumber.add("302-555-9988");
128
-        book.inputEntry("Frank", expectedNumber);
108
+        ArrayList<String> expectedNumber = new ArrayList<String>(Arrays.asList("302-555-9988"));
109
+        book.addEntry("Frank", expectedNumber);
129
         //When
110
         //When
130
         ArrayList<String> actualNumber = new ArrayList<String> (book.lookup("Frank"));
111
         ArrayList<String> actualNumber = new ArrayList<String> (book.lookup("Frank"));
131
         //Then
112
         //Then
137
         // to test if right person is returned when searching by one of multiple phone numbers
118
         // to test if right person is returned when searching by one of multiple phone numbers
138
         //Given
119
         //Given
139
         PhoneBook book = new PhoneBook();
120
         PhoneBook book = new PhoneBook();
140
-        ArrayList<String> bobNumber = new ArrayList<String>();
141
-        bobNumber.add("302-555-2223");
142
-        bobNumber.add("302-555-5555");
121
+        ArrayList<String> bobNumber = new ArrayList<String>(Arrays.asList("302-555-2223","302-555-5555"));
143
         String expectedName = "Bob";
122
         String expectedName = "Bob";
144
-        book.inputEntry(expectedName, bobNumber);
123
+        book.addEntry(expectedName, bobNumber);
145
         //When
124
         //When
146
         String actualName = book.reverseLookup("302-555-2223");
125
         String actualName = book.reverseLookup("302-555-2223");
147
         //Then
126
         //Then
153
     public void testDisplay() {
132
     public void testDisplay() {
154
         //Given:
133
         //Given:
155
         PhoneBook book = new PhoneBook();
134
         PhoneBook book = new PhoneBook();
156
-
157
-        ArrayList<String> bobNumber = new ArrayList<String>();
158
-        bobNumber.add("302-555-1234");
159
-        bobNumber.add("302-556-1245");
160
-        book.inputEntry("Bob", bobNumber);
161
-
162
-        ArrayList<String> frankNumber = new ArrayList<String>();
163
-        frankNumber.add("777-555-1111");
164
-        book.inputEntry("Frank", frankNumber);
135
+        ArrayList<String> bobNumber = new ArrayList<String>(Arrays.asList("302-555-1234","302-556-1245"));
136
+        book.addEntry("Bob", bobNumber);
137
+        ArrayList<String> frankNumber = new ArrayList<String>(Arrays.asList("777-555-1111"));
138
+        book.addEntry("Frank", frankNumber);
165
         //Expected
139
         //Expected
166
         String expectedNameNumber = "Bob " + bobNumber.toString() + "\n" + "Frank " + frankNumber.toString() + "\n";
140
         String expectedNameNumber = "Bob " + bobNumber.toString() + "\n" + "Frank " + frankNumber.toString() + "\n";
167
         //When
141
         //When