From 7f732a52e7dd220e8b019c4e74a464faab69709b Mon Sep 17 00:00:00 2001
From: Vibhav Pant <vibhavp@gmail.com>
Date: Mon, 11 Sep 2023 17:46:42 +0530
Subject: [PATCH] Rename bluez_gatt_service.{cc,h} to bluez_gatt_service_server

---
 internal/platform/implementation/linux/BUILD                  | 4 ++--
 internal/platform/implementation/linux/ble_gatt_server.cc     | 2 +-
 internal/platform/implementation/linux/ble_gatt_server.h      | 2 +-
 .../{bluez_gatt_service.cc => bluez_gatt_service_server.cc}   | 2 +-
 .../{bluez_gatt_service.h => bluez_gatt_service_server.h}     | 0
 .../platform/implementation/linux/count_down_latch_test.cc    | 4 ++++
 6 files changed, 9 insertions(+), 5 deletions(-)
 rename internal/platform/implementation/linux/{bluez_gatt_service.cc => bluez_gatt_service_server.cc} (99%)
 rename internal/platform/implementation/linux/{bluez_gatt_service.h => bluez_gatt_service_server.h} (100%)

diff --git a/internal/platform/implementation/linux/BUILD b/internal/platform/implementation/linux/BUILD
index ebea2627..6b67fd4c 100644
--- a/internal/platform/implementation/linux/BUILD
+++ b/internal/platform/implementation/linux/BUILD
@@ -72,7 +72,7 @@ cc_library(
         "bluez_advertisement_monitor_manager.h",
         "bluez_gatt_characteristic_server.h",
         "bluez_gatt_manager.h",
-        "bluez_gatt_service.h",
+        "bluez_gatt_service_server.h",
         "bluez_le_advertisement.h",
         "dbus.h",
         "network_manager.h",
@@ -146,7 +146,7 @@ cc_library(
         "bluez.cc",
         "bluez_advertisement_monitor.cc",
         "bluez_gatt_characteristic_server.cc",
-        "bluez_gatt_service.cc",
+        "bluez_gatt_service_server.cc",
         "bluez_le_advertisement.cc",
         "dbus.cc",
         "executor.cc",
diff --git a/internal/platform/implementation/linux/ble_gatt_server.cc b/internal/platform/implementation/linux/ble_gatt_server.cc
index 37dc51a9..eb6650b4 100644
--- a/internal/platform/implementation/linux/ble_gatt_server.cc
+++ b/internal/platform/implementation/linux/ble_gatt_server.cc
@@ -17,7 +17,7 @@
 #include "internal/platform/implementation/ble_v2.h"
 #include "internal/platform/implementation/linux/bluez_gatt_characteristic_server.h"
 #include "internal/platform/implementation/linux/bluez_gatt_manager.h"
-#include "internal/platform/implementation/linux/bluez_gatt_service.h"
+#include "internal/platform/implementation/linux/bluez_gatt_service_server.h"
 #include "internal/platform/implementation/linux/dbus.h"
 #include "internal/platform/implementation/linux/generated/dbus/bluez/gatt_service_server.h"
 #include "internal/platform/uuid.h"
diff --git a/internal/platform/implementation/linux/ble_gatt_server.h b/internal/platform/implementation/linux/ble_gatt_server.h
index 1ac26939..814c3f2d 100644
--- a/internal/platform/implementation/linux/ble_gatt_server.h
+++ b/internal/platform/implementation/linux/ble_gatt_server.h
@@ -27,7 +27,7 @@
 #include "internal/platform/implementation/ble_v2.h"
 #include "internal/platform/implementation/linux/bluetooth_adapter.h"
 #include "internal/platform/implementation/linux/bluetooth_devices.h"
-#include "internal/platform/implementation/linux/bluez_gatt_service.h"
+#include "internal/platform/implementation/linux/bluez_gatt_service_server.h"
 #include "internal/platform/uuid.h"
 
 namespace nearby {
diff --git a/internal/platform/implementation/linux/bluez_gatt_service.cc b/internal/platform/implementation/linux/bluez_gatt_service_server.cc
similarity index 99%
rename from internal/platform/implementation/linux/bluez_gatt_service.cc
rename to internal/platform/implementation/linux/bluez_gatt_service_server.cc
index 17b94158..3d04b383 100644
--- a/internal/platform/implementation/linux/bluez_gatt_service.cc
+++ b/internal/platform/implementation/linux/bluez_gatt_service_server.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "internal/platform/implementation/linux/bluez_gatt_service.h"
+#include "internal/platform/implementation/linux/bluez_gatt_service_server.h"
 #include "absl/synchronization/mutex.h"
 #include "internal/platform/implementation/ble_v2.h"
 #include "internal/platform/implementation/linux/bluez_gatt_characteristic_server.h"
diff --git a/internal/platform/implementation/linux/bluez_gatt_service.h b/internal/platform/implementation/linux/bluez_gatt_service_server.h
similarity index 100%
rename from internal/platform/implementation/linux/bluez_gatt_service.h
rename to internal/platform/implementation/linux/bluez_gatt_service_server.h
diff --git a/internal/platform/implementation/linux/count_down_latch_test.cc b/internal/platform/implementation/linux/count_down_latch_test.cc
index 08147a1f..672067ed 100644
--- a/internal/platform/implementation/linux/count_down_latch_test.cc
+++ b/internal/platform/implementation/linux/count_down_latch_test.cc
@@ -81,6 +81,10 @@ TEST_F(CountDownLatchTests, CountDownLatchAwaitSucceeds) {
   // Act
   nearby::Exception result = countDownLatch->Await();
 
+  for (auto& thread : threads) {
+    thread.join();
+  }
+
   // Assert
   EXPECT_EQ(result.value, nearby::Exception::kSuccess);
   EXPECT_EQ(count, 3);