#include "base/containers/hash_tables.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
+#include "base/strings/string_number_conversions.h"
#include "components/dom_distiller/core/article_entry.h"
#include "components/dom_distiller/core/dom_distiller_model.h"
#include "components/dom_distiller/core/dom_distiller_store.h"
class FakeViewRequestDelegate : public ViewRequestDelegate {
public:
virtual ~FakeViewRequestDelegate() {}
- MOCK_METHOD1(OnArticleReady, void(DistilledPageProto* proto));
+ MOCK_METHOD1(OnArticleReady, void(const DistilledArticleProto* proto));
};
class MockDistillerObserver : public DomDistillerObserver {
}
void RunDistillerCallback(FakeDistiller* distiller,
- scoped_ptr<DistilledPageProto> proto) {
+ scoped_ptr<DistilledArticleProto> proto) {
distiller->RunDistillerCallback(proto.Pass());
base::RunLoop().RunUntilIdle();
}
+scoped_ptr<DistilledArticleProto> CreateArticleWithURL(const std::string& url) {
+ scoped_ptr<DistilledArticleProto> proto(new DistilledArticleProto);
+ DistilledPageProto* page = proto->add_pages();
+ page->set_url(url);
+ return proto.Pass();
+}
+
+scoped_ptr<DistilledArticleProto> CreateDefaultArticle() {
+ return CreateArticleWithURL("http://www.example.com/default_article_page1")
+ .Pass();
+}
+
} // namespace
class DomDistillerServiceTest : public testing::Test {
ASSERT_FALSE(distiller->GetCallback().is_null());
- scoped_ptr<DistilledPageProto> proto(new DistilledPageProto);
+ scoped_ptr<DistilledArticleProto> proto = CreateDefaultArticle();
EXPECT_CALL(viewer_delegate, OnArticleReady(proto.get()));
RunDistillerCallback(distiller, proto.Pass());
ASSERT_FALSE(distiller->GetCallback().is_null());
EXPECT_EQ(url, distiller->GetUrl());
- scoped_ptr<DistilledPageProto> proto(new DistilledPageProto);
+ scoped_ptr<DistilledArticleProto> proto = CreateDefaultArticle();
EXPECT_CALL(viewer_delegate, OnArticleReady(proto.get()));
RunDistillerCallback(distiller, proto.Pass());
ASSERT_FALSE(distiller->GetCallback().is_null());
EXPECT_EQ(url, distiller->GetUrl());
- scoped_ptr<DistilledPageProto> proto(new DistilledPageProto);
+ scoped_ptr<DistilledArticleProto> proto = CreateDefaultArticle();
EXPECT_CALL(viewer_delegate, OnArticleReady(proto.get()));
RunDistillerCallback(distiller, proto.Pass());
ASSERT_FALSE(distiller2->GetCallback().is_null());
EXPECT_EQ(url2, distiller2->GetUrl());
- scoped_ptr<DistilledPageProto> proto2(new DistilledPageProto);
+ scoped_ptr<DistilledArticleProto> proto2 = CreateDefaultArticle();
EXPECT_CALL(viewer_delegate2, OnArticleReady(proto2.get()));
RunDistillerCallback(distiller2, proto2.Pass());
EXPECT_TRUE(distiller_destroyed);
}
+TEST_F(DomDistillerServiceTest, TestViewUrlDoesNotAddEntry) {
+ FakeDistiller* distiller = new FakeDistiller(false);
+ EXPECT_CALL(*distiller_factory_, CreateDistillerImpl())
+ .WillOnce(Return(distiller));
+
+ FakeViewRequestDelegate viewer_delegate;
+ GURL url("http://www.example.com/p1");
+ scoped_ptr<ViewerHandle> handle = service_->ViewUrl(&viewer_delegate, url);
+
+ scoped_ptr<DistilledArticleProto> proto = CreateArticleWithURL(url.spec());
+ EXPECT_CALL(viewer_delegate, OnArticleReady(proto.get()));
+
+ RunDistillerCallback(distiller, proto.Pass());
+ base::RunLoop().RunUntilIdle();
+ // The entry should not be added to the store.
+ EXPECT_EQ(0u, store_->GetEntries().size());
+}
+
TEST_F(DomDistillerServiceTest, TestAddAndRemoveEntry) {
FakeDistiller* distiller = new FakeDistiller(false);
EXPECT_CALL(*distiller_factory_, CreateDistillerImpl())
std::string entry_id = service_->AddToList(url, ArticleCallback(&article_cb));
- ArticleEntry entry;
- EXPECT_TRUE(store_->GetEntryByUrl(url, &entry));
- EXPECT_EQ(entry.entry_id(), entry_id);
-
ASSERT_FALSE(distiller->GetCallback().is_null());
EXPECT_EQ(url, distiller->GetUrl());
- scoped_ptr<DistilledPageProto> proto(new DistilledPageProto);
+ scoped_ptr<DistilledArticleProto> proto = CreateArticleWithURL(url.spec());
RunDistillerCallback(distiller, proto.Pass());
+ ArticleEntry entry;
EXPECT_TRUE(store_->GetEntryByUrl(url, &entry));
+ EXPECT_EQ(entry.entry_id(), entry_id);
EXPECT_EQ(1u, store_->GetEntries().size());
service_->RemoveEntry(entry_id);
base::RunLoop().RunUntilIdle();
EXPECT_CALL(*distiller_factory_, CreateDistillerImpl())
.WillOnce(Return(distiller));
- EXPECT_CALL(observer, ArticleEntriesUpdated(_));
MockArticleAvailableCallback article_cb;
EXPECT_CALL(article_cb, DistillationCompleted(false));
GURL url("http://www.example.com/p1");
std::string entry_id = service_->AddToList(url, ArticleCallback(&article_cb));
- // Just remove the entry, there should only be a REMOVE update and no UPDATE
- // update.
- std::vector<DomDistillerObserver::ArticleUpdate> expected_updates;
- DomDistillerObserver::ArticleUpdate update;
- update.entry_id = entry_id;
- update.update_type = DomDistillerObserver::ArticleUpdate::REMOVE;
- expected_updates.push_back(update);
- EXPECT_CALL(
- observer,
- ArticleEntriesUpdated(util::HasExpectedUpdates(expected_updates)));
-
- // Remove entry will post a cancellation task.
+ // Remove entry will cause the |article_cb| to be called with false value.
service_->RemoveEntry(entry_id);
base::RunLoop().RunUntilIdle();
}
MockDistillerObserver observers[kObserverCount];
for (int i = 0; i < kObserverCount; ++i) {
service_->AddObserver(&observers[i]);
- EXPECT_CALL(observers[i], ArticleEntriesUpdated(_));
}
DomDistillerService::ArticleAvailableCallback article_cb;
GURL url("http://www.example.com/p1");
std::string entry_id = service_->AddToList(url, article_cb);
- // Distillation should notify all observers that article is updated.
+ // Distillation should notify all observers that article is added.
std::vector<DomDistillerObserver::ArticleUpdate> expected_updates;
DomDistillerObserver::ArticleUpdate update;
update.entry_id = entry_id;
- update.update_type = DomDistillerObserver::ArticleUpdate::UPDATE;
+ update.update_type = DomDistillerObserver::ArticleUpdate::ADD;
expected_updates.push_back(update);
for (int i = 0; i < kObserverCount; ++i) {
ArticleEntriesUpdated(util::HasExpectedUpdates(expected_updates)));
}
- scoped_ptr<DistilledPageProto> proto(new DistilledPageProto);
+ scoped_ptr<DistilledArticleProto> proto = CreateDefaultArticle();
RunDistillerCallback(distiller, proto.Pass());
// Remove should notify all observers that article is removed.
EXPECT_CALL(article_cb[i], DistillationCompleted(true));
}
- scoped_ptr<DistilledPageProto> proto(new DistilledPageProto);
+ scoped_ptr<DistilledArticleProto> proto = CreateArticleWithURL(url.spec());
RunDistillerCallback(distiller, proto.Pass());
// Add the same url again, all callbacks should be called with true.
base::RunLoop().RunUntilIdle();
}
+TEST_F(DomDistillerServiceTest, TestMultiplePageArticle) {
+ FakeDistiller* distiller = new FakeDistiller(false);
+ EXPECT_CALL(*distiller_factory_, CreateDistillerImpl())
+ .WillOnce(Return(distiller));
+
+ const int kPageCount = 8;
+
+ std::string base_url("http://www.example.com/p");
+ GURL pages_url[kPageCount];
+ for (int page_num = 0; page_num < kPageCount; ++page_num) {
+ pages_url[page_num] = GURL(base_url + base::IntToString(page_num));
+ }
+
+ MockArticleAvailableCallback article_cb;
+ EXPECT_CALL(article_cb, DistillationCompleted(true));
+
+ std::string entry_id =
+ service_->AddToList(pages_url[0], ArticleCallback(&article_cb));
+
+ ArticleEntry entry;
+ ASSERT_FALSE(distiller->GetCallback().is_null());
+ EXPECT_EQ(pages_url[0], distiller->GetUrl());
+
+ // Create the article with pages to pass to the distiller.
+ scoped_ptr<DistilledArticleProto> proto =
+ CreateArticleWithURL(pages_url[0].spec());
+ for (int page_num = 1; page_num < kPageCount; ++page_num) {
+ DistilledPageProto* distilled_page = proto->add_pages();
+ distilled_page->set_url(pages_url[page_num].spec());
+ }
+
+ RunDistillerCallback(distiller, proto.Pass());
+ EXPECT_TRUE(store_->GetEntryByUrl(pages_url[0], &entry));
+
+ EXPECT_EQ(kPageCount, entry.pages_size());
+ // An article should have just one entry.
+ EXPECT_EQ(1u, store_->GetEntries().size());
+
+ // All pages should have correct urls.
+ for (int page_num = 0; page_num < kPageCount; ++page_num) {
+ EXPECT_EQ(pages_url[page_num].spec(), entry.pages(page_num).url());
+ }
+
+ // Should be able to query article using any of the pages url.
+ for (int page_num = 0; page_num < kPageCount; ++page_num) {
+ EXPECT_TRUE(store_->GetEntryByUrl(pages_url[page_num], &entry));
+ }
+
+ service_->RemoveEntry(entry_id);
+ base::RunLoop().RunUntilIdle();
+ EXPECT_EQ(0u, store_->GetEntries().size());
+}
+
} // namespace test
} // namespace dom_distiller
projects / platform / framework / web / crosswalk.git / blobdiff