Skip to content

Commit e04ca76

Browse files
JasperGeurtzJasperGeurtz
committed
add test to ensure colors dont breaka again
1 parent 9dd1679 commit e04ca76

File tree

2 files changed

+269
-10
lines changed

2 files changed

+269
-10
lines changed

‎src/main/java/bwapi/Color.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,9 @@ private static int getBestIdFor(final int red, final int green, final int blue)
133133
if (p.rgbReserved != 0) {
134134
continue;
135135
}
136-
final int r = red - (int) p.rgbRed;
137-
final int g = green - (int) p.rgbGreen;
138-
final int b = blue - (int) p.rgbBlue;
136+
final int r = red - p.rgbRed;
137+
final int g = green - p.rgbGreen;
138+
final int b = blue - p.rgbBlue;
139139

140140
final int distance = r * r + g * g + b * b;
141141
if (distance < min_dist) {

‎src/test/java/bwapi/ColorTest.java‎

Lines changed: 266 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,272 @@
66

77
public class ColorTest {
88

9-
@Test
10-
public void checkBlackColor() {
11-
Color c = Color.Black;
12-
assertEquals(0, c.red());
13-
assertEquals(0, c.green());
14-
assertEquals(0, c.blue());
9+
private static int[][] colors = {
10+
{0, 0, 0},
11+
{0, 0, 0},
12+
{0, 0, 0},
13+
{0, 0, 0},
14+
{0, 0, 0},
15+
{0, 0, 0},
16+
{0, 0, 0},
17+
{0, 0, 0},
18+
{0, 0, 0},
19+
{0, 0, 0},
20+
{0, 0, 0},
21+
{0, 0, 0},
22+
{0, 0, 0},
23+
{0, 0, 0},
24+
{0, 0, 0},
25+
{0, 0, 0},
26+
{24, 36, 44},
27+
{72, 36, 20},
28+
{92, 44, 20},
29+
{112, 48, 20},
30+
{104, 60, 36},
31+
{124, 64, 24},
32+
{120, 76, 44},
33+
{168, 8, 8},
34+
{140, 84, 48},
35+
{132, 96, 68},
36+
{160, 84, 28},
37+
{196, 76, 24},
38+
{188, 104, 36},
39+
{180, 112, 60},
40+
{208, 100, 32},
41+
{220, 148, 52},
42+
{224, 148, 84},
43+
{236, 196, 84},
44+
{52, 68, 40},
45+
{64, 108, 60},
46+
{72, 108, 80},
47+
{76, 128, 80},
48+
{80, 140, 92},
49+
{92, 160, 120},
50+
{0, 0, 24},
51+
{0, 16, 52},
52+
{0, 8, 80},
53+
{36, 52, 72},
54+
{48, 64, 84},
55+
{20, 52, 124},
56+
{52, 76, 108},
57+
{64, 88, 116},
58+
{72, 104, 140},
59+
{0, 112, 156},
60+
{88, 128, 164},
61+
{64, 104, 212},
62+
{24, 172, 184},
63+
{36, 36, 252},
64+
{100, 148, 188},
65+
{112, 168, 204},
66+
{140, 192, 216},
67+
{148, 220, 244},
68+
{172, 220, 232},
69+
{172, 252, 252},
70+
{204, 248, 248},
71+
{252, 252, 0},
72+
{244, 228, 144},
73+
{252, 252, 192},
74+
{12, 12, 12},
75+
{24, 20, 16},
76+
{28, 28, 32},
77+
{40, 40, 48},
78+
{56, 48, 36},
79+
{56, 60, 68},
80+
{76, 64, 48},
81+
{76, 76, 76},
82+
{92, 80, 64},
83+
{88, 88, 88},
84+
{104, 104, 104},
85+
{120, 132, 108},
86+
{104, 148, 108},
87+
{116, 164, 124},
88+
{152, 148, 140},
89+
{144, 184, 148},
90+
{152, 196, 168},
91+
{176, 176, 176},
92+
{172, 204, 176},
93+
{196, 192, 188},
94+
{204, 224, 208},
95+
{240, 240, 240},
96+
{28, 16, 8},
97+
{40, 24, 12},
98+
{52, 16, 8},
99+
{52, 32, 12},
100+
{56, 16, 32},
101+
{52, 40, 32},
102+
{68, 52, 8},
103+
{72, 48, 24},
104+
{96, 0, 0},
105+
{84, 40, 32},
106+
{80, 64, 20},
107+
{92, 84, 20},
108+
{132, 4, 4},
109+
{104, 76, 52},
110+
{124, 56, 48},
111+
{112, 100, 32},
112+
{124, 80, 80},
113+
{164, 52, 28},
114+
{148, 108, 0},
115+
{152, 92, 64},
116+
{140, 128, 52},
117+
{152, 116, 84},
118+
{184, 84, 68},
119+
{176, 144, 24},
120+
{176, 116, 92},
121+
{244, 4, 4},
122+
{200, 120, 84},
123+
{252, 104, 84},
124+
{224, 164, 132},
125+
{252, 148, 104},
126+
{252, 204, 44},
127+
{16, 252, 24},
128+
{12, 0, 32},
129+
{28, 28, 44},
130+
{36, 36, 76},
131+
{40, 44, 104},
132+
{44, 48, 132},
133+
{32, 24, 184},
134+
{52, 60, 172},
135+
{104, 104, 148},
136+
{100, 144, 252},
137+
{124, 172, 252},
138+
{0, 228, 252},
139+
{156, 144, 64},
140+
{168, 148, 84},
141+
{188, 164, 92},
142+
{204, 184, 96},
143+
{232, 216, 128},
144+
{236, 196, 176},
145+
{252, 252, 56},
146+
{252, 252, 124},
147+
{252, 252, 164},
148+
{8, 8, 8},
149+
{16, 16, 16},
150+
{24, 24, 24},
151+
{40, 40, 40},
152+
{52, 52, 52},
153+
{76, 60, 56},
154+
{68, 68, 68},
155+
{72, 72, 88},
156+
{88, 88, 104},
157+
{116, 104, 56},
158+
{120, 100, 92},
159+
{96, 96, 124},
160+
{132, 116, 116},
161+
{132, 132, 156},
162+
{172, 140, 124},
163+
{172, 152, 148},
164+
{144, 144, 184},
165+
{184, 184, 232},
166+
{248, 140, 20},
167+
{16, 84, 60},
168+
{32, 144, 112},
169+
{44, 180, 148},
170+
{4, 32, 100},
171+
{72, 28, 80},
172+
{8, 52, 152},
173+
{104, 48, 120},
174+
{136, 64, 156},
175+
{12, 72, 204},
176+
{188, 184, 52},
177+
{220, 220, 60},
178+
{16, 0, 0},
179+
{36, 0, 0},
180+
{52, 0, 0},
181+
{72, 0, 0},
182+
{96, 24, 4},
183+
{140, 40, 8},
184+
{200, 24, 24},
185+
{224, 44, 44},
186+
{232, 32, 32},
187+
{232, 80, 20},
188+
{252, 32, 32},
189+
{232, 120, 36},
190+
{248, 172, 60},
191+
{0, 20, 0},
192+
{0, 40, 0},
193+
{0, 68, 0},
194+
{0, 100, 0},
195+
{8, 128, 8},
196+
{36, 152, 36},
197+
{60, 156, 60},
198+
{88, 176, 88},
199+
{104, 184, 104},
200+
{128, 196, 128},
201+
{148, 212, 148},
202+
{12, 20, 36},
203+
{36, 60, 100},
204+
{48, 80, 132},
205+
{56, 92, 148},
206+
{72, 116, 180},
207+
{84, 132, 196},
208+
{96, 148, 212},
209+
{120, 180, 236},
210+
{0, 0, 0},
211+
{0, 0, 0},
212+
{0, 0, 0},
213+
{0, 0, 0},
214+
{0, 0, 0},
215+
{0, 0, 0},
216+
{0, 0, 0},
217+
{0, 0, 0},
218+
{0, 0, 0},
219+
{0, 0, 0},
220+
{0, 0, 0},
221+
{0, 0, 0},
222+
{0, 0, 0},
223+
{0, 0, 0},
224+
{0, 0, 0},
225+
{0, 0, 0},
226+
{0, 0, 0},
227+
{0, 0, 0},
228+
{0, 0, 0},
229+
{0, 0, 0},
230+
{0, 0, 0},
231+
{0, 0, 0},
232+
{0, 0, 0},
233+
{0, 0, 0},
234+
{0, 0, 0},
235+
{0, 0, 0},
236+
{0, 0, 0},
237+
{0, 0, 0},
238+
{0, 0, 0},
239+
{0, 0, 0},
240+
{0, 0, 0},
241+
{0, 0, 0},
242+
{0, 0, 0},
243+
{0, 0, 0},
244+
{0, 0, 0},
245+
{0, 0, 0},
246+
{0, 0, 0},
247+
{0, 0, 0},
248+
{0, 0, 0},
249+
{0, 0, 0},
250+
{0, 0, 0},
251+
{0, 0, 0},
252+
{0, 0, 0},
253+
{0, 0, 0},
254+
{0, 0, 0},
255+
{0, 0, 0},
256+
{0, 0, 0},
257+
{0, 0, 0},
258+
{0, 0, 0},
259+
{0, 0, 0},
260+
{0, 0, 0},
261+
{0, 0, 0},
262+
{0, 0, 0},
263+
{0, 0, 0},
264+
{0, 0, 0},
265+
{255, 255, 255}
266+
};
15267

16-
assertEquals(new Color(0, 0,0 ), c);
268+
@Test
269+
public void checkAllColors() {
270+
for (int id=0; id < 256; id++) {
271+
Color c = new Color(id);
272+
assertEquals(colors[id][0], c.red());
273+
assertEquals(colors[id][1], c.green());
274+
assertEquals(colors[id][2], c.blue());
275+
}
17276
}
18277
}

0 commit comments

Comments
 (0)