commit 586dfc2de4f285a0ded77a343c0b663611f250ef
author Lei Zhang <thestig@chromium.org> Fri Jul 19 19:43:15 2024 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Jul 19 19:43:15 2024 +0000
tree 70334c4420fe06aff6c1fabdc569a021cd272455
parent 559efd0fa8744eb87e9b0548b496a0b49d3d7d20

Consolidate some test expectations inside fpdf_edit_embeddertest.cpp

Add NotoSansSCChecksum() to return the checksum used by several tests
that use the same text / font combination.

Change-Id: I741786f31a076bc23cbac013c1bd84f7c6b2002e
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/122090
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@google.com>

fpdfsdk/fpdf_edit_embeddertest.cpp

diff --git a/fpdfsdk/fpdf_edit_embeddertest.cpp b/fpdfsdk/fpdf_edit_embeddertest.cpp
index e6cfae0..972b204 100644
--- a/fpdfsdk/fpdf_edit_embeddertest.cpp
+++ b/fpdfsdk/fpdf_edit_embeddertest.cpp
@@ -108,6 +108,19 @@
 // In embedded_images.pdf.
 const char kEmbeddedImage33Checksum[] = "cb3637934bb3b95a6e4ae1ea9eb9e56e";
 
+const char* NotoSansSCChecksum() {
+  if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
+#if BUILDFLAG(IS_WIN)
+    return "a1bc9e4007dc2155e9f56bf16234573e";
+#elif BUILDFLAG(IS_APPLE)
+    return "9a31fb87d1c6d2346bba22d1196041cd";
+#else
+    return "5bb65e15fc0a685934cd5006dec08a76";
+#endif
+  }
+  return "9a31fb87d1c6d2346bba22d1196041cd";
+}
+
 struct FPDFEditMoveEmbedderTestCase {
   std::vector<int> page_indices;
   int page_indices_len;
@@ -313,23 +326,11 @@
   FPDFPage_InsertObject(page.get(), text_object);
   EXPECT_TRUE(FPDFPage_GenerateContent(page.get()));
 
-  const char* checksum = []() {
-    if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
-#if BUILDFLAG(IS_WIN)
-      return "a1bc9e4007dc2155e9f56bf16234573e";
-#elif BUILDFLAG(IS_APPLE)
-      return "9a31fb87d1c6d2346bba22d1196041cd";
-#else
-      return "5bb65e15fc0a685934cd5006dec08a76";
-#endif
-    }
-    return "9a31fb87d1c6d2346bba22d1196041cd";
-  }();
   ScopedFPDFBitmap page_bitmap = RenderPage(page.get());
-  CompareBitmap(page_bitmap.get(), 400, 400, checksum);
+  CompareBitmap(page_bitmap.get(), 400, 400, NotoSansSCChecksum());
 
   ASSERT_TRUE(FPDF_SaveAsCopy(document(), this, 0));
-  VerifySavedDocument(400, 400, checksum);
+  VerifySavedDocument(400, 400, NotoSansSCChecksum());
 }
 
 TEST_F(FPDFEditEmbedderTest, EmbedNotoSansSCFontWithCharcodes) {
@@ -361,23 +362,11 @@
   FPDFPage_InsertObject(page.get(), text_object);
   EXPECT_TRUE(FPDFPage_GenerateContent(page.get()));
 
-  const char* checksum = []() {
-    if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
-#if BUILDFLAG(IS_WIN)
-      return "a1bc9e4007dc2155e9f56bf16234573e";
-#elif BUILDFLAG(IS_APPLE)
-      return "9a31fb87d1c6d2346bba22d1196041cd";
-#else
-      return "5bb65e15fc0a685934cd5006dec08a76";
-#endif
-    }
-    return "9a31fb87d1c6d2346bba22d1196041cd";
-  }();
   ScopedFPDFBitmap page_bitmap = RenderPage(page.get());
-  CompareBitmap(page_bitmap.get(), 400, 400, checksum);
+  CompareBitmap(page_bitmap.get(), 400, 400, NotoSansSCChecksum());
 
   ASSERT_TRUE(FPDF_SaveAsCopy(document(), this, 0));
-  VerifySavedDocument(400, 400, checksum);
+  VerifySavedDocument(400, 400, NotoSansSCChecksum());
 }
 
 TEST_F(FPDFEditEmbedderTest, Bug2094) {
@@ -3805,23 +3794,11 @@
   FPDFPage_InsertObject(page.get(), text_object);
   EXPECT_TRUE(FPDFPage_GenerateContent(page.get()));
 
-  const char* checksum = []() {
-    if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
-#if BUILDFLAG(IS_WIN)
-      return "a1bc9e4007dc2155e9f56bf16234573e";
-#elif BUILDFLAG(IS_APPLE)
-      return "9a31fb87d1c6d2346bba22d1196041cd";
-#else
-      return "5bb65e15fc0a685934cd5006dec08a76";
-#endif
-    }
-    return "9a31fb87d1c6d2346bba22d1196041cd";
-  }();
   ScopedFPDFBitmap page_bitmap = RenderPage(page.get());
-  CompareBitmap(page_bitmap.get(), 400, 400, checksum);
+  CompareBitmap(page_bitmap.get(), 400, 400, NotoSansSCChecksum());
 
   ASSERT_TRUE(FPDF_SaveAsCopy(document(), this, 0));
-  VerifySavedDocument(400, 400, checksum);
+  VerifySavedDocument(400, 400, NotoSansSCChecksum());
 }
 
 TEST_F(FPDFEditEmbedderTest, LoadCidType2FontWithBadParameters) {