Merge pull request #3581 from cclauss:codespell
PiperOrigin-RevId: 400792845
This commit is contained in:
commit
075810f7a2
@ -238,7 +238,7 @@ You can make a matcher from one or more other matchers:
|
|||||||
| `AnyOf(m1, m2, ..., mn)` | `argument` matches at least one of the matchers `m1` to `mn`. |
|
| `AnyOf(m1, m2, ..., mn)` | `argument` matches at least one of the matchers `m1` to `mn`. |
|
||||||
| `AnyOfArray({m0, m1, ..., mn})`, `AnyOfArray(a_container)`, `AnyOfArray(begin, end)`, `AnyOfArray(array)`, or `AnyOfArray(array, count)` | The same as `AnyOf()` except that the matchers come from an initializer list, STL-style container, iterator range, or C-style array. |
|
| `AnyOfArray({m0, m1, ..., mn})`, `AnyOfArray(a_container)`, `AnyOfArray(begin, end)`, `AnyOfArray(array)`, or `AnyOfArray(array, count)` | The same as `AnyOf()` except that the matchers come from an initializer list, STL-style container, iterator range, or C-style array. |
|
||||||
| `Not(m)` | `argument` doesn't match matcher `m`. |
|
| `Not(m)` | `argument` doesn't match matcher `m`. |
|
||||||
| `Conditional(cond, m1, m2)` | Matches matcher `m1` if `cond` evalutes to true, else matches `m2`.|
|
| `Conditional(cond, m1, m2)` | Matches matcher `m1` if `cond` evaluates to true, else matches `m2`.|
|
||||||
|
|
||||||
## Adapters for Matchers
|
## Adapters for Matchers
|
||||||
|
|
||||||
|
@ -5422,7 +5422,7 @@ PolymorphicMatcher<internal::ExceptionMatcherImpl<Err>> ThrowsMessage(
|
|||||||
#define EXPECT_THAT(value, matcher) EXPECT_PRED_FORMAT1(\
|
#define EXPECT_THAT(value, matcher) EXPECT_PRED_FORMAT1(\
|
||||||
::testing::internal::MakePredicateFormatterFromMatcher(matcher), value)
|
::testing::internal::MakePredicateFormatterFromMatcher(matcher), value)
|
||||||
|
|
||||||
// MATCHER* macroses itself are listed below.
|
// MATCHER* macros itself are listed below.
|
||||||
#define MATCHER(name, description) \
|
#define MATCHER(name, description) \
|
||||||
class name##Matcher \
|
class name##Matcher \
|
||||||
: public ::testing::internal::MatcherBaseImpl<name##Matcher> { \
|
: public ::testing::internal::MatcherBaseImpl<name##Matcher> { \
|
||||||
|
@ -1508,7 +1508,7 @@ class FunctionMocker<R(Args...)> final : public UntypedFunctionMockerBase {
|
|||||||
|
|
||||||
// Performs the default action of this mock function on the given
|
// Performs the default action of this mock function on the given
|
||||||
// arguments and returns the result. Asserts (or throws if
|
// 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
|
// is no valid return value. This method doesn't depend on the
|
||||||
// mutable state of this object, and thus can be called concurrently
|
// mutable state of this object, and thus can be called concurrently
|
||||||
// without locking.
|
// without locking.
|
||||||
|
@ -8405,7 +8405,7 @@ TEST(AnyOfArrayTest, ExplainsMatchResultCorrectly) {
|
|||||||
// Explain with matchers
|
// Explain with matchers
|
||||||
const Matcher<int> g1 = AnyOfArray({GreaterThan(1)});
|
const Matcher<int> g1 = AnyOfArray({GreaterThan(1)});
|
||||||
const Matcher<int> g2 = AnyOfArray({GreaterThan(1), GreaterThan(2)});
|
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 1 less than 1", Explain(g1, 0));
|
||||||
EXPECT_EQ("which is the same as 1", Explain(g1, 1));
|
EXPECT_EQ("which is the same as 1", Explain(g1, 1));
|
||||||
EXPECT_EQ("which is 1 more than 1", Explain(g1, 2));
|
EXPECT_EQ("which is 1 more than 1", Explain(g1, 2));
|
||||||
|
@ -508,11 +508,11 @@ inline SetUpTearDownSuiteFuncType GetNotDefaultOrNull(
|
|||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
// Note that SuiteApiResolver inherits from T because
|
// Note that SuiteApiResolver inherits from T because
|
||||||
// SetUpTestSuite()/TearDownTestSuite() could be protected. Ths way
|
// SetUpTestSuite()/TearDownTestSuite() could be protected. This way
|
||||||
// SuiteApiResolver can access them.
|
// SuiteApiResolver can access them.
|
||||||
struct SuiteApiResolver : T {
|
struct SuiteApiResolver : T {
|
||||||
// testing::Test is only forward declared at this point. So we make it a
|
// testing::Test is only forward declared at this point. So we make it a
|
||||||
// dependend class for the compiler to be OK with it.
|
// dependent class for the compiler to be OK with it.
|
||||||
using Test =
|
using Test =
|
||||||
typename std::conditional<sizeof(T) != 0, ::testing::Test, void>::type;
|
typename std::conditional<sizeof(T) != 0, ::testing::Test, void>::type;
|
||||||
|
|
||||||
|
@ -994,7 +994,7 @@ inline void FlushInfoLog() { fflush(nullptr); }
|
|||||||
//
|
//
|
||||||
// GTEST_CHECK_ is an all-mode assert. It aborts the program if the condition
|
// GTEST_CHECK_ is an all-mode assert. It aborts the program if the condition
|
||||||
// is not satisfied.
|
// is not satisfied.
|
||||||
// Synopsys:
|
// Synopsis:
|
||||||
// GTEST_CHECK_(boolean_condition);
|
// GTEST_CHECK_(boolean_condition);
|
||||||
// or
|
// or
|
||||||
// GTEST_CHECK_(boolean_condition) << "Additional message";
|
// GTEST_CHECK_(boolean_condition) << "Additional message";
|
||||||
@ -1049,7 +1049,7 @@ struct ConstRef<T&> { typedef T& type; };
|
|||||||
// const Foo*). When you use ImplicitCast_, the compiler checks that
|
// const Foo*). When you use ImplicitCast_, the compiler checks that
|
||||||
// the cast is safe. Such explicit ImplicitCast_s are necessary in
|
// the cast is safe. Such explicit ImplicitCast_s are necessary in
|
||||||
// surprisingly many situations where C++ demands an exact type match
|
// surprisingly many situations where C++ demands an exact type match
|
||||||
// instead of an argument type convertable to a target type.
|
// instead of an argument type convertible to a target type.
|
||||||
//
|
//
|
||||||
// The syntax for using ImplicitCast_ is the same as for static_cast:
|
// The syntax for using ImplicitCast_ is the same as for static_cast:
|
||||||
//
|
//
|
||||||
|
@ -224,7 +224,7 @@ class Subprocess:
|
|||||||
combined in a string.
|
combined in a string.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
# The subprocess module is the preferrable way of running programs
|
# The subprocess module is the preferable way of running programs
|
||||||
# since it is available and behaves consistently on all platforms,
|
# since it is available and behaves consistently on all platforms,
|
||||||
# including Windows. But it is only available starting in python 2.4.
|
# including Windows. But it is only available starting in python 2.4.
|
||||||
# In earlier python versions, we revert to the popen2 module, which is
|
# In earlier python versions, we revert to the popen2 module, which is
|
||||||
|
Loading…
Reference in New Issue
Block a user