Commit 8ce8acbb authored by Elaine Chien's avatar Elaine Chien Committed by Commit Bot

DoneCallbackNotCalledOnDoubleClick parameterized test for media types

Bug: 1129024
Change-Id: I4d56a24510e09875463485ba105cbd354bd5f58e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2414925Reviewed-by: default avatarElly Fong-Jones <ellyjones@chromium.org>
Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org>
Auto-Submit: Elaine Chien <elainec@chromium.org>
Cr-Commit-Position: refs/heads/master@{#808383}
parent 53ce931b
...@@ -145,6 +145,35 @@ class DesktopMediaPickerViewsTest : public testing::Test { ...@@ -145,6 +145,35 @@ class DesktopMediaPickerViewsTest : public testing::Test {
std::unique_ptr<views::test::WidgetDestroyedWaiter> widget_destroyed_waiter_; std::unique_ptr<views::test::WidgetDestroyedWaiter> widget_destroyed_waiter_;
}; };
class DesktopMediaPickerDoubleClickTest
: public DesktopMediaPickerViewsTest,
public testing::WithParamInterface<DesktopMediaID::Type> {
public:
DesktopMediaPickerDoubleClickTest() = default;
};
// Regression test for https://crbug.com/1102153 and https://crbug.com/1127496
TEST_P(DesktopMediaPickerDoubleClickTest, DoneCallbackNotCalledOnDoubleClick) {
DesktopMediaID::Type media_type = GetParam();
const DesktopMediaID kFakeId(media_type, 222);
media_lists_[media_type]->AddSourceByFullMediaID(kFakeId);
test_api_.SelectTabForSourceType(media_type);
test_api_.PressMouseOnSourceAtIndex(0, true);
base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
run_loop_.QuitClosure());
run_loop_.Run();
EXPECT_FALSE(picked_id().has_value());
}
INSTANTIATE_TEST_SUITE_P(All,
DesktopMediaPickerDoubleClickTest,
testing::Values(DesktopMediaID::TYPE_WINDOW,
DesktopMediaID::TYPE_SCREEN,
DesktopMediaID::TYPE_WEB_CONTENTS));
TEST_F(DesktopMediaPickerViewsTest, DoneCallbackCalledWhenWindowClosed) { TEST_F(DesktopMediaPickerViewsTest, DoneCallbackCalledWhenWindowClosed) {
GetPickerDialogView()->GetWidget()->Close(); GetPickerDialogView()->GetWidget()->Close();
EXPECT_EQ(content::DesktopMediaID(), WaitForPickerDone()); EXPECT_EQ(content::DesktopMediaID(), WaitForPickerDone());
...@@ -192,24 +221,6 @@ TEST_F(DesktopMediaPickerViewsTest, SelectMediaSourceViewOnSingleClick) { ...@@ -192,24 +221,6 @@ TEST_F(DesktopMediaPickerViewsTest, SelectMediaSourceViewOnSingleClick) {
} }
} }
// Regression test for https://crbug.com/1102153
TEST_F(DesktopMediaPickerViewsTest, DoneCallbackNotCalledOnDoubleClick) {
constexpr DesktopMediaID kFakeId(DesktopMediaID::TYPE_WEB_CONTENTS, 222);
media_lists_[DesktopMediaID::TYPE_WEB_CONTENTS]->AddSourceByFullMediaID(
kFakeId);
test_api_.SelectTabForSourceType(DesktopMediaID::TYPE_WEB_CONTENTS);
test_api_.GetAudioShareCheckbox()->SetChecked(false);
test_api_.PressMouseOnSourceAtIndex(0, true);
base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
run_loop_.QuitClosure());
run_loop_.Run();
EXPECT_FALSE(picked_id().has_value());
}
// Regression test for https://crbug.com/1102153 // Regression test for https://crbug.com/1102153
TEST_F(DesktopMediaPickerViewsTest, DoneCallbackNotCalledOnDoubleTap) { TEST_F(DesktopMediaPickerViewsTest, DoneCallbackNotCalledOnDoubleTap) {
const DesktopMediaID kFakeId(DesktopMediaID::TYPE_SCREEN, 222); const DesktopMediaID kFakeId(DesktopMediaID::TYPE_SCREEN, 222);
......
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