diff --git a/test/gatt_client/expected_results.h b/test/gatt_client/expected_results.h index cb0e1ecc1..3caf71488 100644 --- a/test/gatt_client/expected_results.h +++ b/test/gatt_client/expected_results.h @@ -36,18 +36,18 @@ uint8_t characteristic_handles[][2]= { }; uint8_t characteristic_uuids[][16] = { - {0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb}, + {0x00, 0x00, 0xf1, 0x00, 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb}, {0x00, 0x00, 0xf1, 0x01, 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb}, - {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb}, + {0x00, 0x00, 0xf1, 0x02, 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb}, {0x00, 0x00, 0xf1, 0x03, 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb}, - {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb}, + {0x00, 0x00, 0xf1, 0x04, 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb}, {0x00, 0x00, 0xf1, 0x05, 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb}, - {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb}, + {0x00, 0x00, 0xf1, 0x06, 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb}, {0x00, 0x00, 0xf1, 0x07, 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb}, - {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb}, + {0x00, 0x00, 0xf1, 0x08, 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb}, {0x00, 0x00, 0xf1, 0x09, 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb}, - {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb}, {0x00, 0x00, 0xf1, 0x0a, 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb}, {0x00, 0x00, 0xf1, 0x0b, 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb}, - {0x00, 0x00, 0xf1, 0x0d, 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb} + {0x00, 0x00, 0xf1, 0x0d, 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb}, + {0x00, 0x00, 0xf1, 0x0c, 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb} }; diff --git a/test/gatt_client/gatt_client.c b/test/gatt_client/gatt_client.c index 2c49b6e52..52f0c8ba6 100644 --- a/test/gatt_client/gatt_client.c +++ b/test/gatt_client/gatt_client.c @@ -324,22 +324,22 @@ TEST(GATTClient, TestFindIncludedServicesForServiceWithUUID128){ CHECK(result_found); } -// TEST(GATTClient, TestDiscoverCharacteristicsForService){ -// test = DISCOVER_CHARACTERISTICS_FOR_SERVICE_WITH_UUID16; -// le_central_discover_primary_services_by_uuid16(&test_device, service_uuid16); -// CHECK(result_found); +TEST(GATTClient, TestDiscoverCharacteristicsForService){ + test = DISCOVER_CHARACTERISTICS_FOR_SERVICE_WITH_UUID16; + le_central_discover_primary_services_by_uuid16(&test_device, service_uuid16); + CHECK(result_found); -// result_found = 0; -// result_index = 0; -// le_central_discover_characteristics_for_service(&test_device, &services[0]); -// CHECK(result_found); -// } + result_found = 0; + result_index = 0; + le_central_discover_characteristics_for_service(&test_device, &services[0]); + CHECK(result_found); +} -// TEST(GATTClient, TestDiscoverCharacteristicsByUUID16){ -// test = DISCOVER_CHARACTERISTICS_BY_UUID16; -// le_central_discover_characteristics_for_handle_range_by_uuid16(&test_device, 0x30, 0x32, 0xFFFF); -// CHECK(result_found); -// } +TEST(GATTClient, TestDiscoverCharacteristicsByUUID16){ + test = DISCOVER_CHARACTERISTICS_BY_UUID16; + le_central_discover_characteristics_for_handle_range_by_uuid16(&test_device, 0x30, 0x32, 0xF102); + CHECK(result_found); +} TEST(GATTClient, TestDiscoverCharacteristicsByUUID128){ test = DISCOVER_CHARACTERISTICS_BY_UUID128;