mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

memblockq-test: Some refactoring

Browse source 
- Set the loglevel once in the main entry code instead of in each test function.
 - Check pool allocation succeeded.
 - Reduce code by using utility function to allocate chunks.
 - Improve coverage by using utility function to validate queue invariants.
This commit is contained in:
Ulrich Eckhardt 2016-05-19 20:00:46 +02:00 • committed by Arun Raghavan
parent 37b0ce0333
commit a295cb87cf
1 changed files with 16 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/tests/memblockq-test.c
View file

@ -204,42 +204,21 @@ START_TEST (memblockq_test) {
.channels = 1 .channels = 1
}; };
pa_log_set_level(PA_LOG_DEBUG);
p = pa_mempool_new(PA_MEM_TYPE_PRIVATE, 0, true); p = pa_mempool_new(PA_MEM_TYPE_PRIVATE, 0, true);
ck_assert_ptr_ne(p, NULL);
silence.memblock = pa_memblock_new_fixed(p, (char*) "__", 2, 1); silence = memchunk_from_str(p, "__");
fail_unless(silence.memblock != NULL);
silence.index = 0;
silence.length = pa_memblock_get_length(silence.memblock);
bq = pa_memblockq_new("test memblockq", 0, 200, 10, &ss, 4, 4, 40, &silence); bq = pa_memblockq_new("test memblockq", 0, 200, 10, &ss, 4, 4, 40, &silence);
fail_unless(bq != NULL); fail_unless(bq != NULL);
check_queue_invariants(bq);
chunk1.memblock = pa_memblock_new_fixed(p, (char*) "11", 2, 1); chunk1 = memchunk_from_str(p, "11");
fail_unless(chunk1.memblock != NULL); chunk2 = memchunk_from_str(p, "XX22");
chunk2.index += 2;
chunk1.index = 0; chunk2.length -= 2;
chunk1.length = 2; chunk3 = memchunk_from_str(p, "3333");
chunk4 = memchunk_from_str(p, "44444444");
chunk2.memblock = pa_memblock_new_fixed(p, (char*) "XX22", 4, 1);
fail_unless(chunk2.memblock != NULL);
chunk2.index = 2;
chunk2.length = 2;
chunk3.memblock = pa_memblock_new_fixed(p, (char*) "3333", 4, 1);
fail_unless(chunk3.memblock != NULL);
chunk3.index = 0;
chunk3.length = 4;
chunk4.memblock = pa_memblock_new_fixed(p, (char*) "44444444", 8, 1);
fail_unless(chunk4.memblock != NULL);
chunk4.index = 0;
chunk4.length = 8;
ret = pa_memblockq_push(bq, &chunk1); ret = pa_memblockq_push(bq, &chunk1);
fail_unless(ret == 0); fail_unless(ret == 0);
@ -253,6 +232,8 @@ START_TEST (memblockq_test) {
ret = pa_memblockq_push(bq, &chunk4); ret = pa_memblockq_push(bq, &chunk4);
fail_unless(ret == 0); fail_unless(ret == 0);
check_queue_invariants(bq);
pa_memblockq_seek(bq, -6, 0, true); pa_memblockq_seek(bq, -6, 0, true);
ret = pa_memblockq_push(bq, &chunk3); ret = pa_memblockq_push(bq, &chunk3);
fail_unless(ret == 0); fail_unless(ret == 0);
@ -299,6 +280,8 @@ START_TEST (memblockq_test) {
dump(bq, 1); dump(bq, 1);
check_queue_invariants(bq);
pa_memblockq_free(bq); pa_memblockq_free(bq);
pa_memblock_unref(silence.memblock); pa_memblock_unref(silence.memblock);
pa_memblock_unref(chunk1.memblock); pa_memblock_unref(chunk1.memblock);
@ -395,6 +378,9 @@ int main(int argc, char *argv[]) {
TCase *tc; TCase *tc;
SRunner *sr; SRunner *sr;
if (!getenv("MAKE_CHECK"))
pa_log_set_level(PA_LOG_DEBUG);
s = suite_create("Memblock Queue"); s = suite_create("Memblock Queue");
tc = tcase_create("memblockq"); tc = tcase_create("memblockq");
tcase_add_test(tc, memchunk_from_str_test); tcase_add_test(tc, memchunk_from_str_test);