Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
googletest
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
googletest
Commits
050b5175
Commit
050b5175
authored
Apr 15, 2021
by
John Bampton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore: fix spelling
parent
8d664b94
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
16 additions
and
16 deletions
+16
-16
gmock-matchers.h
googlemock/include/gmock/gmock-matchers.h
+1
-1
ast.py
googlemock/scripts/generator/cpp/ast.py
+3
-3
gmock-actions_test.cc
googlemock/test/gmock-actions_test.cc
+1
-1
gtest.h
googletest/include/gtest/gtest.h
+1
-1
gtest-filepath.h
googletest/include/gtest/internal/gtest-filepath.h
+1
-1
gtest-internal.h
googletest/include/gtest/internal/gtest-internal.h
+1
-1
release_docs.py
googletest/scripts/release_docs.py
+1
-1
gtest-internal-inl.h
googletest/src/gtest-internal-inl.h
+2
-2
gtest.cc
googletest/src/gtest.cc
+1
-1
googletest-output-test_.cc
googletest/test/googletest-output-test_.cc
+1
-1
googletest-param-test-test.cc
googletest/test/googletest-param-test-test.cc
+2
-2
googletest-printers-test.cc
googletest/test/googletest-printers-test.cc
+1
-1
No files found.
googlemock/include/gmock/gmock-matchers.h
View file @
050b5175
...
@@ -343,7 +343,7 @@ class MatcherCastImpl {
...
@@ -343,7 +343,7 @@ class MatcherCastImpl {
// constructor from M (this usually happens when T has an implicit
// constructor from M (this usually happens when T has an implicit
// constructor from any type).
// constructor from any type).
//
//
// It won't work to unconditionally implict_cast
// It won't work to unconditionally implic
i
t_cast
// polymorphic_matcher_or_value to Matcher<T> because it won't trigger
// polymorphic_matcher_or_value to Matcher<T> because it won't trigger
// a user-defined conversion from M to T if one exists (assuming M is
// a user-defined conversion from M to T if one exists (assuming M is
// a value).
// a value).
...
...
googlemock/scripts/generator/cpp/ast.py
View file @
050b5175
...
@@ -336,7 +336,7 @@ class Class(_GenericDeclaration):
...
@@ -336,7 +336,7 @@ class Class(_GenericDeclaration):
# TODO(nnorwitz): handle namespaces, etc.
# TODO(nnorwitz): handle namespaces, etc.
if
self
.
bases
:
if
self
.
bases
:
for
token_list
in
self
.
bases
:
for
token_list
in
self
.
bases
:
# TODO(nnorwitz): bases are tokens, do name comparis
i
on.
# TODO(nnorwitz): bases are tokens, do name comparison.
for
token
in
token_list
:
for
token
in
token_list
:
if
token
.
name
==
node
.
name
:
if
token
.
name
==
node
.
name
:
return
True
return
True
...
@@ -379,7 +379,7 @@ class Function(_GenericDeclaration):
...
@@ -379,7 +379,7 @@ class Function(_GenericDeclaration):
def
Requires
(
self
,
node
):
def
Requires
(
self
,
node
):
if
self
.
parameters
:
if
self
.
parameters
:
# TODO(nnorwitz): parameters are tokens, do name comparis
i
on.
# TODO(nnorwitz): parameters are tokens, do name comparison.
for
p
in
self
.
parameters
:
for
p
in
self
.
parameters
:
if
p
.
name
==
node
.
name
:
if
p
.
name
==
node
.
name
:
return
True
return
True
...
@@ -895,7 +895,7 @@ class AstBuilder(object):
...
@@ -895,7 +895,7 @@ class AstBuilder(object):
nesting
-=
1
nesting
-=
1
return
tokens
,
last_token
return
tokens
,
last_token
# TODO(nnorwitz): remove _IgnoreUpTo() it shouldn't be necesary.
# TODO(nnorwitz): remove _IgnoreUpTo() it shouldn't be neces
s
ary.
def
_IgnoreUpTo
(
self
,
token_type
,
token
):
def
_IgnoreUpTo
(
self
,
token_type
,
token
):
unused_tokens
=
self
.
_GetTokensUpTo
(
token_type
,
token
)
unused_tokens
=
self
.
_GetTokensUpTo
(
token_type
,
token
)
...
...
googlemock/test/gmock-actions_test.cc
View file @
050b5175
...
@@ -795,7 +795,7 @@ TEST(DoDefaultDeathTest, DiesIfUsedInCompositeAction) {
...
@@ -795,7 +795,7 @@ TEST(DoDefaultDeathTest, DiesIfUsedInCompositeAction) {
}
}
// Tests that DoDefault() returns the default value set by
// Tests that DoDefault() returns the default value set by
// DefaultValue<T>::Set() when it's not overriden by an ON_CALL().
// DefaultValue<T>::Set() when it's not overrid
d
en by an ON_CALL().
TEST
(
DoDefaultTest
,
ReturnsUserSpecifiedPerTypeDefaultValueWhenThereIsOne
)
{
TEST
(
DoDefaultTest
,
ReturnsUserSpecifiedPerTypeDefaultValueWhenThereIsOne
)
{
DefaultValue
<
int
>::
Set
(
1
);
DefaultValue
<
int
>::
Set
(
1
);
MockClass
mock
;
MockClass
mock
;
...
...
googletest/include/gtest/gtest.h
View file @
050b5175
...
@@ -673,7 +673,7 @@ class GTEST_API_ TestResult {
...
@@ -673,7 +673,7 @@ class GTEST_API_ TestResult {
// Protects mutable state of the property vector and of owned
// Protects mutable state of the property vector and of owned
// properties, whose values may be updated.
// properties, whose values may be updated.
internal
::
Mutex
test_proper
it
es_mutex_
;
internal
::
Mutex
test_proper
ti
es_mutex_
;
// The vector of TestPartResults
// The vector of TestPartResults
std
::
vector
<
TestPartResult
>
test_part_results_
;
std
::
vector
<
TestPartResult
>
test_part_results_
;
...
...
googletest/include/gtest/internal/gtest-filepath.h
View file @
050b5175
...
@@ -195,7 +195,7 @@ class GTEST_API_ FilePath {
...
@@ -195,7 +195,7 @@ class GTEST_API_ FilePath {
void
Normalize
();
void
Normalize
();
// Returns a pointer to the last occurence of a valid path separator in
// Returns a pointer to the last occur
r
ence of a valid path separator in
// the FilePath. On Windows, for example, both '/' and '\' are valid path
// the FilePath. On Windows, for example, both '/' and '\' are valid path
// separators. Returns NULL if no path separator was found.
// separators. Returns NULL if no path separator was found.
const
char
*
FindLastPathSeparator
()
const
;
const
char
*
FindLastPathSeparator
()
const
;
...
...
googletest/include/gtest/internal/gtest-internal.h
View file @
050b5175
...
@@ -1495,7 +1495,7 @@ class NeverThrown {
...
@@ -1495,7 +1495,7 @@ class NeverThrown {
// Implements Boolean test assertions such as EXPECT_TRUE. expression can be
// Implements Boolean test assertions such as EXPECT_TRUE. expression can be
// either a boolean expression or an AssertionResult. text is a textual
// either a boolean expression or an AssertionResult. text is a textual
// represenation of expression as it was passed into the EXPECT_TRUE.
// represen
t
ation of expression as it was passed into the EXPECT_TRUE.
#define GTEST_TEST_BOOLEAN_(expression, text, actual, expected, fail) \
#define GTEST_TEST_BOOLEAN_(expression, text, actual, expected, fail) \
GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
if (const ::testing::AssertionResult gtest_ar_ = \
if (const ::testing::AssertionResult gtest_ar_ = \
...
...
googletest/scripts/release_docs.py
View file @
050b5175
...
@@ -37,7 +37,7 @@ SYNOPSIS
...
@@ -37,7 +37,7 @@ SYNOPSIS
interlinked wiki files. When we release a new version of
interlinked wiki files. When we release a new version of
Google Test or Google Mock, we need to branch the wiki files
Google Test or Google Mock, we need to branch the wiki files
such that users of a specific version of Google Test/Mock can
such that users of a specific version of Google Test/Mock can
look up documenation relevant for that version. This script
look up documen
t
ation relevant for that version. This script
automates that process by:
automates that process by:
- branching the current wiki pages (which document the
- branching the current wiki pages (which document the
...
...
googletest/src/gtest-internal-inl.h
View file @
050b5175
...
@@ -1164,13 +1164,13 @@ class StreamingListener : public EmptyTestEventListener {
...
@@ -1164,13 +1164,13 @@ class StreamingListener : public EmptyTestEventListener {
}
}
// Note that "event=TestCaseStart" is a wire format and has to remain
// Note that "event=TestCaseStart" is a wire format and has to remain
// "case" for compatibilty
// "case" for compatibil
i
ty
void
OnTestCaseStart
(
const
TestCase
&
test_case
)
override
{
void
OnTestCaseStart
(
const
TestCase
&
test_case
)
override
{
SendLn
(
std
::
string
(
"event=TestCaseStart&name="
)
+
test_case
.
name
());
SendLn
(
std
::
string
(
"event=TestCaseStart&name="
)
+
test_case
.
name
());
}
}
// Note that "event=TestCaseEnd" is a wire format and has to remain
// Note that "event=TestCaseEnd" is a wire format and has to remain
// "case" for compatibilty
// "case" for compatibil
i
ty
void
OnTestCaseEnd
(
const
TestCase
&
test_case
)
override
{
void
OnTestCaseEnd
(
const
TestCase
&
test_case
)
override
{
SendLn
(
"event=TestCaseEnd&passed="
+
FormatBool
(
test_case
.
Passed
())
+
SendLn
(
"event=TestCaseEnd&passed="
+
FormatBool
(
test_case
.
Passed
())
+
"&elapsed_time="
+
StreamableToString
(
test_case
.
elapsed_time
())
+
"&elapsed_time="
+
StreamableToString
(
test_case
.
elapsed_time
())
+
...
...
googletest/src/gtest.cc
View file @
050b5175
...
@@ -2241,7 +2241,7 @@ void TestResult::RecordProperty(const std::string& xml_element,
...
@@ -2241,7 +2241,7 @@ void TestResult::RecordProperty(const std::string& xml_element,
if
(
!
ValidateTestProperty
(
xml_element
,
test_property
))
{
if
(
!
ValidateTestProperty
(
xml_element
,
test_property
))
{
return
;
return
;
}
}
internal
::
MutexLock
lock
(
&
test_proper
it
es_mutex_
);
internal
::
MutexLock
lock
(
&
test_proper
ti
es_mutex_
);
const
std
::
vector
<
TestProperty
>::
iterator
property_with_matching_key
=
const
std
::
vector
<
TestProperty
>::
iterator
property_with_matching_key
=
std
::
find_if
(
test_properties_
.
begin
(),
test_properties_
.
end
(),
std
::
find_if
(
test_properties_
.
begin
(),
test_properties_
.
end
(),
internal
::
TestPropertyKeyIs
(
test_property
.
key
()));
internal
::
TestPropertyKeyIs
(
test_property
.
key
()));
...
...
googletest/test/googletest-output-test_.cc
View file @
050b5175
...
@@ -1029,7 +1029,7 @@ auto dynamic_test = (
...
@@ -1029,7 +1029,7 @@ auto dynamic_test = (
"BadDynamicFixture1"
,
"TestBase"
,
nullptr
,
nullptr
,
__FILE__
,
__LINE__
,
"BadDynamicFixture1"
,
"TestBase"
,
nullptr
,
nullptr
,
__FILE__
,
__LINE__
,
[]()
->
testing
::
Test
*
{
return
new
DynamicTest
<
true
>
;
}),
[]()
->
testing
::
Test
*
{
return
new
DynamicTest
<
true
>
;
}),
// Register two tests with the same fixture incorrectly by om
mi
ting the
// Register two tests with the same fixture incorrectly by om
it
ting the
// return type.
// return type.
testing
::
RegisterTest
(
testing
::
RegisterTest
(
"BadDynamicFixture2"
,
"FixtureBase"
,
nullptr
,
nullptr
,
__FILE__
,
"BadDynamicFixture2"
,
"FixtureBase"
,
nullptr
,
nullptr
,
__FILE__
,
...
...
googletest/test/googletest-param-test-test.cc
View file @
050b5175
...
@@ -835,14 +835,14 @@ TEST(MacroNameing, LookupNames) {
...
@@ -835,14 +835,14 @@ TEST(MacroNameing, LookupNames) {
}
}
}
}
// Check that the expected form of the test suit name actualy exists.
// Check that the expected form of the test suit name actual
l
y exists.
EXPECT_NE
(
//
EXPECT_NE
(
//
know_suite_names
.
find
(
"FortyTwo/MacroNamingTest"
),
know_suite_names
.
find
(
"FortyTwo/MacroNamingTest"
),
know_suite_names
.
end
());
know_suite_names
.
end
());
EXPECT_NE
(
EXPECT_NE
(
know_suite_names
.
find
(
"MacroNamingTestNonParametrized"
),
know_suite_names
.
find
(
"MacroNamingTestNonParametrized"
),
know_suite_names
.
end
());
know_suite_names
.
end
());
// Check that the expected form of the test name actualy exists.
// Check that the expected form of the test name actual
l
y exists.
EXPECT_NE
(
//
EXPECT_NE
(
//
know_test_names
.
find
(
"FortyTwo/MacroNamingTest.FooSomeTestName/0"
),
know_test_names
.
find
(
"FortyTwo/MacroNamingTest.FooSomeTestName/0"
),
know_test_names
.
end
());
know_test_names
.
end
());
...
...
googletest/test/googletest-printers-test.cc
View file @
050b5175
...
@@ -201,7 +201,7 @@ OutputStream& operator<<(OutputStream& os,
...
@@ -201,7 +201,7 @@ OutputStream& operator<<(OutputStream& os,
return
os
;
return
os
;
}
}
// A user-defined streamable but recursivly-defined container type in
// A user-defined streamable but recursiv
e
ly-defined container type in
// a user namespace, it mimics therefore std::filesystem::path or
// a user namespace, it mimics therefore std::filesystem::path or
// boost::filesystem::path.
// boost::filesystem::path.
class
PathLike
{
class
PathLike
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment