Diff between cc2352a2fc7f5ad3ce458a7d36a30b888a223142 and 19c7222c4701e4a75283b43d325e60137830d431

Changed Files

File Additions Deletions Status
android/android-tester.c +29 -0 modified

Full Patch

diff --git a/android/android-tester.c b/android/android-tester.c
index d831f74..f02d4ac 100644
--- a/android/android-tester.c
+++ b/android/android-tester.c
@@ -866,6 +866,17 @@ static const struct generic_data bluetooth_getprop_scanmode_success_test = {
 	.expected_property.len = sizeof(getprop_scanmode),
 };
 
+static uint32_t getprop_disctimeout_val = 120;
+
+static const struct generic_data bluetooth_getprop_disctimeout_success_test = {
+	.expected_hal_cb.adapter_properties_cb = getprop_success_cb,
+	.expected_cb_count = 1,
+	.expected_adapter_status = BT_STATUS_SUCCESS,
+	.expected_property.type = BT_PROPERTY_ADAPTER_DISCOVERY_TIMEOUT,
+	.expected_property.val = &getprop_disctimeout_val,
+	.expected_property.len = sizeof(getprop_disctimeout_val),
+};
+
 static const struct generic_data bluetooth_discovery_start_success_test = {
 	.expected_hal_cb.discovery_state_changed_cb =
 						discovery_start_success_cb,
@@ -1280,6 +1291,19 @@ static void test_getprop_scanmode_success(const void *test_data)
 	check_expected_status(adapter_status);
 }
 
+static void test_getprop_disctimeout_success(const void *test_data)
+{
+	struct test_data *data = tester_get_data();
+	const struct generic_data *test = data->test_data;
+	const bt_property_t prop = test->expected_property;
+	bt_status_t adapter_status;
+
+	init_test_conditions(data);
+
+	adapter_status = data->if_bluetooth->get_adapter_property(prop.type);
+	check_expected_status(adapter_status);
+}
+
 static void test_discovery_start_success(const void *test_data)
 {
 	struct test_data *data = tester_get_data();
@@ -1869,6 +1893,11 @@ int main(int argc, char *argv[])
 				setup_enabled_adapter,
 				test_getprop_scanmode_success, teardown);
 
+	test_bredrle("Bluetooth Get DISCOVERY_TIMEOUT - Success",
+				&bluetooth_getprop_disctimeout_success_test,
+				setup_enabled_adapter,
+				test_getprop_disctimeout_success, teardown);
+
 	test_bredrle("Bluetooth BREDR Discovery Start - Success",
 				&bluetooth_discovery_start_success_test,
 				setup_enabled_adapter,