commit 0858041d88142225b1821d979e7e6dc4c61c923a
author Lei Zhang <thestig@chromium.org> Wed Aug 11 19:20:18 2021 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Aug 11 19:20:18 2021 +0000
tree 5c92a729520235e48c320de64832d713d9870287
parent 9eedf7312665673eb99c633b212553e82bb2cf78

Use EmbedderTest::CompareBitmap() in fpdf_ppo_embeddertest.cpp.

Remove test code that does the same thing as CompareBitmap(). Use more
scopers along the way.

Change-Id: I486fcb6ae3454ca4d71b66635e916ffe471d3a4d
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/84070
Reviewed-by: Hui Yingst <nigi@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

fpdfsdk/fpdf_ppo_embeddertest.cpp

diff --git a/fpdfsdk/fpdf_ppo_embeddertest.cpp b/fpdfsdk/fpdf_ppo_embeddertest.cpp
index f635996..e0c11ca 100644
--- a/fpdfsdk/fpdf_ppo_embeddertest.cpp
+++ b/fpdfsdk/fpdf_ppo_embeddertest.cpp
@@ -487,11 +487,7 @@
     ASSERT_TRUE(page);
 
     ScopedFPDFBitmap bitmap = RenderLoadedPage(page);
-    ASSERT_EQ(200, FPDFBitmap_GetWidth(bitmap.get()));
-    ASSERT_EQ(200, FPDFBitmap_GetHeight(bitmap.get()));
-    ASSERT_EQ(800, FPDFBitmap_GetStride(bitmap.get()));
-
-    EXPECT_EQ(kHashes[i], HashBitmap(bitmap.get()));
+    CompareBitmap(bitmap.get(), 200, 200, kHashes[i]);
     UnloadPage(page);
   }
 
@@ -507,11 +503,7 @@
     ASSERT_TRUE(page);
 
     ScopedFPDFBitmap bitmap = RenderPage(page);
-    ASSERT_EQ(200, FPDFBitmap_GetWidth(bitmap.get()));
-    ASSERT_EQ(200, FPDFBitmap_GetHeight(bitmap.get()));
-    ASSERT_EQ(800, FPDFBitmap_GetStride(bitmap.get()));
-
-    EXPECT_EQ(kHashes[i], HashBitmap(bitmap.get()));
+    CompareBitmap(bitmap.get(), 200, 200, kHashes[i]);
     FPDF_ClosePage(page);
   }
   FPDF_CloseDocument(output_doc);
@@ -523,29 +515,19 @@
   ASSERT_TRUE(page);
 
   ScopedFPDFBitmap bitmap = RenderLoadedPage(page);
-  ASSERT_EQ(200, FPDFBitmap_GetWidth(bitmap.get()));
-  ASSERT_EQ(200, FPDFBitmap_GetHeight(bitmap.get()));
-  ASSERT_EQ(800, FPDFBitmap_GetStride(bitmap.get()));
-
-  std::string digest = HashBitmap(bitmap.get());
+  CompareBitmap(bitmap.get(), 200, 200, pdfium::kHelloWorldChecksum);
   UnloadPage(page);
 
-  FPDF_DOCUMENT new_doc = FPDF_CreateNewDocument();
-  EXPECT_TRUE(new_doc);
+  ScopedFPDFDocument new_doc(FPDF_CreateNewDocument());
+  ASSERT_TRUE(new_doc);
 
   static constexpr int kIndices[] = {0};
-  EXPECT_TRUE(FPDF_ImportPagesByIndex(new_doc, document(), kIndices,
+  EXPECT_TRUE(FPDF_ImportPagesByIndex(new_doc.get(), document(), kIndices,
                                       pdfium::size(kIndices), 0));
 
-  EXPECT_EQ(1, FPDF_GetPageCount(new_doc));
-  FPDF_PAGE new_page = FPDF_LoadPage(new_doc, 0);
-  ASSERT_NE(nullptr, new_page);
-  ScopedFPDFBitmap new_bitmap = RenderPage(new_page);
-  ASSERT_EQ(200, FPDFBitmap_GetWidth(new_bitmap.get()));
-  ASSERT_EQ(200, FPDFBitmap_GetHeight(new_bitmap.get()));
-  ASSERT_EQ(800, FPDFBitmap_GetStride(new_bitmap.get()));
-
-  EXPECT_EQ(digest, HashBitmap(new_bitmap.get()));
-  FPDF_ClosePage(new_page);
-  FPDF_CloseDocument(new_doc);
+  EXPECT_EQ(1, FPDF_GetPageCount(new_doc.get()));
+  ScopedFPDFPage new_page(FPDF_LoadPage(new_doc.get(), 0));
+  ASSERT_TRUE(new_page);
+  ScopedFPDFBitmap new_bitmap = RenderPage(new_page.get());
+  CompareBitmap(new_bitmap.get(), 200, 200, pdfium::kHelloWorldChecksum);
 }