diff options
author | Tom Sepez <tsepez@chromium.org> | 2017-04-24 15:04:25 -0700 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-04-24 22:42:33 +0000 |
commit | 64ee2c3fe2a21d0471595ae486d7e55e2eadfb57 (patch) | |
tree | 8e83d144c344fe412ccaa21482c5679643ed3a54 /testing | |
parent | 39b83dd0ce7d828f6a17a2e6529ceb5ffc819207 (diff) | |
download | pdfium-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 'testing')
-rw-r--r-- | testing/test_support.cpp | 11 | ||||
-rw-r--r-- | testing/test_support.h | 6 | ||||
-rw-r--r-- | testing/unit_test_main.cpp | 16 |
3 files changed, 16 insertions, 17 deletions
diff --git a/testing/test_support.cpp b/testing/test_support.cpp index 1f527811c4..a2e9a6a6dd 100644 --- a/testing/test_support.cpp +++ b/testing/test_support.cpp @@ -228,14 +228,3 @@ int TestSaver::GetBlockFromString(void* param, memcpy(buf, new_file->data() + pos, size); return 1; } - -namespace pdfium { - -void FPDF_Test::SetUp() { - FXMEM_InitalizePartitionAlloc(); -} - -void FPDF_Test::TearDown() { -} - -} // namespace pdfium diff --git a/testing/test_support.h b/testing/test_support.h index f175811078..4fe7c295cd 100644 --- a/testing/test_support.h +++ b/testing/test_support.h @@ -59,12 +59,6 @@ struct FreeDeleter { inline void operator()(void* ptr) const { free(ptr); } }; -class FPDF_Test : public ::testing::Test { - public: - void SetUp() override; - void TearDown() override; -}; - } // namespace pdfium // Reads the entire contents of a file into a newly alloc'd buffer. diff --git a/testing/unit_test_main.cpp b/testing/unit_test_main.cpp new file mode 100644 index 0000000000..d8076abec6 --- /dev/null +++ b/testing/unit_test_main.cpp @@ -0,0 +1,16 @@ +// Copyright 2017 PDFium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "core/fxcrt/fx_memory.h" +#include "testing/gmock/include/gmock/gmock.h" +#include "testing/gtest/include/gtest/gtest.h" + +// Can't use gtest-provided main since we need to initialize partition +// alloc before invoking any test. +int main(int argc, char** argv) { + FXMEM_InitalizePartitionAlloc(); + testing::InitGoogleTest(&argc, argv); + testing::InitGoogleMock(&argc, argv); + return RUN_ALL_TESTS(); +} |