diff options
| author | Ravi kumar Veeramally <ravikumar.veeramally@linux.intel.com> | 2014-10-29 14:13:29 +0200 |
|---|---|---|
| committer | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2014-10-29 14:39:50 +0200 |
| commit | f1cfb28c6140374d085a6310e369e7cbe1923023 (patch) | |
| tree | 0685a2e0a1d9412e5727e86bc64dd7ce8c5fe774 /android/tester-main.c | |
| parent | 8ea9f985ec1c674822db93979febf9c1130cfb83 (diff) | |
| download | bluez-f1cfb28c6140374d085a6310e369e7cbe1923023.tar.gz | |
android/tester: Fix wrong state comparison in A2DP and AVRCP tests
btav_connection_state_t and btav_audio_state_t enum values are wrongly
stored in different enum type(bt_state_t state).
Diffstat (limited to 'android/tester-main.c')
| -rw-r--r-- | android/tester-main.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/android/tester-main.c b/android/tester-main.c index f4d18e2d6..8cf62c2bc 100644 --- a/android/tester-main.c +++ b/android/tester-main.c @@ -654,6 +654,22 @@ static bool match_data(struct step *step) return false; } + if (exp->callback_result.av_conn_state != + step->callback_result.av_conn_state) { + tester_debug("Callback av conn state mismatch: 0x%x vs 0x%x", + step->callback_result.av_conn_state, + exp->callback_result.av_conn_state); + return false; + } + + if (exp->callback_result.av_audio_state != + step->callback_result.av_audio_state) { + tester_debug("Callback av audio state mismatch: 0x%x vs 0x%x", + step->callback_result.av_audio_state, + exp->callback_result.av_audio_state); + return false; + } + if (exp->callback_result.pairing_variant != step->callback_result.pairing_variant) { tester_debug("Callback pairing result mismatch: %d vs %d", @@ -1863,7 +1879,7 @@ static void a2dp_connection_state_cb(btav_connection_state_t state, struct step *step = g_new0(struct step, 1); step->callback = CB_A2DP_CONN_STATE; - step->callback_result.state = state; + step->callback_result.av_conn_state = state; schedule_callback_verification(step); } @@ -1873,7 +1889,7 @@ static void a2dp_audio_state_cb(btav_audio_state_t state, bt_bdaddr_t *bd_addr) struct step *step = g_new0(struct step, 1); step->callback = CB_A2DP_AUDIO_STATE; - step->callback_result.state = state; + step->callback_result.av_audio_state = state; schedule_callback_verification(step); } |