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

Side by Side Diff: ash/common/system/tray/system_tray_unittest.cc

Issue 2249883002: Disable BubbleCreationTypesTest on Windows and Chrome OS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 unified diff | Download patch
« no previous file with comments | « no previous file | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ash/common/system/tray/system_tray.h" 5 #include "ash/common/system/tray/system_tray.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/common/accessibility_delegate.h" 10 #include "ash/common/accessibility_delegate.h"
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 ASSERT_TRUE(detailed_item->detailed_view() != NULL); 350 ASSERT_TRUE(detailed_item->detailed_view() != NULL);
351 ASSERT_TRUE(test_item->notification_view() != NULL); 351 ASSERT_TRUE(test_item->notification_view() != NULL);
352 352
353 // Hide the detailed view, ensure the notification view still exists. 353 // Hide the detailed view, ensure the notification view still exists.
354 ASSERT_TRUE(tray->CloseSystemBubble()); 354 ASSERT_TRUE(tray->CloseSystemBubble());
355 RunAllPendingInMessageLoop(); 355 RunAllPendingInMessageLoop();
356 ASSERT_TRUE(detailed_item->detailed_view() == NULL); 356 ASSERT_TRUE(detailed_item->detailed_view() == NULL);
357 ASSERT_TRUE(test_item->notification_view() != NULL); 357 ASSERT_TRUE(test_item->notification_view() != NULL);
358 } 358 }
359 359
360 TEST_F(SystemTrayTest, BubbleCreationTypesTest) { 360 // Test is flaky on Win7 and Cros (crbug.com/637978).
361 #if defined(OS_CHROMEOS) || defined(OS_WIN)
362 #define MAYBE_BubbleCreationTypesTest DISABLED_BubbleCreationTypesTest
363 #else
364 #define MAYBE_BubbleCreationTypesTest BubbleCreationTypesTest
365 #endif
366 TEST_F(SystemTrayTest, MAYBE_BubbleCreationTypesTest) {
361 SystemTray* tray = GetPrimarySystemTray(); 367 SystemTray* tray = GetPrimarySystemTray();
362 ASSERT_TRUE(tray->GetWidget()); 368 ASSERT_TRUE(tray->GetWidget());
363 369
364 TestSystemTrayItem* test_item = new TestSystemTrayItem(); 370 TestSystemTrayItem* test_item = new TestSystemTrayItem();
365 tray->AddTrayItem(test_item); 371 tray->AddTrayItem(test_item);
366 372
367 // Ensure the tray views are created. 373 // Ensure the tray views are created.
368 ASSERT_TRUE(test_item->tray_view() != NULL); 374 ASSERT_TRUE(test_item->tray_view() != NULL);
369 375
370 // Show the default view, ensure the notification view is destroyed. 376 // Show the default view, ensure the notification view is destroyed.
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
593 // Hide the default view, ensure the tray bubble height is back to zero. 599 // Hide the default view, ensure the tray bubble height is back to zero.
594 ASSERT_TRUE(tray->CloseSystemBubble()); 600 ASSERT_TRUE(tray->CloseSystemBubble());
595 RunAllPendingInMessageLoop(); 601 RunAllPendingInMessageLoop();
596 602
597 EXPECT_EQ(0, notification_tray->tray_bubble_height_for_test()); 603 EXPECT_EQ(0, notification_tray->tray_bubble_height_for_test());
598 } 604 }
599 #endif // OS_CHROMEOS 605 #endif // OS_CHROMEOS
600 606
601 } // namespace test 607 } // namespace test
602 } // namespace ash 608 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698