浏览代码

Merge pull request #298 from odzeno/Allergies

Allergies: remove redundant array creation [Fix #275]
FridaTveit 9 年前
父节点
当前提交
cb879d3a42
共有 1 个文件被更改,包括 14 次插入13 次删除
  1. 14
    13
      exercises/allergies/src/test/java/AllergiesTest.java

+ 14
- 13
exercises/allergies/src/test/java/AllergiesTest.java 查看文件

3
 
3
 
4
 import java.util.Arrays;
4
 import java.util.Arrays;
5
 import java.util.List;
5
 import java.util.List;
6
+import java.util.Collections;
6
 
7
 
7
 import static org.junit.Assert.assertEquals;
8
 import static org.junit.Assert.assertEquals;
8
 
9
 
103
     @Test
104
     @Test
104
     public void isAllergicToJustEggs() {
105
     public void isAllergicToJustEggs() {
105
         Allergies allergies = new Allergies(1);
106
         Allergies allergies = new Allergies(1);
106
-        List<Allergen> expectedAllergens = Arrays.asList(new Allergen[]{Allergen.EGGS});
107
+        List<Allergen> expectedAllergens = Collections.singletonList(Allergen.EGGS);
107
 
108
 
108
         assertEquals(expectedAllergens, allergies.getList());
109
         assertEquals(expectedAllergens, allergies.getList());
109
     }
110
     }
112
     @Test
113
     @Test
113
     public void isAllergicToJustPeanuts() {
114
     public void isAllergicToJustPeanuts() {
114
         Allergies allergies = new Allergies(2);
115
         Allergies allergies = new Allergies(2);
115
-        List<Allergen> expectedAllergens = Arrays.asList(new Allergen[]{Allergen.PEANUTS});
116
+        List<Allergen> expectedAllergens = Collections.singletonList(Allergen.PEANUTS);
116
 
117
 
117
         assertEquals(expectedAllergens, allergies.getList());
118
         assertEquals(expectedAllergens, allergies.getList());
118
     }
119
     }
121
     @Test
122
     @Test
122
     public void isAllergicToJustStrawberries() {
123
     public void isAllergicToJustStrawberries() {
123
         Allergies allergies = new Allergies(8);
124
         Allergies allergies = new Allergies(8);
124
-        List<Allergen> expectedAllergens = Arrays.asList(new Allergen[]{Allergen.STRAWBERRIES});
125
+        List<Allergen> expectedAllergens = Collections.singletonList(Allergen.STRAWBERRIES);
125
 
126
 
126
         assertEquals(expectedAllergens, allergies.getList());
127
         assertEquals(expectedAllergens, allergies.getList());
127
     }
128
     }
130
     @Test
131
     @Test
131
     public void isAllergicToEggsAndPeanuts() {
132
     public void isAllergicToEggsAndPeanuts() {
132
         Allergies allergies = new Allergies(3);
133
         Allergies allergies = new Allergies(3);
133
-        List<Allergen> expectedAllergens = Arrays.asList(new Allergen[]{
134
+        List<Allergen> expectedAllergens = Arrays.asList(
134
                 Allergen.EGGS,
135
                 Allergen.EGGS,
135
                 Allergen.PEANUTS
136
                 Allergen.PEANUTS
136
-        });
137
+        );
137
 
138
 
138
         assertEquals(expectedAllergens, allergies.getList());
139
         assertEquals(expectedAllergens, allergies.getList());
139
     }
140
     }
142
     @Test
143
     @Test
143
     public void isAllergicToEggsAndShellfish() {
144
     public void isAllergicToEggsAndShellfish() {
144
         Allergies allergies = new Allergies(5);
145
         Allergies allergies = new Allergies(5);
145
-        List<Allergen> expectedAllergens = Arrays.asList(new Allergen[]{
146
+        List<Allergen> expectedAllergens = Arrays.asList(
146
                 Allergen.EGGS,
147
                 Allergen.EGGS,
147
                 Allergen.SHELLFISH
148
                 Allergen.SHELLFISH
148
-        });
149
+        );
149
 
150
 
150
         assertEquals(expectedAllergens, allergies.getList());
151
         assertEquals(expectedAllergens, allergies.getList());
151
     }
152
     }
154
     @Test
155
     @Test
155
     public void isAllergicToLotsOfStuff() {
156
     public void isAllergicToLotsOfStuff() {
156
         Allergies allergies = new Allergies(248);
157
         Allergies allergies = new Allergies(248);
157
-        List<Allergen> expectedAllergens = Arrays.asList(new Allergen[]{
158
+        List<Allergen> expectedAllergens = Arrays.asList(
158
                 Allergen.STRAWBERRIES,
159
                 Allergen.STRAWBERRIES,
159
                 Allergen.TOMATOES,
160
                 Allergen.TOMATOES,
160
                 Allergen.CHOCOLATE,
161
                 Allergen.CHOCOLATE,
161
                 Allergen.POLLEN,
162
                 Allergen.POLLEN,
162
                 Allergen.CATS
163
                 Allergen.CATS
163
-        });
164
+        );
164
 
165
 
165
         assertEquals(expectedAllergens, allergies.getList());
166
         assertEquals(expectedAllergens, allergies.getList());
166
     }
167
     }
169
     @Test
170
     @Test
170
     public void isAllergicToEverything() {
171
     public void isAllergicToEverything() {
171
         Allergies allergies = new Allergies(255);
172
         Allergies allergies = new Allergies(255);
172
-        List<Allergen> expectedAllergens = Arrays.asList(new Allergen[]{
173
+        List<Allergen> expectedAllergens = Arrays.asList(
173
                 Allergen.EGGS,
174
                 Allergen.EGGS,
174
                 Allergen.PEANUTS,
175
                 Allergen.PEANUTS,
175
                 Allergen.SHELLFISH,
176
                 Allergen.SHELLFISH,
178
                 Allergen.CHOCOLATE,
179
                 Allergen.CHOCOLATE,
179
                 Allergen.POLLEN,
180
                 Allergen.POLLEN,
180
                 Allergen.CATS
181
                 Allergen.CATS
181
-        });
182
+        );
182
 
183
 
183
         assertEquals(expectedAllergens, allergies.getList());
184
         assertEquals(expectedAllergens, allergies.getList());
184
     }
185
     }
187
     @Test
188
     @Test
188
     public void ignoreNonAllergenScoreParts() {
189
     public void ignoreNonAllergenScoreParts() {
189
         Allergies allergies = new Allergies(509);
190
         Allergies allergies = new Allergies(509);
190
-        List<Allergen> expectedAllergens = Arrays.asList(new Allergen[]{
191
+        List<Allergen> expectedAllergens = Arrays.asList(
191
                 Allergen.EGGS,
192
                 Allergen.EGGS,
192
                 Allergen.SHELLFISH,
193
                 Allergen.SHELLFISH,
193
                 Allergen.STRAWBERRIES,
194
                 Allergen.STRAWBERRIES,
195
                 Allergen.CHOCOLATE,
196
                 Allergen.CHOCOLATE,
196
                 Allergen.POLLEN,
197
                 Allergen.POLLEN,
197
                 Allergen.CATS
198
                 Allergen.CATS
198
-        });
199
+        );
199
 
200
 
200
         assertEquals(expectedAllergens, allergies.getList());
201
         assertEquals(expectedAllergens, allergies.getList());
201
     }
202
     }