From 64ee2c3fe2a21d0471595ae486d7e55e2eadfb57 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 24 Apr 2017 15:04:25 -0700 Subject: 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 Commit-Queue: Tom Sepez --- xfa/fde/css/cfde_cssdeclaration_unittest.cpp | 6 ++---- xfa/fde/css/cfde_cssvaluelistparser_unittest.cpp | 10 ++++------ 2 files changed, 6 insertions(+), 10 deletions(-) (limited to 'xfa/fde/css') diff --git a/xfa/fde/css/cfde_cssdeclaration_unittest.cpp b/xfa/fde/css/cfde_cssdeclaration_unittest.cpp index 80cd72c4d3..f43f941880 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 @@ TEST_F(CFDE_CSSDecalrationTest, HexEncodingParsing) { 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 077fb54e93..53a0657e12 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 @@ TEST_F(CFDE_CSSValueListParserTest, rgb_short) { 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 @@ TEST_F(CFDE_CSSValueListParserTest, number_parsing) { 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 @@ TEST_F(CFDE_CSSValueListParserTest, string_parsing) { 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; -- cgit v1.2.3