summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaibo Huang <hhb@google.com>2019-05-21 01:53:52 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-05-21 01:53:52 -0700
commitc21747974bb41acdaa1a51d66eddb107c8979d01 (patch)
tree3ffef5ccab03ff48f009ba7bd648846665ab8f74
parent4dcae5651bcb21789929ba7f080e92e207fe5628 (diff)
parentb00fdc6da480dfeaff740a0b0fbf6b00a1122905 (diff)
downloadwifilogd-c21747974bb41acdaa1a51d66eddb107c8979d01.tar.gz
Using ::testing::DoAll am: 87270fdd7e am: 958cd452d6 am: 029477c186
am: b00fdc6da4 Change-Id: Iabd51a495e6d877b59ca9e445676c3bff0a13d56
-rw-r--r--tests/os_unittest.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/os_unittest.cpp b/tests/os_unittest.cpp
index 0cfb493..a014973 100644
--- a/tests/os_unittest.cpp
+++ b/tests/os_unittest.cpp
@@ -38,8 +38,9 @@ namespace wifilogd {
namespace {
using ::testing::_;
-using ::testing::Invoke;
+using ::testing::DoAll;
using ::testing::InSequence;
+using ::testing::Invoke;
using ::testing::Matcher;
using ::testing::MatcherInterface;
using ::testing::MatchResultListener;
@@ -48,8 +49,8 @@ using ::testing::Pointee;
using ::testing::Return;
using ::testing::SetArgumentPointee;
using ::testing::SetErrnoAndReturn;
-using ::testing::StrictMock;
using ::testing::StrEq;
+using ::testing::StrictMock;
using local_utils::GetMaxVal;