Commit 761cb64c authored by Leonid Baraz's avatar Leonid Baraz Committed by Commit Bot

Remove noisy "uninteresting calls" logging.

Change-Id: Ifa68ca8083ccb12602ae62f0f1e19e4827bc2afa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2392711Reviewed-by: default avatarZach Trudo <zatrudo@google.com>
Commit-Queue: Leonid Baraz <lbaraz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#804316}
parent 3bcef6f0
...@@ -14,7 +14,7 @@ using ::testing::Invoke; ...@@ -14,7 +14,7 @@ using ::testing::Invoke;
namespace reporting { namespace reporting {
namespace test { namespace test {
TestEncryptionModule::TestEncryptionModule() { TestEncryptionModuleStrict::TestEncryptionModuleStrict() {
ON_CALL(*this, EncryptRecord) ON_CALL(*this, EncryptRecord)
.WillByDefault( .WillByDefault(
Invoke([](base::StringPiece record, Invoke([](base::StringPiece record,
...@@ -26,7 +26,7 @@ TestEncryptionModule::TestEncryptionModule() { ...@@ -26,7 +26,7 @@ TestEncryptionModule::TestEncryptionModule() {
})); }));
} }
void TestEncryptionModule::UpdateAsymmetricKey( void TestEncryptionModuleStrict::UpdateAsymmetricKey(
base::StringPiece new_key, base::StringPiece new_key,
base::OnceCallback<void(Status)> response_cb) { base::OnceCallback<void(Status)> response_cb) {
std::move(response_cb) std::move(response_cb)
...@@ -34,7 +34,7 @@ void TestEncryptionModule::UpdateAsymmetricKey( ...@@ -34,7 +34,7 @@ void TestEncryptionModule::UpdateAsymmetricKey(
"Test Encryption Module does not accept any keys")); "Test Encryption Module does not accept any keys"));
} }
TestEncryptionModule::~TestEncryptionModule() = default; TestEncryptionModuleStrict::~TestEncryptionModuleStrict() = default;
} // namespace test } // namespace test
} // namespace reporting } // namespace reporting
...@@ -17,9 +17,9 @@ namespace reporting { ...@@ -17,9 +17,9 @@ namespace reporting {
namespace test { namespace test {
// An |EncryptionModule| that does no encryption. // An |EncryptionModule| that does no encryption.
class TestEncryptionModule : public EncryptionModule { class TestEncryptionModuleStrict : public EncryptionModule {
public: public:
TestEncryptionModule(); TestEncryptionModuleStrict();
MOCK_METHOD(void, MOCK_METHOD(void,
EncryptRecord, EncryptRecord,
...@@ -32,9 +32,12 @@ class TestEncryptionModule : public EncryptionModule { ...@@ -32,9 +32,12 @@ class TestEncryptionModule : public EncryptionModule {
base::OnceCallback<void(Status)> response_cb) override; base::OnceCallback<void(Status)> response_cb) override;
protected: protected:
~TestEncryptionModule() override; ~TestEncryptionModuleStrict() override;
}; };
// Most of the time no need to log uninterested calls to |EncryptRecord|.
typedef ::testing::NiceMock<TestEncryptionModuleStrict> TestEncryptionModule;
} // namespace test } // namespace test
} // namespace reporting } // namespace reporting
......
...@@ -18,24 +18,24 @@ using ::testing::Invoke; ...@@ -18,24 +18,24 @@ using ::testing::Invoke;
namespace reporting { namespace reporting {
namespace test { namespace test {
TestStorageModule::TestStorageModule() { TestStorageModuleStrict::TestStorageModuleStrict() {
ON_CALL(*this, AddRecord) ON_CALL(*this, AddRecord)
.WillByDefault(Invoke(this, &TestStorageModule::AddRecordSuccessfully)); .WillByDefault(Invoke(this, &TestStorageModule::AddRecordSuccessfully));
} }
TestStorageModule::~TestStorageModule() = default; TestStorageModuleStrict::~TestStorageModuleStrict() = default;
Record TestStorageModule::record() const { Record TestStorageModuleStrict::record() const {
EXPECT_TRUE(record_.has_value()); EXPECT_TRUE(record_.has_value());
return record_.value(); return record_.value();
} }
Priority TestStorageModule::priority() const { Priority TestStorageModuleStrict::priority() const {
EXPECT_TRUE(priority_.has_value()); EXPECT_TRUE(priority_.has_value());
return priority_.value(); return priority_.value();
} }
void TestStorageModule::AddRecordSuccessfully( void TestStorageModuleStrict::AddRecordSuccessfully(
Priority priority, Priority priority,
Record record, Record record,
base::OnceCallback<void(Status)> callback) { base::OnceCallback<void(Status)> callback) {
......
...@@ -18,11 +18,11 @@ ...@@ -18,11 +18,11 @@
namespace reporting { namespace reporting {
namespace test { namespace test {
class TestStorageModule : public StorageModule { class TestStorageModuleStrict : public StorageModule {
public: public:
// As opposed to the production |StorageModule|, test module does not need to // As opposed to the production |StorageModule|, test module does not need to
// call factory method - it is created directly by constructor. // call factory method - it is created directly by constructor.
TestStorageModule(); TestStorageModuleStrict();
MOCK_METHOD(void, MOCK_METHOD(void,
AddRecord, AddRecord,
...@@ -35,7 +35,7 @@ class TestStorageModule : public StorageModule { ...@@ -35,7 +35,7 @@ class TestStorageModule : public StorageModule {
Priority priority() const; Priority priority() const;
protected: protected:
~TestStorageModule() override; ~TestStorageModuleStrict() override;
private: private:
void AddRecordSuccessfully(Priority priority, void AddRecordSuccessfully(Priority priority,
...@@ -46,6 +46,9 @@ class TestStorageModule : public StorageModule { ...@@ -46,6 +46,9 @@ class TestStorageModule : public StorageModule {
base::Optional<Priority> priority_; base::Optional<Priority> priority_;
}; };
// Most of the time no need to log uninterested calls to |AddRecord|.
typedef ::testing::NiceMock<TestStorageModuleStrict> TestStorageModule;
} // namespace test } // namespace test
} // namespace reporting } // namespace reporting
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment