More misc. cleanups to minimize future refactoring diffs.

chrome/browser/webdata/keyword_table_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/stl_util.h"
@@ skipping 64 matching lines @@
   KeywordTable::Keywords keywords;
   EXPECT_TRUE(keyword_table->GetKeywords(&keywords));
   EXPECT_EQ(1U, keywords.size());
   const TemplateURLData& restored_keyword = keywords.front();
 
   EXPECT_EQ(keyword.short_name, restored_keyword.short_name);
   EXPECT_EQ(url.keyword(), TemplateURL(restored_keyword).keyword());
   EXPECT_EQ(keyword.autogenerate_keyword(),
             restored_keyword.autogenerate_keyword());
   EXPECT_EQ(keyword.url(), restored_keyword.url());
+  EXPECT_EQ(keyword.suggestions_url, restored_keyword.suggestions_url);
   EXPECT_EQ(keyword.instant_url, restored_keyword.instant_url);
   EXPECT_EQ(keyword.favicon_url, restored_keyword.favicon_url);
   EXPECT_EQ(keyword.originating_url, restored_keyword.originating_url);
   EXPECT_EQ(keyword.show_in_default_list,
             restored_keyword.show_in_default_list);
   EXPECT_EQ(keyword.safe_for_autoreplace,
             restored_keyword.safe_for_autoreplace);
   EXPECT_EQ(keyword.input_encodings, restored_keyword.input_encodings);
   EXPECT_EQ(keyword.id, restored_keyword.id);
   // The database stores time only at the resolution of a second.
@@ skipping 10 matching lines @@
   KeywordTable::Keywords empty_keywords;
   EXPECT_TRUE(keyword_table->GetKeywords(&empty_keywords));
   EXPECT_EQ(0U, empty_keywords.size());
 }
 
 TEST_F(KeywordTableTest, KeywordMisc) {
   WebDatabase db;
   ASSERT_EQ(sql::INIT_OK, db.Init(file_));
   KeywordTable* keyword_table = db.GetKeywordTable();
 
-  ASSERT_EQ(kInvalidTemplateURLID, keyword_table->GetDefaultSearchProviderID());
-  ASSERT_EQ(0, keyword_table->GetBuiltinKeywordVersion());
+  EXPECT_EQ(kInvalidTemplateURLID, keyword_table->GetDefaultSearchProviderID());
+  EXPECT_EQ(0, keyword_table->GetBuiltinKeywordVersion());
 
   TemplateURLData keyword;
   keyword.short_name = ASCIIToUTF16("short_name");
   keyword.SetKeyword(ASCIIToUTF16("keyword"));
   keyword.SetURL("http://url/");
   keyword.instant_url = "http://instant/";
   keyword.favicon_url = GURL("http://favicon.url/");
   keyword.originating_url = GURL("http://google.com/");
   keyword.show_in_default_list = true;
   keyword.safe_for_autoreplace = true;
   keyword.input_encodings.push_back("UTF-8");
   keyword.input_encodings.push_back("UTF-16");
   keyword.id = 10;
   keyword.date_created = Time::Now();
   keyword.last_modified = keyword.date_created + TimeDelta::FromSeconds(10);
   keyword.created_by_policy = true;
   keyword.usage_count = 32;
   keyword.prepopulate_id = 10;
   TemplateURL url(keyword);
-  ASSERT_TRUE(keyword_table->AddKeyword(url));
+  EXPECT_TRUE(keyword_table->AddKeyword(url));
 
-  ASSERT_TRUE(keyword_table->SetDefaultSearchProviderID(10));
-  ASSERT_TRUE(keyword_table->SetBuiltinKeywordVersion(11));
+  EXPECT_TRUE(keyword_table->SetDefaultSearchProviderID(10));
+  EXPECT_TRUE(keyword_table->SetBuiltinKeywordVersion(11));
 
-  ASSERT_EQ(10, keyword_table->GetDefaultSearchProviderID());
-  ASSERT_EQ(11, keyword_table->GetBuiltinKeywordVersion());
+  EXPECT_EQ(10, keyword_table->GetDefaultSearchProviderID());
+  EXPECT_EQ(11, keyword_table->GetBuiltinKeywordVersion());
 }
 
 TEST_F(KeywordTableTest, DefaultSearchProviderBackup) {
   // TODO(ivankr): suppress keyword_table.cc ERROR logs.
   WebDatabase db;
   ASSERT_EQ(sql::INIT_OK, db.Init(file_));
   KeywordTable* keyword_table = db.GetKeywordTable();
 
   EXPECT_EQ(kInvalidTemplateURLID, keyword_table->GetDefaultSearchProviderID());
 
   TemplateURLData keyword;
   keyword.short_name = ASCIIToUTF16("short_name");
   keyword.SetKeyword(ASCIIToUTF16("keyword"));
   keyword.SetURL("http://url/");
   keyword.suggestions_url = "url2";
   keyword.favicon_url = GURL("http://favicon.url/");
   keyword.show_in_default_list = true;
   keyword.safe_for_autoreplace = true;
   keyword.id = 1;
   TemplateURL url(keyword);
   EXPECT_TRUE(keyword_table->AddKeyword(url));
 
-  ASSERT_TRUE(keyword_table->SetDefaultSearchProviderID(1));
+  EXPECT_TRUE(keyword_table->SetDefaultSearchProviderID(1));
   EXPECT_TRUE(keyword_table->IsBackupSignatureValid());
   EXPECT_EQ(1, keyword_table->GetDefaultSearchProviderID());
 
   TemplateURLData backup;
   EXPECT_TRUE(keyword_table->GetDefaultSearchProviderBackup(&backup));
   // Backup URL should have an invalid ID.
   EXPECT_EQ(kInvalidTemplateURLID, backup.id);
   EXPECT_EQ(keyword.short_name, backup.short_name);
   EXPECT_EQ(url.keyword(), TemplateURL(backup).keyword());
   EXPECT_EQ(keyword.url(), backup.url());
   EXPECT_EQ(keyword.favicon_url, backup.favicon_url);
   EXPECT_EQ(keyword.suggestions_url, backup.suggestions_url);
   EXPECT_EQ(keyword.show_in_default_list, backup.show_in_default_list);
   EXPECT_EQ(keyword.safe_for_autoreplace, backup.safe_for_autoreplace);
   EXPECT_FALSE(keyword_table->DidDefaultSearchProviderChange());
 
   // Change the actual setting.
-  ASSERT_TRUE(keyword_table->meta_table_->SetValue(
+  EXPECT_TRUE(keyword_table->meta_table_->SetValue(
       KeywordTable::kDefaultSearchProviderKey, 2));
   EXPECT_TRUE(keyword_table->IsBackupSignatureValid());
   EXPECT_EQ(2, keyword_table->GetDefaultSearchProviderID());
 
   EXPECT_TRUE(keyword_table->GetDefaultSearchProviderBackup(&backup));
   EXPECT_EQ(kInvalidTemplateURLID, backup.id);
   EXPECT_EQ(keyword.short_name, backup.short_name);
   EXPECT_EQ(url.keyword(), TemplateURL(backup).keyword());
   EXPECT_EQ(keyword.url(), backup.url());
   EXPECT_EQ(keyword.favicon_url, backup.favicon_url);
   EXPECT_EQ(keyword.suggestions_url, backup.suggestions_url);
   EXPECT_EQ(keyword.show_in_default_list, backup.show_in_default_list);
   EXPECT_EQ(keyword.safe_for_autoreplace, backup.safe_for_autoreplace);
   EXPECT_TRUE(keyword_table->DidDefaultSearchProviderChange());
 
   // Change the backup.
-  ASSERT_TRUE(keyword_table->meta_table_->SetValue(
+  EXPECT_TRUE(keyword_table->meta_table_->SetValue(
       KeywordTable::kDefaultSearchProviderKey, 1));
-  ASSERT_TRUE(keyword_table->meta_table_->SetValue(
+  EXPECT_TRUE(keyword_table->meta_table_->SetValue(
       KeywordTable::kDefaultSearchIDBackupKey, 2));
   EXPECT_FALSE(keyword_table->IsBackupSignatureValid());
   EXPECT_EQ(1, keyword_table->GetDefaultSearchProviderID());
   EXPECT_FALSE(keyword_table->GetDefaultSearchProviderBackup(&backup));
   EXPECT_TRUE(keyword_table->DidDefaultSearchProviderChange());
 
   // Change the signature.
-  ASSERT_TRUE(keyword_table->meta_table_->SetValue(
+  EXPECT_TRUE(keyword_table->meta_table_->SetValue(
       KeywordTable::kDefaultSearchIDBackupKey, 1));
-  ASSERT_TRUE(keyword_table->meta_table_->SetValue(
+  EXPECT_TRUE(keyword_table->meta_table_->SetValue(
       KeywordTable::kBackupSignatureKey, std::string()));
   EXPECT_FALSE(keyword_table->IsBackupSignatureValid());
   EXPECT_EQ(1, keyword_table->GetDefaultSearchProviderID());
   EXPECT_FALSE(keyword_table->GetDefaultSearchProviderBackup(&backup));
   EXPECT_TRUE(keyword_table->DidDefaultSearchProviderChange());
 
   // Change keywords.
-  ASSERT_TRUE(keyword_table->UpdateBackupSignature());
+  EXPECT_TRUE(keyword_table->UpdateBackupSignature());
   sql::Statement remove_keyword(keyword_table->db_->GetUniqueStatement(
       "DELETE FROM keywords WHERE id=1"));
-  ASSERT_TRUE(remove_keyword.Run());
+  EXPECT_TRUE(remove_keyword.Run());
   EXPECT_TRUE(keyword_table->IsBackupSignatureValid());
   EXPECT_EQ(1, keyword_table->GetDefaultSearchProviderID());
 
   EXPECT_TRUE(keyword_table->GetDefaultSearchProviderBackup(&backup));
   EXPECT_EQ(kInvalidTemplateURLID, backup.id);
   EXPECT_EQ(keyword.short_name, backup.short_name);
   EXPECT_EQ(url.keyword(), TemplateURL(backup).keyword());
   EXPECT_EQ(keyword.url(), backup.url());
   EXPECT_EQ(keyword.suggestions_url, backup.suggestions_url);
   EXPECT_EQ(keyword.favicon_url, backup.favicon_url);
   EXPECT_EQ(keyword.show_in_default_list, backup.show_in_default_list);
   EXPECT_EQ(keyword.safe_for_autoreplace, backup.safe_for_autoreplace);
   EXPECT_TRUE(keyword_table->DidDefaultSearchProviderChange());
 
   // Change keywords backup.
   sql::Statement remove_keyword_backup(keyword_table->db_->GetUniqueStatement(
       "DELETE FROM keywords_backup WHERE id=1"));
-  ASSERT_TRUE(remove_keyword_backup.Run());
+  EXPECT_TRUE(remove_keyword_backup.Run());
   EXPECT_FALSE(keyword_table->IsBackupSignatureValid());
   EXPECT_EQ(1, keyword_table->GetDefaultSearchProviderID());
   EXPECT_FALSE(keyword_table->GetDefaultSearchProviderBackup(&backup));
   EXPECT_TRUE(keyword_table->DidDefaultSearchProviderChange());
 }
 
 TEST_F(KeywordTableTest, GetTableContents) {
   WebDatabase db;
   ASSERT_EQ(sql::INIT_OK, db.Init(file_));
   KeywordTable* keyword_table = db.GetKeywordTable();
@@ skipping 22 matching lines @@
   keyword.sync_guid = "FEDC-BA09-8765-4321";
   TemplateURL url2(keyword);
   EXPECT_TRUE(keyword_table->AddKeyword(url2));
 
   const char kTestContents[] = "1short_namekeywordhttp://favicon.url/"
       "http://url/1001url2000001234-5678-90AB-CDEF2short_nameurl"
       "http://favicon.url/http://url/1http://originating.url/00Shift_JIS1url251"
       "00http://instant2/0FEDC-BA09-8765-4321";
 
   std::string contents;
-  ASSERT_TRUE(keyword_table->GetTableContents("keywords", &contents));
+  EXPECT_TRUE(keyword_table->GetTableContents("keywords", &contents));
   EXPECT_EQ(kTestContents, contents);
 
-  ASSERT_TRUE(keyword_table->GetTableContents("keywords_backup", &contents));
+  EXPECT_TRUE(keyword_table->GetTableContents("keywords_backup", &contents));
   EXPECT_EQ(kTestContents, contents);
 }
 
 TEST_F(KeywordTableTest, GetTableContentsOrdering) {
   WebDatabase db;
   ASSERT_EQ(sql::INIT_OK, db.Init(file_));
   KeywordTable* keyword_table = db.GetKeywordTable();
 
   TemplateURLData keyword;
   keyword.short_name = ASCIIToUTF16("short_name");
@@ skipping 19 matching lines @@
   keyword.sync_guid = "FEDC-BA09-8765-4321";
   TemplateURL url2(keyword);
   EXPECT_TRUE(keyword_table->AddKeyword(url2));
 
   const char kTestContents[] = "1short_nameurlhttp://favicon.url/http://url/1"
       "http://originating.url/00Shift_JIS1url25100http://instant2/0"
       "FEDC-BA09-8765-43212short_namekeywordhttp://favicon.url/http://url/1001"
       "url2000001234-5678-90AB-CDEF";
 
   std::string contents;
-  ASSERT_TRUE(keyword_table->GetTableContents("keywords", &contents));
+  EXPECT_TRUE(keyword_table->GetTableContents("keywords", &contents));
   EXPECT_EQ(kTestContents, contents);
 
-  ASSERT_TRUE(keyword_table->GetTableContents("keywords_backup", &contents));
+  EXPECT_TRUE(keyword_table->GetTableContents("keywords_backup", &contents));
   EXPECT_EQ(kTestContents, contents);
 }
 
 TEST_F(KeywordTableTest, UpdateKeyword) {
   WebDatabase db;
   ASSERT_EQ(sql::INIT_OK, db.Init(file_));
   KeywordTable* keyword_table = db.GetKeywordTable();
 
   TemplateURLData keyword;
   keyword.short_name = ASCIIToUTF16("short_name");
@@ skipping 56 matching lines @@
   EXPECT_EQ(1U, keywords.size());
   const TemplateURLData& restored_keyword = keywords.front();
 
   EXPECT_EQ(keyword.short_name, restored_keyword.short_name);
   EXPECT_EQ(url.keyword(), TemplateURL(restored_keyword).keyword());
   EXPECT_EQ(keyword.favicon_url, restored_keyword.favicon_url);
   EXPECT_EQ(keyword.safe_for_autoreplace,
             restored_keyword.safe_for_autoreplace);
   EXPECT_EQ(keyword.id, restored_keyword.id);
 }