diff options
author | Lei Zhang <thestig@chromium.org> | 2017-11-21 22:07:50 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-11-21 22:07:50 +0000 |
commit | 56e04d2656bdd5f2b9448d857e8e73ab16aadf8e (patch) | |
tree | 57ed8ebed62f498bdd1fe010b0909f162bbcd29c /core/fxcrt/css/cfx_cssvaluelistparser_unittest.cpp | |
parent | ebe865db548f768038186054fc0f1eb024565c43 (diff) | |
download | pdfium-56e04d2656bdd5f2b9448d857e8e73ab16aadf8e.tar.xz |
Avoid passing pointers by reference in core.
This gets rid of most core/ non-const ref passing, either by passing by
pointer-to-pointer instead, or by returning std::pair.
Change-Id: Id7bdc355a1a725a05f9fa2f1e982ca8c975beef1
Reviewed-on: https://pdfium-review.googlesource.com/19030
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fxcrt/css/cfx_cssvaluelistparser_unittest.cpp')
-rw-r--r-- | core/fxcrt/css/cfx_cssvaluelistparser_unittest.cpp | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/core/fxcrt/css/cfx_cssvaluelistparser_unittest.cpp b/core/fxcrt/css/cfx_cssvaluelistparser_unittest.cpp index 62a542bc52..e232a2dc65 100644 --- a/core/fxcrt/css/cfx_cssvaluelistparser_unittest.cpp +++ b/core/fxcrt/css/cfx_cssvaluelistparser_unittest.cpp @@ -16,28 +16,28 @@ TEST(CFX_CSSValueListParserTest, rgb_short) { int32_t len; auto parser = pdfium::MakeUnique<CFX_CSSValueListParser>(L"#abc", 4, L' '); - EXPECT_TRUE(parser->NextValue(type, start, len)); + EXPECT_TRUE(parser->NextValue(&type, &start, &len)); EXPECT_EQ(CFX_CSSPrimitiveType::RGB, type); EXPECT_EQ(L"#abc", WideString(start, len)); - EXPECT_FALSE(parser->NextValue(type, start, len)); + EXPECT_FALSE(parser->NextValue(&type, &start, &len)); parser = pdfium::MakeUnique<CFX_CSSValueListParser>(L"#abcdef", 7, L' '); - EXPECT_TRUE(parser->NextValue(type, start, len)); + EXPECT_TRUE(parser->NextValue(&type, &start, &len)); EXPECT_EQ(CFX_CSSPrimitiveType::RGB, type); EXPECT_EQ(L"#abcdef", WideString(start, len)); - EXPECT_FALSE(parser->NextValue(type, start, len)); + EXPECT_FALSE(parser->NextValue(&type, &start, &len)); parser = pdfium::MakeUnique<CFX_CSSValueListParser>(L"rgb(1, 255, 4)", 14, L' '); - EXPECT_TRUE(parser->NextValue(type, start, len)); + EXPECT_TRUE(parser->NextValue(&type, &start, &len)); EXPECT_EQ(CFX_CSSPrimitiveType::RGB, type); EXPECT_EQ(L"rgb(1, 255, 4)", WideString(start, len)); parser = pdfium::MakeUnique<CFX_CSSValueListParser>(L"#abcdefghij", 11, L' '); - EXPECT_TRUE(parser->NextValue(type, start, len)); + EXPECT_TRUE(parser->NextValue(&type, &start, &len)); EXPECT_EQ(CFX_CSSPrimitiveType::Unknown, type); EXPECT_EQ(L"#abcdefghij", WideString(start, len)); - EXPECT_FALSE(parser->NextValue(type, start, len)); + EXPECT_FALSE(parser->NextValue(&type, &start, &len)); } TEST(CFX_CSSValueListParserTest, number_parsing) { @@ -46,38 +46,38 @@ TEST(CFX_CSSValueListParserTest, number_parsing) { int32_t len; auto parser = pdfium::MakeUnique<CFX_CSSValueListParser>(L"1234", 4, L' '); - EXPECT_TRUE(parser->NextValue(type, start, len)); + EXPECT_TRUE(parser->NextValue(&type, &start, &len)); EXPECT_EQ(CFX_CSSPrimitiveType::Number, type); EXPECT_EQ(L"1234", WideString(start, len)); parser = pdfium::MakeUnique<CFX_CSSValueListParser>(L"-1234", 5, L' '); - EXPECT_TRUE(parser->NextValue(type, start, len)); + EXPECT_TRUE(parser->NextValue(&type, &start, &len)); EXPECT_EQ(CFX_CSSPrimitiveType::Number, type); EXPECT_EQ(L"-1234", WideString(start, len)); parser = pdfium::MakeUnique<CFX_CSSValueListParser>(L"+1234", 5, L' '); - EXPECT_TRUE(parser->NextValue(type, start, len)); + EXPECT_TRUE(parser->NextValue(&type, &start, &len)); EXPECT_EQ(CFX_CSSPrimitiveType::Number, type); EXPECT_EQ(L"+1234", WideString(start, len)); parser = pdfium::MakeUnique<CFX_CSSValueListParser>(L".1234", 5, L' '); - EXPECT_TRUE(parser->NextValue(type, start, len)); + EXPECT_TRUE(parser->NextValue(&type, &start, &len)); EXPECT_EQ(CFX_CSSPrimitiveType::Number, type); EXPECT_EQ(L".1234", WideString(start, len)); parser = pdfium::MakeUnique<CFX_CSSValueListParser>(L"4321.1234", 9, L' '); - EXPECT_TRUE(parser->NextValue(type, start, len)); + EXPECT_TRUE(parser->NextValue(&type, &start, &len)); EXPECT_EQ(CFX_CSSPrimitiveType::Number, type); EXPECT_EQ(L"4321.1234", WideString(start, len)); // TODO(dsinclair): These should probably fail but currently don't. parser = pdfium::MakeUnique<CFX_CSSValueListParser>(L"4321.12.34", 10, L' '); - EXPECT_TRUE(parser->NextValue(type, start, len)); + EXPECT_TRUE(parser->NextValue(&type, &start, &len)); EXPECT_EQ(CFX_CSSPrimitiveType::Number, type); EXPECT_EQ(L"4321.12.34", WideString(start, len)); parser = pdfium::MakeUnique<CFX_CSSValueListParser>(L"43a1.12.34", 10, L' '); - EXPECT_TRUE(parser->NextValue(type, start, len)); + EXPECT_TRUE(parser->NextValue(&type, &start, &len)); EXPECT_EQ(CFX_CSSPrimitiveType::Number, type); EXPECT_EQ(L"43a1.12.34", WideString(start, len)); } @@ -89,18 +89,18 @@ TEST(CFX_CSSValueListParserTest, string_parsing) { auto parser = pdfium::MakeUnique<CFX_CSSValueListParser>(L"'string'", 8, L' '); - EXPECT_TRUE(parser->NextValue(type, start, len)); + EXPECT_TRUE(parser->NextValue(&type, &start, &len)); EXPECT_EQ(CFX_CSSPrimitiveType::String, type); EXPECT_EQ(L"string", WideString(start, len)); parser = pdfium::MakeUnique<CFX_CSSValueListParser>(L"\"another string\"", 16, L' '); - EXPECT_TRUE(parser->NextValue(type, start, len)); + EXPECT_TRUE(parser->NextValue(&type, &start, &len)); EXPECT_EQ(CFX_CSSPrimitiveType::String, type); EXPECT_EQ(L"another string", WideString(start, len)); parser = pdfium::MakeUnique<CFX_CSSValueListParser>(L"standalone", 10, L' '); - EXPECT_TRUE(parser->NextValue(type, start, len)); + EXPECT_TRUE(parser->NextValue(&type, &start, &len)); EXPECT_EQ(CFX_CSSPrimitiveType::String, type); EXPECT_EQ(L"standalone", WideString(start, len)); } @@ -111,31 +111,31 @@ TEST(CFX_CSSValueListParserTest, multiparsing) { int32_t len; auto parser = pdfium::MakeUnique<CFX_CSSValueListParser>(L"1, 2, 3", 7, L','); - EXPECT_TRUE(parser->NextValue(type, start, len)); + EXPECT_TRUE(parser->NextValue(&type, &start, &len)); EXPECT_EQ(CFX_CSSPrimitiveType::Number, type); EXPECT_EQ(L"1", WideString(start, len)); - EXPECT_TRUE(parser->NextValue(type, start, len)); + EXPECT_TRUE(parser->NextValue(&type, &start, &len)); EXPECT_EQ(CFX_CSSPrimitiveType::Number, type); EXPECT_EQ(L"2", WideString(start, len)); - EXPECT_TRUE(parser->NextValue(type, start, len)); + EXPECT_TRUE(parser->NextValue(&type, &start, &len)); EXPECT_EQ(CFX_CSSPrimitiveType::Number, type); EXPECT_EQ(L"3", WideString(start, len)); - EXPECT_FALSE(parser->NextValue(type, start, len)); + EXPECT_FALSE(parser->NextValue(&type, &start, &len)); parser = pdfium::MakeUnique<CFX_CSSValueListParser>(L"'str', rgb(1, 2, 3), 4", 22, L','); - EXPECT_TRUE(parser->NextValue(type, start, len)); + EXPECT_TRUE(parser->NextValue(&type, &start, &len)); EXPECT_EQ(CFX_CSSPrimitiveType::String, type); EXPECT_EQ(L"str", WideString(start, len)); - EXPECT_TRUE(parser->NextValue(type, start, len)); + EXPECT_TRUE(parser->NextValue(&type, &start, &len)); EXPECT_EQ(CFX_CSSPrimitiveType::RGB, type); EXPECT_EQ(L"rgb(1, 2, 3)", WideString(start, len)); - EXPECT_TRUE(parser->NextValue(type, start, len)); + EXPECT_TRUE(parser->NextValue(&type, &start, &len)); EXPECT_EQ(CFX_CSSPrimitiveType::Number, type); EXPECT_EQ(L"4", WideString(start, len)); } |