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

Unified Diff: chrome/browser/printing/print_preview_manager_unittest.cc

Issue 6221005: Print Preview: Store preview data in the print preview controller.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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
Index: chrome/browser/printing/print_preview_manager_unittest.cc
===================================================================
--- chrome/browser/printing/print_preview_manager_unittest.cc (revision 71344)
+++ chrome/browser/printing/print_preview_manager_unittest.cc (working copy)
@@ -1,18 +1,19 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "chrome/browser/printing/print_preview_tab_controller.h"
+#include "base/shared_memory.h"
+#include "chrome/browser/printing/print_preview_manager.h"
#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/tabs/tab_strip_model.h"
#include "chrome/browser/ui/browser_list.h"
#include "chrome/test/browser_with_test_window_test.h"
#include "chrome/test/testing_profile.h"
-typedef BrowserWithTestWindowTest PrintPreviewTabControllerTest;
+typedef BrowserWithTestWindowTest PrintPreviewManagerTest;
// Create/Get a preview tab for initiator tab.
-TEST_F(PrintPreviewTabControllerTest, GetOrCreatePreviewTab) {
+TEST_F(PrintPreviewManagerTest, GetOrCreatePreviewTab) {
ASSERT_TRUE(browser());
BrowserList::SetLastActive(browser());
ASSERT_TRUE(BrowserList::GetLastActive());
@@ -26,12 +27,12 @@
// Create a reference to initiator tab contents.
TabContents* initiator_tab = browser()->GetSelectedTabContents();
- scoped_refptr<printing::PrintPreviewTabController>
- tab_controller(new printing::PrintPreviewTabController());
- ASSERT_TRUE(tab_controller);
+ scoped_refptr<printing::PrintPreviewManager>
+ print_preview_manager(new printing::PrintPreviewManager());
+ ASSERT_TRUE(print_preview_manager);
// Get the preview tab for initiator tab.
- TabContents* preview_tab = tab_controller->GetOrCreatePreviewTab(
+ TabContents* preview_tab = print_preview_manager->GetOrCreatePreviewTab(
initiator_tab, initiator_tab->controller().window_id().id());
// New print preview tab is created. Current focus is on preview tab.
@@ -42,7 +43,7 @@
initiator_tab->Activate();
// Get the print preview tab for initiator tab.
- TabContents* new_preview_tab = tab_controller->GetOrCreatePreviewTab(
+ TabContents* new_preview_tab = print_preview_manager->GetOrCreatePreviewTab(
initiator_tab, initiator_tab->controller().window_id().id());
// Preview tab already exists. Tab count remains the same.
@@ -55,7 +56,7 @@
// To show multiple print preview tabs exist in the same browser for
// different initiator tabs. If preview tab already exists for an initiator, it
// gets focused.
-TEST_F(PrintPreviewTabControllerTest, MultiplePreviewTabs) {
+TEST_F(PrintPreviewManagerTest, MultiplePreviewTabs) {
ASSERT_TRUE(browser());
BrowserList::SetLastActive(browser());
ASSERT_TRUE(BrowserList::GetLastActive());
@@ -73,19 +74,19 @@
ASSERT_TRUE(tab_contents_2);
EXPECT_EQ(2, browser()->tab_count());
- scoped_refptr<printing::PrintPreviewTabController>
- tab_controller(new printing::PrintPreviewTabController());
- ASSERT_TRUE(tab_controller);
+ scoped_refptr<printing::PrintPreviewManager>
+ print_preview_manager(new printing::PrintPreviewManager());
+ ASSERT_TRUE(print_preview_manager);
// Create preview tab for |tab_contents_1|
- TabContents* preview_tab_1 = tab_controller->GetOrCreatePreviewTab(
+ TabContents* preview_tab_1 = print_preview_manager->GetOrCreatePreviewTab(
tab_contents_1, tab_contents_1->controller().window_id().id());
EXPECT_NE(tab_contents_1, preview_tab_1);
EXPECT_EQ(3, browser()->tab_count());
// Create preview tab for |tab_contents_2|
- TabContents* preview_tab_2 = tab_controller->GetOrCreatePreviewTab(
+ TabContents* preview_tab_2 = print_preview_manager->GetOrCreatePreviewTab(
tab_contents_2, tab_contents_2->controller().window_id().id());
EXPECT_NE(tab_contents_2, preview_tab_2);
@@ -108,7 +109,51 @@
// When we get the preview tab for |tab_contents_1|,
// |preview_tab_1| is activated and focused.
- tab_controller->GetOrCreatePreviewTab(
+ print_preview_manager->GetOrCreatePreviewTab(
tab_contents_1, tab_contents_1->controller().window_id().id());
EXPECT_EQ(preview_tab_1_index, browser()->selected_index());
}
+
+// Tests {Get,Set}PrintPreviewData.
+TEST_F(PrintPreviewManagerTest, PrintPreviewData) {
+ ASSERT_TRUE(browser());
+ BrowserList::SetLastActive(browser());
+ ASSERT_TRUE(BrowserList::GetLastActive());
+
+ browser()->NewTab();
+ TabContents* initiator_tab = browser()->GetSelectedTabContents();
+ ASSERT_TRUE(initiator_tab);
+
+ scoped_refptr<printing::PrintPreviewManager>
+ controller(new printing::PrintPreviewManager());
+ ASSERT_TRUE(controller);
+
+ TabContents* preview_tab = controller->GetOrCreatePreviewTab(
+ initiator_tab, initiator_tab->controller().window_id().id());
+
+ EXPECT_NE(initiator_tab, preview_tab);
+ EXPECT_EQ(2, browser()->tab_count());
+
+ printing::PrintPreviewManager::PrintPreviewData data;
+ EXPECT_FALSE(controller->GetPrintPreviewData(NULL, &data));
+ EXPECT_FALSE(controller->GetPrintPreviewData(initiator_tab, &data));
+ EXPECT_TRUE(controller->GetPrintPreviewData(preview_tab, &data));
+ EXPECT_EQ(NULL, data.first);
+ EXPECT_EQ(0U, data.second);
+
+ printing::PrintPreviewManager::PrintPreviewData dummy_data =
+ std::make_pair(new base::SharedMemory(), 1234);
+
+ EXPECT_FALSE(controller->SetPrintPreviewData(NULL, dummy_data));
+ EXPECT_FALSE(controller->SetPrintPreviewData(initiator_tab, dummy_data));
+ EXPECT_TRUE(controller->SetPrintPreviewData(preview_tab, dummy_data));
+
+ EXPECT_FALSE(controller->GetPrintPreviewData(NULL, &data));
+ EXPECT_FALSE(controller->GetPrintPreviewData(initiator_tab, &data));
+ EXPECT_TRUE(controller->GetPrintPreviewData(preview_tab, &data));
+ EXPECT_EQ(dummy_data, data);
+
+ // This should not cause any memory leaks.
+ dummy_data.first = new base::SharedMemory();
+ EXPECT_TRUE(controller->SetPrintPreviewData(preview_tab, dummy_data));
+}
Property changes on: chrome/browser/printing/print_preview_manager_unittest.cc
___________________________________________________________________
Added: svn:eol-style
+ LF
« no previous file with comments | « chrome/browser/printing/print_preview_manager.cc ('k') | chrome/browser/printing/print_preview_tab_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698