Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
f0e4c411
Commit
f0e4c411
authored
Aug 14, 2018
by
Gennadiy Civil
Browse files
more comments changes
parent
bbf738a2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
5 deletions
+3
-5
googlemock/src/gmock-spec-builders.cc
googlemock/src/gmock-spec-builders.cc
+1
-1
googletest/test/googletest-options-test.cc
googletest/test/googletest-options-test.cc
+1
-2
googletest/test/gtest_repeat_test.cc
googletest/test/gtest_repeat_test.cc
+1
-2
No files found.
googlemock/src/gmock-spec-builders.cc
View file @
f0e4c411
...
@@ -782,7 +782,7 @@ void Mock::RegisterUseByOnCallOrExpectCall(const void* mock_obj,
...
@@ -782,7 +782,7 @@ void Mock::RegisterUseByOnCallOrExpectCall(const void* mock_obj,
const
TestInfo
*
const
test_info
=
const
TestInfo
*
const
test_info
=
UnitTest
::
GetInstance
()
->
current_test_info
();
UnitTest
::
GetInstance
()
->
current_test_info
();
if
(
test_info
!=
NULL
)
{
if
(
test_info
!=
NULL
)
{
//
TODO(wan@google.com)
: record the test case name when the
//
FIXME
: record the test case name when the
// ON_CALL or EXPECT_CALL is invoked from SetUpTestCase() or
// ON_CALL or EXPECT_CALL is invoked from SetUpTestCase() or
// TearDownTestCase().
// TearDownTestCase().
state
.
first_used_test_case
=
test_info
->
test_case_name
();
state
.
first_used_test_case
=
test_info
->
test_case_name
();
...
...
googletest/test/googletest-options-test.cc
View file @
f0e4c411
...
@@ -105,8 +105,7 @@ TEST(OutputFileHelpersTest, GetCurrentExecutableName) {
...
@@ -105,8 +105,7 @@ TEST(OutputFileHelpersTest, GetCurrentExecutableName) {
#elif GTEST_OS_FUCHSIA
#elif GTEST_OS_FUCHSIA
const
bool
success
=
exe_str
==
"app"
;
const
bool
success
=
exe_str
==
"app"
;
#else
#else
// FIXME: remove the hard-coded "lt-" prefix when
// FIXME: remove the hard-coded "lt-" prefix when libtool replacement is ready
// libtool replacement is ready.
const
bool
success
=
const
bool
success
=
exe_str
==
"googletest-options-test"
||
exe_str
==
"googletest-options-test"
||
exe_str
==
"gtest_all_test"
||
exe_str
==
"gtest_all_test"
||
...
...
googletest/test/gtest_repeat_test.cc
View file @
f0e4c411
...
@@ -117,8 +117,7 @@ const int kNumberOfParamTests = 10;
...
@@ -117,8 +117,7 @@ const int kNumberOfParamTests = 10;
class
MyParamTest
:
public
testing
::
TestWithParam
<
int
>
{};
class
MyParamTest
:
public
testing
::
TestWithParam
<
int
>
{};
TEST_P
(
MyParamTest
,
ShouldPass
)
{
TEST_P
(
MyParamTest
,
ShouldPass
)
{
// FIXME: Make parameter value checking robust
// FIXME: Make parameter value checking robust WRT order of tests.
// WRT order of tests.
GTEST_CHECK_INT_EQ_
(
g_param_test_count
%
kNumberOfParamTests
,
GetParam
());
GTEST_CHECK_INT_EQ_
(
g_param_test_count
%
kNumberOfParamTests
,
GetParam
());
g_param_test_count
++
;
g_param_test_count
++
;
}
}
...
...
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