diff options
| author | tommycli@chromium.org <tommycli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-06 23:45:29 +0000 |
|---|---|---|
| committer | tommycli@chromium.org <tommycli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-06 23:45:29 +0000 |
| commit | 9a10c844a29d13ef38b72de0cb34bdd76b33cc97 (patch) | |
| tree | 1dfd3955a9b0068a860682004726c89f646b95a2 /chrome/utility | |
| parent | 9ca018c5a88ebe00e460e37ea0d1f0911e273801 (diff) | |
| download | chromium_src-9a10c844a29d13ef38b72de0cb34bdd76b33cc97.zip chromium_src-9a10c844a29d13ef38b72de0cb34bdd76b33cc97.tar.gz chromium_src-9a10c844a29d13ef38b72de0cb34bdd76b33cc97.tar.bz2 | |
Media Galleries API Picasa: Add file watch to invalidate database data on disk write.
Depends on: https://codereview.chromium.org/22912008/
R=vandebo
BUG=151701
Review URL: https://chromiumcodereview.appspot.com/23499006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221818 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/utility')
| -rw-r--r-- | chrome/utility/media_galleries/picasa_album_table_reader_unittest.cc | 4 | ||||
| -rw-r--r-- | chrome/utility/media_galleries/pmp_column_reader_unittest.cc | 9 |
2 files changed, 2 insertions, 11 deletions
diff --git a/chrome/utility/media_galleries/picasa_album_table_reader_unittest.cc b/chrome/utility/media_galleries/picasa_album_table_reader_unittest.cc index fe9b828..fb45dbf 100644 --- a/chrome/utility/media_galleries/picasa_album_table_reader_unittest.cc +++ b/chrome/utility/media_galleries/picasa_album_table_reader_unittest.cc @@ -13,7 +13,7 @@ namespace { TEST(PicasaAlbumTableReaderTest, FoldersAndAlbums) { PmpTestHelper test_helper(kPicasaAlbumTableName); - ASSERT_TRUE(test_helper.Init()); + ASSERT_TRUE(test_helper.Init(PmpTestHelper::DATABASE_DIRECTORY)); int test_time_delta = 100; @@ -65,7 +65,7 @@ TEST(PicasaAlbumTableReaderTest, FoldersAndAlbums) { ASSERT_TRUE(test_helper.WriteColumnFileFromVector( "uid", PMP_TYPE_STRING, uid_vector)); - AlbumTableFiles album_table_files(test_helper.GetTempDirPath()); + AlbumTableFiles album_table_files(test_helper.GetDatabaseDirPath()); PicasaAlbumTableReader reader(album_table_files); ASSERT_TRUE(reader.Init()); diff --git a/chrome/utility/media_galleries/pmp_column_reader_unittest.cc b/chrome/utility/media_galleries/pmp_column_reader_unittest.cc index a1f44b7..2fda740 100644 --- a/chrome/utility/media_galleries/pmp_column_reader_unittest.cc +++ b/chrome/utility/media_galleries/pmp_column_reader_unittest.cc @@ -72,9 +72,6 @@ bool DoRead(const PmpColumnReader* reader, uint32 row, uint64* target) { template<class T> void TestValid(const PmpFieldType field_type, const std::vector<T>& elems) { - PmpTestHelper test_helper("test"); - ASSERT_TRUE(test_helper.Init()); - PmpColumnReader reader; std::vector<char> data = PmpTestHelper::MakeHeaderAndBody(field_type, elems.size(), elems); @@ -91,9 +88,6 @@ void TestValid(const PmpFieldType field_type, template<class T> void TestMalformed(const PmpFieldType field_type, const std::vector<T>& elems) { - PmpTestHelper test_helper("test"); - ASSERT_TRUE(test_helper.Init()); - PmpColumnReader reader_too_few_declared_rows; std::vector<char> data_too_few_declared_rows = PmpTestHelper::MakeHeaderAndBody(field_type, elems.size()-1, elems); @@ -140,9 +134,6 @@ void TestPrimitive(const PmpFieldType field_type) { TEST(PmpColumnReaderTest, HeaderParsingAndValidation) { - PmpTestHelper test_helper("test"); - ASSERT_TRUE(test_helper.Init()); - PmpColumnReader reader_good_header; std::vector<char> good_header = PmpTestHelper::MakeHeader(PMP_TYPE_STRING, 0); |