summaryrefslogtreecommitdiffstats
path: root/googlemock
diff options
context:
space:
mode:
authordinord <dino.radakovich@gmail.com>2021-10-05 14:59:42 (GMT)
committerdinord <dino.radakovich@gmail.com>2021-10-05 14:59:42 (GMT)
commit075810f7a20405ea09a93f68847d6e963212fa62 (patch)
treeb4e370b5ec2782a003496ea36706f0266f8dee57 /googlemock
parent3b49be074d5c1340eeb447e6a8e78427051e675a (diff)
parentee1be03b43dd78916a0a2118c6e31090fdaed286 (diff)
downloadgoogletest-075810f7a20405ea09a93f68847d6e963212fa62.zip
googletest-075810f7a20405ea09a93f68847d6e963212fa62.tar.gz
googletest-075810f7a20405ea09a93f68847d6e963212fa62.tar.bz2
Merge pull request #3581 from cclauss:codespell
PiperOrigin-RevId: 400792845
Diffstat (limited to 'googlemock')
-rw-r--r--googlemock/include/gmock/gmock-matchers.h2
-rw-r--r--googlemock/include/gmock/gmock-spec-builders.h2
-rw-r--r--googlemock/test/gmock-matchers_test.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h
index 0e4aa0b..d952369 100644
--- a/googlemock/include/gmock/gmock-matchers.h
+++ b/googlemock/include/gmock/gmock-matchers.h
@@ -5422,7 +5422,7 @@ PolymorphicMatcher<internal::ExceptionMatcherImpl<Err>> ThrowsMessage(
#define EXPECT_THAT(value, matcher) EXPECT_PRED_FORMAT1(\
::testing::internal::MakePredicateFormatterFromMatcher(matcher), value)
-// MATCHER* macroses itself are listed below.
+// MATCHER* macros itself are listed below.
#define MATCHER(name, description) \
class name##Matcher \
: public ::testing::internal::MatcherBaseImpl<name##Matcher> { \
diff --git a/googlemock/include/gmock/gmock-spec-builders.h b/googlemock/include/gmock/gmock-spec-builders.h
index eb45aba..8e9f2f1 100644
--- a/googlemock/include/gmock/gmock-spec-builders.h
+++ b/googlemock/include/gmock/gmock-spec-builders.h
@@ -1508,7 +1508,7 @@ class FunctionMocker<R(Args...)> final : public UntypedFunctionMockerBase {
// Performs the default action of this mock function on the given
// arguments and returns the result. Asserts (or throws if
- // exceptions are enabled) with a helpful call descrption if there
+ // exceptions are enabled) with a helpful call description if there
// is no valid return value. This method doesn't depend on the
// mutable state of this object, and thus can be called concurrently
// without locking.
diff --git a/googlemock/test/gmock-matchers_test.cc b/googlemock/test/gmock-matchers_test.cc
index 4cec003..d1505bf 100644
--- a/googlemock/test/gmock-matchers_test.cc
+++ b/googlemock/test/gmock-matchers_test.cc
@@ -8405,7 +8405,7 @@ TEST(AnyOfArrayTest, ExplainsMatchResultCorrectly) {
// Explain with matchers
const Matcher<int> g1 = AnyOfArray({GreaterThan(1)});
const Matcher<int> g2 = AnyOfArray({GreaterThan(1), GreaterThan(2)});
- // Explains the first positiv match and all prior negative matches...
+ // Explains the first positive match and all prior negative matches...
EXPECT_EQ("which is 1 less than 1", Explain(g1, 0));
EXPECT_EQ("which is the same as 1", Explain(g1, 1));
EXPECT_EQ("which is 1 more than 1", Explain(g1, 2));