Fixes the explanation generated by many composite matchers (by Manuel Klimek); publishes the gmock value printer as testing::PrintToString() (by Zhanyong Wan).

2010-03-16 20:01:51 +00:00
parent a862f1de30
commit 676e8cc609
5 changed files with 185 additions and 143 deletions
--- a/test/gmock-generated-matchers_test.cc
+++ b/test/gmock-generated-matchers_test.cc
@@ -178,9 +178,7 @@ TEST(ArgsTest, CanMatchTupleByReference) {

 // Validates that arg is printed as str.
 MATCHER_P(PrintsAs, str, "") {
-  typedef GMOCK_REMOVE_CONST_(GMOCK_REMOVE_REFERENCE_(arg_type)) RawTuple;
-  return
-      testing::internal::UniversalPrinter<RawTuple>::PrintToString(arg) == str;
+  return testing::PrintToString(arg) == str;
 }

 TEST(ArgsTest, AcceptsTenTemplateArgs) {