aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorzhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386>2013-09-16 05:50:53 +0000
committerzhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386>2013-09-16 05:50:53 +0000
commit6e0fba4de0c506dff05598799fcc56fccfdcc669 (patch)
tree43ff0831f305681e1507a522d5485c201ec91894 /test
parent45fef502fac471efa4bf25b3d4104943463912eb (diff)
downloadgoogletest-6e0fba4de0c506dff05598799fcc56fccfdcc669.tar.gz
googletest-6e0fba4de0c506dff05598799fcc56fccfdcc669.tar.bz2
googletest-6e0fba4de0c506dff05598799fcc56fccfdcc669.zip
fixes the bug reported by Andrzej Jarzabek where 2 gmock tests fail when built with VS
Diffstat (limited to 'test')
-rw-r--r--test/gmock-spec-builders_test.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/gmock-spec-builders_test.cc b/test/gmock-spec-builders_test.cc
index 92e7d343..843681cf 100644
--- a/test/gmock-spec-builders_test.cc
+++ b/test/gmock-spec-builders_test.cc
@@ -886,7 +886,7 @@ TEST(ExpectCallTest, TakesDefaultActionWhenWillListIsExhausted) {
" - returning default value."));
}
-TEST(FunctionMockerTest, ReportsExpectCallLocationForExhausedActions) {
+TEST(FunctionMockerMessageTest, 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(FunctionMockerMessageTest,
ReportsDefaultActionLocationOfUninterestingCallsForNaggyMock) {
std::string on_call_location;
CaptureStdout();