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

Side by Side Diff: chrome/browser/ui/webui/print_preview_handler_unittest.cc

Issue 8520034: Add missing ConstrainedDialog code and re-enable disabled PrintPreviewHandlerTest tests on CrOS. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/views/constrained_html_delegate_gtk.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/json/json_writer.h" 6 #include "base/json/json_writer.h"
7 #include "base/values.h" 7 #include "base/values.h"
8 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/printing/background_printing_manager.h" 9 #include "chrome/browser/printing/background_printing_manager.h"
10 #include "chrome/browser/printing/print_preview_tab_controller.h" 10 #include "chrome/browser/printing/print_preview_tab_controller.h"
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 private: 142 private:
143 void ClearStickySettings() { 143 void ClearStickySettings() {
144 PrintPreviewHandler::last_used_margins_type_ = printing::DEFAULT_MARGINS; 144 PrintPreviewHandler::last_used_margins_type_ = printing::DEFAULT_MARGINS;
145 delete PrintPreviewHandler::last_used_page_size_margins_; 145 delete PrintPreviewHandler::last_used_page_size_margins_;
146 PrintPreviewHandler::last_used_page_size_margins_ = NULL; 146 PrintPreviewHandler::last_used_page_size_margins_ = NULL;
147 } 147 }
148 }; 148 };
149 149
150 // Test crashs on TouchUI due to initiator tab's native view having no parent. 150 // Test crashs on TouchUI due to initiator tab's native view having no parent.
151 // http://crbug.com/104284 151 // http://crbug.com/104284
152 // Test crashes on CrOS as well. http://crbug.com/104403 152 #if defined(TOUCH_UI)
153 #if defined(TOUCH_UI) || defined(OS_CHROMEOS)
154 #define MAYBE_StickyMarginsCustom DISABLED_StickyMarginsCustom 153 #define MAYBE_StickyMarginsCustom DISABLED_StickyMarginsCustom
155 #else 154 #else
156 #define MAYBE_StickyMarginsCustom StickyMarginsCustom 155 #define MAYBE_StickyMarginsCustom StickyMarginsCustom
157 #endif 156 #endif
158 // Tests that margin settings are saved correctly when printing with custom 157 // Tests that margin settings are saved correctly when printing with custom
159 // margins selected. 158 // margins selected.
160 TEST_F(PrintPreviewHandlerTest, MAYBE_StickyMarginsCustom) { 159 TEST_F(PrintPreviewHandlerTest, MAYBE_StickyMarginsCustom) {
161 const double kMarginTop = 25.5; 160 const double kMarginTop = 25.5;
162 const double kMarginRight = 26.5; 161 const double kMarginRight = 26.5;
163 const double kMarginBottom = 27.5; 162 const double kMarginBottom = 27.5;
164 const double kMarginLeft = 28.5; 163 const double kMarginLeft = 28.5;
165 RequestPrintWithCustomMargins( 164 RequestPrintWithCustomMargins(
166 kMarginTop, kMarginRight, kMarginBottom, kMarginLeft); 165 kMarginTop, kMarginRight, kMarginBottom, kMarginLeft);
167 EXPECT_EQ(1, browser()->tab_count()); 166 EXPECT_EQ(1, browser()->tab_count());
168 167
169 // Checking that sticky settings were saved correctly. 168 // Checking that sticky settings were saved correctly.
170 EXPECT_EQ(PrintPreviewHandler::last_used_color_model_, printing::COLOR); 169 EXPECT_EQ(PrintPreviewHandler::last_used_color_model_, printing::COLOR);
171 EXPECT_EQ(PrintPreviewHandler::last_used_margins_type_, 170 EXPECT_EQ(PrintPreviewHandler::last_used_margins_type_,
172 printing::CUSTOM_MARGINS); 171 printing::CUSTOM_MARGINS);
173 ASSERT_TRUE(PrintPreviewHandler::last_used_page_size_margins_); 172 ASSERT_TRUE(PrintPreviewHandler::last_used_page_size_margins_);
174 CheckCustomMargins(kMarginTop, kMarginRight, kMarginBottom, kMarginLeft); 173 CheckCustomMargins(kMarginTop, kMarginRight, kMarginBottom, kMarginLeft);
175 } 174 }
176 175
177 // http://crbug.com/104284, http://crbug.com/104403 176 // http://crbug.com/104284
178 #if defined(TOUCH_UI) || defined(OS_CHROMEOS) 177 #if defined(TOUCH_UI)
179 #define MAYBE_StickyMarginsDefault DISABLED_StickyMarginsDefault 178 #define MAYBE_StickyMarginsDefault DISABLED_StickyMarginsDefault
180 #else 179 #else
181 #define MAYBE_StickyMarginsDefault StickyMarginsDefault 180 #define MAYBE_StickyMarginsDefault StickyMarginsDefault
182 #endif 181 #endif
183 // Tests that margin settings are saved correctly when printing with default 182 // Tests that margin settings are saved correctly when printing with default
184 // margins selected. 183 // margins selected.
185 TEST_F(PrintPreviewHandlerTest, MAYBE_StickyMarginsDefault) { 184 TEST_F(PrintPreviewHandlerTest, MAYBE_StickyMarginsDefault) {
186 RequestPrintWithDefaultMargins(); 185 RequestPrintWithDefaultMargins();
187 EXPECT_EQ(1, browser()->tab_count()); 186 EXPECT_EQ(1, browser()->tab_count());
188 187
189 // Checking that sticky settings were saved correctly. 188 // Checking that sticky settings were saved correctly.
190 EXPECT_EQ(PrintPreviewHandler::last_used_color_model_, printing::COLOR); 189 EXPECT_EQ(PrintPreviewHandler::last_used_color_model_, printing::COLOR);
191 EXPECT_EQ(PrintPreviewHandler::last_used_margins_type_, 190 EXPECT_EQ(PrintPreviewHandler::last_used_margins_type_,
192 printing::DEFAULT_MARGINS); 191 printing::DEFAULT_MARGINS);
193 ASSERT_FALSE(PrintPreviewHandler::last_used_page_size_margins_); 192 ASSERT_FALSE(PrintPreviewHandler::last_used_page_size_margins_);
194 } 193 }
195 194
196 // http://crbug.com/104284, http://crbug.com/104403 195 // http://crbug.com/104284
197 #if defined(TOUCH_UI) || defined(OS_CHROMEOS) 196 #if defined(TOUCH_UI)
198 #define MAYBE_StickyMarginsCustomThenDefault \ 197 #define MAYBE_StickyMarginsCustomThenDefault \
199 DISABLED_StickyMarginsCustomThenDefault 198 DISABLED_StickyMarginsCustomThenDefault
200 #else 199 #else
201 #define MAYBE_StickyMarginsCustomThenDefault StickyMarginsCustomThenDefault 200 #define MAYBE_StickyMarginsCustomThenDefault StickyMarginsCustomThenDefault
202 #endif 201 #endif
203 // Tests that margin settings are saved correctly when printing with custom 202 // Tests that margin settings are saved correctly when printing with custom
204 // margins selected and then again with default margins selected. 203 // margins selected and then again with default margins selected.
205 TEST_F(PrintPreviewHandlerTest, MAYBE_StickyMarginsCustomThenDefault) { 204 TEST_F(PrintPreviewHandlerTest, MAYBE_StickyMarginsCustomThenDefault) {
206 const double kMarginTop = 125.5; 205 const double kMarginTop = 125.5;
207 const double kMarginRight = 126.5; 206 const double kMarginRight = 126.5;
(...skipping 12 matching lines...) Expand all
220 RequestPrintWithDefaultMargins(); 219 RequestPrintWithDefaultMargins();
221 220
222 // Checking that sticky settings were saved correctly. 221 // Checking that sticky settings were saved correctly.
223 EXPECT_EQ(PrintPreviewHandler::last_used_color_model_, printing::COLOR); 222 EXPECT_EQ(PrintPreviewHandler::last_used_color_model_, printing::COLOR);
224 EXPECT_EQ(PrintPreviewHandler::last_used_margins_type_, 223 EXPECT_EQ(PrintPreviewHandler::last_used_margins_type_,
225 printing::DEFAULT_MARGINS); 224 printing::DEFAULT_MARGINS);
226 ASSERT_TRUE(PrintPreviewHandler::last_used_page_size_margins_); 225 ASSERT_TRUE(PrintPreviewHandler::last_used_page_size_margins_);
227 CheckCustomMargins(kMarginTop, kMarginRight, kMarginBottom, kMarginLeft); 226 CheckCustomMargins(kMarginTop, kMarginRight, kMarginBottom, kMarginLeft);
228 } 227 }
229 228
230 // http://crbug.com/104284, http://crbug.com/104403 229 // http://crbug.com/104284
231 #if defined(TOUCH_UI) || defined(OS_CHROMEOS) 230 #if defined(TOUCH_UI)
232 #define MAYBE_GetLastUsedMarginSettingsCustom \ 231 #define MAYBE_GetLastUsedMarginSettingsCustom \
233 DISABLED_GetLastUsedMarginSettingsCustom 232 DISABLED_GetLastUsedMarginSettingsCustom
234 #else 233 #else
235 #define MAYBE_GetLastUsedMarginSettingsCustom GetLastUsedMarginSettingsCustom 234 #define MAYBE_GetLastUsedMarginSettingsCustom GetLastUsedMarginSettingsCustom
236 #endif 235 #endif
237 // Tests that margin settings are retrieved correctly after printing with custom 236 // Tests that margin settings are retrieved correctly after printing with custom
238 // margins. 237 // margins.
239 TEST_F(PrintPreviewHandlerTest, MAYBE_GetLastUsedMarginSettingsCustom) { 238 TEST_F(PrintPreviewHandlerTest, MAYBE_GetLastUsedMarginSettingsCustom) {
240 const double kMarginTop = 125.5; 239 const double kMarginTop = 125.5;
241 const double kMarginRight = 126.5; 240 const double kMarginRight = 126.5;
(...skipping 15 matching lines...) Expand all
257 &margin_value)); 256 &margin_value));
258 EXPECT_EQ(kMarginRight, margin_value); 257 EXPECT_EQ(kMarginRight, margin_value);
259 EXPECT_TRUE(initial_settings.GetDouble(printing::kSettingMarginBottom, 258 EXPECT_TRUE(initial_settings.GetDouble(printing::kSettingMarginBottom,
260 &margin_value)); 259 &margin_value));
261 EXPECT_EQ(kMarginBottom, margin_value); 260 EXPECT_EQ(kMarginBottom, margin_value);
262 EXPECT_TRUE(initial_settings.GetDouble(printing::kSettingMarginLeft, 261 EXPECT_TRUE(initial_settings.GetDouble(printing::kSettingMarginLeft,
263 &margin_value)); 262 &margin_value));
264 EXPECT_EQ(kMarginLeft, margin_value); 263 EXPECT_EQ(kMarginLeft, margin_value);
265 } 264 }
266 265
267 // http://crbug.com/104284, http://crbug.com/104403 266 // http://crbug.com/104284
268 #if defined(TOUCH_UI) || defined(OS_CHROMEOS) 267 #if defined(TOUCH_UI)
269 #define MAYBE_GetLastUsedMarginSettingsDefault \ 268 #define MAYBE_GetLastUsedMarginSettingsDefault \
270 DISABLED_GetLastUsedMarginSettingsDefault 269 DISABLED_GetLastUsedMarginSettingsDefault
271 #else 270 #else
272 #define MAYBE_GetLastUsedMarginSettingsDefault GetLastUsedMarginSettingsDefault 271 #define MAYBE_GetLastUsedMarginSettingsDefault GetLastUsedMarginSettingsDefault
273 #endif 272 #endif
274 // Tests that margin settings are retrieved correctly after printing with 273 // Tests that margin settings are retrieved correctly after printing with
275 // default margins. 274 // default margins.
276 TEST_F(PrintPreviewHandlerTest, MAYBE_GetLastUsedMarginSettingsDefault) { 275 TEST_F(PrintPreviewHandlerTest, MAYBE_GetLastUsedMarginSettingsDefault) {
277 RequestPrintWithDefaultMargins(); 276 RequestPrintWithDefaultMargins();
278 base::DictionaryValue initial_settings; 277 base::DictionaryValue initial_settings;
279 preview_ui_->handler_->GetLastUsedMarginSettings(&initial_settings); 278 preview_ui_->handler_->GetLastUsedMarginSettings(&initial_settings);
280 int margins_type; 279 int margins_type;
281 EXPECT_TRUE(initial_settings.GetInteger(printing::kSettingMarginsType, 280 EXPECT_TRUE(initial_settings.GetInteger(printing::kSettingMarginsType,
282 &margins_type)); 281 &margins_type));
283 EXPECT_EQ(margins_type, printing::DEFAULT_MARGINS); 282 EXPECT_EQ(margins_type, printing::DEFAULT_MARGINS);
284 double margin_value; 283 double margin_value;
285 EXPECT_FALSE(initial_settings.GetDouble(printing::kSettingMarginTop, 284 EXPECT_FALSE(initial_settings.GetDouble(printing::kSettingMarginTop,
286 &margin_value)); 285 &margin_value));
287 EXPECT_FALSE(initial_settings.GetDouble(printing::kSettingMarginRight, 286 EXPECT_FALSE(initial_settings.GetDouble(printing::kSettingMarginRight,
288 &margin_value)); 287 &margin_value));
289 EXPECT_FALSE(initial_settings.GetDouble(printing::kSettingMarginBottom, 288 EXPECT_FALSE(initial_settings.GetDouble(printing::kSettingMarginBottom,
290 &margin_value)); 289 &margin_value));
291 EXPECT_FALSE(initial_settings.GetDouble(printing::kSettingMarginLeft, 290 EXPECT_FALSE(initial_settings.GetDouble(printing::kSettingMarginLeft,
292 &margin_value)); 291 &margin_value));
293 } 292 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/constrained_html_delegate_gtk.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698