From dd2dbe6a83dfc0ce7e071a87e4b031a2d8fc8e47 Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Wed, 18 Sep 2019 13:13:05 +0200 Subject: [PATCH] test/flash_tlv: fix test and add to test suite --- test/Makefile | 2 +- test/flash_tlv/tlv_le_test.c | 35 +++++++++++++++++++++-------------- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/test/Makefile b/test/Makefile index ebf1ae836..6ac0ae8bd 100644 --- a/test/Makefile +++ b/test/Makefile @@ -10,6 +10,7 @@ SUBDIRS = \ btstack_link_key_db \ crypto \ des_iterator \ + flash_tlv \ gatt_client \ hfp \ hid_parser \ @@ -23,7 +24,6 @@ SUBDIRS = \ # test fails -# flash_tlv \ # map_test \ # mesh \ # sdp \ diff --git a/test/flash_tlv/tlv_le_test.c b/test/flash_tlv/tlv_le_test.c index a0c4c3646..b7af63e93 100644 --- a/test/flash_tlv/tlv_le_test.c +++ b/test/flash_tlv/tlv_le_test.c @@ -68,50 +68,57 @@ TEST(LE_DEVICE_DB, Empty){ } TEST(LE_DEVICE_DB, AddOne){ - le_device_db_add(BD_ADDR_TYPE_LE_PUBLIC, addr_aa, sm_key_aa); + int index = le_device_db_add(BD_ADDR_TYPE_LE_PUBLIC, addr_aa, sm_key_aa); + CHECK_TRUE(index >= 0); CHECK_EQUAL(1, le_device_db_count()); } TEST(LE_DEVICE_DB, RetrieveOne){ - le_device_db_add(BD_ADDR_TYPE_LE_PUBLIC, addr_aa, sm_key_aa); + int index = le_device_db_add(BD_ADDR_TYPE_LE_PUBLIC, addr_aa, sm_key_aa); + CHECK_TRUE(index >= 0); CHECK_EQUAL(1, le_device_db_count()); bd_addr_t addr; sm_key_t sm_key; int addr_type; - le_device_db_info(0, &addr_type, addr, sm_key); + le_device_db_info((uint16_t) index, &addr_type, addr, sm_key); CHECK_EQUAL_ARRAY(sm_key_aa, sm_key, 16); CHECK_EQUAL_ARRAY(addr_aa, addr, 6); } -TEST(LE_DEVICE_DB, AddOTwo){ +TEST(LE_DEVICE_DB, AddTwo){ le_device_db_add(BD_ADDR_TYPE_LE_PUBLIC, addr_aa, sm_key_aa); le_device_db_add(BD_ADDR_TYPE_LE_PUBLIC, addr_bb, sm_key_bb); CHECK_EQUAL(2, le_device_db_count()); } TEST(LE_DEVICE_DB, AddOTwoRemoveOne){ - le_device_db_add(BD_ADDR_TYPE_LE_PUBLIC, addr_aa, sm_key_aa); - le_device_db_add(BD_ADDR_TYPE_LE_PUBLIC, addr_bb, sm_key_bb); - le_device_db_remove(0); + int index_a = le_device_db_add(BD_ADDR_TYPE_LE_PUBLIC, addr_aa, sm_key_aa); + CHECK_TRUE(index_a >= 0); + int index_b = le_device_db_add(BD_ADDR_TYPE_LE_PUBLIC, addr_bb, sm_key_bb); + CHECK_TRUE(index_b >= 0); + le_device_db_remove((uint16_t) index_a); CHECK_EQUAL(1, le_device_db_count()); bd_addr_t addr; sm_key_t sm_key; int addr_type; - le_device_db_info(1, &addr_type, addr, sm_key); + le_device_db_info((uint16_t) index_b, &addr_type, addr, sm_key); CHECK_EQUAL_ARRAY(sm_key_bb, sm_key, 16); CHECK_EQUAL_ARRAY(addr_bb, addr, 6); } -TEST(LE_DEVICE_DB, AddOTwoRemoveOneAddOne){ - le_device_db_add(BD_ADDR_TYPE_LE_PUBLIC, addr_aa, sm_key_aa); - le_device_db_add(BD_ADDR_TYPE_LE_PUBLIC, addr_bb, sm_key_bb); - le_device_db_remove(0); - le_device_db_add(BD_ADDR_TYPE_LE_PUBLIC, addr_cc, sm_key_cc); +TEST(LE_DEVICE_DB, AddTwoRemoveOneAddOne){ + int index_a = le_device_db_add(BD_ADDR_TYPE_LE_PUBLIC, addr_aa, sm_key_aa); + CHECK_TRUE(index_a >= 0); + int index_b = le_device_db_add(BD_ADDR_TYPE_LE_PUBLIC, addr_bb, sm_key_bb); + CHECK_TRUE(index_b >= 0); + le_device_db_remove((uint16_t) index_a); + int index_c = le_device_db_add(BD_ADDR_TYPE_LE_PUBLIC, addr_cc, sm_key_cc); + CHECK_TRUE(index_c >= 0); CHECK_EQUAL(2, le_device_db_count()); bd_addr_t addr; sm_key_t sm_key; int addr_type; - le_device_db_info(0, &addr_type, addr, sm_key); + le_device_db_info((uint16_t) index_c, &addr_type, addr, sm_key); CHECK_EQUAL_ARRAY(sm_key_cc, sm_key, 16); CHECK_EQUAL_ARRAY(addr_cc, addr, 6); }