diff options
| author | Alex Deymo <deymo@google.com> | 2015-08-17 11:29:22 -0700 |
|---|---|---|
| committer | Alex Deymo <deymo@google.com> | 2015-08-17 11:33:32 -0700 |
| commit | 583f7b9e67f932f9bba7ae0ac84dce3d31107cfa (patch) | |
| tree | 4fd5ca86b580c3943423e4c1f7f077e64a7aa165 /utils_unittest.cc | |
| parent | 2a57bfa299f6409e930ed11dda26421272d1bf5f (diff) | |
| parent | ac6246ae239518a27ab4e89ee01ba1b1d76d440f (diff) | |
Sync update_engine from chromiumos/platform2.
The update_engine project was synced from chromium gerrit instance with
the latest changes.You can find the old version here:
https://chromium.googlesource.com/chromiumos/platform2/+/830d80acf26c8232d4b6e14916b7dad543bcf5ec/update_engine
BUG=b/23084607
Diffstat (limited to 'utils_unittest.cc')
| -rw-r--r-- | utils_unittest.cc | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/utils_unittest.cc b/utils_unittest.cc index 4787e840..83ef4852 100644 --- a/utils_unittest.cc +++ b/utils_unittest.cc @@ -682,50 +682,50 @@ TEST(UtilsTest, MonotonicDurationHelper) { TEST(UtilsTest, GetConnectionType) { // Check that expected combinations map to the right value. EXPECT_EQ(metrics::ConnectionType::kUnknown, - utils::GetConnectionType(kNetUnknown, + utils::GetConnectionType(NetworkConnectionType::kUnknown, NetworkTethering::kUnknown)); EXPECT_EQ(metrics::ConnectionType::kEthernet, - utils::GetConnectionType(kNetEthernet, + utils::GetConnectionType(NetworkConnectionType::kEthernet, NetworkTethering::kUnknown)); EXPECT_EQ(metrics::ConnectionType::kWifi, - utils::GetConnectionType(kNetWifi, + utils::GetConnectionType(NetworkConnectionType::kWifi, NetworkTethering::kUnknown)); EXPECT_EQ(metrics::ConnectionType::kWimax, - utils::GetConnectionType(kNetWimax, + utils::GetConnectionType(NetworkConnectionType::kWimax, NetworkTethering::kUnknown)); EXPECT_EQ(metrics::ConnectionType::kBluetooth, - utils::GetConnectionType(kNetBluetooth, + utils::GetConnectionType(NetworkConnectionType::kBluetooth, NetworkTethering::kUnknown)); EXPECT_EQ(metrics::ConnectionType::kCellular, - utils::GetConnectionType(kNetCellular, + utils::GetConnectionType(NetworkConnectionType::kCellular, NetworkTethering::kUnknown)); EXPECT_EQ(metrics::ConnectionType::kTetheredEthernet, - utils::GetConnectionType(kNetEthernet, + utils::GetConnectionType(NetworkConnectionType::kEthernet, NetworkTethering::kConfirmed)); EXPECT_EQ(metrics::ConnectionType::kTetheredWifi, - utils::GetConnectionType(kNetWifi, + utils::GetConnectionType(NetworkConnectionType::kWifi, NetworkTethering::kConfirmed)); // Ensure that we don't report tethered ethernet unless it's confirmed. EXPECT_EQ(metrics::ConnectionType::kEthernet, - utils::GetConnectionType(kNetEthernet, + utils::GetConnectionType(NetworkConnectionType::kEthernet, NetworkTethering::kNotDetected)); EXPECT_EQ(metrics::ConnectionType::kEthernet, - utils::GetConnectionType(kNetEthernet, + utils::GetConnectionType(NetworkConnectionType::kEthernet, NetworkTethering::kSuspected)); EXPECT_EQ(metrics::ConnectionType::kEthernet, - utils::GetConnectionType(kNetEthernet, + utils::GetConnectionType(NetworkConnectionType::kEthernet, NetworkTethering::kUnknown)); // Ditto for tethered wifi. EXPECT_EQ(metrics::ConnectionType::kWifi, - utils::GetConnectionType(kNetWifi, + utils::GetConnectionType(NetworkConnectionType::kWifi, NetworkTethering::kNotDetected)); EXPECT_EQ(metrics::ConnectionType::kWifi, - utils::GetConnectionType(kNetWifi, + utils::GetConnectionType(NetworkConnectionType::kWifi, NetworkTethering::kSuspected)); EXPECT_EQ(metrics::ConnectionType::kWifi, - utils::GetConnectionType(kNetWifi, + utils::GetConnectionType(NetworkConnectionType::kWifi, NetworkTethering::kUnknown)); } |