Do some clean up in fpdf_parser_decode test.
Change-Id: I5d8fd1a679f7c22a937ce2b9f34b67a12ff98b68
Reviewed-on: https://pdfium-review.googlesource.com/c/49992
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
diff --git a/core/fpdfapi/parser/fpdf_parser_decode_unittest.cpp b/core/fpdfapi/parser/fpdf_parser_decode_unittest.cpp
index a457239..c291294 100644
--- a/core/fpdfapi/parser/fpdf_parser_decode_unittest.cpp
+++ b/core/fpdfapi/parser/fpdf_parser_decode_unittest.cpp
@@ -88,7 +88,7 @@
}
TEST(fpdf_parser_decode, A85Decode) {
- const pdfium::DecodeTestData test_data[] = {
+ const pdfium::DecodeTestData kTestData[] = {
// Empty src string.
STR_IN_OUT_CASE("", "", 0),
// Empty content in src string.
@@ -106,24 +106,24 @@
// Stop at unknown characters.
STR_IN_OUT_CASE("FCfN8FCfN8vw", "testtest", 11),
};
- for (size_t i = 0; i < FX_ArraySize(test_data); ++i) {
- const pdfium::DecodeTestData* ptr = &test_data[i];
+ for (const auto& test_case : kTestData) {
std::unique_ptr<uint8_t, FxFreeDeleter> result;
uint32_t result_size = 0;
- EXPECT_EQ(ptr->processed_size,
- A85Decode({ptr->input, ptr->input_size}, &result, &result_size))
- << "for case " << i;
- ASSERT_EQ(ptr->expected_size, result_size);
+ EXPECT_EQ(test_case.processed_size,
+ A85Decode({test_case.input, test_case.input_size}, &result,
+ &result_size))
+ << "for case " << test_case.input;
+ ASSERT_EQ(test_case.expected_size, result_size);
const uint8_t* result_ptr = result.get();
for (size_t j = 0; j < result_size; ++j) {
- EXPECT_EQ(ptr->expected[j], result_ptr[j])
- << "for case " << i << " char " << j;
+ EXPECT_EQ(test_case.expected[j], result_ptr[j])
+ << "for case " << test_case.input << " char " << j;
}
}
}
TEST(fpdf_parser_decode, HexDecode) {
- const pdfium::DecodeTestData test_data[] = {
+ const pdfium::DecodeTestData kTestData[] = {
// Empty src string.
STR_IN_OUT_CASE("", "", 0),
// Empty content in src string.
@@ -141,28 +141,28 @@
// No ending mark.
STR_IN_OUT_CASE("12AcED3c3456", "\x12\xac\xed\x3c\x34\x56", 12),
};
- for (size_t i = 0; i < FX_ArraySize(test_data); ++i) {
- const pdfium::DecodeTestData* ptr = &test_data[i];
+ for (const auto& test_case : kTestData) {
std::unique_ptr<uint8_t, FxFreeDeleter> result;
uint32_t result_size = 0;
- EXPECT_EQ(ptr->processed_size,
- HexDecode({ptr->input, ptr->input_size}, &result, &result_size))
- << "for case " << i;
- ASSERT_EQ(ptr->expected_size, result_size);
+ EXPECT_EQ(test_case.processed_size,
+ HexDecode({test_case.input, test_case.input_size}, &result,
+ &result_size))
+ << "for case " << test_case.input;
+ ASSERT_EQ(test_case.expected_size, result_size);
const uint8_t* result_ptr = result.get();
for (size_t j = 0; j < result_size; ++j) {
- EXPECT_EQ(ptr->expected[j], result_ptr[j])
- << "for case " << i << " char " << j;
+ EXPECT_EQ(test_case.expected[j], result_ptr[j])
+ << "for case " << test_case.input << " char " << j;
}
}
}
TEST(fpdf_parser_decode, EncodeText) {
- struct EncodeTestData {
+ const struct EncodeTestData {
const wchar_t* input;
const char* expected_output;
size_t expected_length;
- } test_data[] = {
+ } kTestData[] = {
// Empty src string.
{L"", "", 0},
// ASCII text.
@@ -177,15 +177,14 @@
26},
};
- for (size_t i = 0; i < FX_ArraySize(test_data); ++i) {
- const auto& test_case = test_data[i];
+ for (const auto& test_case : kTestData) {
ByteString output = PDF_EncodeText(test_case.input);
- ASSERT_EQ(test_case.expected_length, output.GetLength()) << "for case "
- << i;
+ ASSERT_EQ(test_case.expected_length, output.GetLength())
+ << "for case " << test_case.input;
const char* str_ptr = output.c_str();
for (size_t j = 0; j < test_case.expected_length; ++j) {
- EXPECT_EQ(test_case.expected_output[j], str_ptr[j]) << "for case " << i
- << " char " << j;
+ EXPECT_EQ(test_case.expected_output[j], str_ptr[j])
+ << "for case " << test_case.input << " char " << j;
}
}
}
