From 93a31738e212cb05458fd100e6b55642f2daed17 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 25 Sep 2018 12:37:45 +0200 Subject: [PATCH] lib/generic/queue: add some tests --- lib/generic/queue.h | 2 -- tests/test_queue.c | 65 +++++++++++++++++++++++++++++++++++++++++++++ tests/unit.mk | 11 ++++---- 3 files changed, 71 insertions(+), 7 deletions(-) create mode 100644 tests/test_queue.c diff --git a/lib/generic/queue.h b/lib/generic/queue.h index 7fcbccc7f..a93ebdeb0 100644 --- a/lib/generic/queue.h +++ b/lib/generic/queue.h @@ -17,8 +17,6 @@ * @file queue.h * @brief A queue, usable for FIFO and LIFO simultaneously. * - * FIXME: unit tests - * * Both the head and tail of the queue can be accessed and pushed to, * but only the head can be popped from. * diff --git a/tests/test_queue.c b/tests/test_queue.c new file mode 100644 index 000000000..547adb96b --- /dev/null +++ b/tests/test_queue.c @@ -0,0 +1,65 @@ +/* Copyright (C) 2018 CZ.NIC, z.s.p.o. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + */ + +#include "tests/test.h" +#include "lib/generic/queue.h" + +/* The main intention is to use queues with pointers, so we test the same-sized int. */ +typedef queue_t(ptrdiff_t) queue_int_t; + +static void test_int(void **state_) +{ + queue_int_t q; + queue_init(q); + + queue_push_head(q, 2); + queue_push_head(q, 1); + queue_push_head(q, 0); + for (int i = 0; i < 100; ++i) { + assert_int_equal(queue_head(q), i); + queue_push(q, i + 3); + queue_pop(q); + } + assert_int_equal(queue_len(q), 3); + for (int i = 99; i > 0; --i) { + assert_int_equal(queue_head(q), i + 1); + queue_push_head(q, i); + } + assert_int_equal(queue_len(q), 3 + 99); + + queue_deinit(q); + queue_init(q); + + for (int i = 0; i < 100; ++i) { + queue_push(q, 2*i); + queue_push(q, 2*i + 1); + assert_int_equal(queue_head(q), i); + queue_pop(q); + } + + queue_deinit(q); +} + + +int main(void) +{ + const UnitTest tests[] = { + unit_test(test_int), + }; + + return run_tests(tests); +} + diff --git a/tests/unit.mk b/tests/unit.mk index df3b878fa..8ff93582c 100644 --- a/tests/unit.mk +++ b/tests/unit.mk @@ -3,15 +3,16 @@ # tests_BIN := \ - test_set \ - test_map \ test_array \ - test_pack \ test_lru \ - test_utils \ + test_map \ test_module \ + test_pack \ + test_queue \ + test_rplan \ + test_set \ + test_utils \ test_zonecut \ - test_rplan #test_cache TODO: re-consider how best to test cache mock_cmodule_CFLAGS := -fPIC -- 2.47.3