mirror of
https://github.com/google/googletest.git
synced 2025-01-14 00:20:57 +08:00
Merge pull request #3927 from yutotnh:fix-typo
PiperOrigin-RevId: 461699509 Change-Id: I9bab4474c5f52d4d66691dfb96a4d20f89fbcfeb
This commit is contained in:
commit
91480a4e79
@ -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; }
|
||||
|
@ -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};
|
||||
|
@ -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);
|
||||
|
@ -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 {
|
||||
|
@ -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_;
|
||||
|
@ -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_),
|
||||
|
Loading…
x
Reference in New Issue
Block a user