diff options
author | dinord <dinor@google.com> | 2021-07-29 03:26:54 +0000 |
---|---|---|
committer | dinord <dinor@google.com> | 2021-07-29 03:26:54 +0000 |
commit | df43ce9675a7f68b24a8d0a3a2b80cce0b57de17 (patch) | |
tree | 691f6f45bf9aed271619008196d187db98227e10 | |
parent | 96f4ce02a3a78d63981c67acbd368945d11d7d70 (diff) | |
parent | 2f3e2e39cc4c399b66711e6b720bf22373e841b5 (diff) | |
download | googletest-git-df43ce9675a7f68b24a8d0a3a2b80cce0b57de17.tar.gz |
Merge pull request #3499 from slowy07:fixing
PiperOrigin-RevId: 386888057
-rw-r--r-- | googlemock/include/gmock/gmock-matchers.h | 2 | ||||
-rw-r--r-- | googlemock/include/gmock/gmock-spec-builders.h | 2 | ||||
-rw-r--r-- | googlemock/test/gmock-actions_test.cc | 2 | ||||
-rw-r--r-- | googletest/src/gtest-death-test.cc | 4 | ||||
-rw-r--r-- | googletest/src/gtest.cc | 4 | ||||
-rw-r--r-- | googletest/test/gtest_unittest.cc | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h index 7e59fbe5..8c5ccb74 100644 --- a/googlemock/include/gmock/gmock-matchers.h +++ b/googlemock/include/gmock/gmock-matchers.h @@ -4950,7 +4950,7 @@ Pair(FirstMatcher first_matcher, SecondMatcher second_matcher) { namespace no_adl { // Conditional() creates a matcher that conditionally uses either the first or // second matcher provided. For example, we could create an `equal if, and only -// if' matcher using the Conditonal wrapper as follows: +// if' matcher using the Conditional wrapper as follows: // // EXPECT_THAT(result, Conditional(condition, Eq(expected), Ne(expected))); template <typename MatcherTrue, typename MatcherFalse> diff --git a/googlemock/include/gmock/gmock-spec-builders.h b/googlemock/include/gmock/gmock-spec-builders.h index b46cebe5..eb45abac 100644 --- a/googlemock/include/gmock/gmock-spec-builders.h +++ b/googlemock/include/gmock/gmock-spec-builders.h @@ -888,7 +888,7 @@ class GTEST_API_ ExpectationBase { mutable Mutex mutex_; // Protects action_count_checked_. }; // class ExpectationBase -// Impements an expectation for the given function type. +// Implements an expectation for the given function type. template <typename F> class TypedExpectation : public ExpectationBase { public: diff --git a/googlemock/test/gmock-actions_test.cc b/googlemock/test/gmock-actions_test.cc index e1ca7fe2..fc628937 100644 --- a/googlemock/test/gmock-actions_test.cc +++ b/googlemock/test/gmock-actions_test.cc @@ -384,7 +384,7 @@ TEST(ActionInterfaceTest, MakeAction) { EXPECT_EQ(5, action.Perform(std::make_tuple(true, 5))); } -// Tests that Action<F> can be contructed from a pointer to +// Tests that Action<F> can be constructed from a pointer to // ActionInterface<F>. TEST(ActionTest, CanBeConstructedFromActionInterface) { Action<MyGlobalFunction> action(new MyActionImpl); diff --git a/googletest/src/gtest-death-test.cc b/googletest/src/gtest-death-test.cc index 52af2c79..87d5e9b9 100644 --- a/googletest/src/gtest-death-test.cc +++ b/googletest/src/gtest-death-test.cc @@ -799,8 +799,8 @@ DeathTest::TestRole WindowsDeathTest::AssumeRole() { GTEST_DEATH_TEST_CHECK_( ::CreateProcessA( executable_path, const_cast<char*>(command_line.c_str()), - nullptr, // Retuned process handle is not inheritable. - nullptr, // Retuned thread handle is not inheritable. + nullptr, // Returned process handle is not inheritable. + nullptr, // Returned thread handle is not inheritable. TRUE, // Child inherits all inheritable handles (for write_handle_). 0x0, // Default creation flags. nullptr, // Inherit the parent's environment. diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index 6c5321aa..3bff676a 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -177,7 +177,7 @@ const char kStackTraceMarker[] = "\nStack trace:\n"; // is specified on the command line. bool g_help_flag = false; -// Utilty function to Open File for Writing +// Utility function to Open File for Writing static FILE* OpenFileForWriting(const std::string& output_file) { FILE* fileout = nullptr; FilePath output_file_path(output_file); @@ -443,7 +443,7 @@ void AssertHelper::operator=(const Message& message) const { namespace { // When TEST_P is found without a matching INSTANTIATE_TEST_SUITE_P -// to creates test cases for it, a syntetic test case is +// to creates test cases for it, a synthetic test case is // inserted to report ether an error or a log message. // // This configuration bit will likely be removed at some point. diff --git a/googletest/test/gtest_unittest.cc b/googletest/test/gtest_unittest.cc index 3f2f082f..c0d2d99e 100644 --- a/googletest/test/gtest_unittest.cc +++ b/googletest/test/gtest_unittest.cc @@ -2017,7 +2017,7 @@ void ExpectNonFatalFailureRecordingPropertyWithReservedKeyOutsideOfTestSuite( } // Tests that property recording functions in UnitTest outside of tests -// functions correcly. Creating a separate instance of UnitTest ensures it +// functions correctly. Creating a separate instance of UnitTest ensures it // is in a state similar to the UnitTest's singleton's between tests. class UnitTestRecordPropertyTest : public testing::internal::UnitTestRecordPropertyTestHelper { |