This adds property check handling. Existing test cases (enable, enable
done) are updated with property check. If property type/len/val is not
expected in test step its value should be set to 0/NULL. Order of
property is not considered while checking.
---
android/tester-bluetooth.c | 42 +++++++++++++++++
android/tester-main.c | 110 ++++++++++++++++++++++++++++++++++++++++++++-
android/tester-main.h | 3 ++
3 files changed, 154 insertions(+), 1 deletion(-)
diff --git a/android/tester-bluetooth.c b/android/tester-bluetooth.c
index 5022da4..e89011f 100644
--- a/android/tester-bluetooth.c
+++ b/android/tester-bluetooth.c
@@ -30,12 +30,49 @@ static struct test_case bluetooth_init = {
.step_num = get_test_case_step_num(dummy_steps),
};
+static bt_bdaddr_t enable_bdaddr_val = {
+ .address = { 0x00, 0xaa, 0x01, 0x00, 0x00, 0x00 },
+};
+static const char enable_bdname_val[] = "BlueZ for Android";
+static const char enable_uuids_val[] = {
+ /* Multi profile UUID */
+ 0x00, 0x00, 0x11, 0x3b, 0x00, 0x00, 0x10, 0x00, 0x80, 0x00,
+ 0x00, 0x80, 0x5F, 0x9B, 0x34, 0xFB,
+ /* Device identification profile UUID */
+ 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x10, 0x00, 0x80, 0x00,
+ 0x00, 0x80, 0x5F, 0x9B, 0x34, 0xFB,
+};
+static bt_device_type_t enable_tod_val = BT_DEVICE_DEVTYPE_DUAL;
+static bt_scan_mode_t enable_scanmode_val = BT_SCAN_MODE_NONE;
+static uint32_t enable_disctimeout_val = 120;
+
+static bt_property_t enable_props[] = {
+ { BT_PROPERTY_BDADDR, sizeof(enable_bdaddr_val), NULL },
+ { BT_PROPERTY_BDNAME, sizeof(enable_bdname_val) - 1,
+ &enable_bdname_val },
+ { BT_PROPERTY_CLASS_OF_DEVICE, sizeof(uint32_t), NULL },
+ { BT_PROPERTY_TYPE_OF_DEVICE, sizeof(enable_tod_val),
+ &enable_tod_val },
+ { BT_PROPERTY_ADAPTER_SCAN_MODE, sizeof(enable_scanmode_val),
+ &enable_scanmode_val },
+ { BT_PROPERTY_ADAPTER_DISCOVERY_TIMEOUT,
+ sizeof(enable_disctimeout_val),
+ &enable_disctimeout_val },
+ { BT_PROPERTY_ADAPTER_BONDED_DEVICES, 0, NULL },
+ { BT_PROPERTY_UUIDS, sizeof(enable_uuids_val), &enable_uuids_val },
+};
+
static struct step bluetooth_enable_success_steps[] = {
{
.action_result.status = BT_STATUS_SUCCESS,
.action = bluetooth_enable_action,
},
{
+ .callback = CB_BT_ADAPTER_PROPERTIES,
+ .callback_result.properties = enable_props,
+ .callback_result.num_properties = 8,
+ },
+ {
.callback = CB_BT_ADAPTER_STATE_CHANGED,
.callback_result.state = BT_STATE_ON,
},
@@ -52,6 +89,11 @@ static struct step bluetooth_enable_success2_steps[] = {
.action = bluetooth_enable_action,
},
{
+ .callback = CB_BT_ADAPTER_PROPERTIES,
+ .callback_result.properties = enable_props,
+ .callback_result.num_properties = 8,
+ },
+ {
.callback = CB_BT_ADAPTER_STATE_CHANGED,
.callback_result.state = BT_STATE_ON,
},
diff --git a/android/tester-main.c b/android/tester-main.c
index 6a20eb8..4a81b3c 100644
--- a/android/tester-main.c
+++ b/android/tester-main.c
@@ -338,6 +338,47 @@ static void test_pre_setup(const void *test_data)
NULL, read_index_list_callback, NULL, NULL);
}
+static bool match_property(bt_property_t *exp_prop, bt_property_t *rec_prop,
+ int prop_num)
+{
+ if (exp_prop->type && (exp_prop->type != rec_prop->type))
+ return 0;
+
+ if (exp_prop->len && (exp_prop->len != rec_prop->len)) {
+ tester_debug("Property [%d] len don't match! received=%d, "
+ "expected=%d", prop_num, rec_prop->len,
+ exp_prop->len);
+ return 0;
+ }
+
+ if (exp_prop->val && memcmp(exp_prop->val, rec_prop->val,
+ exp_prop->len)) {
+ tester_debug("Property [%d] value don't match!", prop_num);
+ return 0;
+ }
+
+ return 1;
+}
+
+static int verify_property(bt_property_t *exp_props, int exp_num_props,
+ bt_property_t *rec_props, int rec_num_props)
+{
+ int i, j;
+ int exp_prop_to_find = exp_num_props;
+
+ /* Get first exp prop to match and search for it */
+ for (i = 0; i < exp_num_props; i++) {
+ for (j = 0; j < rec_num_props; j++) {
+ if (match_property(&exp_props[i], &rec_props[j], i)) {
+ exp_prop_to_find--;
+ break;
+ }
+ }
+ }
+
+ return exp_prop_to_find;
+}
+
/*
* Check each test case step if test case expected
* data is set and match it with expected result.
@@ -360,6 +401,29 @@ static bool match_data(struct step *step)
tester_debug("Action status don't match");
return false;
}
+
+ if (exp->callback) {
+ if (exp->callback != step->callback) {
+ tester_debug("Callback type don't match");
+ return false;
+ }
+
+ if (exp->callback_result.state !=
+ step->callback_result.state) {
+ tester_debug("Callback state don't match");
+ return false;
+ }
+
+ if (exp->callback_result.properties &&
+ verify_property(exp->callback_result.properties,
+ exp->callback_result.num_properties,
+ step->callback_result.properties,
+ step->callback_result.num_properties)) {
+ tester_debug("Gatt properties don't match");
+ return false;
+ }
+ }
+
return true;
}
@@ -423,10 +487,25 @@ static void verify_step(struct step *step, queue_destroy_func_t cleanup_cb)
* step verification could pass and move to next test step
*/
+static void free_properties(struct step *step)
+{
+ bt_property_t *properties = step->callback_result.properties;
+ int num_properties = step->callback_result.num_properties;
+ int i;
+
+ for (i = 0; i < num_properties; i++)
+ g_free(properties[i].val);
+
+ g_free(properties);
+}
+
static void destroy_callback_step(void *data)
{
struct step *step = data;
+ if (step->callback_result.properties)
+ free_properties(step);
+
g_free(step);
g_atomic_int_dec_and_test(&scheduled_cbacks_num);
}
@@ -460,10 +539,39 @@ static void adapter_state_changed_cb(bt_state_t state)
schedule_callback_call(step);
}
+static bt_property_t *copy_properties(int num_properties,
+ bt_property_t *properties)
+{
+ int i;
+ bt_property_t *props = g_new0(bt_property_t, num_properties);
+
+ for (i = 0; i < num_properties; i++) {
+ props[i].type = properties[i].type;
+ props[i].len = properties[i].len;
+ props[i].val = g_memdup(properties[i].val, properties[i].len);
+ }
+
+ return props;
+}
+
+static void adapter_properties_cb(bt_status_t status, int num_properties,
+ bt_property_t *properties)
+{
+ struct step *step = g_new0(struct step, 1);
+
+ step->callback_result.status = status;
+ step->callback_result.num_properties = num_properties;
+ step->callback_result.properties = copy_properties(num_properties,
+ properties);
+ step->callback = CB_BT_ADAPTER_PROPERTIES;
+
+ schedule_callback_call(step);
+}
+
static bt_callbacks_t bt_callbacks = {
.size = sizeof(bt_callbacks),
.adapter_state_changed_cb = adapter_state_changed_cb,
- .adapter_properties_cb = NULL,
+ .adapter_properties_cb = adapter_properties_cb,
.remote_device_properties_cb = NULL,
.device_found_cb = NULL,
.discovery_state_changed_cb = NULL,
diff --git a/android/tester-main.h b/android/tester-main.h
index 2157d8a..aaeada7 100644
--- a/android/tester-main.h
+++ b/android/tester-main.h
@@ -154,6 +154,9 @@ struct bt_action_data {
*/
struct bt_callback_data {
bt_state_t state;
+ bt_status_t status;
+ int num_properties;
+ bt_property_t *properties;
};
/*
--
1.9.3
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
