Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1220)

Unified Diff: testing/embedder_test.cpp

Issue 1411403012: Merge to XFA: Add path service to retrieve test data directory at run time so tests can be run from… (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: remove a blank line Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « testing/embedder_test.h ('k') | testing/test_support.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: testing/embedder_test.cpp
diff --git a/testing/embedder_test.cpp b/testing/embedder_test.cpp
index ebd8c64b32758878cefacb6bfcd52611981f4cd4..baaf016d9fb59ee8e73ef6b60232f3a0514158df 100644
--- a/testing/embedder_test.cpp
+++ b/testing/embedder_test.cpp
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "embedder_test.h"
+#include "testing/embedder_test.h"
#include <limits.h>
@@ -14,8 +14,9 @@
#include "public/fpdf_dataavail.h"
#include "public/fpdf_text.h"
#include "public/fpdfview.h"
-#include "test_support.h"
#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/test_support.h"
+#include "testing/utils/path_service.h"
#ifdef PDF_ENABLE_V8
#include "v8/include/v8.h"
@@ -97,7 +98,10 @@ void EmbedderTest::TearDown() {
}
bool EmbedderTest::OpenDocument(const std::string& filename) {
- file_contents_ = GetFileContents(filename.c_str(), &file_length_);
+ std::string file_path;
+ if (!PathService::GetTestFilePath(filename, &file_path))
+ return false;
+ file_contents_ = GetFileContents(file_path.c_str(), &file_length_);
if (!file_contents_)
return false;
« no previous file with comments | « testing/embedder_test.h ('k') | testing/test_support.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698