From 83fdce14794dfad71fe2ef37c4f0cff278241b7d Mon Sep 17 00:00:00 2001
From: Chienyuan <chienyuanhuang@google.com>
Date: Fri, 23 Apr 2021 18:12:44 +0800
Subject: [PATCH] gd test: Enqueue data/command in right order

Tag: #gd-refactor
Bug: 186071486
Test: gd/cert/run
Test: bluetooth_test_gd
Change-Id: Iec8663e8ae99fb689871e982b85c81a4f093b555
---
 gd/hci/acl_manager_test.cc         | 2 +-
 gd/hci/hci_layer_test.cc           | 6 +++---
 gd/hci/le_address_manager_test.cc  | 2 +-
 gd/hci/le_scanning_manager_test.cc | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/gd/hci/acl_manager_test.cc b/gd/hci/acl_manager_test.cc
index 29de3117f..cd32504df 100644
--- a/gd/hci/acl_manager_test.cc
+++ b/gd/hci/acl_manager_test.cc
@@ -120,7 +120,7 @@ class TestHciLayer : public HciLayer {
       std::unique_ptr<CommandBuilder> command,
       common::ContextualOnceCallback<void(CommandStatusView)> on_status) override {
     command_queue_.push(std::move(command));
-    command_status_callbacks.push_front(std::move(on_status));
+    command_status_callbacks.push_back(std::move(on_status));
     if (command_promise_ != nullptr) {
       command_promise_->set_value();
       command_promise_.reset();
diff --git a/gd/hci/hci_layer_test.cc b/gd/hci/hci_layer_test.cc
index cde2cdaf4..745b71a0e 100644
--- a/gd/hci/hci_layer_test.cc
+++ b/gd/hci/hci_layer_test.cc
@@ -90,7 +90,7 @@ class TestHciHal : public hal::HciHal {
   }
 
   void sendAclData(hal::HciPacket data) override {
-    outgoing_acl_.push_front(std::move(data));
+    outgoing_acl_.push_back(std::move(data));
     if (sent_acl_promise_ != nullptr) {
       auto promise = std::move(sent_acl_promise_);
       sent_acl_promise_.reset();
@@ -99,11 +99,11 @@ class TestHciHal : public hal::HciHal {
   }
 
   void sendScoData(hal::HciPacket data) override {
-    outgoing_sco_.push_front(std::move(data));
+    outgoing_sco_.push_back(std::move(data));
   }
 
   void sendIsoData(hal::HciPacket data) override {
-    outgoing_iso_.push_front(std::move(data));
+    outgoing_iso_.push_back(std::move(data));
     if (sent_iso_promise_ != nullptr) {
       auto promise = std::move(sent_iso_promise_);
       sent_iso_promise_.reset();
diff --git a/gd/hci/le_address_manager_test.cc b/gd/hci/le_address_manager_test.cc
index febff37ab..237a30c6f 100644
--- a/gd/hci/le_address_manager_test.cc
+++ b/gd/hci/le_address_manager_test.cc
@@ -48,7 +48,7 @@ class TestHciLayer : public HciLayer {
       common::ContextualOnceCallback<void(CommandCompleteView)> on_complete) override {
     std::lock_guard<std::mutex> lock(mutex_);
     command_queue_.push(std::move(command));
-    command_complete_callbacks.push_front(std::move(on_complete));
+    command_complete_callbacks.push_back(std::move(on_complete));
     if (command_promise_ != nullptr) {
       command_promise_->set_value();
       command_promise_.reset();
diff --git a/gd/hci/le_scanning_manager_test.cc b/gd/hci/le_scanning_manager_test.cc
index 63958db86..2d52c015c 100644
--- a/gd/hci/le_scanning_manager_test.cc
+++ b/gd/hci/le_scanning_manager_test.cc
@@ -72,7 +72,7 @@ class TestHciLayer : public HciLayer {
       std::unique_ptr<CommandBuilder> command,
       common::ContextualOnceCallback<void(CommandStatusView)> on_status) override {
     command_queue_.push(std::move(command));
-    command_status_callbacks.push_front(std::move(on_status));
+    command_status_callbacks.push_back(std::move(on_status));
     if (command_promise_ != nullptr) {
       command_promise_->set_value();
       command_promise_.reset();
@@ -83,7 +83,7 @@ class TestHciLayer : public HciLayer {
       std::unique_ptr<CommandBuilder> command,
       common::ContextualOnceCallback<void(CommandCompleteView)> on_complete) override {
     command_queue_.push(std::move(command));
-    command_complete_callbacks.push_front(std::move(on_complete));
+    command_complete_callbacks.push_back(std::move(on_complete));
     if (command_promise_ != nullptr) {
       command_promise_->set_value();
       command_promise_.reset();
-- 
2.11.0