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

Side by Side Diff: chrome/browser/history/android/android_cache_database_unittest.cc

Issue 11359217: Move scoped_temp_dir from base to base/files (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/file_path.h" 5 #include "base/file_path.h"
6 #include "base/file_util.h" 6 #include "base/file_util.h"
7 #include "base/scoped_temp_dir.h" 7 #include "base/files/scoped_temp_dir.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/browser/history/android/android_cache_database.h" 9 #include "chrome/browser/history/android/android_cache_database.h"
10 #include "chrome/browser/history/android/android_time.h" 10 #include "chrome/browser/history/android/android_time.h"
11 #include "chrome/browser/history/history_database.h" 11 #include "chrome/browser/history/history_database.h"
12 #include "chrome/test/base/testing_profile.h" 12 #include "chrome/test/base/testing_profile.h"
13 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
14 14
15 using base::Time; 15 using base::Time;
16 using base::TimeDelta; 16 using base::TimeDelta;
17 17
(...skipping 11 matching lines...) Expand all
29 // Get a temporary directory for the test DB files. 29 // Get a temporary directory for the test DB files.
30 ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); 30 ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
31 FilePath history_db_name_ = temp_dir_.path().AppendASCII("history.db"); 31 FilePath history_db_name_ = temp_dir_.path().AppendASCII("history.db");
32 android_cache_db_name_ = temp_dir_.path().AppendASCII( 32 android_cache_db_name_ = temp_dir_.path().AppendASCII(
33 "TestAndroidCache.db"); 33 "TestAndroidCache.db");
34 ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_, NULL)); 34 ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_, NULL));
35 ASSERT_EQ(sql::INIT_OK, 35 ASSERT_EQ(sql::INIT_OK,
36 history_db_.InitAndroidCacheDatabase(android_cache_db_name_)); 36 history_db_.InitAndroidCacheDatabase(android_cache_db_name_));
37 } 37 }
38 38
39 ScopedTempDir temp_dir_; 39 base::ScopedTempDir temp_dir_;
40 FilePath android_cache_db_name_; 40 FilePath android_cache_db_name_;
41 HistoryDatabase history_db_; 41 HistoryDatabase history_db_;
42 }; 42 };
43 43
44 TEST(AndroidCacheDatabaseAttachTest, AttachDatabaseInTransactionNesting) { 44 TEST(AndroidCacheDatabaseAttachTest, AttachDatabaseInTransactionNesting) {
45 ScopedTempDir temp_dir; 45 base::ScopedTempDir temp_dir;
46 FilePath android_cache_db_name; 46 FilePath android_cache_db_name;
47 HistoryDatabase history_db; 47 HistoryDatabase history_db;
48 ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); 48 ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
49 FilePath history_db_name = temp_dir.path().AppendASCII("history.db"); 49 FilePath history_db_name = temp_dir.path().AppendASCII("history.db");
50 android_cache_db_name = temp_dir.path().AppendASCII( 50 android_cache_db_name = temp_dir.path().AppendASCII(
51 "TestAndroidCache.db"); 51 "TestAndroidCache.db");
52 ASSERT_EQ(sql::INIT_OK, history_db.Init(history_db_name, NULL)); 52 ASSERT_EQ(sql::INIT_OK, history_db.Init(history_db_name, NULL));
53 // Create nested transactions. 53 // Create nested transactions.
54 history_db.BeginTransaction(); 54 history_db.BeginTransaction();
55 history_db.BeginTransaction(); 55 history_db.BeginTransaction();
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 EXPECT_FALSE(history_db_.GetSearchTerm(update_row1.term, NULL)); 106 EXPECT_FALSE(history_db_.GetSearchTerm(update_row1.term, NULL));
107 // The search_term2 should still in the table. 107 // The search_term2 should still in the table.
108 ASSERT_EQ(id2, history_db_.GetSearchTerm(search_term2, &row1)); 108 ASSERT_EQ(id2, history_db_.GetSearchTerm(search_term2, &row1));
109 EXPECT_EQ(id2, row1.id); 109 EXPECT_EQ(id2, row1.id);
110 EXPECT_EQ(ToDatabaseTime(search_time2), 110 EXPECT_EQ(ToDatabaseTime(search_time2),
111 ToDatabaseTime(row1.last_visit_time)); 111 ToDatabaseTime(row1.last_visit_time));
112 EXPECT_EQ(search_term2, row1.term); 112 EXPECT_EQ(search_term2, row1.term);
113 } 113 }
114 114
115 } // namespace history 115 } // namespace history
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698