diff options
| author | Abseil Team <absl-team@google.com> | 2018-12-03 16:30:02 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-12-03 17:54:11 (GMT) |
| commit | 26743363be8f579ee7d637e5b15cbf73e9e18a4a (patch) | |
| tree | fb89238693dad174c6ddaf57f04bae3c8f41d7fb /googlemock/test/gmock-internal-utils_test.cc | |
| parent | a42cdf2abdc0ab7ddfbafc098cafdd6152ae1b70 (diff) | |
| download | googletest-26743363be8f579ee7d637e5b15cbf73e9e18a4a.zip googletest-26743363be8f579ee7d637e5b15cbf73e9e18a4a.tar.gz googletest-26743363be8f579ee7d637e5b15cbf73e9e18a4a.tar.bz2 | |
Googletest export
Applied fixes for ClangTidy modernize-use-override and modernize-use-using.
PiperOrigin-RevId: 223800219
Diffstat (limited to 'googlemock/test/gmock-internal-utils_test.cc')
| -rw-r--r-- | googlemock/test/gmock-internal-utils_test.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/googlemock/test/gmock-internal-utils_test.cc b/googlemock/test/gmock-internal-utils_test.cc index aa0162b..48fcacc 100644 --- a/googlemock/test/gmock-internal-utils_test.cc +++ b/googlemock/test/gmock-internal-utils_test.cc @@ -379,11 +379,9 @@ TEST(ExpectTest, FailsNonfatallyOnFalse) { class LogIsVisibleTest : public ::testing::Test { protected: - virtual void SetUp() { - original_verbose_ = GMOCK_FLAG(verbose); - } + void SetUp() override { original_verbose_ = GMOCK_FLAG(verbose); } - virtual void TearDown() { GMOCK_FLAG(verbose) = original_verbose_; } + void TearDown() override { GMOCK_FLAG(verbose) = original_verbose_; } std::string original_verbose_; }; @@ -442,11 +440,11 @@ TEST(LogTest, NoStackTraceWhenStackFramesToSkipIsNegative) { } struct MockStackTraceGetter : testing::internal::OsStackTraceGetterInterface { - virtual std::string CurrentStackTrace(int max_depth, int skip_count) { + std::string CurrentStackTrace(int max_depth, int skip_count) override { return (testing::Message() << max_depth << "::" << skip_count << "\n") .GetString(); } - virtual void UponLeavingGTest() {} + void UponLeavingGTest() override {} }; // Tests that in opt mode, a positive stack_frames_to_skip argument is |