2013-12-13 08:05:04

by Lukasz Rymanowski

Subject: [PATCH 1/2] android/tester: Add new id to hal_bluetooth_callbacks_id

Added adapter_prop_tod id to represents BT_PROPERTY_TYPE_OF_DEVICE
property changed.
---
android/android-tester.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/android/android-tester.c b/android/android-tester.c
index a50ed7b..16ddcc4 100644
--- a/android/android-tester.c
+++ b/android/android-tester.c
@@ -55,6 +55,7 @@ enum hal_bluetooth_callbacks_id {
adapter_prop_uuids,
adapter_prop_cod,
adapter_prop_scan_mode,
+ adapter_prop_tod,
adapter_prop_disc_timeout,
adapter_prop_service_record,
adapter_prop_bonded_devices
@@ -484,7 +485,7 @@ static void adapter_properties_cb(bt_status_t status, int num_properties,
remove_expected_hal_cb();
break;
case BT_PROPERTY_TYPE_OF_DEVICE:
- if (hal_cb != adapter_prop_bdaddr) {
+ if (hal_cb != adapter_prop_tod) {
tester_test_failed();
return;
}
--
1.8.4

2013-12-13 09:03:58

by Luiz Augusto von Dentz

Subject: Re: [PATCH 1/2] android/tester: Add new id to hal_bluetooth_callbacks_id

Hi Lukasz,

On Fri, Dec 13, 2013 at 10:05 AM, Lukasz Rymanowski
<[email protected]> wrote:
> Added adapter_prop_tod id to represents BT_PROPERTY_TYPE_OF_DEVICE
> property changed.
> ---
> android/android-tester.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/android/android-tester.c b/android/android-tester.c
> index a50ed7b..16ddcc4 100644
> --- a/android/android-tester.c
> +++ b/android/android-tester.c
> @@ -55,6 +55,7 @@ enum hal_bluetooth_callbacks_id {
> adapter_prop_uuids,
> adapter_prop_cod,
> adapter_prop_scan_mode,
> + adapter_prop_tod,
> adapter_prop_disc_timeout,
> adapter_prop_service_record,
> adapter_prop_bonded_devices
> @@ -484,7 +485,7 @@ static void adapter_properties_cb(bt_status_t status, int num_properties,
> remove_expected_hal_cb();
> break;
> case BT_PROPERTY_TYPE_OF_DEVICE:
> - if (hal_cb != adapter_prop_bdaddr) {
> + if (hal_cb != adapter_prop_tod) {
> tester_test_failed();
> return;
> }
> --
> 1.8.4

Too late, I already fixed it myself, but thanks anyway.


--
Luiz Augusto von Dentz

2013-12-13 08:05:05

by Lukasz Rymanowski

Subject: [PATCH 2/2] android/tester: Update expected adapter properties

Bluetooth daemon supports now BT_PROPERTY_ADAPTER_BONDED_DEVICES and
BT_PROPERTY_TYPE_OF_DEVICE. Android tester needs to be updated with this
expected properties. Test result with this patch:

Test Summary
------------
Test Init Passed 0.026 seconds
Test Enable - Success Passed 0.027 seconds
Test Enable - Done Passed 0.030 seconds
Test Disable - Success Passed 0.036 seconds
Test Socket Init Passed 0.020 seconds
Test Socket Listen - Invalid sock type Passed 0.088 seconds
Test Socket Listen - Invalid: L2CAP Passed 0.025 seconds

Total: 7, Passed: 7 (100.0%), Failed: 0, Not Run: 0
---
android/android-tester.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/android/android-tester.c b/android/android-tester.c
index 16ddcc4..fbcbb27 100644
--- a/android/android-tester.c
+++ b/android/android-tester.c
@@ -38,7 +38,8 @@

#define adapter_props adapter_prop_bdaddr, adapter_prop_bdname, \
adapter_prop_uuids, adapter_prop_cod, \
- adapter_prop_scan_mode, adapter_prop_disc_timeout
+ adapter_prop_tod, adapter_prop_scan_mode, \
+ adapter_prop_bonded_devices, adapter_prop_disc_timeout

/*
* those are assigned to HAL methods and callbacks, we use ID later
--
1.8.4