| Index: fpdfsdk/src/fpdftext_embeddertest.cpp
|
| diff --git a/fpdfsdk/src/fpdftext_embeddertest.cpp b/fpdfsdk/src/fpdftext_embeddertest.cpp
|
| index 8384a41944c1500004e78f4413d17ee2588f0ca9..dd3737a40ef1044efc7d0ce73e0af41b562d403a 100644
|
| --- a/fpdfsdk/src/fpdftext_embeddertest.cpp
|
| +++ b/fpdfsdk/src/fpdftext_embeddertest.cpp
|
| @@ -25,8 +25,7 @@ static bool check_unsigned_shorts(const char* expected,
|
|
|
| } // namespace
|
|
|
| -class FPDFTextEmbeddertest : public EmbedderTest {
|
| -};
|
| +class FPDFTextEmbeddertest : public EmbedderTest {};
|
|
|
| TEST_F(FPDFTextEmbeddertest, Text) {
|
| EXPECT_TRUE(OpenDocument("testing/resources/hello_world.pdf"));
|
| @@ -63,18 +62,14 @@ TEST_F(FPDFTextEmbeddertest, Text) {
|
| EXPECT_NEAR(49.844, bottom, 0.001);
|
| EXPECT_NEAR(55.520, top, 0.001);
|
|
|
| - EXPECT_EQ(4, FPDFText_GetCharIndexAtPos(
|
| - textpage, 42.0, 50.0, 1.0, 1.0));
|
| - EXPECT_EQ(-1, FPDFText_GetCharIndexAtPos(
|
| - textpage, 0.0, 0.0, 1.0, 1.0));
|
| - EXPECT_EQ(-1, FPDFText_GetCharIndexAtPos(
|
| - textpage, 199.0, 199.0, 1.0, 1.0));
|
| + EXPECT_EQ(4, FPDFText_GetCharIndexAtPos(textpage, 42.0, 50.0, 1.0, 1.0));
|
| + EXPECT_EQ(-1, FPDFText_GetCharIndexAtPos(textpage, 0.0, 0.0, 1.0, 1.0));
|
| + EXPECT_EQ(-1, FPDFText_GetCharIndexAtPos(textpage, 199.0, 199.0, 1.0, 1.0));
|
|
|
| // Test out of range indicies.
|
| - EXPECT_EQ(-1, FPDFText_GetCharIndexAtPos(
|
| - textpage, 42.0, 10000000.0, 1.0, 1.0));
|
| - EXPECT_EQ(-1, FPDFText_GetCharIndexAtPos(
|
| - textpage, -1.0, 50.0, 1.0, 1.0));
|
| + EXPECT_EQ(-1,
|
| + FPDFText_GetCharIndexAtPos(textpage, 42.0, 10000000.0, 1.0, 1.0));
|
| + EXPECT_EQ(-1, FPDFText_GetCharIndexAtPos(textpage, -1.0, 50.0, 1.0, 1.0));
|
|
|
| // Count does not include the terminating NUL in the string literal.
|
| EXPECT_EQ(2, FPDFText_CountRects(textpage, 0, sizeof(expected) - 1));
|
| @@ -110,25 +105,24 @@ TEST_F(FPDFTextEmbeddertest, Text) {
|
| EXPECT_EQ(0.0, bottom);
|
| EXPECT_EQ(0.0, top);
|
|
|
| - EXPECT_EQ(9, FPDFText_GetBoundedText(
|
| - textpage, 41.0, 56.0, 82.0, 48.0, 0, 0));
|
| + EXPECT_EQ(9, FPDFText_GetBoundedText(textpage, 41.0, 56.0, 82.0, 48.0, 0, 0));
|
|
|
| // Extract starting at character 4 as above.
|
| memset(fixed_buffer, 0xbd, sizeof(fixed_buffer));
|
| - EXPECT_EQ(1, FPDFText_GetBoundedText(
|
| - textpage, 41.0, 56.0, 82.0, 48.0, fixed_buffer, 1));
|
| + EXPECT_EQ(1, FPDFText_GetBoundedText(textpage, 41.0, 56.0, 82.0, 48.0,
|
| + fixed_buffer, 1));
|
| EXPECT_TRUE(check_unsigned_shorts(expected + 4, fixed_buffer, 1));
|
| EXPECT_EQ(0xbdbd, fixed_buffer[1]);
|
|
|
| memset(fixed_buffer, 0xbd, sizeof(fixed_buffer));
|
| - EXPECT_EQ(9, FPDFText_GetBoundedText(
|
| - textpage, 41.0, 56.0, 82.0, 48.0, fixed_buffer, 9));
|
| + EXPECT_EQ(9, FPDFText_GetBoundedText(textpage, 41.0, 56.0, 82.0, 48.0,
|
| + fixed_buffer, 9));
|
| EXPECT_TRUE(check_unsigned_shorts(expected + 4, fixed_buffer, 9));
|
| EXPECT_EQ(0xbdbd, fixed_buffer[9]);
|
|
|
| memset(fixed_buffer, 0xbd, sizeof(fixed_buffer));
|
| - EXPECT_EQ(10, FPDFText_GetBoundedText(
|
| - textpage, 41.0, 56.0, 82.0, 48.0, fixed_buffer, 128));
|
| + EXPECT_EQ(10, FPDFText_GetBoundedText(textpage, 41.0, 56.0, 82.0, 48.0,
|
| + fixed_buffer, 128));
|
| EXPECT_TRUE(check_unsigned_shorts(expected + 4, fixed_buffer, 9));
|
| EXPECT_EQ(0u, fixed_buffer[9]);
|
| EXPECT_EQ(0xbdbd, fixed_buffer[10]);
|
| @@ -146,10 +140,10 @@ TEST_F(FPDFTextEmbeddertest, TextSearch) {
|
| EXPECT_NE(nullptr, textpage);
|
|
|
| // Avoid issues with system wchar_t width vs. FPDF_WideString.
|
| - const unsigned short nope[] = { 'n', 'o', 'p', 'e', '\0' };
|
| - const unsigned short world[] = { 'w', 'o', 'r', 'l', 'd', '\0' };
|
| - const unsigned short world_caps[] = { 'W', 'O', 'R', 'L', 'D', '\0' };
|
| - const unsigned short world_substr[] = { 'o', 'r', 'l', 'd', '\0' };
|
| + const unsigned short nope[] = {'n', 'o', 'p', 'e', '\0'};
|
| + const unsigned short world[] = {'w', 'o', 'r', 'l', 'd', '\0'};
|
| + const unsigned short world_caps[] = {'W', 'O', 'R', 'L', 'D', '\0'};
|
| + const unsigned short world_substr[] = {'o', 'r', 'l', 'd', '\0'};
|
|
|
| // No occurences of "nope" in test page.
|
| FPDF_SCHHANDLE search = FPDFText_FindStart(textpage, nope, 0, 0);
|
| @@ -203,8 +197,8 @@ TEST_F(FPDFTextEmbeddertest, TextSearch) {
|
| FPDFText_FindClose(search);
|
|
|
| // Exact search unaffected by case sensitiity and whole word flags.
|
| - search = FPDFText_FindStart(
|
| - textpage, world, FPDF_MATCHCASE | FPDF_MATCHWHOLEWORD, 0);
|
| + search = FPDFText_FindStart(textpage, world,
|
| + FPDF_MATCHCASE | FPDF_MATCHWHOLEWORD, 0);
|
| EXPECT_NE(nullptr, search);
|
| EXPECT_TRUE(FPDFText_FindNext(search));
|
| EXPECT_EQ(7, FPDFText_GetSchResultIndex(search));
|
| @@ -293,27 +287,28 @@ TEST_F(FPDFTextEmbeddertest, WebLinks) {
|
|
|
| // Check buffer that doesn't have space for a terminating NUL.
|
| memset(fixed_buffer, 0xbd, sizeof(fixed_buffer));
|
| - EXPECT_EQ(sizeof(expected_url) - 1, FPDFLink_GetURL(
|
| - pagelink, 0, fixed_buffer, sizeof(expected_url) - 1));
|
| - EXPECT_TRUE(check_unsigned_shorts(
|
| - expected_url, fixed_buffer, sizeof(expected_url) - 1));
|
| + EXPECT_EQ(
|
| + sizeof(expected_url) - 1,
|
| + FPDFLink_GetURL(pagelink, 0, fixed_buffer, sizeof(expected_url) - 1));
|
| + EXPECT_TRUE(check_unsigned_shorts(expected_url, fixed_buffer,
|
| + sizeof(expected_url) - 1));
|
| EXPECT_EQ(0xbdbd, fixed_buffer[sizeof(expected_url) - 1]);
|
|
|
| // Retreive link with exactly-sized buffer.
|
| memset(fixed_buffer, 0xbd, sizeof(fixed_buffer));
|
| - EXPECT_EQ(sizeof(expected_url), FPDFLink_GetURL(
|
| - pagelink, 0, fixed_buffer, sizeof(expected_url)));
|
| - EXPECT_TRUE(check_unsigned_shorts(
|
| - expected_url, fixed_buffer, sizeof(expected_url)));
|
| + EXPECT_EQ(sizeof(expected_url),
|
| + FPDFLink_GetURL(pagelink, 0, fixed_buffer, sizeof(expected_url)));
|
| + EXPECT_TRUE(
|
| + check_unsigned_shorts(expected_url, fixed_buffer, sizeof(expected_url)));
|
| EXPECT_EQ(0u, fixed_buffer[sizeof(expected_url) - 1]);
|
| EXPECT_EQ(0xbdbd, fixed_buffer[sizeof(expected_url)]);
|
|
|
| // Retreive link with ample-sized-buffer.
|
| memset(fixed_buffer, 0xbd, sizeof(fixed_buffer));
|
| - EXPECT_EQ(sizeof(expected_url), FPDFLink_GetURL(
|
| - pagelink, 0, fixed_buffer, 128));
|
| - EXPECT_TRUE(check_unsigned_shorts(
|
| - expected_url, fixed_buffer, sizeof(expected_url)));
|
| + EXPECT_EQ(sizeof(expected_url),
|
| + FPDFLink_GetURL(pagelink, 0, fixed_buffer, 128));
|
| + EXPECT_TRUE(
|
| + check_unsigned_shorts(expected_url, fixed_buffer, sizeof(expected_url)));
|
| EXPECT_EQ(0u, fixed_buffer[sizeof(expected_url) - 1]);
|
| EXPECT_EQ(0xbdbd, fixed_buffer[sizeof(expected_url)]);
|
|
|
|
|