summaryrefslogtreecommitdiff
path: root/fpdfsdk/src
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-01-30 14:41:50 -0800
committerTom Sepez <tsepez@chromium.org>2015-01-30 14:41:50 -0800
commitda8189e65547f87a9c7ba3ebb72f78ecdb47e120 (patch)
treebf8b076d906a28d728735cda767007e8180d6329 /fpdfsdk/src
parent09dc51a44ba2c084ca553d8a52ba6e2e669f4f9c (diff)
downloadpdfium-da8189e65547f87a9c7ba3ebb72f78ecdb47e120.tar.xz
Merge to XFA: track formhandles in embeddder test class itself
TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/891763003
Diffstat (limited to 'fpdfsdk/src')
-rw-r--r--fpdfsdk/src/fpdftext_embeddertest.cpp16
-rw-r--r--fpdfsdk/src/fpdfview_embeddertest.cpp8
2 files changed, 7 insertions, 17 deletions
diff --git a/fpdfsdk/src/fpdftext_embeddertest.cpp b/fpdfsdk/src/fpdftext_embeddertest.cpp
index 1457832658..f0d9feb91d 100644
--- a/fpdfsdk/src/fpdftext_embeddertest.cpp
+++ b/fpdfsdk/src/fpdftext_embeddertest.cpp
@@ -30,8 +30,7 @@ class FPDFTextEmbeddertest : public EmbedderTest {
TEST_F(FPDFTextEmbeddertest, Text) {
EXPECT_TRUE(OpenDocument("testing/resources/hello_world.pdf"));
- FPDF_FORMHANDLE form_handle = SetFormFillEnvironment();
- FPDF_PAGE page = LoadPage(0, form_handle);
+ FPDF_PAGE page = LoadPage(0);
EXPECT_NE(nullptr, page);
FPDF_TEXTPAGE textpage = FPDFText_LoadPage(page);
@@ -135,13 +134,11 @@ TEST_F(FPDFTextEmbeddertest, Text) {
EXPECT_EQ(0xbdbd, fixed_buffer[10]);
FPDFText_ClosePage(textpage);
- ClearFormFillEnvironment(form_handle);
}
TEST_F(FPDFTextEmbeddertest, TextSearch) {
EXPECT_TRUE(OpenDocument("testing/resources/hello_world.pdf"));
- FPDF_FORMHANDLE form_handle = SetFormFillEnvironment();
- FPDF_PAGE page = LoadPage(0, form_handle);
+ FPDF_PAGE page = LoadPage(0);
EXPECT_NE(nullptr, page);
FPDF_TEXTPAGE textpage = FPDFText_LoadPage(page);
@@ -242,14 +239,12 @@ TEST_F(FPDFTextEmbeddertest, TextSearch) {
FPDFText_FindClose(search);
FPDFText_ClosePage(textpage);
- ClearFormFillEnvironment(form_handle);
}
// Test that the page has characters despite a bad stream length.
TEST_F(FPDFTextEmbeddertest, StreamLengthPastEndOfFile) {
EXPECT_TRUE(OpenDocument("testing/resources/bug_57.pdf"));
- FPDF_FORMHANDLE form_handle = SetFormFillEnvironment();
- FPDF_PAGE page = LoadPage(0, form_handle);
+ FPDF_PAGE page = LoadPage(0);
EXPECT_NE(nullptr, page);
FPDF_TEXTPAGE textpage = FPDFText_LoadPage(page);
@@ -257,13 +252,11 @@ TEST_F(FPDFTextEmbeddertest, StreamLengthPastEndOfFile) {
EXPECT_EQ(13, FPDFText_CountChars(textpage));
FPDFText_ClosePage(textpage);
- ClearFormFillEnvironment(form_handle);
}
TEST_F(FPDFTextEmbeddertest, WebLinks) {
EXPECT_TRUE(OpenDocument("testing/resources/weblinks.pdf"));
- FPDF_FORMHANDLE form_handle = SetFormFillEnvironment();
- FPDF_PAGE page = LoadPage(0, form_handle);
+ FPDF_PAGE page = LoadPage(0);
EXPECT_NE(nullptr, page);
FPDF_TEXTPAGE textpage = FPDFText_LoadPage(page);
@@ -365,5 +358,4 @@ TEST_F(FPDFTextEmbeddertest, WebLinks) {
FPDFLink_CloseWebLinks(pagelink);
FPDFText_ClosePage(textpage);
- ClearFormFillEnvironment(form_handle);
}
diff --git a/fpdfsdk/src/fpdfview_embeddertest.cpp b/fpdfsdk/src/fpdfview_embeddertest.cpp
index 76dd9a5798..4827f76839 100644
--- a/fpdfsdk/src/fpdfview_embeddertest.cpp
+++ b/fpdfsdk/src/fpdfview_embeddertest.cpp
@@ -27,14 +27,12 @@ TEST_F(FPDFViewEmbeddertest, Document) {
TEST_F(FPDFViewEmbeddertest, Page) {
EXPECT_TRUE(OpenDocument("testing/resources/about_blank.pdf"));
- FPDF_FORMHANDLE form_handle = SetFormFillEnvironment();
- FPDF_PAGE page = LoadPage(0, form_handle);
+ FPDF_PAGE page = LoadPage(0);
EXPECT_NE(nullptr, page);
EXPECT_EQ(612.0, FPDF_GetPageWidth(page));
EXPECT_EQ(792.0, FPDF_GetPageHeight(page));
- UnloadPage(page, form_handle);
- EXPECT_EQ(nullptr, LoadPage(1, form_handle));
- ClearFormFillEnvironment(form_handle);
+ UnloadPage(page);
+ EXPECT_EQ(nullptr, LoadPage(1));
}
TEST_F(FPDFViewEmbeddertest, ViewerRef) {