diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-01-30 22:34:22 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-01-30 22:34:22 (GMT) |
| commit | e55fded0c88228fa40e998a6b54069d15853a9c0 (patch) | |
| tree | 0eb2df723cb2f7cdb29fcb9d374bae3de16beb4c /googletest/test | |
| parent | 2a4683021ab3e969a63c5e9226c1db4522f7129d (diff) | |
| download | googletest-e55fded0c88228fa40e998a6b54069d15853a9c0.zip googletest-e55fded0c88228fa40e998a6b54069d15853a9c0.tar.gz googletest-e55fded0c88228fa40e998a6b54069d15853a9c0.tar.bz2 | |
Code merges
Diffstat (limited to 'googletest/test')
| -rw-r--r-- | googletest/test/gtest-printers_test.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/googletest/test/gtest-printers_test.cc b/googletest/test/gtest-printers_test.cc index 42e1965..0860abf 100644 --- a/googletest/test/gtest-printers_test.cc +++ b/googletest/test/gtest-printers_test.cc @@ -837,22 +837,22 @@ TEST(PrintTypeWithGenericStreamingTest, TypeImplicitlyConvertible) { EXPECT_EQ("AllowsGenericStreamingAndImplicitConversionTemplate", Print(a)); } -#if GTEST_HAS_STRING_PIECE_ +#if GTEST_HAS_ABSL -// Tests printing StringPiece. +// Tests printing ::absl::string_view. -TEST(PrintStringPieceTest, SimpleStringPiece) { - const StringPiece sp = "Hello"; +TEST(PrintStringViewTest, SimpleStringView) { + const ::absl::string_view sp = "Hello"; EXPECT_EQ("\"Hello\"", Print(sp)); } -TEST(PrintStringPieceTest, UnprintableCharacters) { +TEST(PrintStringViewTest, UnprintableCharacters) { const char str[] = "NUL (\0) and \r\t"; - const StringPiece sp(str, sizeof(str) - 1); + const ::absl::string_view sp(str, sizeof(str) - 1); EXPECT_EQ("\"NUL (\\0) and \\r\\t\"", Print(sp)); } -#endif // GTEST_HAS_STRING_PIECE_ +#endif // GTEST_HAS_ABSL // Tests printing STL containers. |