From 0d6d1783ed96ae25cf5d0fb83d13ba1e7421a6cd Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 24 Mar 2017 15:52:00 -0700 Subject: Remove old test expectations after the Mac 10.12 upgrade. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit BUG=chromium:703912 Change-Id: I5b4e582afc95b845e8e5e7a4e14581127c18de2d Reviewed-on: https://pdfium-review.googlesource.com/3193 Commit-Queue: dsinclair Reviewed-by: Nicolás Peña --- testing/embedder_test.cpp | 22 ---------------------- testing/embedder_test.h | 8 -------- 2 files changed, 30 deletions(-) (limited to 'testing') diff --git a/testing/embedder_test.cpp b/testing/embedder_test.cpp index 5d906fe503..79074153fb 100644 --- a/testing/embedder_test.cpp +++ b/testing/embedder_test.cpp @@ -355,28 +355,6 @@ void EmbedderTest::CompareBitmap(FPDF_BITMAP bitmap, EXPECT_EQ(expected_md5sum, CRYPT_ToBase16(digest)); } -// static -void EmbedderTest::CompareBitmap2Options(FPDF_BITMAP bitmap, - int expected_width, - int expected_height, - const char* option1_md5sum, - const char* option2_md5sum) { - ASSERT_EQ(expected_width, FPDFBitmap_GetWidth(bitmap)); - ASSERT_EQ(expected_height, FPDFBitmap_GetHeight(bitmap)); - const int expected_stride = expected_width * 4; - ASSERT_EQ(expected_stride, FPDFBitmap_GetStride(bitmap)); - - if (!option1_md5sum || !option2_md5sum) - return; - - uint8_t digest[16]; - CRYPT_MD5Generate(static_cast(FPDFBitmap_GetBuffer(bitmap)), - expected_stride * expected_height, digest); - std::string digest_string = CRYPT_ToBase16(digest); - EXPECT_TRUE(digest_string == option1_md5sum || - digest_string == option2_md5sum); -} - // Can't use gtest-provided main since we need to stash the path to the // executable in order to find the external V8 binary data files. int main(int argc, char** argv) { diff --git a/testing/embedder_test.h b/testing/embedder_test.h index f341acf688..619fc5d699 100644 --- a/testing/embedder_test.h +++ b/testing/embedder_test.h @@ -114,14 +114,6 @@ class EmbedderTest : public ::testing::Test, int expected_height, const char* expected_md5sum); - // Check |bitmap| to make sure it has the right dimensions and content. - // Have two options for the expected md5 sum. - static void CompareBitmap2Options(FPDF_BITMAP bitmap, - int expected_width, - int expected_height, - const char* option1_md5sum, - const char* option2_md5sum); - Delegate* delegate_; std::unique_ptr default_delegate_; FPDF_DOCUMENT document_; -- cgit v1.2.3