summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaibo Huang <hhb@google.com>2019-05-20 13:41:39 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-05-20 13:41:39 -0700
commit958cd452d6254613aacfe0dea72ab1335d21330b (patch)
tree3ffef5ccab03ff48f009ba7bd648846665ab8f74
parent30a41c2a30d28ec1d1e5ab1df5fb3060c9ee0cdc (diff)
parent87270fdd7e2fbad37284ebf00719e87932f1410c (diff)
downloadwifilogd-958cd452d6254613aacfe0dea72ab1335d21330b.tar.gz
Using ::testing::DoAll
am: 87270fdd7e Change-Id: Ib79207b3fe039080681e99a887ea00a089ea5f59
-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;