diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2020-04-28 20:26:37 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-04-28 20:26:37 +0000 |
commit | 3d1a2009e15784c2f50448c200995a3c9a12c556 (patch) | |
tree | b681a8ae10944e65fc15c63422a08becd43c33cb | |
parent | b00fdc6da480dfeaff740a0b0fbf6b00a1122905 (diff) | |
parent | 4dcae5651bcb21789929ba7f080e92e207fe5628 (diff) | |
download | wifilogd-android10-android13-mainline-tzdata-release.tar.gz |
Snap for 6439596 from 4dcae5651bcb21789929ba7f080e92e207fe5628 to qt-aml-tzdata-releaseq_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11q_tzdata_aml_297100000android12-mainline-tzdata-releaseandroid10-mainline-tzdata-releaseandroid10-android13-mainline-tzdata-release
Change-Id: Iad09923df6e9dc982021f7fe1f4848429c41dbee
-rw-r--r-- | tests/os_unittest.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/os_unittest.cpp b/tests/os_unittest.cpp index a014973..0cfb493 100644 --- a/tests/os_unittest.cpp +++ b/tests/os_unittest.cpp @@ -38,9 +38,8 @@ namespace wifilogd { namespace { using ::testing::_; -using ::testing::DoAll; -using ::testing::InSequence; using ::testing::Invoke; +using ::testing::InSequence; using ::testing::Matcher; using ::testing::MatcherInterface; using ::testing::MatchResultListener; @@ -49,8 +48,8 @@ using ::testing::Pointee; using ::testing::Return; using ::testing::SetArgumentPointee; using ::testing::SetErrnoAndReturn; -using ::testing::StrEq; using ::testing::StrictMock; +using ::testing::StrEq; using local_utils::GetMaxVal; |