base: Consolidate all test data directories under base/test/data.
This is the follow up patch I promised in r191077 -
https://chromiumcodereview.appspot.com/12481028
TEST=base_unittests
R=darin@chromium.org,bulach@chromium.org
Review URL: https://codereview.chromium.org/13376002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192780 0039d316-1c4b-4281-b951-d872f2087c98
CrOS-Libchrome-Original-Commit: fd1d067bf96418e78c89cadc263f13e23ecab08f
diff --git a/base/base.gyp b/base/base.gyp
index 1c54c8e..2524e8f 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -700,9 +700,6 @@
'action_name': 'copy_test_data',
'variables': {
'test_data_files': [
- 'data/file_util_unittest',
- 'data/json/bom_feff.json',
- 'prefs/test/data/pref_service',
'test/data',
],
'test_data_prefix': 'base',
diff --git a/base/data/file_util_unittest/binary_file.bin b/base/data/file_util_unittest/binary_file.bin
deleted file mode 100644
index f53cc82..0000000
--- a/base/data/file_util_unittest/binary_file.bin
+++ /dev/null
Binary files differ
diff --git a/base/data/file_util_unittest/binary_file_diff.bin b/base/data/file_util_unittest/binary_file_diff.bin
deleted file mode 100644
index 103b26d..0000000
--- a/base/data/file_util_unittest/binary_file_diff.bin
+++ /dev/null
Binary files differ
diff --git a/base/data/file_util_unittest/binary_file_same.bin b/base/data/file_util_unittest/binary_file_same.bin
deleted file mode 100644
index f53cc82..0000000
--- a/base/data/file_util_unittest/binary_file_same.bin
+++ /dev/null
Binary files differ
diff --git a/base/data/json/bom_feff.json b/base/data/json/bom_feff.json
deleted file mode 100644
index b05ae50..0000000
--- a/base/data/json/bom_feff.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "appName": {
- "message": "Gmail",
- "description": "App name."
- },
- "appDesc": {
- "message": "بريد إلكتروني يوفر إمكانية البحث مع مقدار أقل من الرسائل غير المرغوب فيها.",
- "description":"App description."
- }
-}
\ No newline at end of file
diff --git a/base/file_util_unittest.cc b/base/file_util_unittest.cc
index cffab35..1f10a33 100644
--- a/base/file_util_unittest.cc
+++ b/base/file_util_unittest.cc
@@ -1531,10 +1531,8 @@
TEST_F(ReadOnlyFileUtilTest, ContentsEqual) {
FilePath data_dir;
- ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &data_dir));
- data_dir = data_dir.Append(FILE_PATH_LITERAL("base"))
- .Append(FILE_PATH_LITERAL("data"))
- .Append(FILE_PATH_LITERAL("file_util_unittest"));
+ ASSERT_TRUE(PathService::Get(base::DIR_TEST_DATA, &data_dir));
+ data_dir = data_dir.AppendASCII("file_util");
ASSERT_TRUE(file_util::PathExists(data_dir));
FilePath original_file =
@@ -1580,10 +1578,8 @@
TEST_F(ReadOnlyFileUtilTest, TextContentsEqual) {
FilePath data_dir;
- ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &data_dir));
- data_dir = data_dir.Append(FILE_PATH_LITERAL("base"))
- .Append(FILE_PATH_LITERAL("data"))
- .Append(FILE_PATH_LITERAL("file_util_unittest"));
+ ASSERT_TRUE(PathService::Get(base::DIR_TEST_DATA, &data_dir));
+ data_dir = data_dir.AppendASCII("file_util");
ASSERT_TRUE(file_util::PathExists(data_dir));
FilePath original_file =
diff --git a/base/json/json_reader_unittest.cc b/base/json/json_reader_unittest.cc
index 4cf1d37..ab38b04 100644
--- a/base/json/json_reader_unittest.cc
+++ b/base/json/json_reader_unittest.cc
@@ -542,10 +542,9 @@
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(
diff --git a/base/prefs/json_pref_store_unittest.cc b/base/prefs/json_pref_store_unittest.cc
index 175ef2c..1368b3f 100644
--- a/base/prefs/json_pref_store_unittest.cc
+++ b/base/prefs/json_pref_store_unittest.cc
@@ -42,13 +42,8 @@
virtual void SetUp() OVERRIDE {
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
- ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &data_dir_));
- data_dir_ = data_dir_.AppendASCII("base");
+ ASSERT_TRUE(PathService::Get(base::DIR_TEST_DATA, &data_dir_));
data_dir_ = data_dir_.AppendASCII("prefs");
- data_dir_ = data_dir_.AppendASCII("test");
- data_dir_ = data_dir_.AppendASCII("data");
- data_dir_ = data_dir_.AppendASCII("pref_service");
- LOG(WARNING) << data_dir_.value().c_str();
ASSERT_TRUE(file_util::PathExists(data_dir_));
}
diff --git a/base/data/file_util_unittest/blank_line.txt b/base/test/data/file_util/blank_line.txt
similarity index 100%
rename from base/data/file_util_unittest/blank_line.txt
rename to base/test/data/file_util/blank_line.txt
diff --git a/base/data/file_util_unittest/blank_line_crlf.txt b/base/test/data/file_util/blank_line_crlf.txt
similarity index 100%
rename from base/data/file_util_unittest/blank_line_crlf.txt
rename to base/test/data/file_util/blank_line_crlf.txt
diff --git a/base/data/file_util_unittest/crlf.txt b/base/test/data/file_util/crlf.txt
similarity index 100%
rename from base/data/file_util_unittest/crlf.txt
rename to base/test/data/file_util/crlf.txt
diff --git a/base/data/file_util_unittest/different.txt b/base/test/data/file_util/different.txt
similarity index 100%
rename from base/data/file_util_unittest/different.txt
rename to base/test/data/file_util/different.txt
diff --git a/base/data/file_util_unittest/different_first.txt b/base/test/data/file_util/different_first.txt
similarity index 100%
rename from base/data/file_util_unittest/different_first.txt
rename to base/test/data/file_util/different_first.txt
diff --git a/base/data/file_util_unittest/different_last.txt b/base/test/data/file_util/different_last.txt
similarity index 100%
rename from base/data/file_util_unittest/different_last.txt
rename to base/test/data/file_util/different_last.txt
diff --git a/base/data/file_util_unittest/empty1.txt b/base/test/data/file_util/empty1.txt
similarity index 100%
rename from base/data/file_util_unittest/empty1.txt
rename to base/test/data/file_util/empty1.txt
diff --git a/base/data/file_util_unittest/empty2.txt b/base/test/data/file_util/empty2.txt
similarity index 100%
rename from base/data/file_util_unittest/empty2.txt
rename to base/test/data/file_util/empty2.txt
diff --git a/base/data/file_util_unittest/first1.txt b/base/test/data/file_util/first1.txt
similarity index 100%
rename from base/data/file_util_unittest/first1.txt
rename to base/test/data/file_util/first1.txt
diff --git a/base/data/file_util_unittest/first2.txt b/base/test/data/file_util/first2.txt
similarity index 100%
rename from base/data/file_util_unittest/first2.txt
rename to base/test/data/file_util/first2.txt
diff --git a/base/data/file_util_unittest/original.txt b/base/test/data/file_util/original.txt
similarity index 100%
rename from base/data/file_util_unittest/original.txt
rename to base/test/data/file_util/original.txt
diff --git a/base/data/file_util_unittest/same.txt b/base/test/data/file_util/same.txt
similarity index 100%
rename from base/data/file_util_unittest/same.txt
rename to base/test/data/file_util/same.txt
diff --git a/base/data/file_util_unittest/same_length.txt b/base/test/data/file_util/same_length.txt
similarity index 100%
rename from base/data/file_util_unittest/same_length.txt
rename to base/test/data/file_util/same_length.txt
diff --git a/base/data/file_util_unittest/shortened.txt b/base/test/data/file_util/shortened.txt
similarity index 100%
rename from base/data/file_util_unittest/shortened.txt
rename to base/test/data/file_util/shortened.txt
diff --git a/base/prefs/test/data/pref_service/invalid.json b/base/test/data/prefs/invalid.json
similarity index 100%
rename from base/prefs/test/data/pref_service/invalid.json
rename to base/test/data/prefs/invalid.json
diff --git a/base/prefs/test/data/pref_service/read.json b/base/test/data/prefs/read.json
similarity index 100%
rename from base/prefs/test/data/pref_service/read.json
rename to base/test/data/prefs/read.json
diff --git a/base/prefs/test/data/pref_service/read.need_empty_value.json b/base/test/data/prefs/read.need_empty_value.json
similarity index 100%
rename from base/prefs/test/data/pref_service/read.need_empty_value.json
rename to base/test/data/prefs/read.need_empty_value.json
diff --git a/base/prefs/test/data/pref_service/write.golden.json b/base/test/data/prefs/write.golden.json
similarity index 100%
rename from base/prefs/test/data/pref_service/write.golden.json
rename to base/test/data/prefs/write.golden.json
diff --git a/base/prefs/test/data/pref_service/write.golden.need_empty_value.json b/base/test/data/prefs/write.golden.need_empty_value.json
similarity index 100%
rename from base/prefs/test/data/pref_service/write.golden.need_empty_value.json
rename to base/test/data/prefs/write.golden.need_empty_value.json