Skip to content

Commit 2404ca3

Browse files
BlockoSBlockoS
committed
Fix output unit test
1 parent 4c8d09e commit 2404ca3

File tree

1 file changed

+37
-40
lines changed

1 file changed

+37
-40
lines changed

‎test/output.c

+37-40
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,13 @@ MunitResult output_char_test(const MunitParameter params[] __attribute__((unused
6363
munit_assert_true(output_char(&output, '@'));
6464
munit_assert_size(1, ==, output.column);
6565
munit_assert_size(0, ==, output.line);
66-
munit_assert_char('@', ==, g_buffer[0]);
6766

6867
munit_assert_true(output_char(&output, '='));
6968
munit_assert_size(2, ==, output.column);
7069
munit_assert_size(0, ==, output.line);
70+
71+
fflush(output.stream);
72+
munit_assert_char('@', ==, g_buffer[0]);
7173
munit_assert_char('=', ==, g_buffer[1]);
7274

7375
return MUNIT_OK;
@@ -84,16 +86,18 @@ MunitResult output_newline_test(const MunitParameter params[] __attribute__((unu
8486
munit_assert_true(output_newline(&output));
8587
munit_assert_size(0, ==, output.column);
8688
munit_assert_size(1, ==, output.line);
87-
munit_assert_char('\n', ==, g_buffer[0]);
8889

8990
munit_assert_true(output_char(&output, '+'));
9091
munit_assert_size(1, ==, output.column);
9192
munit_assert_size(1, ==, output.line);
92-
munit_assert_char('+', ==, g_buffer[1]);
9393

9494
munit_assert_true(output_newline(&output));
9595
munit_assert_size(0, ==, output.column);
9696
munit_assert_size(2, ==, output.line);
97+
98+
fflush(output.stream);
99+
munit_assert_char('\n', ==, g_buffer[0]);
100+
munit_assert_char('+', ==, g_buffer[1]);
97101
munit_assert_char('\n', ==, g_buffer[2]);
98102

99103
return MUNIT_OK;
@@ -105,7 +109,7 @@ MunitResult output_string_test(const MunitParameter params[] __attribute__((unus
105109
.stream = (FILE*)fixture
106110
};
107111

108-
const char *expected = "this is a test\nfoobar";
112+
const char expected[] = "this is a test\nfoobar";
109113

110114
munit_assert_not_null(output.stream);
111115

@@ -123,9 +127,8 @@ MunitResult output_string_test(const MunitParameter params[] __attribute__((unus
123127
munit_assert_size(6, ==, output.column);
124128
munit_assert_size(1, ==, output.line);
125129

126-
fputc('\0', output.stream);
127-
128-
munit_assert_string_equal(expected, g_buffer);
130+
fflush(output.stream);
131+
munit_assert_memory_equal(sizeof(expected)-1, expected, g_buffer);
129132

130133
return MUNIT_OK;
131134
}
@@ -136,7 +139,7 @@ MunitResult output_inline_comment_test(const MunitParameter params[] __attribute
136139
.stream = (FILE*)fixture
137140
};
138141

139-
const char *expected =
142+
const char expected[] =
140143
"[^_^] ; line#0\n"
141144
" ; line#1\n"
142145
" ; line#2";
@@ -153,15 +156,12 @@ MunitResult output_inline_comment_test(const MunitParameter params[] __attribute
153156
munit_assert_size(5, ==, output.column);
154157
munit_assert_size(0, ==, output.line);
155158

156-
munit_assert_memory_equal(output.column, expected, g_buffer);
157-
158159
munit_assert_true(output_inline_comment(&output, "line#0\nline#1\nline#2"));
159160
munit_assert_size(88, ==, output.column);
160161
munit_assert_size(2, ==, output.line);
161162

162-
fputc('\0', output.stream);
163-
164-
munit_assert_string_equal(expected, g_buffer);
163+
fflush(output.stream);
164+
munit_assert_memory_equal(sizeof(expected)-1, expected, g_buffer);
165165

166166
return MUNIT_OK;
167167
}
@@ -172,7 +172,7 @@ MunitResult output_comment_test(const MunitParameter params[] __attribute__((unu
172172
.stream = (FILE*)fixture
173173
};
174174

175-
const char *expected =
175+
const char expected[] =
176176
"[^_^]\n"
177177
"; line#0\n"
178178
"; line#1\n"
@@ -190,17 +190,14 @@ MunitResult output_comment_test(const MunitParameter params[] __attribute__((unu
190190
munit_assert_size(5, ==, output.column);
191191
munit_assert_size(0, ==, output.line);
192192

193-
munit_assert_memory_equal(output.column, expected, g_buffer);
194-
195193
munit_assert_true(output_newline(&output));
196194

197195
munit_assert_true(output_comment(&output, "line#0\nline#1\nline#2"));
198196
munit_assert_size(0, ==, output.column);
199197
munit_assert_size(4, ==, output.line);
200198

201-
fputc('\0', output.stream);
202-
203-
munit_assert_string_equal(expected, g_buffer);
199+
fflush(output.stream);
200+
munit_assert_memory_equal(sizeof(expected)-1, expected, g_buffer);
204201

205202
return MUNIT_OK;
206203
}
@@ -211,7 +208,7 @@ MunitResult output_comment_address_test(const MunitParameter params[] __attribut
211208
.stream = (FILE*)fixture
212209
};
213210

214-
const char *expected =
211+
const char expected[] =
215212
"[=_o] ; page: $000 logical: $e082\n"
216213
" ; page: $1a5 logical: $94c0";
217214

@@ -226,8 +223,6 @@ MunitResult output_comment_address_test(const MunitParameter params[] __attribut
226223
munit_assert_size(5, ==, output.column);
227224
munit_assert_size(0, ==, output.line);
228225

229-
munit_assert_memory_equal(output.column, expected, g_buffer);
230-
231226
munit_assert_true(output_address_comment(&output, 0x000, 0xE082));
232227
munit_assert_size(107, ==, output.column);
233228
munit_assert_size(0, ==, output.line);
@@ -239,10 +234,9 @@ MunitResult output_comment_address_test(const MunitParameter params[] __attribut
239234
munit_assert_size(107, ==, output.column);
240235
munit_assert_size(1, ==, output.line);
241236

242-
fputc('\0', output.stream);
243-
244-
munit_assert_string_equal(expected, g_buffer);
245-
237+
fflush(output.stream);
238+
munit_assert_memory_equal(sizeof(expected)-1, expected, g_buffer);
239+
246240
return MUNIT_OK;
247241
}
248242

@@ -266,7 +260,7 @@ MunitResult output_label_test(const MunitParameter params[] __attribute__((unuse
266260
}
267261
};
268262

269-
const char *expected =
263+
const char expected[] =
270264
"routine: ; page: $000 logical: $e082\n"
271265
"; function\n"
272266
"; do something\n"
@@ -284,10 +278,9 @@ MunitResult output_label_test(const MunitParameter params[] __attribute__((unuse
284278
munit_assert_size(107, ==, output.column);
285279
munit_assert_size(3, ==, output.line);
286280

287-
fputc('\0', output.stream);
288-
289-
munit_assert_string_equal(expected, g_buffer);
290-
281+
fflush(output.stream);
282+
munit_assert_memory_equal(sizeof(expected)-1, expected, g_buffer);
283+
291284
return MUNIT_OK;
292285
}
293286

@@ -307,6 +300,7 @@ MunitResult output_fill_to_test(const MunitParameter params[] __attribute__((unu
307300
munit_assert_size(60, ==, output.column);
308301
munit_assert_size(0, ==, output.line);
309302

303+
fflush(output.stream);
310304
for(size_t i=0; i<30; i++) {
311305
munit_assert_char('x', ==, g_buffer[i]);
312306
}
@@ -333,6 +327,7 @@ MunitResult output_fill_n_test(const MunitParameter params[] __attribute__((unus
333327
munit_assert_size(17, ==, output.column);
334328
munit_assert_size(0, ==, output.line);
335329

330+
fflush(output.stream);
336331
for(size_t i=0; i<10; i++) {
337332
munit_assert_char('.', ==, g_buffer[i]);
338333
}
@@ -349,32 +344,32 @@ MunitResult output_byte_test(const MunitParameter params[] __attribute__((unused
349344
.stream = (FILE*)fixture
350345
};
351346

347+
const char expected[] = "e79a05c000";
348+
352349
munit_assert_not_null(output.stream);
353350

354351
munit_assert_true(output_byte(&output, 0xE7));
355352
munit_assert_size(2, ==, output.column);
356353
munit_assert_size(0, ==, output.line);
357-
munit_assert_memory_equal(2, "e7", &g_buffer[0]);
358354

359355
munit_assert_true(output_byte(&output, 0x9A));
360356
munit_assert_size(4, ==, output.column);
361357
munit_assert_size(0, ==, output.line);
362-
munit_assert_memory_equal(2, "9a", &g_buffer[2]);
363358

364359
munit_assert_true(output_byte(&output, 0x05));
365360
munit_assert_size(6, ==, output.column);
366361
munit_assert_size(0, ==, output.line);
367-
munit_assert_memory_equal(2, "05", &g_buffer[4]);
368362

369363
munit_assert_true(output_byte(&output, 0xC0));
370364
munit_assert_size(8, ==, output.column);
371365
munit_assert_size(0, ==, output.line);
372-
munit_assert_memory_equal(2, "c0", &g_buffer[6]);
373-
366+
374367
munit_assert_true(output_byte(&output, 0x00));
375368
munit_assert_size(10, ==, output.column);
376369
munit_assert_size(0, ==, output.line);
377-
munit_assert_memory_equal(2, "00", &g_buffer[8]);
370+
371+
fflush(output.stream);
372+
munit_assert_memory_equal(sizeof(expected)-1, expected, g_buffer);
378373

379374
return MUNIT_OK;
380375
}
@@ -385,22 +380,24 @@ MunitResult output_word_test(const MunitParameter params[] __attribute__((unused
385380
.stream = (FILE*)fixture
386381
};
387382

383+
const char expected[] = "a45c07010000";
384+
388385
munit_assert_not_null(output.stream);
389386

390387
munit_assert_true(output_word(&output, 0xA45C));
391388
munit_assert_size(4, ==, output.column);
392389
munit_assert_size(0, ==, output.line);
393-
munit_assert_memory_equal(4, "a45c", &g_buffer[0]);
394390

395391
munit_assert_true(output_word(&output, 0x0701));
396392
munit_assert_size(8, ==, output.column);
397393
munit_assert_size(0, ==, output.line);
398-
munit_assert_memory_equal(4, "0701", &g_buffer[4]);
399394

400395
munit_assert_true(output_word(&output, 0x0000));
401396
munit_assert_size(12, ==, output.column);
402397
munit_assert_size(0, ==, output.line);
403-
munit_assert_memory_equal(4, "0000", &g_buffer[8]);
398+
399+
fflush(output.stream);
400+
munit_assert_memory_equal(sizeof(expected)-1, expected, g_buffer);
404401

405402
return MUNIT_OK;
406403
}

0 commit comments

Comments
 (0)