summaryrefslogtreecommitdiff
path: root/testing
diff options
context:
space:
mode:
Diffstat (limited to 'testing')
-rw-r--r--testing/test_support.cpp11
-rw-r--r--testing/test_support.h6
-rw-r--r--testing/unit_test_main.cpp16
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();
+}