Convert parts of SavePage UI tests to more reliable browser tests.

chrome/browser/download/save_page_browsertest.cc

Index: chrome/browser/download/save_page_browsertest.cc
diff --git a/chrome/browser/download/save_page_browsertest.cc b/chrome/browser/download/save_page_browsertest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..a9bdb42be3028855766bfce3ef6f0187183708d0
--- /dev/null
+++ b/chrome/browser/download/save_page_browsertest.cc
@@ -0,0 +1,119 @@
+// Copyright (c) 2009 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 "base/file_path.h"
+#include "base/scoped_temp_dir.h"
+#include "chrome/browser/browser.h"
+#include "chrome/browser/browser_window.h"
+#include "chrome/browser/net/url_request_mock_http_job.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/common/chrome_paths.h"
+#include "chrome/common/notification_service.h"
+#include "chrome/test/in_process_browser_test.h"
+#include "chrome/test/ui_test_utils.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+static const FilePath::CharType* kTestDir = FILE_PATH_LITERAL("save_page");
+
+namespace {
+
+class SavePageFinishedObserver : public NotificationObserver {
+ public:
+  SavePageFinishedObserver() {
+    registrar_.Add(this, NotificationType::SAVE_PACKAGE_SUCCESSFULLY_FINISHED,
+                   NotificationService::AllSources());
+    ui_test_utils::RunMessageLoop();
+  }
+
+  GURL page_url() const { return page_url_; }
+
+  virtual void Observe(NotificationType type,
+                       const NotificationSource& source,
+                       const NotificationDetails& details) {
+    if (type == NotificationType::SAVE_PACKAGE_SUCCESSFULLY_FINISHED) {
+      page_url_ = *Details<GURL>(details).ptr();
+      MessageLoopForUI::current()->Quit();
+    } else {
+      NOTREACHED();
+    }
+  }
+
+ private:
+  NotificationRegistrar registrar_;
+
+  GURL page_url_;
+
+  DISALLOW_COPY_AND_ASSIGN(SavePageFinishedObserver);
+};
+
+class SavePageBrowserTest : public InProcessBrowserTest {
+ protected:
+  void SetUp() {
+    ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_dir_));
+    ASSERT_TRUE(save_dir_.CreateUniqueTempDir());
+    InProcessBrowserTest::SetUp();
+  }
+
+  // Path to directory containing test data.
+  FilePath test_dir_;
+
+  // Temporary directory we will save pages to.
+  ScopedTempDir save_dir_;
+};
+
+IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, SaveHTMLOnly) {
+  FilePath file_name(FILE_PATH_LITERAL("a.htm"));
+  GURL url = URLRequestMockHTTPJob::GetMockUrl(
+      FilePath(kTestDir).Append(file_name).ToWStringHack());
+  ui_test_utils::NavigateToURL(browser(), url);
+
+  TabContents* current_tab = browser()->GetSelectedTabContents();
+  ASSERT_TRUE(current_tab);
+
+  FilePath full_file_name = save_dir_.path().Append(file_name);
+  FilePath dir = save_dir_.path().AppendASCII("a_files");
+  current_tab->SavePage(full_file_name.ToWStringHack(), dir.ToWStringHack(),
+                        SavePackage::SAVE_AS_ONLY_HTML);
+
+  SavePageFinishedObserver observer;
+
+  EXPECT_EQ(url, observer.page_url());
+  EXPECT_TRUE(browser()->window()->IsDownloadShelfVisible());
+  EXPECT_TRUE(file_util::PathExists(full_file_name));
+  EXPECT_FALSE(file_util::PathExists(dir));
+  EXPECT_TRUE(file_util::ContentsEqual(
+      test_dir_.Append(FilePath(kTestDir)).Append(file_name),
+      full_file_name));
+}
+
+IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, SaveCompleteHTML) {
+  FilePath file_name(FILE_PATH_LITERAL("b.htm"));
+  GURL url = URLRequestMockHTTPJob::GetMockUrl(
+      FilePath(kTestDir).Append(file_name).ToWStringHack());
+  ui_test_utils::NavigateToURL(browser(), url);
+
+  TabContents* current_tab = browser()->GetSelectedTabContents();
+  ASSERT_TRUE(current_tab);
+
+  FilePath full_file_name = save_dir_.path().Append(file_name);
+  FilePath dir = save_dir_.path().AppendASCII("b_files");
+  current_tab->SavePage(full_file_name.ToWStringHack(), dir.ToWStringHack(),
+                        SavePackage::SAVE_AS_COMPLETE_HTML);
+
+  SavePageFinishedObserver observer;
+
+  EXPECT_EQ(url, observer.page_url());
+  EXPECT_TRUE(browser()->window()->IsDownloadShelfVisible());
+  EXPECT_TRUE(file_util::PathExists(full_file_name));
+  EXPECT_TRUE(file_util::PathExists(dir));
+  // TODO(phajdan.jr): Also check the saved html file against golden version.

[Paul Godavari, 2009/07/31 22:11:26]

Bug number.

+  EXPECT_TRUE(file_util::ContentsEqual(
+      test_dir_.Append(FilePath(kTestDir)).AppendASCII("1.png"),
+      dir.AppendASCII("1.png")));
+  EXPECT_TRUE(file_util::ContentsEqual(
+      test_dir_.Append(FilePath(kTestDir)).AppendASCII("1.css"),
+      dir.AppendASCII("1.css")));
+}
+
+}  // namespace