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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/download/internal/model_impl_unittest.cc

Issue 2895953004: Add initial Controller to DownloadService (Closed)
Patch Set: Moved stats out Created 3 years, 7 months 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 side-by-side diff with in-line comments
Download patch
« components/download/internal/model.h ('K') | « components/download/internal/model_impl.cc ('k') | components/download/internal/startup_status.h » ('j') | components/download/internal/startup_status.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/download/internal/model_impl_unittest.cc
diff --git a/components/download/internal/model_impl_unittest.cc b/components/download/internal/model_impl_unittest.cc
index 19a78391702979755d00f60e52e570bc48f72d65..b59a19f67e52cb9b3d8dbae27017c689218bf850 100644
--- a/components/download/internal/model_impl_unittest.cc
+++ b/components/download/internal/model_impl_unittest.cc
@@ -35,7 +35,7 @@ class DownloadServiceModelImplTest : public testing::Test {
void SetUp() override {
auto store = base::MakeUnique<test::TestStore>();
store_ = store.get();
- model_ = base::MakeUnique<ModelImpl>(&client_, std::move(store));
+ model_ = base::MakeUnique<ModelImpl>(std::move(store));
}
protected:
@@ -51,10 +51,10 @@ class DownloadServiceModelImplTest : public testing::Test {
TEST_F(DownloadServiceModelImplTest, SuccessfulLifecycle) {
InSequence sequence;
- EXPECT_CALL(client_, OnInitialized(true)).Times(1);
- EXPECT_CALL(client_, OnDestroyed(true)).Times(1);
+ EXPECT_CALL(client_, OnModelReady(true)).Times(1);
+ EXPECT_CALL(client_, OnModelDestroyed(true)).Times(1);
- model_->Initialize();
+ model_->Initialize(&client_);
EXPECT_TRUE(store_->init_called());
store_->TriggerInit(true, base::MakeUnique<std::vector<Entry>>());
@@ -69,9 +69,9 @@ TEST_F(DownloadServiceModelImplTest, SuccessfulInitWithEntries) {
std::vector<Entry> entries = {entry1, entry2};
InSequence sequence;
- EXPECT_CALL(client_, OnInitialized(true)).Times(1);
+ EXPECT_CALL(client_, OnModelReady(true)).Times(1);
- model_->Initialize();
+ model_->Initialize(&client_);
EXPECT_TRUE(store_->init_called());
store_->TriggerInit(true, base::MakeUnique<std::vector<Entry>>(entries));
@@ -80,19 +80,19 @@ TEST_F(DownloadServiceModelImplTest, SuccessfulInitWithEntries) {
}
TEST_F(DownloadServiceModelImplTest, BadInit) {
- EXPECT_CALL(client_, OnInitialized(false)).Times(1);
+ EXPECT_CALL(client_, OnModelReady(false)).Times(1);
- model_->Initialize();
+ model_->Initialize(&client_);
EXPECT_TRUE(store_->init_called());
store_->TriggerInit(false, base::MakeUnique<std::vector<Entry>>());
}
TEST_F(DownloadServiceModelImplTest, BadDestroy) {
InSequence sequence;
- EXPECT_CALL(client_, OnInitialized(true)).Times(1);
- EXPECT_CALL(client_, OnDestroyed(false)).Times(1);
+ EXPECT_CALL(client_, OnModelReady(true)).Times(1);
+ EXPECT_CALL(client_, OnModelDestroyed(false)).Times(1);
- model_->Initialize();
+ model_->Initialize(&client_);
EXPECT_TRUE(store_->init_called());
store_->TriggerInit(true, base::MakeUnique<std::vector<Entry>>());
@@ -106,11 +106,11 @@ TEST_F(DownloadServiceModelImplTest, Add) {
Entry entry2 = test::BuildEntry(DownloadClient::TEST, base::GenerateGUID());
InSequence sequence;
- EXPECT_CALL(client_, OnInitialized(true)).Times(1);
+ EXPECT_CALL(client_, OnModelReady(true)).Times(1);
EXPECT_CALL(client_, OnItemAdded(true, entry1.client, entry1.guid)).Times(1);
EXPECT_CALL(client_, OnItemAdded(false, entry2.client, entry2.guid)).Times(1);
- model_->Initialize();
+ model_->Initialize(&client_);
store_->TriggerInit(true, base::MakeUnique<std::vector<Entry>>());
model_->Add(entry1);
@@ -140,13 +140,13 @@ TEST_F(DownloadServiceModelImplTest, Update) {
std::vector<Entry> entries = {entry1};
InSequence sequence;
- EXPECT_CALL(client_, OnInitialized(true)).Times(1);
+ EXPECT_CALL(client_, OnModelReady(true)).Times(1);
EXPECT_CALL(client_, OnItemUpdated(true, entry1.client, entry1.guid))
.Times(1);
EXPECT_CALL(client_, OnItemUpdated(false, entry1.client, entry1.guid))
.Times(1);
- model_->Initialize();
+ model_->Initialize(&client_);
store_->TriggerInit(true, base::MakeUnique<std::vector<Entry>>(entries));
model_->Update(entry2);
@@ -170,13 +170,13 @@ TEST_F(DownloadServiceModelImplTest, Remove) {
std::vector<Entry> entries = {entry1, entry2};
InSequence sequence;
- EXPECT_CALL(client_, OnInitialized(true)).Times(1);
+ EXPECT_CALL(client_, OnModelReady(true)).Times(1);
EXPECT_CALL(client_, OnItemRemoved(true, entry1.client, entry1.guid))
.Times(1);
EXPECT_CALL(client_, OnItemRemoved(false, entry2.client, entry2.guid))
.Times(1);
- model_->Initialize();
+ model_->Initialize(&client_);
store_->TriggerInit(true, base::MakeUnique<std::vector<Entry>>(entries));
model_->Remove(entry1.guid);
@@ -196,9 +196,9 @@ TEST_F(DownloadServiceModelImplTest, Get) {
std::vector<Entry> entries = {entry};
InSequence sequence;
- EXPECT_CALL(client_, OnInitialized(true)).Times(1);
+ EXPECT_CALL(client_, OnModelReady(true)).Times(1);
- model_->Initialize();
+ model_->Initialize(&client_);
store_->TriggerInit(true, base::MakeUnique<std::vector<Entry>>(entries));
EXPECT_TRUE(test::SuperficialEntryCompare(&entry, model_->Get(entry.guid)));
@@ -211,9 +211,9 @@ TEST_F(DownloadServiceModelImplTest, PeekEntries) {
std::vector<Entry> entries = {entry1, entry2};
InSequence sequence;
- EXPECT_CALL(client_, OnInitialized(true)).Times(1);
+ EXPECT_CALL(client_, OnModelReady(true)).Times(1);
- model_->Initialize();
+ model_->Initialize(&client_);
store_->TriggerInit(true, base::MakeUnique<std::vector<Entry>>(entries));
std::vector<Entry*> expected_peek = {&entry1, &entry2};
@@ -226,11 +226,11 @@ TEST_F(DownloadServiceModelImplTest, TestRemoveAfterAdd) {
Entry entry = test::BuildEntry(DownloadClient::TEST, base::GenerateGUID());
InSequence sequence;
- EXPECT_CALL(client_, OnInitialized(true)).Times(1);
+ EXPECT_CALL(client_, OnModelReady(true)).Times(1);
EXPECT_CALL(client_, OnItemAdded(_, _, _)).Times(0);
EXPECT_CALL(client_, OnItemRemoved(true, entry.client, entry.guid)).Times(1);
- model_->Initialize();
+ model_->Initialize(&client_);
store_->TriggerInit(true, base::MakeUnique<std::vector<Entry>>());
model_->Add(entry);
@@ -252,12 +252,12 @@ TEST_F(DownloadServiceModelImplTest, TestRemoveAfterUpdate) {
std::vector<Entry> entries = {entry1};
InSequence sequence;
- EXPECT_CALL(client_, OnInitialized(true)).Times(1);
+ EXPECT_CALL(client_, OnModelReady(true)).Times(1);
EXPECT_CALL(client_, OnItemUpdated(_, _, _)).Times(0);
EXPECT_CALL(client_, OnItemRemoved(true, entry1.client, entry1.guid))
.Times(1);
- model_->Initialize();
+ model_->Initialize(&client_);
store_->TriggerInit(true, base::MakeUnique<std::vector<Entry>>(entries));
EXPECT_TRUE(test::SuperficialEntryCompare(&entry1, model_->Get(entry1.guid)));
« components/download/internal/model.h ('K') | « components/download/internal/model_impl.cc ('k') | components/download/internal/startup_status.h » ('j') | components/download/internal/startup_status.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698