Commit 2cb6d5e0 authored by Maksim Sisov's avatar Maksim Sisov Committed by Commit Bot

X11 and Ozone: fix expectation in ClipboardTest/PlatformClipboardTest.TextTest

While fixing tests that started to fail with use_x11 && use_ozone
config, I encountered some additional expectations that were
not part of USE_X11 builds before.

And given that we are heading towards use_x11 && use_ozone build,
we need to continue to run tests and other stuff as it'd be
a single use_x11 build.

Also, it seems like our Ozone clipboard impl is more advanced
than non-Ozone/X11. Thus, disable this expectation for x11.

Bug: 1085700
Change-Id: I01f27f213f595ae5d635fa76d68164a8a178141b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2367061Reviewed-by: default avatarScott Violet <sky@chromium.org>
Commit-Queue: Maksim Sisov (GMT+3) <msisov@igalia.com>
Cr-Commit-Position: refs/heads/master@{#800623}
parent 408a56a8
...@@ -171,8 +171,12 @@ TYPED_TEST(ClipboardTest, TextTest) { ...@@ -171,8 +171,12 @@ TYPED_TEST(ClipboardTest, TextTest) {
Contains(ASCIIToUTF16(kMimeTypeText))); Contains(ASCIIToUTF16(kMimeTypeText)));
#if defined(USE_OZONE) && !defined(OS_CHROMEOS) && !defined(OS_FUCHSIA) && \ #if defined(USE_OZONE) && !defined(OS_CHROMEOS) && !defined(OS_FUCHSIA) && \
!BUILDFLAG(IS_CHROMECAST) && !BUILDFLAG(IS_LACROS) !BUILDFLAG(IS_CHROMECAST) && !BUILDFLAG(IS_LACROS)
// TODO(https://crbug.com/1096425): remove this if condition. It seems like
// we have this condition working for Ozone/Linux, but not for X11/Linux.
if (features::IsUsingOzonePlatform()) {
EXPECT_THAT(this->GetAvailableTypes(ClipboardBuffer::kCopyPaste), EXPECT_THAT(this->GetAvailableTypes(ClipboardBuffer::kCopyPaste),
Contains(ASCIIToUTF16(kMimeTypeTextUtf8))); Contains(ASCIIToUTF16(kMimeTypeTextUtf8)));
}
#endif #endif
EXPECT_TRUE(this->clipboard().IsFormatAvailable( EXPECT_TRUE(this->clipboard().IsFormatAvailable(
ClipboardFormatType::GetPlainTextType(), ClipboardBuffer::kCopyPaste, ClipboardFormatType::GetPlainTextType(), ClipboardBuffer::kCopyPaste,
......
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