Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
035de8c7
Commit
035de8c7
authored
Nov 10, 2020
by
Mark Barolak
Browse files
Merge pull request #3109 from hyukmyeong:typo
PiperOrigin-RevId: 341604515
parents
cda39064
87347d54
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
16 deletions
+16
-16
googletest/include/gtest/internal/gtest-internal.h
googletest/include/gtest/internal/gtest-internal.h
+3
-3
googletest/include/gtest/internal/gtest-param-util.h
googletest/include/gtest/internal/gtest-param-util.h
+3
-3
googletest/src/gtest-internal-inl.h
googletest/src/gtest-internal-inl.h
+4
-4
googletest/src/gtest.cc
googletest/src/gtest.cc
+6
-6
No files found.
googletest/include/gtest/internal/gtest-internal.h
View file @
035de8c7
...
@@ -566,11 +566,11 @@ struct SuiteApiResolver : T {
...
@@ -566,11 +566,11 @@ struct SuiteApiResolver : T {
//
//
// Arguments:
// Arguments:
//
//
// test_suite_name:
name of the test suite
// test_suite_name: name of the test suite
// name: name of the test
// name: name of the test
// type_param
the name of the test's type parameter, or NULL if
// type_param
:
the name of the test's type parameter, or NULL if
// this is not a typed or a type-parameterized test.
// this is not a typed or a type-parameterized test.
// value_param
text representation of the test's value parameter,
// value_param
:
text representation of the test's value parameter,
// or NULL if this is not a type-parameterized test.
// or NULL if this is not a type-parameterized test.
// code_location: code location where the test is defined
// code_location: code location where the test is defined
// fixture_class_id: ID of the test fixture class
// fixture_class_id: ID of the test fixture class
...
...
googletest/include/gtest/internal/gtest-param-util.h
View file @
035de8c7
...
@@ -459,7 +459,7 @@ class ParameterizedTestSuiteInfoBase {
...
@@ -459,7 +459,7 @@ class ParameterizedTestSuiteInfoBase {
// Base part of test suite name for display purposes.
// Base part of test suite name for display purposes.
virtual
const
std
::
string
&
GetTestSuiteName
()
const
=
0
;
virtual
const
std
::
string
&
GetTestSuiteName
()
const
=
0
;
// Test
cas
e id to verify identity.
// Test
suit
e id to verify identity.
virtual
TypeId
GetTestSuiteTypeId
()
const
=
0
;
virtual
TypeId
GetTestSuiteTypeId
()
const
=
0
;
// UnitTest class invokes this method to register tests in this
// UnitTest class invokes this method to register tests in this
// test suite right before running them in RUN_ALL_TESTS macro.
// test suite right before running them in RUN_ALL_TESTS macro.
...
@@ -507,11 +507,11 @@ class ParameterizedTestSuiteInfo : public ParameterizedTestSuiteInfoBase {
...
@@ -507,11 +507,11 @@ class ParameterizedTestSuiteInfo : public ParameterizedTestSuiteInfoBase {
CodeLocation
code_location
)
CodeLocation
code_location
)
:
test_suite_name_
(
name
),
code_location_
(
code_location
)
{}
:
test_suite_name_
(
name
),
code_location_
(
code_location
)
{}
// Test
cas
e base name for display purposes.
// Test
suit
e base name for display purposes.
const
std
::
string
&
GetTestSuiteName
()
const
override
{
const
std
::
string
&
GetTestSuiteName
()
const
override
{
return
test_suite_name_
;
return
test_suite_name_
;
}
}
// Test
cas
e id to verify identity.
// Test
suit
e id to verify identity.
TypeId
GetTestSuiteTypeId
()
const
override
{
return
GetTypeId
<
TestSuite
>
();
}
TypeId
GetTestSuiteTypeId
()
const
override
{
return
GetTypeId
<
TestSuite
>
();
}
// TEST_P macro uses AddTestPattern() to record information
// TEST_P macro uses AddTestPattern() to record information
// about a single test in a LocalTestInfo structure.
// about a single test in a LocalTestInfo structure.
...
...
googletest/src/gtest-internal-inl.h
View file @
035de8c7
...
@@ -655,10 +655,10 @@ class GTEST_API_ UnitTestImpl {
...
@@ -655,10 +655,10 @@ class GTEST_API_ UnitTestImpl {
// Arguments:
// Arguments:
//
//
// test_suite_name: name of the test suite
// test_suite_name: name of the test suite
// type_param: the name of the test's type parameter, or NULL if
// type_param:
the name of the test's type parameter, or NULL if
// this is not a typed or a type-parameterized test.
//
this is not a typed or a type-parameterized test.
// set_up_tc: pointer to the function that sets up the test suite
// set_up_tc:
pointer to the function that sets up the test suite
// tear_down_tc: pointer to the function that tears down the test suite
// tear_down_tc:
pointer to the function that tears down the test suite
TestSuite
*
GetTestSuite
(
const
char
*
test_suite_name
,
const
char
*
type_param
,
TestSuite
*
GetTestSuite
(
const
char
*
test_suite_name
,
const
char
*
type_param
,
internal
::
SetUpTestSuiteFunc
set_up_tc
,
internal
::
SetUpTestSuiteFunc
set_up_tc
,
internal
::
TearDownTestSuiteFunc
tear_down_tc
);
internal
::
TearDownTestSuiteFunc
tear_down_tc
);
...
...
googletest/src/gtest.cc
View file @
035de8c7
...
@@ -2737,7 +2737,7 @@ namespace internal {
...
@@ -2737,7 +2737,7 @@ namespace internal {
//
//
// Arguments:
// Arguments:
//
//
// test_suite_name:
name of the test suite
// test_suite_name: name of the test suite
// name: name of the test
// name: name of the test
// type_param: the name of the test's type parameter, or NULL if
// type_param: the name of the test's type parameter, or NULL if
// this is not a typed or a type-parameterized test.
// this is not a typed or a type-parameterized test.
...
@@ -2943,7 +2943,7 @@ int TestSuite::total_test_count() const {
...
@@ -2943,7 +2943,7 @@ int TestSuite::total_test_count() const {
//
//
// Arguments:
// Arguments:
//
//
// name:
name of the test suite
//
a_
name: name of the test suite
// a_type_param: the name of the test suite's type parameter, or NULL if
// a_type_param: the name of the test suite's type parameter, or NULL if
// this is not a typed or a type-parameterized test suite.
// this is not a typed or a type-parameterized test suite.
// set_up_tc: pointer to the function that sets up the test suite
// set_up_tc: pointer to the function that sets up the test suite
...
@@ -5558,10 +5558,10 @@ class TestSuiteNameIs {
...
@@ -5558,10 +5558,10 @@ class TestSuiteNameIs {
// Arguments:
// Arguments:
//
//
// test_suite_name: name of the test suite
// test_suite_name: name of the test suite
// type_param: the name of the test suite's type parameter, or NULL if
// type_param:
the name of the test suite's type parameter, or NULL if
// this is not a typed or a type-parameterized test suite.
//
this is not a typed or a type-parameterized test suite.
// set_up_tc: pointer to the function that sets up the test suite
// set_up_tc:
pointer to the function that sets up the test suite
// tear_down_tc: pointer to the function that tears down the test suite
// tear_down_tc:
pointer to the function that tears down the test suite
TestSuite* UnitTestImpl::GetTestSuite(
TestSuite* UnitTestImpl::GetTestSuite(
const char* test_suite_name, const char* type_param,
const char* test_suite_name, const char* type_param,
internal::SetUpTestSuiteFunc set_up_tc,
internal::SetUpTestSuiteFunc set_up_tc,
...
...
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