gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removes unused scons scripts; picks up gtest r446.

Browse Source
This commit is contained in:
zhanyong.wan
2010-07-21 22:21:07 +00:00
parent e3bd0981ca
commit d60c5f41c2
5 changed files with 3 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/gmock-generated-matchers_test.cc
View File

@@ -243,7 +243,7 @@ Matcher<tuple<char, int> > LessThan() {
TEST(ArgsTest, ExplainsMatchResultWithInnerExplanation) {
const Matcher<tuple<char, int, int> > m = Args<0, 2>(LessThan());
EXPECT_EQ("whose fields (#0, #2) are ('a' (97), 42), "
EXPECT_EQ("whose fields (#0, #2) are ('a' (97, 0x61), 42), "
"where the first value is 55 more than the second",
Explain(m, make_tuple('a', 42, 42)));
EXPECT_EQ("whose fields (#0, #2) are ('\\0', 43)",

4
test/gmock-matchers_test.cc
View File

@@ -3751,8 +3751,8 @@ TEST(MatcherTupleTest, ExplainsMatchFailure) {
make_tuple(2, 'b'), &ss2);
EXPECT_EQ(" Expected arg #0: is > 5\n"
" Actual: 2, which is 3 less than 5\n"
" Expected arg #1: is equal to 'a' (97)\n"
" Actual: 'b' (98)\n",
" Expected arg #1: is equal to 'a' (97, 0x61)\n"
" Actual: 'b' (98, 0x62)\n",
ss2.str()); // Failed match where both arguments need explanation.
stringstream ss3;