From 2137559a52e827092fbb2d001df57d739a99d146 Mon Sep 17 00:00:00 2001 From: Grzegorz Kolodziejczyk Date: Mon, 23 Dec 2013 15:15:51 +0100 Subject: [PATCH] android/tester: Change test data variables placement This patch moves two test variables to proper place in code - before test case init structs. --- android/android-tester.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/android/android-tester.c b/android/android-tester.c index 2078a403b..57f3fc958 100644 --- a/android/android-tester.c +++ b/android/android-tester.c @@ -47,10 +47,6 @@ ADAPTER_PROP_TYPE, ADAPTER_PROP_SCAN_MODE, \ ADAPTER_PROP_BONDED_DEVICES, ADAPTER_PROP_DISC_TIMEOUT -static bt_scan_mode_t test_setprop_scanmode_val = - BT_SCAN_MODE_CONNECTABLE_DISCOVERABLE; -static uint32_t test_setprop_disctimeout_val = 120; - /* * those are assigned to HAL methods and callbacks, we use ID later * on mapped in switch-case due to different functions prototypes. @@ -727,6 +723,9 @@ static const struct generic_data bluetooth_setprop_bdname_success_test = { .expected_property.len = 11 }; +static bt_scan_mode_t test_setprop_scanmode_val = + BT_SCAN_MODE_CONNECTABLE_DISCOVERABLE; + static const struct generic_data bluetooth_setprop_scanmode_success_test = { .expected_hal_callbacks = { ADAPTER_PROP_SCAN_MODE, ADAPTER_PROP_SCAN_MODE, @@ -737,6 +736,8 @@ static const struct generic_data bluetooth_setprop_scanmode_success_test = { .expected_property.len = sizeof(bt_scan_mode_t) }; +static uint32_t test_setprop_disctimeout_val = 120; + static const struct generic_data bluetooth_setprop_disctimeout_success_test = { .expected_hal_callbacks = { ADAPTER_PROP_DISC_TIMEOUT, ADAPTER_TEST_END }, .expected_adapter_status = BT_STATUS_SUCCESS, -- 2.47.3