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
6e0fba4d
Commit
6e0fba4d
authored
Sep 16, 2013
by
zhanyong.wan
Browse files
fixes the bug reported by Andrzej Jarzabek where 2 gmock tests fail when built with VS
parent
45fef502
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
test/gmock-spec-builders_test.cc
test/gmock-spec-builders_test.cc
+2
-2
No files found.
test/gmock-spec-builders_test.cc
View file @
6e0fba4d
...
...
@@ -886,7 +886,7 @@ TEST(ExpectCallTest, TakesDefaultActionWhenWillListIsExhausted) {
" - returning default value."
));
}
TEST
(
FunctionMockerTest
,
ReportsExpectCallLocationForExhausedActions
)
{
TEST
(
FunctionMocker
Message
Test
,
ReportsExpectCallLocationForExhausedActions
)
{
MockB
b
;
std
::
string
expect_call_location
=
FormatFileLocation
(
__FILE__
,
__LINE__
+
1
);
EXPECT_CALL
(
b
,
DoB
()).
Times
(
AnyNumber
()).
WillOnce
(
Return
(
1
));
...
...
@@ -900,7 +900,7 @@ TEST(FunctionMockerTest, ReportsExpectCallLocationForExhausedActions) {
EXPECT_PRED_FORMAT2
(
IsSubstring
,
expect_call_location
,
output
);
}
TEST
(
FunctionMockerTest
,
TEST
(
FunctionMocker
Message
Test
,
ReportsDefaultActionLocationOfUninterestingCallsForNaggyMock
)
{
std
::
string
on_call_location
;
CaptureStdout
();
...
...
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