diff options
author | Copybara-Service <copybara-worker@google.com> | 2022-07-18 20:29:19 (GMT) |
---|---|---|
committer | Copybara-Service <copybara-worker@google.com> | 2022-07-18 20:29:19 (GMT) |
commit | 91480a4e79ed76e9edb1fa07ef852fd6c92ab924 (patch) | |
tree | 821f3a335182476db20b7b89d1515cda059fab07 | |
parent | 760acf30e3b535468f74f4fabd94e2bcca0e17fe (diff) | |
parent | 644a4bea02c478f73325b9125a2b6409f3c55420 (diff) | |
download | googletest-91480a4e79ed76e9edb1fa07ef852fd6c92ab924.zip googletest-91480a4e79ed76e9edb1fa07ef852fd6c92ab924.tar.gz googletest-91480a4e79ed76e9edb1fa07ef852fd6c92ab924.tar.bz2 |
Merge pull request #3927 from yutotnh:fix-typo
PiperOrigin-RevId: 461699509
Change-Id: I9bab4474c5f52d4d66691dfb96a4d20f89fbcfeb
-rw-r--r-- | googlemock/test/gmock-actions_test.cc | 4 | ||||
-rw-r--r-- | googlemock/test/gmock-matchers-misc_test.cc | 2 | ||||
-rw-r--r-- | googlemock/test/gmock-spec-builders_test.cc | 2 | ||||
-rw-r--r-- | googletest/include/gtest/internal/gtest-internal.h | 2 | ||||
-rw-r--r-- | googletest/src/gtest-internal-inl.h | 6 | ||||
-rw-r--r-- | googletest/src/gtest.cc | 6 |
6 files changed, 11 insertions, 11 deletions
diff --git a/googlemock/test/gmock-actions_test.cc b/googlemock/test/gmock-actions_test.cc index 215495e..e5a7ae1 100644 --- a/googlemock/test/gmock-actions_test.cc +++ b/googlemock/test/gmock-actions_test.cc @@ -466,7 +466,7 @@ TEST(DefaultValueOfReferenceTest, IsInitiallyUnset) { EXPECT_FALSE(DefaultValue<MyNonDefaultConstructible&>::IsSet()); } -// Tests that DefaultValue<T&>::Exists is false initiallly. +// Tests that DefaultValue<T&>::Exists is false initially. TEST(DefaultValueOfReferenceTest, IsInitiallyNotExisting) { EXPECT_FALSE(DefaultValue<int&>::Exists()); EXPECT_FALSE(DefaultValue<MyDefaultConstructible&>::Exists()); @@ -807,7 +807,7 @@ TEST(ReturnTest, MoveOnlyResultType) { ""); } -// Tests that Return(v) is covaraint. +// Tests that Return(v) is covariant. struct Base { bool operator==(const Base&) { return true; } diff --git a/googlemock/test/gmock-matchers-misc_test.cc b/googlemock/test/gmock-matchers-misc_test.cc index c68431c..53f4962 100644 --- a/googlemock/test/gmock-matchers-misc_test.cc +++ b/googlemock/test/gmock-matchers-misc_test.cc @@ -1561,7 +1561,7 @@ TEST(AnyOfArrayTest, Matchers) { } TEST_P(AnyOfArrayTestP, ExplainsMatchResultCorrectly) { - // AnyOfArray and AllOfArry use the same underlying template-template, + // AnyOfArray and AllOfArray use the same underlying template-template, // thus it is sufficient to test one here. const std::vector<int> v0{}; const std::vector<int> v1{1}; diff --git a/googlemock/test/gmock-spec-builders_test.cc b/googlemock/test/gmock-spec-builders_test.cc index 122d5b9..bb0773b 100644 --- a/googlemock/test/gmock-spec-builders_test.cc +++ b/googlemock/test/gmock-spec-builders_test.cc @@ -1064,7 +1064,7 @@ TEST(UnexpectedCallTest, UnmatchedArguments) { // Tests that Google Mock explains that an expectation with // unsatisfied pre-requisites doesn't match the call. -TEST(UnexpectedCallTest, UnsatisifiedPrerequisites) { +TEST(UnexpectedCallTest, UnsatisfiedPrerequisites) { Sequence s1, s2; MockB b; EXPECT_CALL(b, DoB(1)).InSequence(s1); diff --git a/googletest/include/gtest/internal/gtest-internal.h b/googletest/include/gtest/internal/gtest-internal.h index 74521db..e9c2441 100644 --- a/googletest/include/gtest/internal/gtest-internal.h +++ b/googletest/include/gtest/internal/gtest-internal.h @@ -462,7 +462,7 @@ class TestFactoryBase { TestFactoryBase& operator=(const TestFactoryBase&) = delete; }; -// This class provides implementation of TeastFactoryBase interface. +// This class provides implementation of TestFactoryBase interface. // It is used in TEST and TEST_F macros. template <class TestClass> class TestFactoryImpl : public TestFactoryBase { diff --git a/googletest/src/gtest-internal-inl.h b/googletest/src/gtest-internal-inl.h index 0b9e929..8c650e0 100644 --- a/googletest/src/gtest-internal-inl.h +++ b/googletest/src/gtest-internal-inl.h @@ -507,9 +507,9 @@ class GTEST_API_ UnitTestImpl { virtual ~UnitTestImpl(); // There are two different ways to register your own TestPartResultReporter. - // You can register your own repoter to listen either only for test results + // You can register your own reporter to listen either only for test results // from the current thread or for results from all threads. - // By default, each per-thread test result repoter just passes a new + // By default, each per-thread test result reporter just passes a new // TestPartResult to the global test result reporter, which registers the // test part result for the currently running test. @@ -850,7 +850,7 @@ class GTEST_API_ UnitTestImpl { default_per_thread_test_part_result_reporter_; // Points to (but doesn't own) the global test part result reporter. - TestPartResultReporterInterface* global_test_part_result_repoter_; + TestPartResultReporterInterface* global_test_part_result_reporter_; // Protects read and write access to global_test_part_result_reporter_. internal::Mutex global_test_part_result_reporter_mutex_; diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index a1b2b5d..bcfb41a 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -1010,14 +1010,14 @@ void DefaultPerThreadTestPartResultReporter::ReportTestPartResult( TestPartResultReporterInterface* UnitTestImpl::GetGlobalTestPartResultReporter() { internal::MutexLock lock(&global_test_part_result_reporter_mutex_); - return global_test_part_result_repoter_; + return global_test_part_result_reporter_; } // Sets the global test part result reporter. void UnitTestImpl::SetGlobalTestPartResultReporter( TestPartResultReporterInterface* reporter) { internal::MutexLock lock(&global_test_part_result_reporter_mutex_); - global_test_part_result_repoter_ = reporter; + global_test_part_result_reporter_ = reporter; } // Returns the test part result reporter for the current thread. @@ -5518,7 +5518,7 @@ UnitTestImpl::UnitTestImpl(UnitTest* parent) GTEST_DISABLE_MSC_WARNINGS_PUSH_(4355 /* using this in initializer */) default_global_test_part_result_reporter_(this), default_per_thread_test_part_result_reporter_(this), - GTEST_DISABLE_MSC_WARNINGS_POP_() global_test_part_result_repoter_( + GTEST_DISABLE_MSC_WARNINGS_POP_() global_test_part_result_reporter_( &default_global_test_part_result_reporter_), per_thread_test_part_result_reporter_( &default_per_thread_test_part_result_reporter_), |