Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98964a53 authored by Haibo Huang's avatar Haibo Huang Committed by Gerrit Code Review
Browse files

Merge "Fix test for googletest upgrade"

parents f03ab203 0acc44dc

system/gd/storage/adapter_config_test.cc

+2 −3
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ 
#include "storage/adapter_config.h"

#include "storage/mutation.h"



namespace testing {



using bluetooth::common::ByteArray;

using bluetooth::hci::Address;

using bluetooth::hci::DeviceType;
@@ -29,6 +27,8 @@ using bluetooth::storage::AdapterConfig; 
using bluetooth::storage::ConfigCache;

using bluetooth::storage::Device;

using bluetooth::storage::Mutation;

using ::testing::Eq;

using ::testing::Optional;



TEST(AdapterConfigTest, create_new_adapter_config) {

  ConfigCache config(10, Device::kLinkKeyProperties);
@@ -61,4 +61,3 @@ TEST(AdapterConfigTest, equality_test) { 
  ASSERT_NE(adapter_config_1, adapter_config_3);

}

}  // namespace testing
 
 No newline at end of file

system/gd/storage/classic_device_test.cc

+2 −3
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ 
#include "storage/classic_device.h"

#include "storage/mutation.h"



namespace testing {



using bluetooth::common::ByteArray;

using bluetooth::hci::Address;

using bluetooth::hci::DeviceType;
@@ -32,6 +30,8 @@ using bluetooth::storage::ClassicDevice; 
using bluetooth::storage::ConfigCache;

using bluetooth::storage::Device;

using bluetooth::storage::Mutation;

using ::testing::Eq;

using ::testing::Optional;



TEST(ClassicDeviceTest, create_new_le_device) {

  ConfigCache config(10, Device::kLinkKeyProperties);
@@ -65,4 +65,3 @@ TEST(ClassicDeviceTest, equality_test) { 
  ASSERT_NE(device1, device3);

}

}  // namespace testing
 
 No newline at end of file

system/gd/storage/device_test.cc

+3 −3
Original line number Diff line number Diff line
@@ -24,13 +24,14 @@ 
#include "storage/le_device.h"

#include "storage/mutation.h"



namespace testing {



using bluetooth::hci::Address;

using bluetooth::hci::DeviceType;

using bluetooth::storage::ConfigCache;

using bluetooth::storage::Device;

using bluetooth::storage::Mutation;

using ::testing::Eq;

using ::testing::Optional;

using ::testing::StrEq;



TEST(DeviceTest, create_new_device_using_legacy_key_address) {

  ConfigCache config(10, Device::kLinkKeyProperties);
@@ -235,4 +236,3 @@ TEST(DeviceTest, remove_config_test) { 
  ASSERT_FALSE(config.GetProperty(address.ToString(), "Name"));

}

}  // namespace testing
 
 No newline at end of file

system/gd/storage/le_device_test.cc

+2 −3
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ 
#include "storage/le_device.h"

#include "storage/mutation.h"



namespace testing {



using bluetooth::hci::Address;

using bluetooth::hci::AddressType;

using bluetooth::hci::DeviceType;
@@ -32,6 +30,8 @@ using bluetooth::storage::ConfigCache; 
using bluetooth::storage::Device;

using bluetooth::storage::LeDevice;

using bluetooth::storage::Mutation;

using ::testing::Eq;

using ::testing::Optional;



TEST(LeDeviceTest, create_new_le_device) {

  ConfigCache config(10, Device::kLinkKeyProperties);
@@ -65,4 +65,3 @@ TEST(LeDeviceTest, equality_test) { 
  ASSERT_NE(device1, device3);

}

}  // namespace testing
 
 No newline at end of file