Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2669)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: device/bluetooth/bluetooth_adapter_unittest.cc

Issue 2063353002: device/bluetooth: split out transport enum (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: renaming header, moving TransportMask back into filter Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « device/bluetooth/bluetooth_adapter_mac_unittest.mm ('k') | device/bluetooth/bluetooth_discovery_filter.h » ('j') | device/bluetooth/bluetooth_discovery_filter.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/bluetooth_adapter_unittest.cc
diff --git a/device/bluetooth/bluetooth_adapter_unittest.cc b/device/bluetooth/bluetooth_adapter_unittest.cc
index 834859c101e2acced911bb14a508fec27da19422..eaf24270ee01e0aecd35c6dde59b41ccc1a8ce1c 100644
--- a/device/bluetooth/bluetooth_adapter_unittest.cc
+++ b/device/bluetooth/bluetooth_adapter_unittest.cc
@@ -20,6 +20,7 @@
#include "device/bluetooth/bluetooth_local_gatt_characteristic.h"
#include "device/bluetooth/bluetooth_local_gatt_descriptor.h"
#include "device/bluetooth/bluetooth_local_gatt_service.h"
+#include "device/bluetooth/bluetooth_types.h"
#include "device/bluetooth/test/bluetooth_test.h"
#include "device/bluetooth/test/test_bluetooth_adapter_observer.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -266,13 +267,13 @@ TEST(BluetoothAdapterTest, GetMergedDiscoveryFilterRssi) {
uint16_t resulting_pathloss;
std::unique_ptr<BluetoothDiscoveryFilter> resulting_filter;
- BluetoothDiscoveryFilter* df = new BluetoothDiscoveryFilter(
- BluetoothDiscoveryFilter::Transport::TRANSPORT_LE);
+ BluetoothDiscoveryFilter* df =
+ new BluetoothDiscoveryFilter(BluetoothTransport::TRANSPORT_LE);
df->SetRSSI(-30);
std::unique_ptr<BluetoothDiscoveryFilter> discovery_filter(df);
- BluetoothDiscoveryFilter* df2 = new BluetoothDiscoveryFilter(
- BluetoothDiscoveryFilter::Transport::TRANSPORT_LE);
+ BluetoothDiscoveryFilter* df2 =
+ new BluetoothDiscoveryFilter(BluetoothTransport::TRANSPORT_LE);
df2->SetRSSI(-65);
std::unique_ptr<BluetoothDiscoveryFilter> discovery_filter2(df2);
@@ -306,8 +307,8 @@ TEST(BluetoothAdapterTest, GetMergedDiscoveryFilterRssi) {
resulting_filter->GetRSSI(&resulting_rssi);
EXPECT_EQ(-30, resulting_rssi);
- BluetoothDiscoveryFilter* df3 = new BluetoothDiscoveryFilter(
- BluetoothDiscoveryFilter::Transport::TRANSPORT_LE);
+ BluetoothDiscoveryFilter* df3 =
+ new BluetoothDiscoveryFilter(BluetoothTransport::TRANSPORT_LE);
df3->SetPathloss(60);
std::unique_ptr<BluetoothDiscoveryFilter> discovery_filter3(df3);
@@ -325,42 +326,40 @@ TEST(BluetoothAdapterTest, GetMergedDiscoveryFilterTransport) {
scoped_refptr<TestBluetoothAdapter> adapter = new TestBluetoothAdapter();
std::unique_ptr<BluetoothDiscoveryFilter> resulting_filter;
- BluetoothDiscoveryFilter* df = new BluetoothDiscoveryFilter(
- BluetoothDiscoveryFilter::Transport::TRANSPORT_CLASSIC);
+ BluetoothDiscoveryFilter* df =
+ new BluetoothDiscoveryFilter(BluetoothTransport::TRANSPORT_CLASSIC);
std::unique_ptr<BluetoothDiscoveryFilter> discovery_filter(df);
- BluetoothDiscoveryFilter* df2 = new BluetoothDiscoveryFilter(
- BluetoothDiscoveryFilter::Transport::TRANSPORT_LE);
+ BluetoothDiscoveryFilter* df2 =
+ new BluetoothDiscoveryFilter(BluetoothTransport::TRANSPORT_LE);
std::unique_ptr<BluetoothDiscoveryFilter> discovery_filter2(df2);
adapter->InjectFilteredSession(std::move(discovery_filter));
// Just one filter, make sure transport was properly rewritten
resulting_filter = adapter->GetMergedDiscoveryFilter();
- EXPECT_EQ(BluetoothDiscoveryFilter::Transport::TRANSPORT_CLASSIC,
+ EXPECT_EQ(BluetoothTransport::TRANSPORT_CLASSIC,
resulting_filter->GetTransport());
adapter->InjectFilteredSession(std::move(discovery_filter2));
// Two filters, should have OR of both transport's
resulting_filter = adapter->GetMergedDiscoveryFilter();
- EXPECT_EQ(BluetoothDiscoveryFilter::Transport::TRANSPORT_DUAL,
+ EXPECT_EQ(BluetoothTransport::TRANSPORT_DUAL,
resulting_filter->GetTransport());
// When 1st filter is masked, 2nd filter transport should be returned.
resulting_filter = adapter->GetMergedDiscoveryFilterMasked(df);
- EXPECT_EQ(BluetoothDiscoveryFilter::Transport::TRANSPORT_LE,
- resulting_filter->GetTransport());
+ EXPECT_EQ(BluetoothTransport::TRANSPORT_LE, resulting_filter->GetTransport());
// When 2nd filter is masked, 1st filter transport should be returned.
resulting_filter = adapter->GetMergedDiscoveryFilterMasked(df2);
- EXPECT_EQ(BluetoothDiscoveryFilter::Transport::TRANSPORT_CLASSIC,
+ EXPECT_EQ(BluetoothTransport::TRANSPORT_CLASSIC,
resulting_filter->GetTransport());
- BluetoothDiscoveryFilter* df3 = new BluetoothDiscoveryFilter(
- BluetoothDiscoveryFilter::Transport::TRANSPORT_LE);
- df3->CopyFrom(BluetoothDiscoveryFilter(
- BluetoothDiscoveryFilter::Transport::TRANSPORT_DUAL));
+ BluetoothDiscoveryFilter* df3 =
+ new BluetoothDiscoveryFilter(BluetoothTransport::TRANSPORT_LE);
+ df3->CopyFrom(BluetoothDiscoveryFilter(BluetoothTransport::TRANSPORT_DUAL));
std::unique_ptr<BluetoothDiscoveryFilter> discovery_filter3(df3);
// Merging empty filter in should result in empty filter
@@ -376,24 +375,24 @@ TEST(BluetoothAdapterTest, GetMergedDiscoveryFilterAllFields) {
int16_t resulting_rssi;
std::set<device::BluetoothUUID> resulting_uuids;
- BluetoothDiscoveryFilter* df = new BluetoothDiscoveryFilter(
- BluetoothDiscoveryFilter::Transport::TRANSPORT_LE);
+ BluetoothDiscoveryFilter* df =
+ new BluetoothDiscoveryFilter(BluetoothTransport::TRANSPORT_LE);
df->SetRSSI(-60);
df->AddUUID(device::BluetoothUUID("1000"));
std::unique_ptr<BluetoothDiscoveryFilter> discovery_filter(df);
- BluetoothDiscoveryFilter* df2 = new BluetoothDiscoveryFilter(
- BluetoothDiscoveryFilter::Transport::TRANSPORT_LE);
+ BluetoothDiscoveryFilter* df2 =
+ new BluetoothDiscoveryFilter(BluetoothTransport::TRANSPORT_LE);
df2->SetRSSI(-85);
- df2->SetTransport(BluetoothDiscoveryFilter::Transport::TRANSPORT_LE);
+ df2->SetTransport(BluetoothTransport::TRANSPORT_LE);
df2->AddUUID(device::BluetoothUUID("1020"));
df2->AddUUID(device::BluetoothUUID("1001"));
std::unique_ptr<BluetoothDiscoveryFilter> discovery_filter2(df2);
- BluetoothDiscoveryFilter* df3 = new BluetoothDiscoveryFilter(
- BluetoothDiscoveryFilter::Transport::TRANSPORT_LE);
+ BluetoothDiscoveryFilter* df3 =
+ new BluetoothDiscoveryFilter(BluetoothTransport::TRANSPORT_LE);
df3->SetRSSI(-65);
- df3->SetTransport(BluetoothDiscoveryFilter::Transport::TRANSPORT_CLASSIC);
+ df3->SetTransport(BluetoothTransport::TRANSPORT_CLASSIC);
df3->AddUUID(device::BluetoothUUID("1020"));
df3->AddUUID(device::BluetoothUUID("1003"));
std::unique_ptr<BluetoothDiscoveryFilter> discovery_filter3(df3);
@@ -408,7 +407,7 @@ TEST(BluetoothAdapterTest, GetMergedDiscoveryFilterAllFields) {
resulting_filter->GetRSSI(&resulting_rssi);
resulting_filter->GetUUIDs(resulting_uuids);
EXPECT_TRUE(resulting_filter->GetTransport());
- EXPECT_EQ(BluetoothDiscoveryFilter::Transport::TRANSPORT_DUAL,
+ EXPECT_EQ(BluetoothTransport::TRANSPORT_DUAL,
resulting_filter->GetTransport());
EXPECT_EQ(-85, resulting_rssi);
EXPECT_EQ(4UL, resulting_uuids.size());
@@ -422,7 +421,7 @@ TEST(BluetoothAdapterTest, GetMergedDiscoveryFilterAllFields) {
resulting_uuids.end());
resulting_filter = adapter->GetMergedDiscoveryFilterMasked(df);
- EXPECT_EQ(BluetoothDiscoveryFilter::Transport::TRANSPORT_DUAL,
+ EXPECT_EQ(BluetoothTransport::TRANSPORT_DUAL,
resulting_filter->GetTransport());
adapter->CleanupSessions();
« no previous file with comments | « device/bluetooth/bluetooth_adapter_mac_unittest.mm ('k') | device/bluetooth/bluetooth_discovery_filter.h » ('j') | device/bluetooth/bluetooth_discovery_filter.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698