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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: device/bluetooth/bluez/bluetooth_bluez_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
« device/bluetooth/bluetooth_types.h ('K') | « device/bluetooth/bluez/bluetooth_adapter_bluez.cc ('k') | device/bluetooth/test/bluetooth_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/bluez/bluetooth_bluez_unittest.cc
diff --git a/device/bluetooth/bluez/bluetooth_bluez_unittest.cc b/device/bluetooth/bluez/bluetooth_bluez_unittest.cc
index 01851ffc6a1604345a40a2f06c7e0e14a503377f..22896a763159c75c235d1aa4d28c5c4974c043f9 100644
--- a/device/bluetooth/bluez/bluetooth_bluez_unittest.cc
+++ b/device/bluetooth/bluez/bluetooth_bluez_unittest.cc
@@ -18,6 +18,7 @@
#include "device/bluetooth/bluetooth_adapter_factory.h"
#include "device/bluetooth/bluetooth_device.h"
#include "device/bluetooth/bluetooth_discovery_session.h"
+#include "device/bluetooth/bluetooth_types.h"
#include "device/bluetooth/bluez/bluetooth_adapter_bluez.h"
#include "device/bluetooth/bluez/bluetooth_device_bluez.h"
#include "device/bluetooth/bluez/bluetooth_pairing_bluez.h"
@@ -37,6 +38,7 @@ using device::BluetoothAudioSink;
using device::BluetoothDevice;
using device::BluetoothDiscoveryFilter;
using device::BluetoothDiscoverySession;
+using device::BluetoothTransport;
using device::BluetoothUUID;
using device::TestBluetoothAdapterObserver;
@@ -1441,8 +1443,8 @@ TEST_F(BluetoothBlueZTest, SetDiscoveryFilterBeforeStartDiscovery) {
TestBluetoothAdapterObserver observer(adapter_);
- BluetoothDiscoveryFilter* df = new BluetoothDiscoveryFilter(
- BluetoothDiscoveryFilter::Transport::TRANSPORT_LE);
+ BluetoothDiscoveryFilter* df =
+ new BluetoothDiscoveryFilter(BluetoothTransport::TRANSPORT_LE);
df->SetRSSI(-60);
df->AddUUID(BluetoothUUID("1000"));
std::unique_ptr<BluetoothDiscoveryFilter> discovery_filter(df);
@@ -1501,8 +1503,8 @@ TEST_F(BluetoothBlueZTest, SetDiscoveryFilterBeforeStartDiscoveryFail) {
TestBluetoothAdapterObserver observer(adapter_);
- BluetoothDiscoveryFilter* df = new BluetoothDiscoveryFilter(
- BluetoothDiscoveryFilter::Transport::TRANSPORT_LE);
+ BluetoothDiscoveryFilter* df =
+ new BluetoothDiscoveryFilter(BluetoothTransport::TRANSPORT_LE);
df->SetRSSI(-60);
df->AddUUID(BluetoothUUID("1000"));
std::unique_ptr<BluetoothDiscoveryFilter> discovery_filter(df);
@@ -1544,14 +1546,14 @@ TEST_F(BluetoothBlueZTest, QueuedSetDiscoveryFilterBeforeStartDiscovery) {
TestBluetoothAdapterObserver observer(adapter_);
- BluetoothDiscoveryFilter* df = new BluetoothDiscoveryFilter(
- BluetoothDiscoveryFilter::Transport::TRANSPORT_LE);
+ BluetoothDiscoveryFilter* df =
+ new BluetoothDiscoveryFilter(BluetoothTransport::TRANSPORT_LE);
df->SetRSSI(-60);
df->AddUUID(BluetoothUUID("1000"));
std::unique_ptr<BluetoothDiscoveryFilter> discovery_filter(df);
- BluetoothDiscoveryFilter* df2 = new BluetoothDiscoveryFilter(
- BluetoothDiscoveryFilter::Transport::TRANSPORT_CLASSIC);
+ BluetoothDiscoveryFilter* df2 =
+ new BluetoothDiscoveryFilter(BluetoothTransport::TRANSPORT_CLASSIC);
df2->SetRSSI(-65);
df2->AddUUID(BluetoothUUID("1002"));
std::unique_ptr<BluetoothDiscoveryFilter> discovery_filter2(df2);
@@ -1639,14 +1641,14 @@ TEST_F(BluetoothBlueZTest, QueuedSetDiscoveryFilterBeforeStartDiscoveryFail) {
TestBluetoothAdapterObserver observer(adapter_);
- BluetoothDiscoveryFilter* df = new BluetoothDiscoveryFilter(
- BluetoothDiscoveryFilter::Transport::TRANSPORT_LE);
+ BluetoothDiscoveryFilter* df =
+ new BluetoothDiscoveryFilter(BluetoothTransport::TRANSPORT_LE);
df->SetRSSI(-60);
df->AddUUID(BluetoothUUID("1000"));
std::unique_ptr<BluetoothDiscoveryFilter> discovery_filter(df);
- BluetoothDiscoveryFilter* df2 = new BluetoothDiscoveryFilter(
- BluetoothDiscoveryFilter::Transport::TRANSPORT_CLASSIC);
+ BluetoothDiscoveryFilter* df2 =
+ new BluetoothDiscoveryFilter(BluetoothTransport::TRANSPORT_CLASSIC);
df2->SetRSSI(-65);
df2->AddUUID(BluetoothUUID("1002"));
std::unique_ptr<BluetoothDiscoveryFilter> discovery_filter2(df2);
@@ -1758,8 +1760,8 @@ TEST_F(BluetoothBlueZTest, SetDiscoveryFilterAfterStartDiscovery) {
auto filter = fake_bluetooth_adapter_client_->GetDiscoveryFilter();
EXPECT_EQ(nullptr, filter);
- BluetoothDiscoveryFilter* df = new BluetoothDiscoveryFilter(
- BluetoothDiscoveryFilter::Transport::TRANSPORT_LE);
+ BluetoothDiscoveryFilter* df =
+ new BluetoothDiscoveryFilter(BluetoothTransport::TRANSPORT_LE);
df->SetRSSI(-60);
df->AddUUID(BluetoothUUID("1000"));
std::unique_ptr<BluetoothDiscoveryFilter> discovery_filter(df);
@@ -1822,21 +1824,21 @@ TEST_F(BluetoothBlueZTest, SetDiscoveryFilterBeforeStartDiscoveryMultiple) {
for (int i = 0; i < 3; i++) {
std::unique_ptr<BluetoothDiscoveryFilter> discovery_filter;
if (i == 0) {
- BluetoothDiscoveryFilter* df = new BluetoothDiscoveryFilter(
- BluetoothDiscoveryFilter::Transport::TRANSPORT_LE);
+ BluetoothDiscoveryFilter* df =
+ new BluetoothDiscoveryFilter(BluetoothTransport::TRANSPORT_LE);
df->SetRSSI(-85);
df->AddUUID(BluetoothUUID("1000"));
discovery_filter.reset(df);
} else if (i == 1) {
- BluetoothDiscoveryFilter* df = new BluetoothDiscoveryFilter(
- BluetoothDiscoveryFilter::Transport::TRANSPORT_LE);
+ BluetoothDiscoveryFilter* df =
+ new BluetoothDiscoveryFilter(BluetoothTransport::TRANSPORT_LE);
df->SetRSSI(-60);
df->AddUUID(BluetoothUUID("1020"));
df->AddUUID(BluetoothUUID("1001"));
discovery_filter.reset(df);
} else if (i == 2) {
- BluetoothDiscoveryFilter* df = new BluetoothDiscoveryFilter(
- BluetoothDiscoveryFilter::Transport::TRANSPORT_LE);
+ BluetoothDiscoveryFilter* df =
+ new BluetoothDiscoveryFilter(BluetoothTransport::TRANSPORT_LE);
df->SetRSSI(-65);
df->AddUUID(BluetoothUUID("1020"));
df->AddUUID(BluetoothUUID("1003"));
@@ -1946,21 +1948,21 @@ TEST_F(BluetoothBlueZTest, SetDiscoveryFilterBeforeStartDiscoveryMultiple) {
std::unique_ptr<BluetoothDiscoveryFilter> discovery_filter;
if (i == 0) {
- BluetoothDiscoveryFilter* df = new BluetoothDiscoveryFilter(
- BluetoothDiscoveryFilter::Transport::TRANSPORT_LE);
+ BluetoothDiscoveryFilter* df =
+ new BluetoothDiscoveryFilter(BluetoothTransport::TRANSPORT_LE);
df->SetRSSI(-85);
df->AddUUID(BluetoothUUID("1000"));
discovery_filter.reset(df);
} else if (i == 1) {
- BluetoothDiscoveryFilter* df = new BluetoothDiscoveryFilter(
- BluetoothDiscoveryFilter::Transport::TRANSPORT_LE);
+ BluetoothDiscoveryFilter* df =
+ new BluetoothDiscoveryFilter(BluetoothTransport::TRANSPORT_LE);
df->SetRSSI(-60);
df->AddUUID(BluetoothUUID("1020"));
df->AddUUID(BluetoothUUID("1001"));
discovery_filter.reset(df);
} else if (i == 2) {
- BluetoothDiscoveryFilter* df = new BluetoothDiscoveryFilter(
- BluetoothDiscoveryFilter::Transport::TRANSPORT_LE);
+ BluetoothDiscoveryFilter* df =
+ new BluetoothDiscoveryFilter(BluetoothTransport::TRANSPORT_LE);
df->SetRSSI(-65);
df->AddUUID(BluetoothUUID("1020"));
df->AddUUID(BluetoothUUID("1003"));
@@ -2043,8 +2045,8 @@ TEST_F(BluetoothBlueZTest, SetDiscoveryFilterMergingTest) {
true, base::Bind(&BluetoothBlueZTest::Callback, base::Unretained(this)),
base::Bind(&BluetoothBlueZTest::ErrorCallback, base::Unretained(this)));
- BluetoothDiscoveryFilter* df = new BluetoothDiscoveryFilter(
- BluetoothDiscoveryFilter::Transport::TRANSPORT_LE);
+ BluetoothDiscoveryFilter* df =
+ new BluetoothDiscoveryFilter(BluetoothTransport::TRANSPORT_LE);
df->SetRSSI(-15);
df->AddUUID(BluetoothUUID("1000"));
std::unique_ptr<BluetoothDiscoveryFilter> discovery_filter(df);
@@ -2064,8 +2066,7 @@ TEST_F(BluetoothBlueZTest, SetDiscoveryFilterMergingTest) {
std::vector<std::string> uuids = *filter->uuids;
EXPECT_NE(uuids.end(), std::find(uuids.begin(), uuids.end(), "1000"));
- df = new BluetoothDiscoveryFilter(
- BluetoothDiscoveryFilter::Transport::TRANSPORT_LE);
+ df = new BluetoothDiscoveryFilter(BluetoothTransport::TRANSPORT_LE);
df->SetRSSI(-60);
df->AddUUID(BluetoothUUID("1020"));
df->AddUUID(BluetoothUUID("1001"));
@@ -2088,8 +2089,8 @@ TEST_F(BluetoothBlueZTest, SetDiscoveryFilterMergingTest) {
EXPECT_NE(uuids.end(), std::find(uuids.begin(), uuids.end(), "1001"));
EXPECT_NE(uuids.end(), std::find(uuids.begin(), uuids.end(), "1020"));
- BluetoothDiscoveryFilter* df3 = new BluetoothDiscoveryFilter(
- BluetoothDiscoveryFilter::Transport::TRANSPORT_CLASSIC);
+ BluetoothDiscoveryFilter* df3 =
+ new BluetoothDiscoveryFilter(BluetoothTransport::TRANSPORT_CLASSIC);
df3->SetRSSI(-65);
df3->AddUUID(BluetoothUUID("1020"));
df3->AddUUID(BluetoothUUID("1003"));
« device/bluetooth/bluetooth_types.h ('K') | « device/bluetooth/bluez/bluetooth_adapter_bluez.cc ('k') | device/bluetooth/test/bluetooth_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698