Use new DomDistillerJs Proto API

components/dom_distiller/core/distiller_unittest.cc

 // Copyright 2013 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 <algorithm>
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "components/dom_distiller/core/article_distillation_update.h"
 #include "components/dom_distiller/core/distiller.h"
 #include "components/dom_distiller/core/distiller_page.h"
 #include "components/dom_distiller/core/fake_distiller_page.h"
 #include "components/dom_distiller/core/proto/distilled_article.pb.h"
 #include "components/dom_distiller/core/proto/distilled_page.pb.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/dom_distiller_js/dom_distiller.pb.h"
+#include "third_party/dom_distiller_js/dom_distiller_json_converter.h"
 
 using std::vector;
 using std::string;
 using ::testing::Invoke;
 using ::testing::Return;
 using ::testing::_;
 
 namespace {
 const char kTitle[] = "Title";
 const char kContent[] = "Content";
 const char kURL[] = "http://a.com/";
 const size_t kTotalImages = 2;
 const char* kImageURLs[kTotalImages] = {"http://a.com/img1.jpg",
                                         "http://a.com/img2.jpg"};
 const char* kImageData[kTotalImages] = {"abcde", "12345"};
 
 const string GetImageName(int page_num, int image_num) {
   return base::IntToString(page_num) + "_" + base::IntToString(image_num);
 }
 
-scoped_ptr<base::ListValue> CreateDistilledValueReturnedFromJS(
+scoped_ptr<base::Value> CreateDistilledValueReturnedFromJS(
     const string& title,
     const string& content,
     const vector<int>& image_indices,
     const string& next_page_url,
     const string& prev_page_url = "") {
-  scoped_ptr<base::ListValue> list(new base::ListValue());
+  dom_distiller::proto::DomDistillerResult result;
+  result.set_title(title);
+  result.mutable_distilled_content()->set_html(content);
+  result.mutable_pagination_info()->set_next_page(next_page_url);
+  result.mutable_pagination_info()->set_prev_page(prev_page_url);
 
-  list->AppendString(title);
-  list->AppendString(content);
-  list->AppendString(next_page_url);
-  list->AppendString(prev_page_url);
   for (size_t i = 0; i < image_indices.size(); ++i) {
-    list->AppendString(kImageURLs[image_indices[i]]);
+    result.add_image_urls(kImageURLs[image_indices[i]]);
   }
-  return list.Pass();
+
+  return dom_distiller::proto::json::DomDistillerResult::WriteToValue(result);
 }
 
 // Return the sequence in which Distiller will distill pages.
 // Note: ignores any delays due to fetching images etc.
 vector<int> GetPagesInSequence(int start_page_num, int num_pages) {
   // Distiller prefers distilling past pages first. E.g. when distillation
   // starts on page 2 then pages are distilled in the order: 2, 1, 0, 3, 4.
   vector<int> page_nums;
   for (int page = start_page_num; page >= 0; --page)
     page_nums.push_back(page);
@@ skipping 65 matching lines @@
   for (size_t page_num = 0; page_num < pages_size; ++page_num) {
     result->page_urls.push_back(url_prefix + base::IntToString(page_num));
     result->content.push_back("Content for page:" +
                               base::IntToString(page_num));
     result->image_ids.push_back(vector<int>());
     string next_page_url = (page_num + 1 < pages_size)
                                ? url_prefix + base::IntToString(page_num + 1)
                                : "";
     string prev_page_url =
         (page_num > 0) ? result->page_urls[page_num - 1] : "";
-    scoped_ptr<base::ListValue> distilled_value =
+    scoped_ptr<base::Value> distilled_value =
         CreateDistilledValueReturnedFromJS(kTitle,
                                            result->content[page_num],
                                            result->image_ids[page_num],
                                            next_page_url,
                                            prev_page_url);
     result->distilled_values.push_back(distilled_value.release());
   }
   return result.Pass();
 }
 
@@ skipping 72 matching lines @@
  public:
   MockDistillerURLFetcherFactory() : DistillerURLFetcherFactory(NULL) {}
   virtual ~MockDistillerURLFetcherFactory() {}
 
   MOCK_CONST_METHOD0(CreateDistillerURLFetcher, DistillerURLFetcher*());
 };
 
 class DistillerTest : public testing::Test {
  public:
   virtual ~DistillerTest() {}
+
   void OnDistillArticleDone(scoped_ptr<DistilledArticleProto> proto) {
     article_proto_ = proto.Pass();
   }
 
   void OnDistillArticleUpdate(const ArticleDistillationUpdate& article_update) {
     in_sequence_updates_.push_back(article_update);
   }
 
   void DistillPage(const std::string& url,
                    scoped_ptr<DistillerPage> distiller_page) {
     distiller_->DistillPage(GURL(url),
                             distiller_page.Pass(),
                             base::Bind(&DistillerTest::OnDistillArticleDone,
                                        base::Unretained(this)),
                             base::Bind(&DistillerTest::OnDistillArticleUpdate,
                                        base::Unretained(this)));
   }
 
  protected:
   scoped_ptr<DistillerImpl> distiller_;
   scoped_ptr<DistilledArticleProto> article_proto_;
   std::vector<ArticleDistillationUpdate> in_sequence_updates_;
   MockDistillerPageFactory page_factory_;
   TestDistillerURLFetcherFactory url_fetcher_factory_;
 };
 
-ACTION_P3(DistillerPageOnDistillationDone, distiller_page, url, list) {
-  distiller_page->OnDistillationDone(url, list);
+ACTION_P3(DistillerPageOnDistillationDone, distiller_page, url, result) {
+  distiller_page->OnDistillationDone(url, result);
 }
 
-scoped_ptr<DistillerPage> CreateMockDistillerPage(const base::Value* list,
+scoped_ptr<DistillerPage> CreateMockDistillerPage(const base::Value* result,
                                                   const GURL& url) {
   MockDistillerPage* distiller_page = new MockDistillerPage();
   EXPECT_CALL(*distiller_page, DistillPageImpl(url, _))
-      .WillOnce(DistillerPageOnDistillationDone(distiller_page, url, list));
+      .WillOnce(DistillerPageOnDistillationDone(distiller_page, url, result));
   return scoped_ptr<DistillerPage>(distiller_page).Pass();
 }
 
 scoped_ptr<DistillerPage> CreateMockDistillerPageWithPendingJSCallback(
     MockDistillerPage** distiller_page_ptr,
     const GURL& url) {
   MockDistillerPage* distiller_page = new MockDistillerPage();
   *distiller_page_ptr = distiller_page;
   EXPECT_CALL(*distiller_page, DistillPageImpl(url, _));
   return scoped_ptr<DistillerPage>(distiller_page).Pass();
@@ skipping 13 matching lines @@
       EXPECT_CALL(*distiller_page, DistillPageImpl(url, _))
           .WillOnce(DistillerPageOnDistillationDone(
               distiller_page, url, distiller_data->distilled_values[page]));
     }
   }
   return scoped_ptr<DistillerPage>(distiller_page).Pass();
 }
 
 TEST_F(DistillerTest, DistillPage) {
   base::MessageLoopForUI loop;
-  scoped_ptr<base::ListValue> list =
+  scoped_ptr<base::Value> result =
       CreateDistilledValueReturnedFromJS(kTitle, kContent, vector<int>(), "");
   distiller_.reset(new DistillerImpl(url_fetcher_factory_));
-  DistillPage(kURL, CreateMockDistillerPage(list.get(), GURL(kURL)).Pass());
+  DistillPage(kURL, CreateMockDistillerPage(result.get(), GURL(kURL)).Pass());
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(kTitle, article_proto_->title());
   EXPECT_EQ(article_proto_->pages_size(), 1);
   const DistilledPageProto& first_page = article_proto_->pages(0);
   EXPECT_EQ(kContent, first_page.html());
   EXPECT_EQ(kURL, first_page.url());
 }
 
 TEST_F(DistillerTest, DistillPageWithImages) {
   base::MessageLoopForUI loop;
   vector<int> image_indices;
   image_indices.push_back(0);
   image_indices.push_back(1);
-  scoped_ptr<base::ListValue> list =
+  scoped_ptr<base::Value> result =
       CreateDistilledValueReturnedFromJS(kTitle, kContent, image_indices, "");
   distiller_.reset(new DistillerImpl(url_fetcher_factory_));
-  DistillPage(kURL, CreateMockDistillerPage(list.get(), GURL(kURL)).Pass());
+  DistillPage(kURL, CreateMockDistillerPage(result.get(), GURL(kURL)).Pass());
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(kTitle, article_proto_->title());
   EXPECT_EQ(article_proto_->pages_size(), 1);
   const DistilledPageProto& first_page = article_proto_->pages(0);
   EXPECT_EQ(kContent, first_page.html());
   EXPECT_EQ(kURL, first_page.url());
   EXPECT_EQ(2, first_page.image_size());
   EXPECT_EQ(kImageData[0], first_page.image(0).data());
   EXPECT_EQ(GetImageName(1, 0), first_page.image(0).name());
   EXPECT_EQ(kImageData[1], first_page.image(1).data());
@@ skipping 25 matching lines @@
       CreateMockDistillerPages(distiller_data.get(), kNumPages, 0).Pass());
   base::MessageLoop::current()->RunUntilIdle();
   VerifyArticleProtoMatchesMultipageData(
       article_proto_.get(), distiller_data.get(), kNumPages);
 }
 
 TEST_F(DistillerTest, DistillLinkLoop) {
   base::MessageLoopForUI loop;
   // Create a loop, the next page is same as the current page. This could
   // happen if javascript misparses a next page link.
-  scoped_ptr<base::ListValue> list =
+  scoped_ptr<base::Value> result =
       CreateDistilledValueReturnedFromJS(kTitle, kContent, vector<int>(), kURL);
   distiller_.reset(new DistillerImpl(url_fetcher_factory_));
-  DistillPage(kURL, CreateMockDistillerPage(list.get(), GURL(kURL)).Pass());
+  DistillPage(kURL, CreateMockDistillerPage(result.get(), GURL(kURL)).Pass());
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(kTitle, article_proto_->title());
   EXPECT_EQ(article_proto_->pages_size(), 1);
 }
 
 TEST_F(DistillerTest, CheckMaxPageLimitExtraPage) {
   base::MessageLoopForUI loop;
   const size_t kMaxPagesInArticle = 10;
   scoped_ptr<MultipageDistillerData> distiller_data =
       CreateMultipageDistillerDataWithoutImages(kMaxPagesInArticle);
 
   // Note: Next page url of the last page of article is set. So distiller will
   // try to do kMaxPagesInArticle + 1 calls if the max article limit does not
   // work.
-  scoped_ptr<base::ListValue> last_page_data =
+  scoped_ptr<base::Value> last_page_data =
       CreateDistilledValueReturnedFromJS(
           kTitle,
           distiller_data->content[kMaxPagesInArticle - 1],
           vector<int>(),
           "",
           distiller_data->page_urls[kMaxPagesInArticle - 2]);
 
   distiller_data->distilled_values.pop_back();
   distiller_data->distilled_values.push_back(last_page_data.release());
 
@@ skipping 148 matching lines @@
   // Delete the article.
   article_proto_.reset();
   VerifyIncrementalUpdatesMatch(
       distiller_data.get(), kNumPages, in_sequence_updates_, start_page_num);
 }
 
 TEST_F(DistillerTest, CancelWithDelayedImageFetchCallback) {
   base::MessageLoopForUI loop;
   vector<int> image_indices;
   image_indices.push_back(0);
-  scoped_ptr<base::ListValue> distilled_value =
+  scoped_ptr<base::Value> distilled_value =
       CreateDistilledValueReturnedFromJS(kTitle, kContent, image_indices, "");
   TestDistillerURLFetcher* delayed_fetcher = new TestDistillerURLFetcher(true);
   MockDistillerURLFetcherFactory url_fetcher_factory;
   EXPECT_CALL(url_fetcher_factory, CreateDistillerURLFetcher())
       .WillOnce(Return(delayed_fetcher));
   distiller_.reset(new DistillerImpl(url_fetcher_factory));
   DistillPage(
       kURL, CreateMockDistillerPage(distilled_value.get(), GURL(kURL)).Pass());
   base::MessageLoop::current()->RunUntilIdle();
 
   // Post callback from the url fetcher and then delete the distiller.
   delayed_fetcher->PostCallbackTask();
   distiller_.reset();
 
   base::MessageLoop::current()->RunUntilIdle();
 }
 
 TEST_F(DistillerTest, CancelWithDelayedJSCallback) {
   base::MessageLoopForUI loop;
-  scoped_ptr<base::ListValue> distilled_value =
+  scoped_ptr<base::Value> distilled_value =
       CreateDistilledValueReturnedFromJS(kTitle, kContent, vector<int>(), "");
   MockDistillerPage* distiller_page = NULL;
   distiller_.reset(new DistillerImpl(url_fetcher_factory_));
   DistillPage(kURL,
               CreateMockDistillerPageWithPendingJSCallback(&distiller_page,
                                                            GURL(kURL)));
   base::MessageLoop::current()->RunUntilIdle();
 
   ASSERT_TRUE(distiller_page);
   // Post the task to execute javascript and then delete the distiller.
   distiller_page->OnDistillationDone(GURL(kURL), distilled_value.get());
   distiller_.reset();
 
   base::MessageLoop::current()->RunUntilIdle();
 }
 
 }  // namespace dom_distiller