Move FlateDecode/Encode tests to fpdf_parser_decode_unittest.cpp.
These tests do not need to be embedder tests.
Change-Id: I9b1d93ab67edb051f1b161b256f5ec7c9e8f8c11
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/67730
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/core/fpdfapi/parser/fpdf_parser_decode_embeddertest.cpp b/core/fpdfapi/parser/fpdf_parser_decode_embeddertest.cpp
index e25e00d..fb8ad5f 100644
--- a/core/fpdfapi/parser/fpdf_parser_decode_embeddertest.cpp
+++ b/core/fpdfapi/parser/fpdf_parser_decode_embeddertest.cpp
@@ -16,79 +16,6 @@
using FPDFParserDecodeEmbedderTest = EmbedderTest;
-// NOTE: python's zlib.compress() and zlib.decompress() may be useful for
-// external validation of the FlateEncode/FlateDecode test cases.
-
-TEST_F(FPDFParserDecodeEmbedderTest, FlateEncode) {
- static const pdfium::StrFuncTestData flate_encode_cases[] = {
- STR_IN_OUT_CASE("", "\x78\x9c\x03\x00\x00\x00\x00\x01"),
- STR_IN_OUT_CASE(" ", "\x78\x9c\x53\x00\x00\x00\x21\x00\x21"),
- STR_IN_OUT_CASE("123", "\x78\x9c\x33\x34\x32\x06\x00\01\x2d\x00\x97"),
- STR_IN_OUT_CASE("\x00\xff", "\x78\x9c\x63\xf8\x0f\x00\x01\x01\x01\x00"),
- STR_IN_OUT_CASE(
- "1 0 0 -1 29 763 cm\n0 0 555 735 re\nW n\nq\n0 0 555 734.394 re\n"
- "W n\nq\n0.8009 0 0 0.8009 0 0 cm\n1 1 1 RG 1 1 1 rg\n/G0 gs\n"
- "0 0 693 917 re\nf\nQ\nQ\n",
- "\x78\x9c\x33\x54\x30\x00\x42\x5d\x43\x05\x23\x4b\x05\x73\x33\x63"
- "\x85\xe4\x5c\x2e\x90\x80\xa9\xa9\xa9\x82\xb9\xb1\xa9\x42\x51\x2a"
- "\x57\xb8\x42\x1e\x57\x21\x92\xa0\x89\x9e\xb1\xa5\x09\x92\x84\x9e"
- "\x85\x81\x81\x25\xd8\x14\x24\x26\xd0\x18\x43\x05\x10\x0c\x72\x57"
- "\x80\x30\x8a\xd2\xb9\xf4\xdd\x0d\x14\xd2\x8b\xc1\x46\x99\x59\x1a"
- "\x2b\x58\x1a\x9a\x83\x8c\x49\xe3\x0a\x04\x42\x00\x37\x4c\x1b\x42"),
- };
-
- for (size_t i = 0; i < FX_ArraySize(flate_encode_cases); ++i) {
- const pdfium::StrFuncTestData& data = flate_encode_cases[i];
- std::unique_ptr<uint8_t, FxFreeDeleter> buf;
- uint32_t buf_size;
- EXPECT_TRUE(FlateEncode({data.input, data.input_size}, &buf, &buf_size));
- ASSERT_TRUE(buf);
- EXPECT_EQ(data.expected_size, buf_size) << " for case " << i;
- if (data.expected_size != buf_size)
- continue;
- EXPECT_EQ(0, memcmp(data.expected, buf.get(), data.expected_size))
- << " for case " << i;
- }
-}
-
-TEST_F(FPDFParserDecodeEmbedderTest, FlateDecode) {
- static const pdfium::DecodeTestData flate_decode_cases[] = {
- STR_IN_OUT_CASE("", "", 0),
- STR_IN_OUT_CASE("preposterous nonsense", "", 2),
- STR_IN_OUT_CASE("\x78\x9c\x03\x00\x00\x00\x00\x01", "", 8),
- STR_IN_OUT_CASE("\x78\x9c\x53\x00\x00\x00\x21\x00\x21", " ", 9),
- STR_IN_OUT_CASE("\x78\x9c\x33\x34\x32\x06\x00\01\x2d\x00\x97", "123", 11),
- STR_IN_OUT_CASE("\x78\x9c\x63\xf8\x0f\x00\x01\x01\x01\x00", "\x00\xff",
- 10),
- STR_IN_OUT_CASE(
- "\x78\x9c\x33\x54\x30\x00\x42\x5d\x43\x05\x23\x4b\x05\x73\x33\x63"
- "\x85\xe4\x5c\x2e\x90\x80\xa9\xa9\xa9\x82\xb9\xb1\xa9\x42\x51\x2a"
- "\x57\xb8\x42\x1e\x57\x21\x92\xa0\x89\x9e\xb1\xa5\x09\x92\x84\x9e"
- "\x85\x81\x81\x25\xd8\x14\x24\x26\xd0\x18\x43\x05\x10\x0c\x72\x57"
- "\x80\x30\x8a\xd2\xb9\xf4\xdd\x0d\x14\xd2\x8b\xc1\x46\x99\x59\x1a"
- "\x2b\x58\x1a\x9a\x83\x8c\x49\xe3\x0a\x04\x42\x00\x37\x4c\x1b\x42",
- "1 0 0 -1 29 763 cm\n0 0 555 735 re\nW n\nq\n0 0 555 734.394 re\n"
- "W n\nq\n0.8009 0 0 0.8009 0 0 cm\n1 1 1 RG 1 1 1 rg\n/G0 gs\n"
- "0 0 693 917 re\nf\nQ\nQ\n",
- 96),
- };
-
- for (size_t i = 0; i < FX_ArraySize(flate_decode_cases); ++i) {
- const pdfium::DecodeTestData& data = flate_decode_cases[i];
- std::unique_ptr<uint8_t, FxFreeDeleter> buf;
- uint32_t buf_size;
- EXPECT_EQ(data.processed_size,
- FlateDecode({data.input, data.input_size}, &buf, &buf_size))
- << " for case " << i;
- ASSERT_TRUE(buf);
- EXPECT_EQ(data.expected_size, buf_size) << " for case " << i;
- if (data.expected_size != buf_size)
- continue;
- EXPECT_EQ(0, memcmp(data.expected, buf.get(), data.expected_size))
- << " for case " << i;
- }
-}
-
TEST_F(FPDFParserDecodeEmbedderTest, Bug_552046) {
// Tests specifying multiple image filters for a stream. Should not cause a
// crash when rendered.
diff --git a/core/fpdfapi/parser/fpdf_parser_decode_unittest.cpp b/core/fpdfapi/parser/fpdf_parser_decode_unittest.cpp
index 311226f..895a964 100644
--- a/core/fpdfapi/parser/fpdf_parser_decode_unittest.cpp
+++ b/core/fpdfapi/parser/fpdf_parser_decode_unittest.cpp
@@ -147,6 +147,78 @@
}
}
+// NOTE: python's zlib.compress() and zlib.decompress() may be useful for
+// external validation of the FlateDncode/FlateEecode test cases.
+TEST(FPDFParserDecodeEmbedderTest, FlateDecode) {
+ static const pdfium::DecodeTestData flate_decode_cases[] = {
+ STR_IN_OUT_CASE("", "", 0),
+ STR_IN_OUT_CASE("preposterous nonsense", "", 2),
+ STR_IN_OUT_CASE("\x78\x9c\x03\x00\x00\x00\x00\x01", "", 8),
+ STR_IN_OUT_CASE("\x78\x9c\x53\x00\x00\x00\x21\x00\x21", " ", 9),
+ STR_IN_OUT_CASE("\x78\x9c\x33\x34\x32\x06\x00\01\x2d\x00\x97", "123", 11),
+ STR_IN_OUT_CASE("\x78\x9c\x63\xf8\x0f\x00\x01\x01\x01\x00", "\x00\xff",
+ 10),
+ STR_IN_OUT_CASE(
+ "\x78\x9c\x33\x54\x30\x00\x42\x5d\x43\x05\x23\x4b\x05\x73\x33\x63"
+ "\x85\xe4\x5c\x2e\x90\x80\xa9\xa9\xa9\x82\xb9\xb1\xa9\x42\x51\x2a"
+ "\x57\xb8\x42\x1e\x57\x21\x92\xa0\x89\x9e\xb1\xa5\x09\x92\x84\x9e"
+ "\x85\x81\x81\x25\xd8\x14\x24\x26\xd0\x18\x43\x05\x10\x0c\x72\x57"
+ "\x80\x30\x8a\xd2\xb9\xf4\xdd\x0d\x14\xd2\x8b\xc1\x46\x99\x59\x1a"
+ "\x2b\x58\x1a\x9a\x83\x8c\x49\xe3\x0a\x04\x42\x00\x37\x4c\x1b\x42",
+ "1 0 0 -1 29 763 cm\n0 0 555 735 re\nW n\nq\n0 0 555 734.394 re\n"
+ "W n\nq\n0.8009 0 0 0.8009 0 0 cm\n1 1 1 RG 1 1 1 rg\n/G0 gs\n"
+ "0 0 693 917 re\nf\nQ\nQ\n",
+ 96),
+ };
+
+ for (size_t i = 0; i < FX_ArraySize(flate_decode_cases); ++i) {
+ const pdfium::DecodeTestData& data = flate_decode_cases[i];
+ std::unique_ptr<uint8_t, FxFreeDeleter> buf;
+ uint32_t buf_size;
+ EXPECT_EQ(data.processed_size,
+ FlateDecode({data.input, data.input_size}, &buf, &buf_size))
+ << " for case " << i;
+ ASSERT_TRUE(buf);
+ EXPECT_EQ(data.expected_size, buf_size) << " for case " << i;
+ if (data.expected_size != buf_size)
+ continue;
+ EXPECT_EQ(0, memcmp(data.expected, buf.get(), data.expected_size))
+ << " for case " << i;
+ }
+}
+
+TEST(fpdf_parser_decode, FlateEncode) {
+ static const pdfium::StrFuncTestData flate_encode_cases[] = {
+ STR_IN_OUT_CASE("", "\x78\x9c\x03\x00\x00\x00\x00\x01"),
+ STR_IN_OUT_CASE(" ", "\x78\x9c\x53\x00\x00\x00\x21\x00\x21"),
+ STR_IN_OUT_CASE("123", "\x78\x9c\x33\x34\x32\x06\x00\01\x2d\x00\x97"),
+ STR_IN_OUT_CASE("\x00\xff", "\x78\x9c\x63\xf8\x0f\x00\x01\x01\x01\x00"),
+ STR_IN_OUT_CASE(
+ "1 0 0 -1 29 763 cm\n0 0 555 735 re\nW n\nq\n0 0 555 734.394 re\n"
+ "W n\nq\n0.8009 0 0 0.8009 0 0 cm\n1 1 1 RG 1 1 1 rg\n/G0 gs\n"
+ "0 0 693 917 re\nf\nQ\nQ\n",
+ "\x78\x9c\x33\x54\x30\x00\x42\x5d\x43\x05\x23\x4b\x05\x73\x33\x63"
+ "\x85\xe4\x5c\x2e\x90\x80\xa9\xa9\xa9\x82\xb9\xb1\xa9\x42\x51\x2a"
+ "\x57\xb8\x42\x1e\x57\x21\x92\xa0\x89\x9e\xb1\xa5\x09\x92\x84\x9e"
+ "\x85\x81\x81\x25\xd8\x14\x24\x26\xd0\x18\x43\x05\x10\x0c\x72\x57"
+ "\x80\x30\x8a\xd2\xb9\xf4\xdd\x0d\x14\xd2\x8b\xc1\x46\x99\x59\x1a"
+ "\x2b\x58\x1a\x9a\x83\x8c\x49\xe3\x0a\x04\x42\x00\x37\x4c\x1b\x42"),
+ };
+
+ for (size_t i = 0; i < FX_ArraySize(flate_encode_cases); ++i) {
+ const pdfium::StrFuncTestData& data = flate_encode_cases[i];
+ std::unique_ptr<uint8_t, FxFreeDeleter> buf;
+ uint32_t buf_size;
+ EXPECT_TRUE(FlateEncode({data.input, data.input_size}, &buf, &buf_size));
+ ASSERT_TRUE(buf);
+ EXPECT_EQ(data.expected_size, buf_size) << " for case " << i;
+ if (data.expected_size != buf_size)
+ continue;
+ EXPECT_EQ(0, memcmp(data.expected, buf.get(), data.expected_size))
+ << " for case " << i;
+ }
+}
+
TEST(fpdf_parser_decode, HexDecode) {
const pdfium::DecodeTestData kTestData[] = {
// Empty src string.
