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

Side by Side Diff: content/renderer/render_view_browsertest.cc

Issue 8660003: AURA: Disable failing browser tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: incognitopopup now passes 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/extensions/extension_tabs_test.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/basictypes.h" 5 #include "base/basictypes.h"
6 6
7 #include "base/shared_memory.h" 7 #include "base/shared_memory.h"
8 #include "base/string_util.h" 8 #include "base/string_util.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "content/common/view_messages.h" 10 #include "content/common/view_messages.h"
(...skipping 503 matching lines...) Expand 10 before | Expand all | Expand 10 after
514 514
515 // Copy the document content to std::wstring and compare with the 515 // Copy the document content to std::wstring and compare with the
516 // expected result. 516 // expected result.
517 const int kMaxOutputCharacters = 16; 517 const int kMaxOutputCharacters = 16;
518 std::wstring output = UTF16ToWideHack( 518 std::wstring output = UTF16ToWideHack(
519 GetMainFrame()->contentAsText(kMaxOutputCharacters)); 519 GetMainFrame()->contentAsText(kMaxOutputCharacters));
520 EXPECT_EQ(output, kTextDirection[i].expected_result); 520 EXPECT_EQ(output, kTextDirection[i].expected_result);
521 } 521 }
522 } 522 }
523 523
524 #if defined(USE_AURA)
525 // crbug.com/103499.
526 #define MAYBE_OnHandleKeyboardEvent DISABLED_OnHandleKeyboardEvent
527 #else
528 #define MAYBE_OnHandleKeyboardEvent OnHandleKeyboardEvent
529 #endif
530
524 // Test that we can receive correct DOM events when we send input events 531 // Test that we can receive correct DOM events when we send input events
525 // through the RenderWidget::OnHandleInputEvent() function. 532 // through the RenderWidget::OnHandleInputEvent() function.
526 TEST_F(RenderViewImplTest, OnHandleKeyboardEvent) { 533 TEST_F(RenderViewImplTest, MAYBE_OnHandleKeyboardEvent) {
527 #if !defined(OS_MACOSX) 534 #if !defined(OS_MACOSX)
528 // Load an HTML page consisting of one <input> element and three 535 // Load an HTML page consisting of one <input> element and three
529 // contentediable <div> elements. 536 // contentediable <div> elements.
530 // The <input> element is used for sending keyboard events, and the <div> 537 // The <input> element is used for sending keyboard events, and the <div>
531 // elements are used for writing DOM events in the following format: 538 // elements are used for writing DOM events in the following format:
532 // "<keyCode>,<shiftKey>,<controlKey>,<altKey>". 539 // "<keyCode>,<shiftKey>,<controlKey>,<altKey>".
533 // TODO(hbono): <http://crbug.com/2215> Our WebKit port set |ev.metaKey| to 540 // TODO(hbono): <http://crbug.com/2215> Our WebKit port set |ev.metaKey| to
534 // true when pressing an alt key, i.e. the |ev.metaKey| value is not 541 // true when pressing an alt key, i.e. the |ev.metaKey| value is not
535 // trustworthy. We will check the |ev.metaKey| value when this issue is fixed. 542 // trustworthy. We will check the |ev.metaKey| value when this issue is fixed.
536 view()->set_send_content_state_immediately(true); 543 view()->set_send_content_state_immediately(true);
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
660 GetMainFrame()->contentAsText(kMaxOutputCharacters)); 667 GetMainFrame()->contentAsText(kMaxOutputCharacters));
661 EXPECT_EQ(expected_result, output); 668 EXPECT_EQ(expected_result, output);
662 } 669 }
663 } 670 }
664 } 671 }
665 #else 672 #else
666 NOTIMPLEMENTED(); 673 NOTIMPLEMENTED();
667 #endif 674 #endif
668 } 675 }
669 676
677 #if defined(USE_AURA)
678 // crbug.com/103499.
679 #define MAYBE_InsertCharacters DISABLED_InsertCharacters
680 #else
681 #define MAYBE_InsertCharacters InsertCharacters
682 #endif
683
670 // Test that our EditorClientImpl class can insert characters when we send 684 // Test that our EditorClientImpl class can insert characters when we send
671 // keyboard events through the RenderWidget::OnHandleInputEvent() function. 685 // keyboard events through the RenderWidget::OnHandleInputEvent() function.
672 // This test is for preventing regressions caused only when we use non-US 686 // This test is for preventing regressions caused only when we use non-US
673 // keyboards, such as Issue 10846. 687 // keyboards, such as Issue 10846.
674 TEST_F(RenderViewImplTest, InsertCharacters) { 688 TEST_F(RenderViewImplTest, MAYBE_InsertCharacters) {
675 #if !defined(OS_MACOSX) 689 #if !defined(OS_MACOSX)
676 static const struct { 690 static const struct {
677 MockKeyboard::Layout layout; 691 MockKeyboard::Layout layout;
678 const wchar_t* expected_result; 692 const wchar_t* expected_result;
679 } kLayouts[] = { 693 } kLayouts[] = {
680 #if 0 694 #if 0
681 // Disabled these keyboard layouts because buildbots do not have their 695 // Disabled these keyboard layouts because buildbots do not have their
682 // keyboard-layout drivers installed. 696 // keyboard-layout drivers installed.
683 {MockKeyboard::LAYOUT_ARABIC, 697 {MockKeyboard::LAYOUT_ARABIC,
684 L"\x0030\x0031\x0032\x0033\x0034\x0035\x0036\x0037" 698 L"\x0030\x0031\x0032\x0033\x0034\x0035\x0036\x0037"
(...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after
1077 expected_page_id_2 = view()->page_id_; 1091 expected_page_id_2 = view()->page_id_;
1078 EXPECT_GT(expected_page_id_2, expected_page_id); 1092 EXPECT_GT(expected_page_id_2, expected_page_id);
1079 view()->OnSetHistoryLengthAndPrune(2, -1); 1093 view()->OnSetHistoryLengthAndPrune(2, -1);
1080 EXPECT_EQ(4, view()->history_list_length_); 1094 EXPECT_EQ(4, view()->history_list_length_);
1081 EXPECT_EQ(3, view()->history_list_offset_); 1095 EXPECT_EQ(3, view()->history_list_offset_);
1082 EXPECT_EQ(-1, view()->history_page_ids_[0]); 1096 EXPECT_EQ(-1, view()->history_page_ids_[0]);
1083 EXPECT_EQ(-1, view()->history_page_ids_[1]); 1097 EXPECT_EQ(-1, view()->history_page_ids_[1]);
1084 EXPECT_EQ(expected_page_id, view()->history_page_ids_[2]); 1098 EXPECT_EQ(expected_page_id, view()->history_page_ids_[2]);
1085 EXPECT_EQ(expected_page_id_2, view()->history_page_ids_[3]); 1099 EXPECT_EQ(expected_page_id_2, view()->history_page_ids_[3]);
1086 } 1100 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_tabs_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698