Update to current gtest/gmock.

testing/gmock/test/gmock-printers_test.cc

 // Copyright 2007, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 135 matching lines @@
 using ::std::make_pair;
 using ::std::map;
 using ::std::multimap;
 using ::std::multiset;
 using ::std::pair;
 using ::std::set;
 using ::std::tr1::make_tuple;
 using ::std::tr1::tuple;
 using ::std::vector;
 using ::testing::ElementsAre;
+using ::testing::PrintToString;
 using ::testing::StartsWith;
 using ::testing::internal::NativeArray;
 using ::testing::internal::Strings;
 using ::testing::internal::UniversalTersePrint;
 using ::testing::internal::UniversalPrint;
 using ::testing::internal::UniversalTersePrintTupleFieldsToStrings;
 using ::testing::internal::UniversalPrinter;
 using ::testing::internal::kReference;
 using ::testing::internal::string;
 
@@ skipping 837 matching lines @@
 
 // Tests that the universal printer prints a member variable pointer
 // passed by reference.
 TEST(PrintReferenceTest, HandlesMemberVariablePointer) {
   int (Foo::*p) = &Foo::value;  // NOLINT
   EXPECT_THAT(PrintByRef(p),
               StartsWith("@" + PrintPointer(&p)
                          + " " + Print(sizeof(p)) + "-byte object "));
 }
 
-TEST(PrintToStringTest, WorksForNonReference) {
-  EXPECT_EQ("123", UniversalPrinter<int>::PrintToString(123));
+TEST(PrintToStringTest, WorksForScalar) {
+  EXPECT_EQ("123", PrintToString(123));
 }
 
-TEST(PrintToStringTest, WorksForReference) {
-  int n = 123;
-  EXPECT_EQ("@" + PrintPointer(&n) + " 123",
-            UniversalPrinter<const int&>::PrintToString(n));
+TEST(PrintToStringTest, WorksForPointerToConstChar) {
+  const char* p = "hello";
+  EXPECT_EQ("\"hello\"", PrintToString(p));
+}
+
+TEST(PrintToStringTest, WorksForPointerToNonConstChar) {
+  char s[] = "hello";
+  char* p = s;
+  EXPECT_EQ("\"hello\"", PrintToString(p));
 }
 
 TEST(PrintToStringTest, WorksForArray) {
   int n[3] = { 1, 2, 3 };
-  EXPECT_EQ("{ 1, 2, 3 }", UniversalPrinter<int[3]>::PrintToString(n));
+  EXPECT_EQ("{ 1, 2, 3 }", PrintToString(n));
 }
 
 TEST(UniversalTersePrintTest, WorksForNonReference) {
   ::std::stringstream ss;
   UniversalTersePrint(123, &ss);
   EXPECT_EQ("123", ss.str());
 }
 
 TEST(UniversalTersePrintTest, WorksForReference) {
   const int& n = 123;
@@ skipping 67 matching lines @@
 
 TEST(UniversalTersePrintTupleFieldsToStringsTest, PrintsTersely) {
   const int n = 1;
   EXPECT_THAT(UniversalTersePrintTupleFieldsToStrings(
                   tuple<const int&, const char*>(n, "a")),
               ElementsAre("1", "\"a\""));
 }
 
 }  // namespace gmock_printers_test
 }  // namespace testing