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