summaryrefslogtreecommitdiffstats
path: root/testing/gmock/test/gmock-printers_test.cc
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-25 17:03:47 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-25 17:03:47 +0000
commit762217321f240970b7a7dc404470caedbf43cd5e (patch)
treeb0b66383100d57a8272e4b622580dff16b5007ee /testing/gmock/test/gmock-printers_test.cc
parent7ee7e191bb9f5419b6f6fd9036e6bcdc77d5cc0b (diff)
downloadchromium_src-762217321f240970b7a7dc404470caedbf43cd5e.zip
chromium_src-762217321f240970b7a7dc404470caedbf43cd5e.tar.gz
chromium_src-762217321f240970b7a7dc404470caedbf43cd5e.tar.bz2
Update to current gtest/gmock.
Synced in new gmock, twiddled DEPS for new gtest, updated README. BUG=34160 Review URL: http://codereview.chromium.org/1151006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42625 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing/gmock/test/gmock-printers_test.cc')
-rw-r--r--testing/gmock/test/gmock-printers_test.cc20
1 files changed, 13 insertions, 7 deletions
diff --git a/testing/gmock/test/gmock-printers_test.cc b/testing/gmock/test/gmock-printers_test.cc
index 0553e9c..92c8413 100644
--- a/testing/gmock/test/gmock-printers_test.cc
+++ b/testing/gmock/test/gmock-printers_test.cc
@@ -153,6 +153,7 @@ 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;
@@ -1010,19 +1011,24 @@ TEST(PrintReferenceTest, HandlesMemberVariablePointer) {
+ " " + 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) {