diff options
| author | Ben Chan <benchan@chromium.org> | 2017-10-23 15:41:39 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-10-24 15:30:15 -0700 |
| commit | 672c1f54a499a825cc0bb9bc4f240bf1887550d9 (patch) | |
| tree | 3af8dfb6a3674a6df97f9b3957ffec786a06a4e2 /certificate_checker_unittest.cc | |
| parent | 8ad22ba0765dc6351bfd59da8c43e06476b56c01 (diff) | |
update_engine: replace testing::SetArgumentPointee with testing::SetArgPointee
testing::SetArgumentPointee defined in gmock has been deprecated and
superseded by an equivalent testing::SetArgPointee.
BUG=chromium:777011
TEST=Run unit tests.
Change-Id: Ifc48897148d721e6f65159a54586e1fb456d75b9
Reviewed-on: https://chromium-review.googlesource.com/735213
Commit-Ready: Ben Chan <benchan@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Diffstat (limited to 'certificate_checker_unittest.cc')
| -rw-r--r-- | certificate_checker_unittest.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/certificate_checker_unittest.cc b/certificate_checker_unittest.cc index 20efce90..66b92d68 100644 --- a/certificate_checker_unittest.cc +++ b/certificate_checker_unittest.cc @@ -29,7 +29,7 @@ using ::testing::DoAll; using ::testing::Return; -using ::testing::SetArgumentPointee; +using ::testing::SetArgPointee; using ::testing::SetArrayArgument; using ::testing::_; using std::string; @@ -78,8 +78,8 @@ class CertificateCheckerTest : public testing::Test { TEST_F(CertificateCheckerTest, NewCertificate) { EXPECT_CALL(openssl_wrapper_, GetCertificateDigest(nullptr, _, _, _)) .WillOnce(DoAll( - SetArgumentPointee<1>(depth_), - SetArgumentPointee<2>(length_), + SetArgPointee<1>(depth_), + SetArgPointee<2>(length_), SetArrayArgument<3>(digest_, digest_ + 4), Return(true))); EXPECT_CALL(prefs_, GetString(cert_key_, _)).WillOnce(Return(false)); @@ -95,12 +95,12 @@ TEST_F(CertificateCheckerTest, NewCertificate) { TEST_F(CertificateCheckerTest, SameCertificate) { EXPECT_CALL(openssl_wrapper_, GetCertificateDigest(nullptr, _, _, _)) .WillOnce(DoAll( - SetArgumentPointee<1>(depth_), - SetArgumentPointee<2>(length_), + SetArgPointee<1>(depth_), + SetArgPointee<2>(length_), SetArrayArgument<3>(digest_, digest_ + 4), Return(true))); EXPECT_CALL(prefs_, GetString(cert_key_, _)) - .WillOnce(DoAll(SetArgumentPointee<1>(digest_hex_), Return(true))); + .WillOnce(DoAll(SetArgPointee<1>(digest_hex_), Return(true))); EXPECT_CALL(prefs_, SetString(_, _)).Times(0); EXPECT_CALL(observer_, CertificateChecked(server_to_check_, @@ -113,12 +113,12 @@ TEST_F(CertificateCheckerTest, SameCertificate) { TEST_F(CertificateCheckerTest, ChangedCertificate) { EXPECT_CALL(openssl_wrapper_, GetCertificateDigest(nullptr, _, _, _)) .WillOnce(DoAll( - SetArgumentPointee<1>(depth_), - SetArgumentPointee<2>(length_), + SetArgPointee<1>(depth_), + SetArgPointee<2>(length_), SetArrayArgument<3>(digest_, digest_ + 4), Return(true))); EXPECT_CALL(prefs_, GetString(cert_key_, _)) - .WillOnce(DoAll(SetArgumentPointee<1>(diff_digest_hex_), Return(true))); + .WillOnce(DoAll(SetArgPointee<1>(diff_digest_hex_), Return(true))); EXPECT_CALL(observer_, CertificateChecked(server_to_check_, CertificateCheckResult::kValidChanged)); |