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

Side by Side Diff: chrome/browser/download/download_manager_unittest.cc

Issue 8687002: Cleanup: Convert ASCIIToUTF16("") to string16(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 <set> 5 #include <set>
6 #include <string> 6 #include <string>
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/i18n/number_formatting.h" 10 #include "base/i18n/number_formatting.h"
(...skipping 754 matching lines...) Expand 10 before | Expand all | Expand 10 after
765 EXPECT_TRUE(GetActiveDownloadItem(0) == NULL); 765 EXPECT_TRUE(GetActiveDownloadItem(0) == NULL);
766 EXPECT_TRUE(observer->hit_state(DownloadItem::IN_PROGRESS)); 766 EXPECT_TRUE(observer->hit_state(DownloadItem::IN_PROGRESS));
767 EXPECT_FALSE(observer->hit_state(DownloadItem::CANCELLED)); 767 EXPECT_FALSE(observer->hit_state(DownloadItem::CANCELLED));
768 EXPECT_FALSE(observer->hit_state(DownloadItem::INTERRUPTED)); 768 EXPECT_FALSE(observer->hit_state(DownloadItem::INTERRUPTED));
769 EXPECT_TRUE(observer->hit_state(DownloadItem::COMPLETE)); 769 EXPECT_TRUE(observer->hit_state(DownloadItem::COMPLETE));
770 EXPECT_FALSE(observer->hit_state(DownloadItem::REMOVING)); 770 EXPECT_FALSE(observer->hit_state(DownloadItem::REMOVING));
771 EXPECT_TRUE(observer->was_updated()); 771 EXPECT_TRUE(observer->was_updated());
772 EXPECT_FALSE(observer->was_opened()); 772 EXPECT_FALSE(observer->was_opened());
773 EXPECT_FALSE(download->GetFileExternallyRemoved()); 773 EXPECT_FALSE(download->GetFileExternallyRemoved());
774 EXPECT_EQ(DownloadItem::COMPLETE, download->GetState()); 774 EXPECT_EQ(DownloadItem::COMPLETE, download->GetState());
775 EXPECT_EQ(download_item_model->GetStatusText(), ASCIIToUTF16("")); 775 EXPECT_EQ(download_item_model->GetStatusText(), string16());
776 776
777 EXPECT_TRUE(file_util::PathExists(new_path)); 777 EXPECT_TRUE(file_util::PathExists(new_path));
778 EXPECT_FALSE(file_util::PathExists(cr_path)); 778 EXPECT_FALSE(file_util::PathExists(cr_path));
779 EXPECT_FALSE(file_util::PathExists(unique_new_path)); 779 EXPECT_FALSE(file_util::PathExists(unique_new_path));
780 std::string file_contents; 780 std::string file_contents;
781 EXPECT_TRUE(file_util::ReadFileToString(new_path, &file_contents)); 781 EXPECT_TRUE(file_util::ReadFileToString(new_path, &file_contents));
782 EXPECT_EQ(std::string(kTestData), file_contents); 782 EXPECT_EQ(std::string(kTestData), file_contents);
783 } 783 }
784 784
785 TEST_F(DownloadManagerTest, MAYBE_DownloadRemoveTest) { 785 TEST_F(DownloadManagerTest, MAYBE_DownloadRemoveTest) {
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
842 EXPECT_TRUE(GetActiveDownloadItem(0) == NULL); 842 EXPECT_TRUE(GetActiveDownloadItem(0) == NULL);
843 EXPECT_TRUE(observer->hit_state(DownloadItem::IN_PROGRESS)); 843 EXPECT_TRUE(observer->hit_state(DownloadItem::IN_PROGRESS));
844 EXPECT_FALSE(observer->hit_state(DownloadItem::CANCELLED)); 844 EXPECT_FALSE(observer->hit_state(DownloadItem::CANCELLED));
845 EXPECT_FALSE(observer->hit_state(DownloadItem::INTERRUPTED)); 845 EXPECT_FALSE(observer->hit_state(DownloadItem::INTERRUPTED));
846 EXPECT_TRUE(observer->hit_state(DownloadItem::COMPLETE)); 846 EXPECT_TRUE(observer->hit_state(DownloadItem::COMPLETE));
847 EXPECT_FALSE(observer->hit_state(DownloadItem::REMOVING)); 847 EXPECT_FALSE(observer->hit_state(DownloadItem::REMOVING));
848 EXPECT_TRUE(observer->was_updated()); 848 EXPECT_TRUE(observer->was_updated());
849 EXPECT_FALSE(observer->was_opened()); 849 EXPECT_FALSE(observer->was_opened());
850 EXPECT_FALSE(download->GetFileExternallyRemoved()); 850 EXPECT_FALSE(download->GetFileExternallyRemoved());
851 EXPECT_EQ(DownloadItem::COMPLETE, download->GetState()); 851 EXPECT_EQ(DownloadItem::COMPLETE, download->GetState());
852 EXPECT_EQ(download_item_model->GetStatusText(), ASCIIToUTF16("")); 852 EXPECT_EQ(download_item_model->GetStatusText(), string16());
853 853
854 EXPECT_TRUE(file_util::PathExists(new_path)); 854 EXPECT_TRUE(file_util::PathExists(new_path));
855 EXPECT_FALSE(file_util::PathExists(cr_path)); 855 EXPECT_FALSE(file_util::PathExists(cr_path));
856 856
857 // Remove the downloaded file. 857 // Remove the downloaded file.
858 ASSERT_TRUE(file_util::Delete(new_path, false)); 858 ASSERT_TRUE(file_util::Delete(new_path, false));
859 download->OnDownloadedFileRemoved(); 859 download->OnDownloadedFileRemoved();
860 message_loop_.RunAllPending(); 860 message_loop_.RunAllPending();
861 861
862 EXPECT_TRUE(GetActiveDownloadItem(0) == NULL); 862 EXPECT_TRUE(GetActiveDownloadItem(0) == NULL);
863 EXPECT_TRUE(observer->hit_state(DownloadItem::IN_PROGRESS)); 863 EXPECT_TRUE(observer->hit_state(DownloadItem::IN_PROGRESS));
864 EXPECT_FALSE(observer->hit_state(DownloadItem::CANCELLED)); 864 EXPECT_FALSE(observer->hit_state(DownloadItem::CANCELLED));
865 EXPECT_FALSE(observer->hit_state(DownloadItem::INTERRUPTED)); 865 EXPECT_FALSE(observer->hit_state(DownloadItem::INTERRUPTED));
866 EXPECT_TRUE(observer->hit_state(DownloadItem::COMPLETE)); 866 EXPECT_TRUE(observer->hit_state(DownloadItem::COMPLETE));
867 EXPECT_FALSE(observer->hit_state(DownloadItem::REMOVING)); 867 EXPECT_FALSE(observer->hit_state(DownloadItem::REMOVING));
868 EXPECT_TRUE(observer->was_updated()); 868 EXPECT_TRUE(observer->was_updated());
869 EXPECT_FALSE(observer->was_opened()); 869 EXPECT_FALSE(observer->was_opened());
870 EXPECT_TRUE(download->GetFileExternallyRemoved()); 870 EXPECT_TRUE(download->GetFileExternallyRemoved());
871 EXPECT_EQ(DownloadItem::COMPLETE, download->GetState()); 871 EXPECT_EQ(DownloadItem::COMPLETE, download->GetState());
872 EXPECT_EQ(download_item_model->GetStatusText(), 872 EXPECT_EQ(download_item_model->GetStatusText(),
873 l10n_util::GetStringUTF16(IDS_DOWNLOAD_STATUS_REMOVED)); 873 l10n_util::GetStringUTF16(IDS_DOWNLOAD_STATUS_REMOVED));
874 874
875 EXPECT_FALSE(file_util::PathExists(new_path)); 875 EXPECT_FALSE(file_util::PathExists(new_path));
876 } 876 }
OLDNEW
« no previous file with comments | « chrome/browser/automation/automation_tab_helper_browsertest.cc ('k') | chrome/browser/importer/firefox_importer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698