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>
diff --git a/xfa/fde/cfde_txtedtbuf_unittest.cpp b/xfa/fde/cfde_txtedtbuf_unittest.cpp index aa80a66..539ce24 100644 --- a/xfa/fde/cfde_txtedtbuf_unittest.cpp +++ b/xfa/fde/cfde_txtedtbuf_unittest.cpp
@@ -8,10 +8,9 @@ #include "testing/test_support.h" #include "third_party/base/ptr_util.h" -class CFDE_TxtEdtBufTest : public pdfium::FPDF_Test { +class CFDE_TxtEdtBufTest : public testing::Test { public: void SetUp() override { - FPDF_Test::SetUp(); buf_ = pdfium::MakeUnique<CFDE_TxtEdtBuf>(); buf_->SetChunkSizeForTesting(5); }
diff --git a/xfa/fde/css/cfde_cssdeclaration_unittest.cpp b/xfa/fde/css/cfde_cssdeclaration_unittest.cpp index 80cd72c..f43f941 100644 --- a/xfa/fde/css/cfde_cssdeclaration_unittest.cpp +++ b/xfa/fde/css/cfde_cssdeclaration_unittest.cpp
@@ -7,9 +7,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "testing/test_support.h" -class CFDE_CSSDecalrationTest : public pdfium::FPDF_Test {}; - -TEST_F(CFDE_CSSDecalrationTest, HexEncodingParsing) { +TEST(CFDE_CSSDecalrationTest, HexEncodingParsing) { FX_ARGB color; // Length value invalid. @@ -45,7 +43,7 @@ EXPECT_EQ(60, FXARGB_B(color)); } -TEST_F(CFDE_CSSDecalrationTest, RGBEncodingParsing) { +TEST(CFDE_CSSDecalrationTest, RGBEncodingParsing) { FX_ARGB color; // Invalid input for rgb() syntax.
diff --git a/xfa/fde/css/cfde_cssvaluelistparser_unittest.cpp b/xfa/fde/css/cfde_cssvaluelistparser_unittest.cpp index 077fb54..53a0657 100644 --- a/xfa/fde/css/cfde_cssvaluelistparser_unittest.cpp +++ b/xfa/fde/css/cfde_cssvaluelistparser_unittest.cpp
@@ -10,9 +10,7 @@ #include "testing/test_support.h" #include "third_party/base/ptr_util.h" -class CFDE_CSSValueListParserTest : public pdfium::FPDF_Test {}; - -TEST_F(CFDE_CSSValueListParserTest, rgb_short) { +TEST(CFDE_CSSValueListParserTest, rgb_short) { FDE_CSSPrimitiveType type; const wchar_t* start; int32_t len; @@ -43,7 +41,7 @@ EXPECT_FALSE(parser->NextValue(type, start, len)); } -TEST_F(CFDE_CSSValueListParserTest, number_parsing) { +TEST(CFDE_CSSValueListParserTest, number_parsing) { FDE_CSSPrimitiveType type; const wchar_t* start; int32_t len; @@ -85,7 +83,7 @@ EXPECT_EQ(L"43a1.12.34", CFX_WideString(start, len)); } -TEST_F(CFDE_CSSValueListParserTest, string_parsing) { +TEST(CFDE_CSSValueListParserTest, string_parsing) { FDE_CSSPrimitiveType type; const wchar_t* start; int32_t len; @@ -108,7 +106,7 @@ EXPECT_EQ(L"standalone", CFX_WideString(start, len)); } -TEST_F(CFDE_CSSValueListParserTest, multiparsing) { +TEST(CFDE_CSSValueListParserTest, multiparsing) { FDE_CSSPrimitiveType type; const wchar_t* start; int32_t len;
diff --git a/xfa/fxfa/cxfa_ffapp_unittest.cpp b/xfa/fxfa/cxfa_ffapp_unittest.cpp index fc1d038..bd35956 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 @@ 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 @@ 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 a2c7f1b..160c4a1 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 6a1de85..aa46813 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 @@ } } -class XFANodeIteratorTest : public pdfium::FPDF_Test { +class XFANodeIteratorTest : public testing::Test { public: class Node { public: