From 5c3174b42c689baee5575fe695a6df1768b736ae Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Wed, 9 Jan 2013 23:11:44 -0800 Subject: [PATCH] tools: Fix up testing of discoverable management command --- tools/mgmt-tester.c | 60 +++++++++++++++++++++++++++++++++------------ 1 file changed, 44 insertions(+), 16 deletions(-) diff --git a/tools/mgmt-tester.c b/tools/mgmt-tester.c index e91e07864..471cb78bd 100644 --- a/tools/mgmt-tester.c +++ b/tools/mgmt-tester.c @@ -474,11 +474,14 @@ static const struct generic_data set_pairable_on_invalid_index_test = { .expect_status = MGMT_STATUS_INVALID_INDEX, }; -static const char set_discoverable_on_param[] = { 0x01, 0x00, 0x00 }; -static const char set_discoverable_timeout_param[] = { 0x01, 0x0a, 0x00 }; -static const char set_discoverable_invalid_param[] = { 0x02, 0x00, 0x00 }; -static const char set_discoverable_garbage_param[] = { 0x01, 0x00, 0x00, 0x00 }; -static const char set_discoverable_settings_param[] = { 0x8b, 0x00, 0x00, 0x00 }; +static const uint8_t set_discoverable_on_param[] = { 0x01, 0x00, 0x00 }; +static const uint8_t set_discoverable_timeout_param[] = { 0x01, 0x0a, 0x00 }; +static const uint8_t set_discoverable_invalid_param[] = { 0x02, 0x00, 0x00 }; +static const uint8_t set_discoverable_off_param[] = { 0x00, 0x00, 0x00 }; +static const uint8_t set_discoverable_offtimeout_param[] = { 0x00, 0x01, 0x00 }; +static const uint8_t set_discoverable_garbage_param[] = { 0x01, 0x00, 0x00, 0x00 }; +static const uint8_t set_discoverable_on_settings_param[] = { 0x8b, 0x00, 0x00, 0x00 }; +static const uint8_t set_discoverable_off_settings_param[] = { 0x82, 0x00, 0x00, 0x00 }; static const struct generic_data set_discoverable_on_invalid_param_test_1 = { .send_opcode = MGMT_OP_SET_DISCOVERABLE, @@ -499,14 +502,14 @@ static const struct generic_data set_discoverable_on_invalid_param_test_3 = { .expect_status = MGMT_STATUS_INVALID_PARAMS, }; -static const struct generic_data set_discoverable_on_not_powered_test_1 = { +static const struct generic_data set_discoverable_on_invalid_param_test_4 = { .send_opcode = MGMT_OP_SET_DISCOVERABLE, - .send_param = set_discoverable_on_param, - .send_len = sizeof(set_discoverable_on_param), - .expect_status = MGMT_STATUS_NOT_POWERED, + .send_param = set_discoverable_offtimeout_param, + .send_len = sizeof(set_discoverable_offtimeout_param), + .expect_status = MGMT_STATUS_INVALID_PARAMS, }; -static const struct generic_data set_discoverable_on_not_powered_test_2 = { +static const struct generic_data set_discoverable_on_not_powered_test_1 = { .send_opcode = MGMT_OP_SET_DISCOVERABLE, .send_param = set_discoverable_timeout_param, .send_len = sizeof(set_discoverable_timeout_param), @@ -521,6 +524,13 @@ static const struct generic_data set_discoverable_on_rejected_test_1 = { }; static const struct generic_data set_discoverable_on_rejected_test_2 = { + .send_opcode = MGMT_OP_SET_DISCOVERABLE, + .send_param = set_discoverable_on_param, + .send_len = sizeof(set_discoverable_on_param), + .expect_status = MGMT_STATUS_REJECTED, +}; + +static const struct generic_data set_discoverable_on_rejected_test_3 = { .send_opcode = MGMT_OP_SET_DISCOVERABLE, .send_param = set_discoverable_timeout_param, .send_len = sizeof(set_discoverable_timeout_param), @@ -532,11 +542,20 @@ static const struct generic_data set_discoverable_on_success_test = { .send_param = set_discoverable_on_param, .send_len = sizeof(set_discoverable_on_param), .expect_status = MGMT_STATUS_SUCCESS, - .expect_param = set_discoverable_settings_param, - .expect_len = sizeof(set_discoverable_settings_param), + .expect_param = set_discoverable_on_settings_param, + .expect_len = sizeof(set_discoverable_on_settings_param), .expect_settings_set = MGMT_SETTING_DISCOVERABLE, }; +static const struct generic_data set_discoverable_off_success_test = { + .send_opcode = MGMT_OP_SET_DISCOVERABLE, + .send_param = set_discoverable_off_param, + .send_len = sizeof(set_discoverable_off_param), + .expect_status = MGMT_STATUS_SUCCESS, + .expect_param = set_discoverable_off_settings_param, + .expect_len = sizeof(set_discoverable_off_settings_param), +}; + static void setup_powered_callback(uint8_t status, uint16_t length, const void *param, void *user_data) { @@ -791,14 +810,17 @@ int main(int argc, char *argv[]) test_bredr("Set discoverable on - Invalid parameters 3", &set_discoverable_on_invalid_param_test_3, NULL, test_command_generic); + test_bredr("Set discoverable on - Invalid parameters 4", + &set_discoverable_on_invalid_param_test_4, + NULL, test_command_generic); test_bredr("Set discoverable on - Not powered 1", &set_discoverable_on_not_powered_test_1, NULL, test_command_generic); - test_bredr("Set discoverable on - Not powered 2", - &set_discoverable_on_not_powered_test_2, + test_bredr("Set discoverable on - Not powered 1", + &set_discoverable_on_not_powered_test_1, NULL, test_command_generic); - test_bredr("Set discoverable on - Not powered 3", - &set_discoverable_on_not_powered_test_2, + test_bredr("Set discoverable on - Not powered 2", + &set_discoverable_on_not_powered_test_1, setup_connectable, test_command_generic); test_bredr("Set discoverable on - Rejected 1", &set_discoverable_on_rejected_test_1, @@ -806,10 +828,16 @@ int main(int argc, char *argv[]) test_bredr("Set discoverable on - Rejected 2", &set_discoverable_on_rejected_test_2, setup_powered, test_command_generic); + test_bredr("Set discoverable on - Rejected 3", + &set_discoverable_on_rejected_test_3, + setup_powered, test_command_generic); test_bredr("Set discoverable on - Success 1", &set_discoverable_on_success_test, setup_connectable, test_command_generic); test_bredr("Set discoverable on - Success 2", + &set_discoverable_off_success_test, + setup_connectable, test_command_generic); + test_bredr("Set discoverable on - Success 3", &set_discoverable_on_success_test, setup_powered_connectable, test_command_generic); -- 2.47.3