base/json/json_reader_unittest.cc - Issue 13376002: base: Consolidate all test data directories under base/test/data.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: base/json/json_reader_unittest.cc

Issue 13376002: base: Consolidate all test data directories under base/test/data. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase2 Created 7 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: base/json/json_reader_unittest.cc

diff --git a/base/json/json_reader_unittest.cc b/base/json/json_reader_unittest.cc

index 4cf1d37982a305aba52106ab9f25f56eab73af7a..ab38b044d94817eb8584835e5bc57ec5772eac7a 100644

--- a/base/json/json_reader_unittest.cc

+++ b/base/json/json_reader_unittest.cc

@@ -542,10 +542,9 @@ TEST(JSONReaderTest, Reading) {

TEST(JSONReaderTest, ReadFromFile) {

FilePath path;

- ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &path));

- path = path.Append(FILE_PATH_LITERAL("base"))

- .Append(FILE_PATH_LITERAL("data"))

- .Append(FILE_PATH_LITERAL("json"));

+ ASSERT_TRUE(PathService::Get(base::DIR_TEST_DATA, &path));

+ path = path.AppendASCII("json");

+ ASSERT_TRUE(file_util::PathExists(path));

std::string input;

ASSERT_TRUE(file_util::ReadFileToString(

« no previous file with comments | « base/file_util_unittest.cc ('k') | base/prefs/json_pref_store_unittest.cc » ('j') | no next file with comments »