summaryrefslogtreecommitdiff
path: root/xfa/fxfa
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2017-04-24 15:04:25 -0700
committerChromium commit bot <commit-bot@chromium.org>2017-04-24 22:42:33 +0000
commit64ee2c3fe2a21d0471595ae486d7e55e2eadfb57 (patch)
tree8e83d144c344fe412ccaa21482c5679643ed3a54 /xfa/fxfa
parent39b83dd0ce7d828f6a17a2e6529ceb5ffc819207 (diff)
downloadpdfium-64ee2c3fe2a21d0471595ae486d7e55e2eadfb57.tar.xz
Use a pdfium-specific unittest main rather than gtest's
We must initialize our partition allocator before calling into any test cases. We can then remove the FPDF_Test class, which did the same thing. Change-Id: I614480fa474b2032052857a02e94781f15a27a4e Reviewed-on: https://pdfium-review.googlesource.com/4473 Reviewed-by: Lei Zhang <thestig@chromium.org> Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa/fxfa')
-rw-r--r--xfa/fxfa/cxfa_ffapp_unittest.cpp8
-rw-r--r--xfa/fxfa/fm2js/xfa_simpleexpression_unittest.cpp4
-rw-r--r--xfa/fxfa/parser/xfa_utils_unittest.cpp6
3 files changed, 6 insertions, 12 deletions
diff --git a/xfa/fxfa/cxfa_ffapp_unittest.cpp b/xfa/fxfa/cxfa_ffapp_unittest.cpp
index fc1d038bac..bd35956c39 100644
--- a/xfa/fxfa/cxfa_ffapp_unittest.cpp
+++ b/xfa/fxfa/cxfa_ffapp_unittest.cpp
@@ -15,9 +15,7 @@
#include "third_party/base/ptr_util.h"
#include "xfa/fxfa/cxfa_fileread.h"
-class CXFAFileReadTest : public pdfium::FPDF_Test {};
-
-TEST_F(CXFAFileReadTest, NoStreams) {
+TEST(CXFAFileReadTest, NoStreams) {
std::vector<CPDF_Stream*> streams;
auto fileread = pdfium::MakeRetain<CXFA_FileRead>(streams);
@@ -27,7 +25,7 @@ TEST_F(CXFAFileReadTest, NoStreams) {
EXPECT_EQ(0xbd, output_buffer[0]);
}
-TEST_F(CXFAFileReadTest, EmptyStreams) {
+TEST(CXFAFileReadTest, EmptyStreams) {
std::vector<CPDF_Stream*> streams;
auto stream1 = pdfium::MakeUnique<CPDF_Stream>();
streams.push_back(stream1.get());
@@ -39,7 +37,7 @@ TEST_F(CXFAFileReadTest, EmptyStreams) {
EXPECT_EQ(0xbd, output_buffer[0]);
}
-TEST_F(CXFAFileReadTest, NormalStreams) {
+TEST(CXFAFileReadTest, NormalStreams) {
std::vector<CPDF_Stream*> streams;
auto stream1 = pdfium::MakeUnique<CPDF_Stream>();
auto stream2 = pdfium::MakeUnique<CPDF_Stream>();
diff --git a/xfa/fxfa/fm2js/xfa_simpleexpression_unittest.cpp b/xfa/fxfa/fm2js/xfa_simpleexpression_unittest.cpp
index a2c7f1b878..160c4a12c4 100644
--- a/xfa/fxfa/fm2js/xfa_simpleexpression_unittest.cpp
+++ b/xfa/fxfa/fm2js/xfa_simpleexpression_unittest.cpp
@@ -12,9 +12,7 @@
#include "third_party/base/ptr_util.h"
#include "xfa/fxfa/fm2js/xfa_lexer.h"
-class FMCallExpressionTest : public pdfium::FPDF_Test {};
-
-TEST_F(FMCallExpressionTest, more_than_32_arguments) {
+TEST(FMCallExpressionTest, more_than_32_arguments) {
// Use sign as it has 3 object parameters at positions 0, 5, and 6.
auto exp = pdfium::MakeUnique<CXFA_FMIdentifierExpression>(0, L"sign");
diff --git a/xfa/fxfa/parser/xfa_utils_unittest.cpp b/xfa/fxfa/parser/xfa_utils_unittest.cpp
index 6a1de85624..aa468136dc 100644
--- a/xfa/fxfa/parser/xfa_utils_unittest.cpp
+++ b/xfa/fxfa/parser/xfa_utils_unittest.cpp
@@ -11,9 +11,7 @@
#include "testing/test_support.h"
#include "third_party/base/ptr_util.h"
-class XfaUtilsImpTest : public pdfium::FPDF_Test {};
-
-TEST_F(XfaUtilsImpTest, XFA_MapRotation) {
+TEST(XfaUtilsImpTest, XFA_MapRotation) {
struct TestCase {
int input;
int expected_output;
@@ -29,7 +27,7 @@ TEST_F(XfaUtilsImpTest, XFA_MapRotation) {
}
}
-class XFANodeIteratorTest : public pdfium::FPDF_Test {
+class XFANodeIteratorTest : public testing::Test {
public:
class Node {
public: