Commit cfb4f38a authored by Leonard Grey's avatar Leonard Grey Committed by Commit Bot

MacViews: Reenable translate bubble unit tests

Bug: 823735
Change-Id: I4eda04eed9f78d89ba585f18812c9c59c5910aad
Reviewed-on: https://chromium-review.googlesource.com/1023011Reviewed-by: default avatarElly Fong-Jones <ellyjones@chromium.org>
Commit-Queue: Leonard Grey <lgrey@chromium.org>
Cr-Commit-Position: refs/heads/master@{#552716}
parent 88be70d7
...@@ -29,26 +29,6 @@ ...@@ -29,26 +29,6 @@
#include "ui/views/test/views_test_base.h" #include "ui/views/test/views_test_base.h"
#include "ui/views/widget/widget.h" #include "ui/views/widget/widget.h"
// On Mac, menus block in a nested runloop, so any tests that trigger
// the menu either hang, or pass only because of a race condition with
// app activation. Disable until either tests can be rewritten or Mac
// menus are made asynchronous.
#if defined(OS_MACOSX)
#define MAYBE_OptionsMenuNeverTranslateLanguage \
DISABLED_OptionsMenuNeverTranslateLanguage
#define MAYBE_OptionsMenuNeverTranslateSite \
DISABLED_OptionsMenuNeverTranslateSite
#define MAYBE_OptionsMenuRespectsBlacklistSite \
DISABLED_OptionsMenuRespectsBlacklistSite
#define MAYBE_AlwaysTranslateLanguageMenuItem \
DISABLED_AlwaysTranslateLanguageMenuItem
#else
#define MAYBE_OptionsMenuNeverTranslateLanguage \
OptionsMenuNeverTranslateLanguage
#define MAYBE_OptionsMenuNeverTranslateSite OptionsMenuNeverTranslateSite
#define MAYBE_OptionsMenuRespectsBlacklistSite OptionsMenuRespectsBlacklistSite
#define MAYBE_AlwaysTranslateLanguageMenuItem AlwaysTranslateLanguageMenuItem
#endif
namespace { namespace {
...@@ -245,7 +225,7 @@ TEST_F(TranslateBubbleViewTest, TranslateButton) { ...@@ -245,7 +225,7 @@ TEST_F(TranslateBubbleViewTest, TranslateButton) {
EXPECT_TRUE(mock_model_->translate_called_); EXPECT_TRUE(mock_model_->translate_called_);
} }
TEST_F(TranslateBubbleViewTest, MAYBE_OptionsMenuNeverTranslateLanguage) { TEST_F(TranslateBubbleViewTest, OptionsMenuNeverTranslateLanguage) {
CreateAndShowBubble(); CreateAndShowBubble();
EXPECT_FALSE(bubble_->GetWidget()->IsClosed()); EXPECT_FALSE(bubble_->GetWidget()->IsClosed());
...@@ -262,7 +242,7 @@ TEST_F(TranslateBubbleViewTest, MAYBE_OptionsMenuNeverTranslateLanguage) { ...@@ -262,7 +242,7 @@ TEST_F(TranslateBubbleViewTest, MAYBE_OptionsMenuNeverTranslateLanguage) {
EXPECT_TRUE(bubble_->GetWidget()->IsClosed()); EXPECT_TRUE(bubble_->GetWidget()->IsClosed());
} }
TEST_F(TranslateBubbleViewTest, MAYBE_OptionsMenuNeverTranslateSite) { TEST_F(TranslateBubbleViewTest, OptionsMenuNeverTranslateSite) {
// NEVER_TRANSLATE_SITE should only show up for sites that can be blacklisted. // NEVER_TRANSLATE_SITE should only show up for sites that can be blacklisted.
mock_model_->SetCanBlacklistSite(true); mock_model_->SetCanBlacklistSite(true);
CreateAndShowBubble(); CreateAndShowBubble();
...@@ -433,7 +413,7 @@ TEST_F(TranslateBubbleViewTest, CancelButtonReturningError) { ...@@ -433,7 +413,7 @@ TEST_F(TranslateBubbleViewTest, CancelButtonReturningError) {
EXPECT_EQ(TranslateBubbleModel::VIEW_STATE_ERROR, bubble_->GetViewState()); EXPECT_EQ(TranslateBubbleModel::VIEW_STATE_ERROR, bubble_->GetViewState());
} }
TEST_F(TranslateBubbleViewTest, MAYBE_OptionsMenuRespectsBlacklistSite) { TEST_F(TranslateBubbleViewTest, OptionsMenuRespectsBlacklistSite) {
mock_model_->SetCanBlacklistSite(false); mock_model_->SetCanBlacklistSite(false);
CreateAndShowBubble(); CreateAndShowBubble();
...@@ -447,7 +427,7 @@ TEST_F(TranslateBubbleViewTest, MAYBE_OptionsMenuRespectsBlacklistSite) { ...@@ -447,7 +427,7 @@ TEST_F(TranslateBubbleViewTest, MAYBE_OptionsMenuRespectsBlacklistSite) {
0); 0);
} }
TEST_F(TranslateBubbleViewTest, MAYBE_AlwaysTranslateLanguageMenuItem) { TEST_F(TranslateBubbleViewTest, AlwaysTranslateLanguageMenuItem) {
CreateAndShowBubble(); CreateAndShowBubble();
TriggerOptionsMenu(); TriggerOptionsMenu();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment