diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-09 00:40:21 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-09 00:40:21 +0000 |
| commit | 73f63f0a6e9787f53f971db3042deb2c9361d7fe (patch) | |
| tree | 04329ae8d1cd0bf2118710a7c6875396dde51afd /chrome | |
| parent | cdccbfc4037bc2e9f0271d1053bbd562909ff31c (diff) | |
| download | chromium_src-73f63f0a6e9787f53f971db3042deb2c9361d7fe.zip chromium_src-73f63f0a6e9787f53f971db3042deb2c9361d7fe.tar.gz chromium_src-73f63f0a6e9787f53f971db3042deb2c9361d7fe.tar.bz2 | |
fix google chrome installer tests
When we updated gtest, this method became private
(GTEST_FATAL_FAILURE_). Use the public methods instead.
This is only a problem on official builds.
Review URL: http://codereview.chromium.org/17440
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7790 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/installer/util/google_chrome_distribution_unittest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/installer/util/google_chrome_distribution_unittest.cc b/chrome/installer/util/google_chrome_distribution_unittest.cc index 34c60e1..4752b17 100644 --- a/chrome/installer/util/google_chrome_distribution_unittest.cc +++ b/chrome/installer/util/google_chrome_distribution_unittest.cc @@ -115,7 +115,7 @@ TEST_F(GoogleChromeDistributionTest, UpdateDiffInstallStatusTest) { scoped_ptr<WorkItemList> work_item_list(WorkItem::CreateWorkItemList()); // Test incremental install failure if (!CreateApKey(work_item_list.get(), L"")) - GTEST_FATAL_FAILURE("Failed to create ap key."); + FAIL() << "Failed to create ap key."; dist->UpdateDiffInstallStatus(false, true, installer_util::INSTALL_FAILED); EXPECT_STREQ(ReadApKeyValue().c_str(), L"-full"); work_item_list->Rollback(); @@ -123,7 +123,7 @@ TEST_F(GoogleChromeDistributionTest, UpdateDiffInstallStatusTest) { work_item_list.reset(WorkItem::CreateWorkItemList()); // Test incremental install success if (!CreateApKey(work_item_list.get(), L"")) - GTEST_FATAL_FAILURE("Failed to create ap key."); + FAIL() << "Failed to create ap key."; dist->UpdateDiffInstallStatus(false, true, installer_util::FIRST_INSTALL_SUCCESS); EXPECT_STREQ(ReadApKeyValue().c_str(), L""); @@ -132,7 +132,7 @@ TEST_F(GoogleChromeDistributionTest, UpdateDiffInstallStatusTest) { work_item_list.reset(WorkItem::CreateWorkItemList()); // Test full install failure if (!CreateApKey(work_item_list.get(), L"-full")) - GTEST_FATAL_FAILURE("Failed to create ap key."); + FAIL() << "Failed to create ap key."; dist->UpdateDiffInstallStatus(false, false, installer_util::INSTALL_FAILED); EXPECT_STREQ(ReadApKeyValue().c_str(), L""); work_item_list->Rollback(); @@ -140,7 +140,7 @@ TEST_F(GoogleChromeDistributionTest, UpdateDiffInstallStatusTest) { work_item_list.reset(WorkItem::CreateWorkItemList()); // Test full install success if (!CreateApKey(work_item_list.get(), L"-full")) - GTEST_FATAL_FAILURE("Failed to create ap key."); + FAIL() << "Failed to create ap key."; dist->UpdateDiffInstallStatus(false, false, installer_util::FIRST_INSTALL_SUCCESS); EXPECT_STREQ(ReadApKeyValue().c_str(), L""); @@ -156,7 +156,7 @@ TEST_F(GoogleChromeDistributionTest, UpdateDiffInstallStatusTest) { if (!key.Open(HKEY_CURRENT_USER, reg_key.c_str(), KEY_ALL_ACCESS)){ work_item_list->AddCreateRegKeyWorkItem(reg_root, reg_key); if (!work_item_list->Do()) - GTEST_FATAL_FAILURE("Failed to create ClientState key."); + FAIL() << "Failed to create ClientState key."; } else if (key.DeleteValue(google_update::kRegApField)) { ap_key_deleted = true; } @@ -176,7 +176,7 @@ TEST_F(GoogleChromeDistributionTest, UpdateDiffInstallStatusTest) { if (ap_key_deleted) { work_item_list.reset(WorkItem::CreateWorkItemList()); if (!CreateApKey(work_item_list.get(), ap_key_value)) - GTEST_FATAL_FAILURE("Failed to restore ap key."); + FAIL() << "Failed to restore ap key."; } } |