From d45f9980995af5c6e4c68e32df89d3cccb0231ef Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 9 Apr 2018 18:14:24 +0000 Subject: Make StringViewTemplate be based on pdfium::span<>. Change-Id: I13d3e462c86d035bbb992696aab523df5642533b Reviewed-on: https://pdfium-review.googlesource.com/29811 Commit-Queue: Tom Sepez Reviewed-by: dsinclair --- core/fxcrt/bytestring_unittest.cpp | 99 +++++++++++++++++++++++--------------- 1 file changed, 60 insertions(+), 39 deletions(-) (limited to 'core/fxcrt/bytestring_unittest.cpp') diff --git a/core/fxcrt/bytestring_unittest.cpp b/core/fxcrt/bytestring_unittest.cpp index ce1512b4cf..74e52db69a 100644 --- a/core/fxcrt/bytestring_unittest.cpp +++ b/core/fxcrt/bytestring_unittest.cpp @@ -9,6 +9,7 @@ #include "core/fxcrt/fx_string.h" #include "testing/gtest/include/gtest/gtest.h" +#include "third_party/base/span.h" #include "third_party/base/stl_util.h" namespace fxcrt { @@ -349,45 +350,6 @@ TEST(ByteString, OperatorNE) { EXPECT_TRUE(c_string3 != byte_string); } -TEST(ByteStringView, Null) { - ByteStringView null_string; - EXPECT_FALSE(null_string.raw_str()); - EXPECT_EQ(0u, null_string.GetLength()); - EXPECT_TRUE(null_string.IsEmpty()); - - ByteStringView another_null_string; - EXPECT_EQ(null_string, another_null_string); - - ByteStringView copied_null_string(null_string); - EXPECT_FALSE(copied_null_string.raw_str()); - EXPECT_EQ(0u, copied_null_string.GetLength()); - EXPECT_TRUE(copied_null_string.IsEmpty()); - EXPECT_EQ(null_string, copied_null_string); - - ByteStringView empty_string(""); // Pointer to NUL, not NULL pointer. - EXPECT_TRUE(empty_string.raw_str()); - EXPECT_EQ(0u, empty_string.GetLength()); - EXPECT_TRUE(empty_string.IsEmpty()); - EXPECT_EQ(null_string, empty_string); - - ByteStringView assigned_null_string("initially not nullptr"); - assigned_null_string = null_string; - EXPECT_FALSE(assigned_null_string.raw_str()); - EXPECT_EQ(0u, assigned_null_string.GetLength()); - EXPECT_TRUE(assigned_null_string.IsEmpty()); - EXPECT_EQ(null_string, assigned_null_string); - - ByteStringView assigned_nullptr_string("initially not nullptr"); - assigned_nullptr_string = nullptr; - EXPECT_FALSE(assigned_nullptr_string.raw_str()); - EXPECT_EQ(0u, assigned_nullptr_string.GetLength()); - EXPECT_TRUE(assigned_nullptr_string.IsEmpty()); - EXPECT_EQ(null_string, assigned_nullptr_string); - - ByteStringView non_null_string("a"); - EXPECT_NE(null_string, non_null_string); -} - TEST(ByteString, Concat) { ByteString fred; fred.Concat("FRED", 4); @@ -1001,16 +963,71 @@ TEST(ByteString, MultiCharReverseIterator) { EXPECT_TRUE(iter == multi_str.rbegin()); } +TEST(ByteStringView, Null) { + ByteStringView null_string; + EXPECT_FALSE(null_string.raw_str()); + EXPECT_EQ(0u, null_string.GetLength()); + EXPECT_TRUE(null_string.IsEmpty()); + + ByteStringView another_null_string; + EXPECT_EQ(null_string, another_null_string); + + ByteStringView copied_null_string(null_string); + EXPECT_FALSE(copied_null_string.raw_str()); + EXPECT_EQ(0u, copied_null_string.GetLength()); + EXPECT_TRUE(copied_null_string.IsEmpty()); + EXPECT_EQ(null_string, copied_null_string); + + ByteStringView span_null_string = pdfium::span(); + EXPECT_FALSE(span_null_string.raw_str()); + EXPECT_EQ(0u, span_null_string.GetLength()); + EXPECT_TRUE(span_null_string.IsEmpty()); + EXPECT_EQ(null_string, span_null_string); + + ByteStringView empty_string(""); // Pointer to NUL, not NULL pointer. + EXPECT_TRUE(empty_string.raw_str()); + EXPECT_EQ(0u, empty_string.GetLength()); + EXPECT_TRUE(empty_string.IsEmpty()); + EXPECT_EQ(null_string, empty_string); + + ByteStringView assigned_null_string("initially not nullptr"); + assigned_null_string = null_string; + EXPECT_FALSE(assigned_null_string.raw_str()); + EXPECT_EQ(0u, assigned_null_string.GetLength()); + EXPECT_TRUE(assigned_null_string.IsEmpty()); + EXPECT_EQ(null_string, assigned_null_string); + + ByteStringView assigned_nullptr_string("initially not nullptr"); + assigned_nullptr_string = nullptr; + EXPECT_FALSE(assigned_nullptr_string.raw_str()); + EXPECT_EQ(0u, assigned_nullptr_string.GetLength()); + EXPECT_TRUE(assigned_nullptr_string.IsEmpty()); + EXPECT_EQ(null_string, assigned_nullptr_string); + + ByteStringView assigned_span_null_string("initially not null span"); + assigned_span_null_string = pdfium::span(); + EXPECT_FALSE(assigned_span_null_string.raw_str()); + EXPECT_EQ(0u, assigned_span_null_string.GetLength()); + EXPECT_TRUE(assigned_span_null_string.IsEmpty()); + EXPECT_EQ(null_string, assigned_span_null_string); + + ByteStringView non_null_string("a"); + EXPECT_NE(null_string, non_null_string); +} + TEST(ByteStringView, NotNull) { ByteStringView string3("abc"); ByteStringView string6("abcdef"); ByteStringView alternate_string3("abcdef", 3); + ByteStringView span_string4( + pdfium::span(reinterpret_cast("abcd"), 4)); ByteStringView embedded_nul_string7("abc\0def", 7); ByteStringView illegal_string7("abcdef", 7); EXPECT_EQ(3u, string3.GetLength()); EXPECT_EQ(6u, string6.GetLength()); EXPECT_EQ(3u, alternate_string3.GetLength()); + EXPECT_EQ(4u, span_string4.GetLength()); EXPECT_EQ(7u, embedded_nul_string7.GetLength()); EXPECT_EQ(7u, illegal_string7.GetLength()); @@ -1296,6 +1313,10 @@ TEST(ByteStringView, OperatorEQ) { EXPECT_FALSE(c_string1 == byte_string_c); EXPECT_FALSE(c_string2 == byte_string_c); EXPECT_FALSE(c_string3 == byte_string_c); + + pdfium::span span5(reinterpret_cast("hello"), + 5); + EXPECT_EQ(byte_string_c.span(), span5); } TEST(ByteStringView, OperatorNE) { -- cgit v1.2.3