fixes the bug reported by Andrzej Jarzabek where 2 gmock tests fail when built with VS

This commit is contained in:
zhanyong.wan 2013-09-16 05:50:53 +00:00
parent 45fef502fa
commit 6e0fba4de0

View File

@ -886,7 +886,7 @@ TEST(ExpectCallTest, TakesDefaultActionWhenWillListIsExhausted) {
" - returning default value.")); " - returning default value."));
} }
TEST(FunctionMockerTest, ReportsExpectCallLocationForExhausedActions) { TEST(FunctionMockerMessageTest, ReportsExpectCallLocationForExhausedActions) {
MockB b; MockB b;
std::string expect_call_location = FormatFileLocation(__FILE__, __LINE__ + 1); std::string expect_call_location = FormatFileLocation(__FILE__, __LINE__ + 1);
EXPECT_CALL(b, DoB()).Times(AnyNumber()).WillOnce(Return(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); EXPECT_PRED_FORMAT2(IsSubstring, expect_call_location, output);
} }
TEST(FunctionMockerTest, TEST(FunctionMockerMessageTest,
ReportsDefaultActionLocationOfUninterestingCallsForNaggyMock) { ReportsDefaultActionLocationOfUninterestingCallsForNaggyMock) {
std::string on_call_location; std::string on_call_location;
CaptureStdout(); CaptureStdout();