| Index: core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_unittest.cpp
|
| diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_unittest.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_unittest.cpp
|
| index 3318bcdfe7393d720cdf588ec1a4e20af4f890fa..3064a24b7a9a01e68f0c2afa25a7845d19939ef6 100644
|
| --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_unittest.cpp
|
| +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_unittest.cpp
|
| @@ -4,52 +4,74 @@
|
|
|
| #include "core/include/fpdfapi/fpdf_parser.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| +#include "testing/test_support.h"
|
|
|
| -TEST(fpdf_parser_decode, HexDecode) {
|
| - {
|
| - // Empty src string.
|
| - uint8_t* dest = nullptr;
|
| - FX_DWORD dest_size;
|
| - uint8_t src[] = "";
|
| - EXPECT_EQ(0, HexDecode(src, 0, dest, dest_size));
|
| - EXPECT_EQ(0, dest_size);
|
| - EXPECT_EQ('\0', dest[0]);
|
| - FX_Free(dest);
|
| - }
|
| -
|
| - {
|
| - // Regular conversion.
|
| - uint8_t* dest = nullptr;
|
| - FX_DWORD dest_size;
|
| - uint8_t src[] = "12Ac>zzz";
|
| - EXPECT_EQ(5, HexDecode(src, 8, dest, dest_size));
|
| - EXPECT_EQ(2, dest_size);
|
| - EXPECT_EQ(18, dest[0]);
|
| - EXPECT_EQ(172, dest[1]);
|
| - FX_Free(dest);
|
| - }
|
| -
|
| - {
|
| - // Non-multiple length.
|
| - uint8_t* dest = nullptr;
|
| - FX_DWORD dest_size;
|
| - uint8_t src[] = "12A>zzz";
|
| - EXPECT_EQ(4, HexDecode(src, 8, dest, dest_size));
|
| - EXPECT_EQ(2, dest_size);
|
| - EXPECT_EQ(18, dest[0]);
|
| - EXPECT_EQ(160, dest[1]);
|
| - FX_Free(dest);
|
| +TEST(fpdf_parser_decode, A85Decode) {
|
| + pdfium::DecodeTestData test_data[] = {
|
| + // Empty src string.
|
| + DECODE_TEST_CASE("", "", 0),
|
| + // Empty content in src string.
|
| + DECODE_TEST_CASE("~>", "", 0),
|
| + // Regular conversion.
|
| + DECODE_TEST_CASE("FCfN8~>", "test", 7),
|
| + // End at the ending mark.
|
| + DECODE_TEST_CASE("FCfN8~>FCfN8", "test", 7),
|
| + // Skip whitespaces.
|
| + DECODE_TEST_CASE("\t F C\r\n \tf N 8 ~>", "test", 17),
|
| + // No ending mark.
|
| + DECODE_TEST_CASE("@3B0)DJj_BF*)>@Gp#-s", "a funny story :)", 20),
|
| + // Non-multiple length.
|
| + DECODE_TEST_CASE("12A", "2k", 3),
|
| + // Stop at unknown characters.
|
| + DECODE_TEST_CASE("FCfN8FCfN8vw", "testtest", 11),
|
| + };
|
| + for (size_t i = 0; i < FX_ArraySize(test_data); ++i) {
|
| + pdfium::DecodeTestData* ptr = &test_data[i];
|
| + uint8_t* result = nullptr;
|
| + FX_DWORD result_size;
|
| + EXPECT_EQ(ptr->processed_size,
|
| + A85Decode(ptr->input, ptr->input_size, result, result_size))
|
| + << "for case " << i;
|
| + ASSERT_EQ(ptr->expected_size, result_size);
|
| + for (size_t j = 0; j < result_size; ++j) {
|
| + EXPECT_EQ(ptr->expected[j], result[j]) << "for case " << i << " char "
|
| + << j;
|
| + }
|
| + FX_Free(result);
|
| }
|
| +}
|
|
|
| - {
|
| - // Skips unknown characters.
|
| - uint8_t* dest = nullptr;
|
| - FX_DWORD dest_size;
|
| - uint8_t src[] = "12tk \tAc>zzz";
|
| - EXPECT_EQ(10, HexDecode(src, 13, dest, dest_size));
|
| - EXPECT_EQ(2, dest_size);
|
| - EXPECT_EQ(18, dest[0]);
|
| - EXPECT_EQ(172, dest[1]);
|
| - FX_Free(dest);
|
| +TEST(fpdf_parser_decode, HexDecode) {
|
| + pdfium::DecodeTestData test_data[] = {
|
| + // Empty src string.
|
| + DECODE_TEST_CASE("", "", 0),
|
| + // Empty content in src string.
|
| + DECODE_TEST_CASE(">", "", 1),
|
| + // Only whitespaces in src string.
|
| + DECODE_TEST_CASE("\t \r\n>", "", 7),
|
| + // Regular conversion.
|
| + DECODE_TEST_CASE("12Ac>zzz", "\x12\xac", 5),
|
| + // Skip whitespaces.
|
| + DECODE_TEST_CASE("12 Ac\t02\r\nBF>zzz>", "\x12\xac\x02\xbf", 13),
|
| + // Non-multiple length.
|
| + DECODE_TEST_CASE("12A>zzz", "\x12\xa0", 4),
|
| + // Skips unknown characters.
|
| + DECODE_TEST_CASE("12tk \tAc>zzz", "\x12\xac", 10),
|
| + // No ending mark.
|
| + DECODE_TEST_CASE("12AcED3c3456", "\x12\xac\xed\x3c\x34\x56", 12),
|
| + };
|
| + for (size_t i = 0; i < FX_ArraySize(test_data); ++i) {
|
| + pdfium::DecodeTestData* ptr = &test_data[i];
|
| + uint8_t* result = nullptr;
|
| + FX_DWORD result_size;
|
| + EXPECT_EQ(ptr->processed_size,
|
| + HexDecode(ptr->input, ptr->input_size, result, result_size))
|
| + << "for case " << i;
|
| + ASSERT_EQ(ptr->expected_size, result_size);
|
| + for (size_t j = 0; j < result_size; ++j) {
|
| + EXPECT_EQ(ptr->expected[j], result[j]) << "for case " << i << " char "
|
| + << j;
|
| + }
|
| + FX_Free(result);
|
| }
|
| }
|
|
|