diff options
author | Haibo Huang <hhb@google.com> | 2019-05-20 17:59:32 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-05-20 17:59:32 -0700 |
commit | b00fdc6da480dfeaff740a0b0fbf6b00a1122905 (patch) | |
tree | 3ffef5ccab03ff48f009ba7bd648846665ab8f74 | |
parent | 4dcae5651bcb21789929ba7f080e92e207fe5628 (diff) | |
parent | 029477c186c85d32eab69b7cd558d359557a63d4 (diff) | |
download | wifilogd-b00fdc6da480dfeaff740a0b0fbf6b00a1122905.tar.gz |
Using ::testing::DoAll am: 87270fdd7e am: 958cd452d6android-mainline-10.0.0_r8android-mainline-10.0.0_r6android10-mainline-resolv-releaseandroid10-mainline-networking-release
am: 029477c186
Change-Id: I7e30e5ef7fd53c6331f7f128764153bb14e0e3d4
-rw-r--r-- | tests/os_unittest.cpp | 5 |
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; |