commit eaf9d21f798c0272c645537b3471f274b080d7b1
author Tom Sepez <tsepez@chromium.org> Wed Jul 22 16:24:00 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Wed Jul 22 16:24:00 2020 +0000
tree dd00cde8f1afb36ca90c75caf2392a81609889cd
parent 9e1fc05ef7a247c6b3810c4ed20e5d17742020f2

Move class EmbedderTestEnvironment to standalone V8TestEnvironment.

This will then allow tests involving garbage-collected objects to
be lighter-weight unittests, rather than embeddertests. In particular,
an object with an existing unit test shouldn't have to become an
embeddertest when it becomes gc'd.

-- add environment setup to unittest main.
-- move two tests back to unittest as a result.

Change-Id: I25c205f3a9dc12854230ed851aebf7d3cb553ace
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/71810
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>

testing/unit_test_main.cpp

diff --git a/testing/unit_test_main.cpp b/testing/unit_test_main.cpp
index 5d50249..b36ac80 100644
--- a/testing/unit_test_main.cpp
+++ b/testing/unit_test_main.cpp
@@ -11,7 +11,7 @@
 #include "testing/test_support.h"
 
 #ifdef PDF_ENABLE_V8
-#include "testing/v8_initializer.h"
+#include "testing/v8_test_environment.h"
 #include "v8/include/v8-platform.h"
 #include "v8/include/v8.h"
 #endif  // PDF_ENABLE_V8
@@ -26,18 +26,14 @@
   FXMEM_InitializePartitionAlloc();
 
 #ifdef PDF_ENABLE_V8
-  std::unique_ptr<v8::Platform> platform;
-#ifdef V8_USE_EXTERNAL_STARTUP_DATA
-  static v8::StartupData* snapshot = new v8::StartupData;
-  platform =
-      InitializeV8ForPDFiumWithStartupData(argv[0], std::string(), snapshot);
-#else  // V8_USE_EXTERNAL_STARTUP_DATA
-  platform = InitializeV8ForPDFium(argv[0]);
-#endif  // V8_USE_EXTERNAL_STARTUP_DATA
+  // V8 test environment will be deleted by gtest.
+  AddGlobalTestEnvironment(new V8TestEnvironment(argv[0]));
 #endif  // PDF_ENABLE_V8
 
   InitializePDFTestEnvironment();
+
 #ifdef PDF_ENABLE_XFA
+  // XFA test environment will be deleted by gtest.
   InitializeXFATestEnvironment();
 #endif  // PDF_ENABLE_XFA
 
@@ -47,11 +43,7 @@
   int ret_val = RUN_ALL_TESTS();
 
   DestroyPDFTestEnvironment();
-  // NOTE: XFA test environment, if present, destroyed by gtest.
 
-#ifdef PDF_ENABLE_V8
-  v8::V8::ShutdownPlatform();
-#endif  // PDF_ENABLE_V8
 
   return ret_val;
 }