From 9ccd94f81e7bcc2358d47bf69f62aa09a88fbd1d Mon Sep 17 00:00:00 2001
From: Matthias Ringwald <matthias@ringwald.ch>
Date: Wed, 18 Sep 2019 17:42:10 +0200
Subject: [PATCH] test/sdp: fix sdp_record_builder and add to test suite

---
 test/Makefile                 |  2 +-
 test/sdp/sdp_record_builder.c | 36 +++++++----------------------------
 2 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/test/Makefile b/test/Makefile
index 9c9d9d204..8ecef8ae6 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -19,6 +19,7 @@ SUBDIRS =  \
 	mesh \
 	obex \
 	ring_buffer \
+	sdp \
 	sdp_client \
 	security_manager \
 	tlv_posix \
@@ -26,7 +27,6 @@ SUBDIRS =  \
 
 # test fails
 # map_test \
-# sdp \
 
 # not unit-tests
 # map_client \
diff --git a/test/sdp/sdp_record_builder.c b/test/sdp/sdp_record_builder.c
index 7aeecf31f..6a463a93b 100644
--- a/test/sdp/sdp_record_builder.c
+++ b/test/sdp/sdp_record_builder.c
@@ -150,11 +150,10 @@ static const char * default_avrcp_target_service_provider_name = "BTstack AVRCP
 
 #define AVRCP_TARGET_RECORD_SIZE_MIN 84
 
-static uint16_t avrcp_target_record_size(int browsing, const char * service_name, const char * service_provider_name){
+static uint16_t avrcp_target_record_size(const char * service_name, const char * service_provider_name){
     int service_name_len           = service_name           ? strlen(service_name)          : strlen(default_avrcp_target_service_name);
     int service_provider_name_len  = service_provider_name  ? strlen(service_provider_name) : strlen(default_avrcp_target_service_provider_name);
-    int browsing_len               = browsing               ? 27 : 0;
-    return AVRCP_TARGET_RECORD_SIZE_MIN + service_name_len + service_provider_name_len + browsing_len;
+    return AVRCP_TARGET_RECORD_SIZE_MIN + service_name_len + service_provider_name_len;
 }
 
 TEST(SDPRecordBuilder, AVRCP_TARGET){
@@ -162,21 +161,11 @@ TEST(SDPRecordBuilder, AVRCP_TARGET){
     const char * service_provider_name;
     int expected_len;
     int descriptor_size;
-    int browsing ;
 
-    browsing = 0;
     service_name = "";
     service_provider_name = "";
     descriptor_size = 0;
-    expected_len = avrcp_target_record_size(browsing, service_name, service_provider_name);
-    avrcp_target_create_sdp_record(service_buffer, 0, 0, service_name, service_provider_name);
-    CHECK_EQUAL(de_get_len(service_buffer), expected_len);
-
-    browsing = 1;
-    service_name = "";
-    service_provider_name = "";
-    descriptor_size = 0;
-    expected_len = avrcp_target_record_size(browsing, service_name, service_provider_name);
+    expected_len = avrcp_target_record_size(service_name, service_provider_name);
     avrcp_target_create_sdp_record(service_buffer, 0, 0, service_name, service_provider_name);
     CHECK_EQUAL(de_get_len(service_buffer), expected_len);
 }
@@ -190,11 +179,10 @@ static const char * default_avrcp_controller_service_provider_name = "BTstack AV
 
 #define AVRCP_CONTROLLER_RECORD_SIZE_MIN 87
 
-static uint16_t avrcp_controller_record_size(int browsing, const char * service_name, const char * service_provider_name){
+static uint16_t avrcp_controller_record_size(const char * service_name, const char * service_provider_name){
     int service_name_len           = service_name           ? strlen(service_name)          : strlen(default_avrcp_controller_service_name);
     int service_provider_name_len  = service_provider_name  ? strlen(service_provider_name) : strlen(default_avrcp_controller_service_provider_name);
-    int browsing_len               = browsing               ? 27 : 0;
-    return AVRCP_CONTROLLER_RECORD_SIZE_MIN + service_name_len + service_provider_name_len + browsing_len;
+    return AVRCP_CONTROLLER_RECORD_SIZE_MIN + service_name_len + service_provider_name_len;
 }
 
 TEST(SDPRecordBuilder, AVRCP_CONTROLLER){
@@ -202,21 +190,11 @@ TEST(SDPRecordBuilder, AVRCP_CONTROLLER){
     const char * service_provider_name;
     int expected_len;
     int descriptor_size;
-    int browsing ;
 
-    browsing = 0;
     service_name = "";
     service_provider_name = "";
     descriptor_size = 0;
-    expected_len = avrcp_controller_record_size(browsing, service_name, service_provider_name);
-    avrcp_controller_create_sdp_record(service_buffer, 0, 0, service_name, service_provider_name);
-    CHECK_EQUAL(de_get_len(service_buffer), expected_len);
-
-    browsing = 1;
-    service_name = "";
-    service_provider_name = "";
-    descriptor_size = 0;
-    expected_len = avrcp_controller_record_size(browsing, service_name, service_provider_name);
+    expected_len = avrcp_controller_record_size(service_name, service_provider_name);
     avrcp_controller_create_sdp_record(service_buffer, 0, 0, service_name, service_provider_name);
     CHECK_EQUAL(de_get_len(service_buffer), expected_len);
 }
@@ -225,7 +203,7 @@ TEST(SDPRecordBuilder, AVRCP_CONTROLLER){
 // hid_device.h
 //
 
-#define HID_DEVICE_RECORD_SIZE_MIN 153
+#define HID_DEVICE_RECORD_SIZE_MIN 164
 
 static uint16_t hid_device_record_size(uint16_t descriptor_size, const char * name){
     return HID_DEVICE_RECORD_SIZE_MIN + descriptor_size + strlen(name);