From bab13b64a1c738e204f811d62b65c722f7d0b8c9 Mon Sep 17 00:00:00 2001 From: Milanka Ringwald Date: Fri, 22 Mar 2019 12:26:08 +0100 Subject: [PATCH] map_xml_test: extract functions for parsing messages, emit events --- test/map_client/map.h | 8 +- test/map_test/Makefile | 2 + test/map_test/map_xml_test.c | 176 ++++++++++++++++++++++++++++------- 3 files changed, 147 insertions(+), 39 deletions(-) diff --git a/test/map_client/map.h b/test/map_client/map.h index fdff3cf52..07bb6848c 100644 --- a/test/map_client/map.h +++ b/test/map_client/map.h @@ -47,8 +47,6 @@ extern "C" { /* API_START */ #define MAP_MAX_VALUE_LEN 32 -#define MAP_MAX_HANDLE_LEN 16 - #define MAP_MESSAGE_HANDLE_SIZE 8 /** * @brief MAP Message handle @@ -96,12 +94,12 @@ typedef enum { } map_feature_t; typedef struct { - char handle[MAP_MAX_HANDLE_LEN]; - char datetime[MAP_MAX_HANDLE_LEN]; + char handle[MAP_MESSAGE_HANDLE_SIZE]; + char datetime[MAP_MAX_VALUE_LEN]; char subject[MAP_MAX_VALUE_LEN]; char sender_name[MAP_MAX_VALUE_LEN]; - char sender_addressing[MAP_MAX_HANDLE_LEN]; + char sender_addressing[MAP_MAX_VALUE_LEN]; map_message_type_t type; diff --git a/test/map_test/Makefile b/test/map_test/Makefile index 688c534e8..31e86403a 100644 --- a/test/map_test/Makefile +++ b/test/map_test/Makefile @@ -20,6 +20,8 @@ CFLAGS += -I${BTSTACK_ROOT}/test/map_client COMMON = \ yxml.c \ + btstack_util.c \ + hci_dump.c \ COMMON_OBJ = $(COMMON:.c=.o) diff --git a/test/map_test/map_xml_test.c b/test/map_test/map_xml_test.c index ef2739cb6..c46f7b888 100644 --- a/test/map_test/map_xml_test.c +++ b/test/map_test/map_xml_test.c @@ -2,6 +2,10 @@ #include "CppUTest/CommandLineTestRunner.h" #include "yxml.h" #include "map.h" +#include "btstack_defines.h" +#include "btstack_util.h" +#include "btstack_debug.h" +#include "btstack_event.h" const static char * folders = "" @@ -29,10 +33,11 @@ const static char * messages = " " ""; -const char * expected_message_handles[] = { - "0400000000000002", - "0400000000000001" +const map_message_handle_t expected_message_handles[] = { + {4,0,0,0,0,0,0,2}, + {4,0,0,0,0,0,0,1} }; + const int num_expected_message_handles = 2; #if 0 @@ -63,24 +68,70 @@ const static char * message = /* xml parser */ static yxml_t xml_parser; static uint8_t xml_buffer[50]; +static int num_found_items; -TEST_GROUP(MAP_XML){ - void setup(void){ - printf("setup\n"); - yxml_init(&xml_parser, xml_buffer, sizeof(xml_buffer)); +static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size); + +static void CHECK_EQUAL_ARRAY(const uint8_t * expected, uint8_t * actual, int size){ + for (int i=0; i sizeof(event)) log_error("map_client_emit_folder_listing_item_event size %u", pos); + (*callback)(HCI_EVENT_PACKET, cid, &event[0], pos); +} + +static void map_client_emit_message_listing_item_event(btstack_packet_handler_t callback, uint16_t cid, map_message_handle_t message_handle){ + uint8_t event[7 + MAP_MESSAGE_HANDLE_SIZE]; + int pos = 0; + event[pos++] = HCI_EVENT_MAP_META; + pos++; // skip len + event[pos++] = MAP_SUBEVENT_MESSAGE_LISTING_ITEM; + little_endian_store_16(event,pos,cid); + pos+=2; + memcpy(event+pos, message_handle, MAP_MESSAGE_HANDLE_SIZE); + pos += MAP_MESSAGE_HANDLE_SIZE; + + event[1] = pos - 2; + if (pos > sizeof(event)) log_error("map_client_emit_message_listing_item_event size %u", pos); + (*callback)(HCI_EVENT_PACKET, cid, &event[0], pos); +} + +static void map_client_emit_parsing_done_event(btstack_packet_handler_t callback, uint16_t cid){ + uint8_t event[5]; + int pos = 0; + event[pos++] = HCI_EVENT_MAP_META; + pos++; // skip len + event[pos++] = MAP_SUBEVENT_PARSING_DONE; + little_endian_store_16(event,pos,cid); + pos += 2; + event[1] = pos - 2; + if (pos != sizeof(event)) log_error("map_client_emit_parsing_done_event size %u", pos); + (*callback)(HCI_EVENT_PACKET, cid, &event[0], pos); +} + +static void map_client_parse_folder_listing(btstack_packet_handler_t callback, uint16_t cid, const uint8_t * data, uint16_t data_len){ int folder_found = 0; int name_found = 0; char name[MAP_MAX_VALUE_LEN]; - int num_found_folders = 0; - + while (data_len--){ yxml_ret_t r = yxml_parse(&xml_parser, *data++); switch (r){ @@ -89,11 +140,7 @@ TEST(MAP_XML, Folders){ break; case YXML_ELEMEND: if (folder_found){ - if (num_found_folders < num_expected_folders){ - printf("Found folder \'%s\'\n", name); - STRCMP_EQUAL(name, expected_folders[num_found_folders]); - } - num_found_folders++; + map_client_emit_folder_listing_item_event(callback, cid, (uint8_t *) name, strlen(name)); } folder_found = 0; break; @@ -120,20 +167,24 @@ TEST(MAP_XML, Folders){ break; } } - CHECK_EQUAL(num_found_folders, num_expected_folders); + map_client_emit_parsing_done_event(callback, cid); } -TEST(MAP_XML, Messages){ - printf("Parse Messages\n"); +static void map_message_str_to_handle(const char * value, map_message_handle_t msg_handle){ + int i; + for (i = 0; i < MAP_MESSAGE_HANDLE_SIZE; i++) { + uint8_t upper_nibble = nibble_for_char(*value++); + uint8_t lower_nibble = nibble_for_char(*value++); + msg_handle[i] = (upper_nibble << 4) | lower_nibble; + } +} - const uint8_t * data = (const uint8_t *) messages; - uint16_t data_len = strlen(messages); - +static void map_client_parse_message_listing(btstack_packet_handler_t callback, uint16_t cid, const uint8_t * data, uint16_t data_len){ // now try parsing it int message_found = 0; int handle_found = 0; - char handle[MAP_MAX_HANDLE_LEN]; - int num_found_messages = 0; + char handle[MAP_MESSAGE_HANDLE_SIZE * 2]; + map_message_handle_t msg_handle; while (data_len--){ yxml_ret_t r = yxml_parse(&xml_parser, *data++); @@ -142,16 +193,17 @@ TEST(MAP_XML, Messages){ message_found = strcmp("msg", xml_parser.elem) == 0; break; case YXML_ELEMEND: - if (message_found){ - printf("Found handle \'%s\'\n\n", handle); - STRCMP_EQUAL(handle, expected_message_handles[num_found_messages]); - num_found_messages++; - } + if (!message_found) break; message_found = 0; + if (strlen(handle) != MAP_MESSAGE_HANDLE_SIZE * 2){ + log_info("message handle string length != 16"); + break; + } + map_message_str_to_handle(handle, msg_handle); + map_client_emit_message_listing_item_event(callback, cid, msg_handle); break; case YXML_ATTRSTART: if (!message_found) break; - printf("%s\n", xml_parser.attr); if (strcmp("handle", xml_parser.attr) == 0){ handle_found = 1; handle[0] = 0; @@ -160,6 +212,7 @@ TEST(MAP_XML, Messages){ break; case YXML_ATTRVAL: if (handle_found) { + strcat(handle, xml_parser.data); break; } @@ -171,7 +224,62 @@ TEST(MAP_XML, Messages){ break; } } - CHECK_EQUAL(num_found_messages, num_expected_message_handles); + map_client_emit_parsing_done_event(callback, cid); +} + +static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size){ + if (packet_type != HCI_EVENT_PACKET) return; + if (hci_event_packet_get_type(packet) != HCI_EVENT_MAP_META) return; + + char value[MAP_MAX_VALUE_LEN]; + int value_len; + memset(value, 0, MAP_MAX_VALUE_LEN); + + switch (hci_event_goep_meta_get_subevent_code(packet)){ + case MAP_SUBEVENT_FOLDER_LISTING_ITEM: + value_len = btstack_min(map_subevent_folder_listing_item_get_name_len(packet), MAP_MAX_VALUE_LEN); + memcpy(value, map_subevent_folder_listing_item_get_name(packet), value_len); + STRCMP_EQUAL(value, expected_folders[num_found_items]); + num_found_items++; + break; + case MAP_SUBEVENT_MESSAGE_LISTING_ITEM: + memcpy(value, map_subevent_message_listing_item_get_handle(packet), MAP_MESSAGE_HANDLE_SIZE); + CHECK_EQUAL_ARRAY((uint8_t *) value, (uint8_t *) expected_message_handles[num_found_items], MAP_MESSAGE_HANDLE_SIZE); + num_found_items++; + break; + default: + break; + } +} + +TEST_GROUP(MAP_XML){ + btstack_packet_handler_t map_callback; + uint16_t map_cid; + + void setup(void){ + map_callback = &packet_handler; + num_found_items = 0; + map_cid = 1; + yxml_init(&xml_parser, xml_buffer, sizeof(xml_buffer)); + } +}; + +TEST(MAP_XML, Folders){ + map_client_parse_folder_listing(map_callback, map_cid, (const uint8_t *) folders, strlen(folders)); + CHECK_EQUAL(num_found_items, num_expected_folders); +} + +TEST(MAP_XML, Messages){ + map_client_parse_message_listing(map_callback, map_cid, (const uint8_t *) messages, strlen(messages)); + CHECK_EQUAL(num_found_items, num_expected_message_handles); +} + +TEST(MAP_XML, Msg2Handle){ + uint8_t expected_handle[] = {4,0,0,0,0,0,0,2}; + map_message_handle_t msg_handle; + char handle[] = "0400000000000002"; + map_message_str_to_handle(handle, msg_handle); + CHECK_EQUAL_ARRAY((uint8_t *) msg_handle, (uint8_t *) expected_handle, MAP_MESSAGE_HANDLE_SIZE); } int main (int argc, const char * argv[]){