Instantiate Linux (or CrOS) system fonts using Fontations
In [1] a Skia flag was introduced to switch to Fontations for system fonts. Enable this flag in skia/fontations_feature.cc and rebaseline the world: - ash tests work with revision_numbers that need to be increased for Skia gold to allow them to be changed. - web tests rebaselines The rebaselines are due to subtle differences in text antiliasing and have been inspected for regressions. We already rolled out Fontations for web fonts, which gives us confidence the rendering output is not disrupted. [1] https://chromium-review.googlesource.com/c/chromium/src/+/6286047 Design doc: go/rust-fontstack-chrome (internal) Fixed: chromium:346918516 Cq-Include-Trybots: luci.chromium.try:linux-blink-rel Change-Id: I2d64a6faba820b556a6ce789456e38ecefe4b7f8 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6169919 Reviewed-by: Rick Byers <rbyers@chromium.org> Owners-Override: Rick Byers <rbyers@chromium.org> Reviewed-by: Mitsuru Oshima <oshima@chromium.org> Commit-Queue: Dominik Röttsches <drott@chromium.org> Cr-Commit-Position: refs/heads/main@{#1430666}


@ -133,9 +133,11 @@ TEST_P(AmbientSlideshowPixelTest, ShowMediaStringView) {
|
||||
media_session::mojom::MediaPlaybackState::kPlaying);
|
||||
}
|
||||
|
||||
// https://crbug.com/346918516, increase revision number for slight
|
||||
// font rendering pixel changes when moving to Fontations.
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"AmbientSlideshow",
|
||||
/*revision_number=*/1, ash::Shell::GetPrimaryRootWindow()));
|
||||
/*revision_number=*/2, ash::Shell::GetPrimaryRootWindow()));
|
||||
}
|
||||
|
||||
} // namespace ash
|
||||
|
@ -201,7 +201,7 @@ TEST_P(AppListItemViewPixelTest, AppListItemView) {
|
||||
|
||||
ShowAppList();
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
GenerateScreenshotName(), /*revision_number=*/5, GetItemViewAt(0),
|
||||
GenerateScreenshotName(), /*revision_number=*/6, GetItemViewAt(0),
|
||||
GetItemViewAt(1)));
|
||||
}
|
||||
|
||||
@ -225,7 +225,7 @@ TEST_P(AppListItemViewPixelTest, AppListFolderItemsLayoutInIcon) {
|
||||
ShowAppList();
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
GenerateScreenshotName(), /*revision_number=*/9, GetItemViewAt(0),
|
||||
GenerateScreenshotName(), /*revision_number=*/10, GetItemViewAt(0),
|
||||
GetItemViewAt(1), GetItemViewAt(2), GetItemViewAt(3), GetItemViewAt(4)));
|
||||
}
|
||||
|
||||
@ -262,7 +262,7 @@ TEST_P(AppListItemViewPixelTest, AppListFolderIconExtendedState) {
|
||||
}
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
GenerateScreenshotName(), /*revision_number=*/11, GetItemViewAt(0),
|
||||
GenerateScreenshotName(), /*revision_number=*/12, GetItemViewAt(0),
|
||||
GetItemViewAt(1), GetItemViewAt(2), GetItemViewAt(3), GetItemViewAt(4)));
|
||||
|
||||
// Reset the states.
|
||||
@ -399,7 +399,7 @@ TEST_P(AppListViewPromiseAppPixelTest, PromiseAppWaiting) {
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
base::JoinString({"promise_app_waiting", GenerateScreenshotName()}, "."),
|
||||
/*revision_number=*/3, GetItemViewAt(0), GetItemViewAt(1)));
|
||||
/*revision_number=*/4, GetItemViewAt(0), GetItemViewAt(1)));
|
||||
}
|
||||
|
||||
TEST_P(AppListViewPromiseAppPixelTest, PromiseAppInstalling) {
|
||||
@ -427,7 +427,7 @@ TEST_P(AppListViewPromiseAppPixelTest, PromiseAppInstalling) {
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
base::JoinString({"promise_app_installing", GenerateScreenshotName()},
|
||||
"."),
|
||||
/*revision_number=*/3, GetItemViewAt(0), GetItemViewAt(1)));
|
||||
/*revision_number=*/4, GetItemViewAt(0), GetItemViewAt(1)));
|
||||
}
|
||||
|
||||
} // namespace ash
|
||||
|
@ -210,7 +210,7 @@ TEST_P(AppListViewPixelRTLTest, AnswerCardSearchResult) {
|
||||
|
||||
UseFixedPlaceholderTextAndHideCursor(test_helper->GetSearchBoxView());
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"bubble_launcher_answer_card_search_results", 15,
|
||||
"bubble_launcher_answer_card_search_results", /*revision_number=*/16,
|
||||
GetAppListTestHelper()->GetBubbleView(),
|
||||
GetPrimaryShelf()->navigation_widget()));
|
||||
}
|
||||
@ -232,7 +232,7 @@ TEST_P(AppListViewPixelRTLTest, URLSearchResult) {
|
||||
|
||||
UseFixedPlaceholderTextAndHideCursor(test_helper->GetSearchBoxView());
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"bubble_launcher_url_search_results", 14,
|
||||
"bubble_launcher_url_search_results", /*revision_number=*/15,
|
||||
GetAppListTestHelper()->GetBubbleView(),
|
||||
GetPrimaryShelf()->navigation_widget()));
|
||||
}
|
||||
@ -254,7 +254,7 @@ TEST_P(AppListViewPixelRTLTest, KeyboardShortcutSearchResult) {
|
||||
|
||||
UseFixedPlaceholderTextAndHideCursor(test_helper->GetSearchBoxView());
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"bubble_launcher_ks_search_results", /*revision_number=*/5,
|
||||
"bubble_launcher_ks_search_results", /*revision_number=*/6,
|
||||
GetAppListTestHelper()->GetBubbleView()));
|
||||
}
|
||||
|
||||
@ -267,7 +267,8 @@ TEST_P(AppListViewPixelRTLTest, Basics) {
|
||||
UseFixedPlaceholderTextAndHideCursor(
|
||||
GetAppListTestHelper()->GetSearchBoxView());
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"bubble_launcher_basics", 14, GetAppListTestHelper()->GetBubbleView(),
|
||||
"bubble_launcher_basics", /*revision_number=*/15,
|
||||
GetAppListTestHelper()->GetBubbleView(),
|
||||
GetPrimaryShelf()->navigation_widget()));
|
||||
}
|
||||
|
||||
@ -288,7 +289,7 @@ TEST_P(AppListViewPixelRTLTest, GradientZone) {
|
||||
/*position=*/20);
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"bubble_launcher_gradient_zone", 14,
|
||||
"bubble_launcher_gradient_zone", /*revision_number=*/15,
|
||||
GetAppListTestHelper()->GetBubbleView(),
|
||||
GetPrimaryShelf()->navigation_widget()));
|
||||
}
|
||||
@ -341,7 +342,7 @@ TEST_P(AppListViewLauncherSearchIphTest, Basic) {
|
||||
|
||||
UseFixedPlaceholderTextAndHideCursor(search_box_view);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"launcher_search_iph", /*revision_number=*/6, search_box_view));
|
||||
"launcher_search_iph", /*revision_number=*/7, search_box_view));
|
||||
}
|
||||
|
||||
class AppListViewTabletPixelTest
|
||||
@ -379,7 +380,7 @@ INSTANTIATE_TEST_SUITE_P(RTL,
|
||||
// Verifies the default layout for tablet mode launcher.
|
||||
TEST_P(AppListViewTabletPixelTest, Basic) {
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"tablet_launcher_basics", 15,
|
||||
"tablet_launcher_basics", /*revision_number=*/16,
|
||||
GetAppListTestHelper()->GetAppsContainerView()));
|
||||
}
|
||||
|
||||
@ -400,7 +401,7 @@ TEST_P(AppListViewTabletPixelTest, TopGradientZone) {
|
||||
generator->MoveTouchBy(0, -40);
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"tablet_launcher_top_gradient_zone", 13,
|
||||
"tablet_launcher_top_gradient_zone", /*revision_number=*/14,
|
||||
GetAppListTestHelper()->GetAppsContainerView()));
|
||||
}
|
||||
|
||||
@ -421,7 +422,7 @@ TEST_P(AppListViewTabletPixelTest, BottomGradientZone) {
|
||||
generator->MoveTouchBy(0, -90);
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"tablet_launcher_bottom_gradient_zone", 15,
|
||||
"tablet_launcher_bottom_gradient_zone", /*revision_number=*/16,
|
||||
GetAppListTestHelper()->GetAppsContainerView()));
|
||||
}
|
||||
|
||||
@ -431,7 +432,7 @@ TEST_P(AppListViewTabletPixelTest, SearchBoxViewActive) {
|
||||
search_box_view->SetSearchBoxActive(true, ui::EventType::kUnknown);
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"search_box_view_active", 8, search_box_view));
|
||||
"search_box_view_active", /*revision_number=*/9, search_box_view));
|
||||
}
|
||||
|
||||
class AppListViewAssistantZeroStateTest
|
||||
@ -478,7 +479,7 @@ TEST_P(AppListViewAssistantZeroStateTest, Basic) {
|
||||
assistant_page_view->GetViewByID(AssistantViewID::kZeroStateView));
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"app_list_view_assistant_zero_state", 10,
|
||||
"app_list_view_assistant_zero_state", /*revision_number=*/11,
|
||||
assistant_page_view->GetViewByID(AssistantViewID::kZeroStateView)));
|
||||
}
|
||||
|
||||
|
@ -99,13 +99,13 @@ class AuthContainerPixelTest : public AshTestBase {
|
||||
TEST_F(AuthContainerPixelTest, SwitchTest) {
|
||||
// Verify the UI.
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"PasswordWithSwitch", /*revision_number=*/0, container_view_));
|
||||
"PasswordWithSwitch", /*revision_number=*/1, container_view_));
|
||||
// Switch to the pin UI.
|
||||
LeftClickOn(test_api_->GetSwitchButton());
|
||||
|
||||
// Verify the UI.
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"PinWithSwitch", /*revision_number=*/0, container_view_));
|
||||
"PinWithSwitch", /*revision_number=*/1, container_view_));
|
||||
}
|
||||
|
||||
// Verify the PIN only UI.
|
||||
@ -114,7 +114,7 @@ TEST_F(AuthContainerPixelTest, PinOnlyTest) {
|
||||
test_api_->GetView()->SetHasPassword(false);
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"PinOnly", /*revision_number=*/0, container_view_));
|
||||
"PinOnly", /*revision_number=*/1, container_view_));
|
||||
}
|
||||
|
||||
// Verify the password only UI.
|
||||
@ -123,7 +123,7 @@ TEST_F(AuthContainerPixelTest, PasswordOnlyTest) {
|
||||
test_api_->GetView()->SetHasPin(false);
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"PasswordOnly", /*revision_number=*/0, container_view_));
|
||||
"PasswordOnly", /*revision_number=*/1, container_view_));
|
||||
}
|
||||
|
||||
// Verify the password only UI with a PIN status.
|
||||
@ -143,11 +143,11 @@ TEST_F(AuthContainerPixelTest, PinStatusTest) {
|
||||
std::make_unique<cryptohome::PinStatus>(pin_status));
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"SetPinStatus", /*revision_number=*/1, container_view_));
|
||||
"SetPinStatus", /*revision_number=*/2, container_view_));
|
||||
|
||||
test_api_->GetView()->SetPinStatus(nullptr);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"PasswordOnly", /*revision_number=*/0, container_view_));
|
||||
"PasswordOnly", /*revision_number=*/1, container_view_));
|
||||
}
|
||||
|
||||
// Verify the fingerprint view.
|
||||
@ -160,12 +160,12 @@ TEST_F(AuthContainerPixelTest, PasswordWithFingerprintTest) {
|
||||
// Turn on the fingerprint factor availability.
|
||||
container_view_->SetFingerprintState(FingerprintState::AVAILABLE_DEFAULT);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"PasswordWithFingerprint", /*revision_number=*/0, container_view_));
|
||||
"PasswordWithFingerprint", /*revision_number=*/1, container_view_));
|
||||
|
||||
// Turn off the fingerprint factor availability.
|
||||
container_view_->SetFingerprintState(FingerprintState::UNAVAILABLE);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"PasswordWithHiddenFingerprint", /*revision_number=*/0, container_view_));
|
||||
"PasswordWithHiddenFingerprint", /*revision_number=*/1, container_view_));
|
||||
}
|
||||
|
||||
// Verify the fingerprint view.
|
||||
@ -178,12 +178,12 @@ TEST_F(AuthContainerPixelTest, PasswordAndPinWithFingerprintTest) {
|
||||
// Turn on the fingerprint factor availability.
|
||||
container_view_->SetFingerprintState(FingerprintState::AVAILABLE_DEFAULT);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"PasswordAndPinWithFingerprint", /*revision_number=*/0, container_view_));
|
||||
"PasswordAndPinWithFingerprint", /*revision_number=*/1, container_view_));
|
||||
|
||||
// Turn on the fingerprint factor availability.
|
||||
container_view_->SetFingerprintState(FingerprintState::UNAVAILABLE);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"PasswordAndPinWithHiddenFingerprint", /*revision_number=*/0,
|
||||
"PasswordAndPinWithHiddenFingerprint", /*revision_number=*/1,
|
||||
container_view_));
|
||||
}
|
||||
|
||||
|
@ -93,15 +93,15 @@ TEST_F(AuthHeaderPixelTest, DayMode) {
|
||||
DarkLightModeControllerImpl::Get()->SetDarkModeEnabledForTest(false);
|
||||
// Verify the UI.
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"DayMode", /*revision_number=*/1, header_view_));
|
||||
"DayMode", /*revision_number=*/2, header_view_));
|
||||
// Verify the error.
|
||||
header_view_->SetErrorTitle(kErrorTitle);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"Error", /*revision_number=*/1, header_view_));
|
||||
"Error", /*revision_number=*/2, header_view_));
|
||||
// Verify the restore
|
||||
header_view_->RestoreTitle();
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"Restore", /*revision_number=*/1, header_view_));
|
||||
"Restore", /*revision_number=*/2, header_view_));
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
@ -122,28 +122,28 @@ TEST_F(InputRowWithPasswordPixelTest, DayMode) {
|
||||
DarkLightModeControllerImpl::Get()->SetDarkModeEnabledForTest(false);
|
||||
// Verify the UI.
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"DayMode", /*revision_number=*/1, container_view_));
|
||||
"DayMode", /*revision_number=*/2, container_view_));
|
||||
}
|
||||
|
||||
TEST_F(InputRowWithPasswordPixelTest, VisibleText) {
|
||||
DarkLightModeControllerImpl::Get()->SetDarkModeEnabledForTest(false);
|
||||
LeftClickOn(test_api_->GetDisplayTextButton());
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"VisibleText", /*revision_number=*/1, container_view_));
|
||||
"VisibleText", /*revision_number=*/2, container_view_));
|
||||
}
|
||||
|
||||
TEST_F(InputRowWithPasswordPixelTest, FocusDisplayTextButton) {
|
||||
auth_input_->GetFocusManager()->SetFocusedView(
|
||||
test_api_->GetDisplayTextButton());
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"FocusDisplayTextButton", /*revision_number=*/1, container_view_));
|
||||
"FocusDisplayTextButton", /*revision_number=*/2, container_view_));
|
||||
}
|
||||
|
||||
TEST_F(InputRowWithPasswordPixelTest, FocusSubmitButton) {
|
||||
DarkLightModeControllerImpl::Get()->SetDarkModeEnabledForTest(false);
|
||||
auth_input_->GetFocusManager()->SetFocusedView(test_api_->GetSubmitButton());
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"FocusSubmitButton", /*revision_number=*/1, container_view_));
|
||||
"FocusSubmitButton", /*revision_number=*/2, container_view_));
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
@ -96,12 +96,12 @@ TEST_F(FingerprintViewPixelTest, AvailableTest) {
|
||||
fingerprint_view_->SetState(FingerprintState::AVAILABLE_DEFAULT);
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"AvailableDark", /*revision_number=*/0, fingerprint_view_));
|
||||
"AvailableDark", /*revision_number=*/1, fingerprint_view_));
|
||||
|
||||
// Switch to day mode.
|
||||
DarkLightModeControllerImpl::Get()->SetDarkModeEnabledForTest(false);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"Available", /*revision_number=*/0, fingerprint_view_));
|
||||
"Available", /*revision_number=*/1, fingerprint_view_));
|
||||
}
|
||||
|
||||
// Verify the AVAILABLE_WITH_TOUCH_SENSOR_WARNING state.
|
||||
@ -111,13 +111,13 @@ TEST_F(FingerprintViewPixelTest, AvailableWithTouchSensorWarningTest) {
|
||||
fingerprint_view_->SetState(
|
||||
FingerprintState::AVAILABLE_WITH_TOUCH_SENSOR_WARNING);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"AvailableWithTouchSensorWarningDark", /*revision_number=*/0,
|
||||
"AvailableWithTouchSensorWarningDark", /*revision_number=*/1,
|
||||
fingerprint_view_));
|
||||
|
||||
// Switch to day mode.
|
||||
DarkLightModeControllerImpl::Get()->SetDarkModeEnabledForTest(false);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"AvailableWithTouchSensorWarning", /*revision_number=*/0,
|
||||
"AvailableWithTouchSensorWarning", /*revision_number=*/1,
|
||||
fingerprint_view_));
|
||||
}
|
||||
|
||||
@ -132,12 +132,12 @@ TEST_F(FingerprintViewPixelTest, AvailableWithFailedAttemptTest) {
|
||||
// To avoid flakiness we just verify the first and last frames.
|
||||
test_api.ShowFirstFrame();
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"AvailableWithFailedAttemptFirstFrame", /*revision_number=*/1,
|
||||
"AvailableWithFailedAttemptFirstFrame", /*revision_number=*/2,
|
||||
fingerprint_view_));
|
||||
|
||||
test_api.ShowLastFrame();
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"AvailableWithFailedAttemptLastFrame", /*revision_number=*/1,
|
||||
"AvailableWithFailedAttemptLastFrame", /*revision_number=*/2,
|
||||
fingerprint_view_));
|
||||
}
|
||||
|
||||
@ -152,12 +152,12 @@ TEST_F(FingerprintViewPixelTest, DisabledFromAttemptsTest) {
|
||||
FingerprintView::TestApi test_api(fingerprint_view_);
|
||||
test_api.ShowFirstFrame();
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"DisabledFromAttemptsFirstFrame", /*revision_number=*/0,
|
||||
"DisabledFromAttemptsFirstFrame", /*revision_number=*/1,
|
||||
fingerprint_view_));
|
||||
|
||||
test_api.ShowLastFrame();
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"DisabledFromAttemptsLastFrame", /*revision_number=*/0,
|
||||
"DisabledFromAttemptsLastFrame", /*revision_number=*/1,
|
||||
fingerprint_view_));
|
||||
}
|
||||
|
||||
@ -167,12 +167,12 @@ TEST_F(FingerprintViewPixelTest, DisabledFromTimeoutTest) {
|
||||
|
||||
fingerprint_view_->SetState(FingerprintState::DISABLED_FROM_TIMEOUT);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"DisabledFromTimeoutDark", /*revision_number=*/0, fingerprint_view_));
|
||||
"DisabledFromTimeoutDark", /*revision_number=*/1, fingerprint_view_));
|
||||
|
||||
// Switch to day mode.
|
||||
DarkLightModeControllerImpl::Get()->SetDarkModeEnabledForTest(false);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"DisabledFromTimeout", /*revision_number=*/0, fingerprint_view_));
|
||||
"DisabledFromTimeout", /*revision_number=*/1, fingerprint_view_));
|
||||
}
|
||||
|
||||
} // namespace ash
|
||||
|
@ -76,14 +76,14 @@ TEST_F(PinKeyboardPixelTest, DayMode) {
|
||||
DarkLightModeControllerImpl::Get()->SetDarkModeEnabledForTest(false);
|
||||
// Verify the UI.
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"DayMode", /*revision_number=*/3, view_));
|
||||
"DayMode", /*revision_number=*/4, view_));
|
||||
}
|
||||
|
||||
// Verify the pin keyboard component look like in DayMode
|
||||
TEST_F(PinKeyboardPixelTest, NightMode) {
|
||||
// Verify the UI.
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"NightMode", /*revision_number=*/3, view_));
|
||||
"NightMode", /*revision_number=*/4, view_));
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
@ -141,7 +141,7 @@ TEST_P(DisplayParameterizedCaptureModePixelTest,
|
||||
GetScreenshotName(base::StrCat({"screen_capture_popup_notification_",
|
||||
GetDisplayTypeName(GetDisplayType())}),
|
||||
IsNotificationWidthIncreaseEnabled()),
|
||||
/*revision_number=*/2,
|
||||
/*revision_number=*/3,
|
||||
test_api()->GetPopupViewForId(kScreenCaptureNotificationId)));
|
||||
}
|
||||
|
||||
@ -174,7 +174,7 @@ TEST_P(DisplayParameterizedCaptureModePixelTest, VideoCaptureNotification) {
|
||||
GetScreenshotName(base::StrCat({"video_capture_notification_popup_",
|
||||
GetDisplayTypeName(GetDisplayType())}),
|
||||
IsNotificationWidthIncreaseEnabled()),
|
||||
/*revision_number=*/3, notification_popup_view));
|
||||
/*revision_number=*/4, notification_popup_view));
|
||||
|
||||
test_api()->ToggleBubble();
|
||||
auto* notification_view =
|
||||
@ -183,7 +183,7 @@ TEST_P(DisplayParameterizedCaptureModePixelTest, VideoCaptureNotification) {
|
||||
GetScreenshotName(base::StrCat({"video_capture_notification_view_",
|
||||
GetDisplayTypeName(GetDisplayType())}),
|
||||
IsNotificationWidthIncreaseEnabled()),
|
||||
/*revision_number=*/2, notification_view));
|
||||
/*revision_number=*/3, notification_view));
|
||||
}
|
||||
|
||||
} // namespace ash
|
||||
|
@ -63,14 +63,14 @@ TEST_F(ClipboardHistoryItemViewPixelTest, BitmapItemView) {
|
||||
clipboard_history_util::kBitmapItemView);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"bitmap_item_view",
|
||||
/*revision_number=*/0, bitmap_contents));
|
||||
/*revision_number=*/1, bitmap_contents));
|
||||
|
||||
// Press the tab key to focus on the delete button.
|
||||
GetEventGenerator()->PressAndReleaseKey(ui::VKEY_TAB, ui::EF_NONE);
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"bitmap_item_view_with_delete_button",
|
||||
/*revision_number=*/0, bitmap_contents));
|
||||
/*revision_number=*/1, bitmap_contents));
|
||||
}
|
||||
|
||||
} // namespace ash
|
||||
|
@ -23,7 +23,7 @@ class FullscreenPixelTest : public AshTestBase {
|
||||
// Verifies the primary fullscreen of an active user session.
|
||||
TEST_F(FullscreenPixelTest, VerifyDefaultPrimaryDisplay) {
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"primary_display", /*revision_number=*/8, Shell::GetPrimaryRootWindow()));
|
||||
"primary_display", /*revision_number=*/9, Shell::GetPrimaryRootWindow()));
|
||||
}
|
||||
|
||||
} // namespace ash
|
||||
|
@ -91,7 +91,7 @@ TEST_F(GlanceablesTasksPixelTest, Smoke) {
|
||||
ASSERT_TRUE(GetDateTray()->is_active());
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"glanceables_smoke", /*revision_number=*/0,
|
||||
"glanceables_smoke", /*revision_number=*/1,
|
||||
GetDateTray()->glanceables_bubble_for_test()->GetBubbleView()));
|
||||
}
|
||||
|
||||
@ -152,22 +152,22 @@ class GlanceablesTimeManagementPixelTest : public GlanceablesTasksPixelTest {
|
||||
// Pixel test for default / basic glanceables functionality.
|
||||
TEST_F(GlanceablesTimeManagementPixelTest, Smoke) {
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"expanded_tasks_top", /*revision_number=*/1,
|
||||
"expanded_tasks_top", /*revision_number=*/2,
|
||||
GetDateTray()->glanceables_bubble_for_test()->GetBubbleView()));
|
||||
GetTasksScrollView()->ScrollToPosition(
|
||||
GetTasksScrollView()->vertical_scroll_bar(), INT_MAX);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"expanded_tasks_bottom", /*revision_number=*/1,
|
||||
"expanded_tasks_bottom", /*revision_number=*/2,
|
||||
GetDateTray()->glanceables_bubble_for_test()->GetBubbleView()));
|
||||
|
||||
GetClassroomView()->SetExpandState(true, /*expand_by_overscroll=*/false);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"expanded_classroom_top", /*revision_number=*/1,
|
||||
"expanded_classroom_top", /*revision_number=*/2,
|
||||
GetDateTray()->glanceables_bubble_for_test()->GetBubbleView()));
|
||||
GetClassroomScrollView()->ScrollToPosition(
|
||||
GetClassroomScrollView()->vertical_scroll_bar(), INT_MAX);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"expanded_classroom_bottom", /*revision_number=*/1,
|
||||
"expanded_classroom_bottom", /*revision_number=*/2,
|
||||
GetDateTray()->glanceables_bubble_for_test()->GetBubbleView()));
|
||||
}
|
||||
|
||||
|
@ -158,7 +158,7 @@ TEST_P(GlanceablesTaskViewPixelTest, GlanceablesTaskView) {
|
||||
widget()->LayoutRootViewIfNecessary();
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
GenerateScreenshotName(), /*revision_number=*/0, widget()));
|
||||
GenerateScreenshotName(), /*revision_number=*/1, widget()));
|
||||
}
|
||||
|
||||
} // namespace ash
|
||||
|
@ -161,13 +161,13 @@ TEST_F(AuthDialogContentsViewPixelTest, PasswordAndThemeChange) {
|
||||
|
||||
// Verify the UI.
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"password", /*revision_number=*/2, widget.get()));
|
||||
"password", /*revision_number=*/3, widget.get()));
|
||||
|
||||
SwitchToLightMode();
|
||||
|
||||
// Verify the UI.
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"password_light", /*revision_number=*/2, widget.get()));
|
||||
"password_light", /*revision_number=*/3, widget.get()));
|
||||
}
|
||||
|
||||
TEST_F(AuthDialogContentsViewPixelTest, PinAndThemeChange) {
|
||||
@ -177,13 +177,13 @@ TEST_F(AuthDialogContentsViewPixelTest, PinAndThemeChange) {
|
||||
|
||||
// Verify the UI.
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"pin", /*revision_number=*/3, widget.get()));
|
||||
"pin", /*revision_number=*/4, widget.get()));
|
||||
|
||||
SwitchToLightMode();
|
||||
|
||||
// Verify the UI.
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"pin_light", /*revision_number=*/3, widget.get()));
|
||||
"pin_light", /*revision_number=*/4, widget.get()));
|
||||
}
|
||||
|
||||
TEST_F(AuthDialogContentsViewPixelTest, FixedPinAndThemeChange) {
|
||||
@ -194,13 +194,13 @@ TEST_F(AuthDialogContentsViewPixelTest, FixedPinAndThemeChange) {
|
||||
|
||||
// Verify the UI.
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"pin6", /*revision_number=*/3, widget.get()));
|
||||
"pin6", /*revision_number=*/4, widget.get()));
|
||||
|
||||
SwitchToLightMode();
|
||||
|
||||
// Verify the UI.
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"pin6_light", /*revision_number=*/3, widget.get()));
|
||||
"pin6_light", /*revision_number=*/4, widget.get()));
|
||||
}
|
||||
|
||||
TEST_F(AuthDialogContentsViewPixelTest, FingerprintAndThemeChange) {
|
||||
@ -211,13 +211,13 @@ TEST_F(AuthDialogContentsViewPixelTest, FingerprintAndThemeChange) {
|
||||
|
||||
// Verify the UI.
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"fingerprint", /*revision_number=*/2, widget.get()));
|
||||
"fingerprint", /*revision_number=*/3, widget.get()));
|
||||
|
||||
SwitchToLightMode();
|
||||
|
||||
// Verify the UI.
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"fingerprint_light", /*revision_number=*/2, widget.get()));
|
||||
"fingerprint_light", /*revision_number=*/3, widget.get()));
|
||||
}
|
||||
|
||||
TEST_F(AuthDialogContentsViewPixelTest,
|
||||
@ -231,7 +231,7 @@ TEST_F(AuthDialogContentsViewPixelTest,
|
||||
|
||||
// Verify the UI.
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"pin6_fingerprint", /*revision_number=*/3, widget.get()));
|
||||
"pin6_fingerprint", /*revision_number=*/4, widget.get()));
|
||||
|
||||
AuthDialogContentsView::TestApi dialog_api(
|
||||
static_cast<AuthDialogContentsView*>(widget->GetContentsView()));
|
||||
@ -242,7 +242,7 @@ TEST_F(AuthDialogContentsViewPixelTest,
|
||||
// Verify the UI.
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"pin6_fingerprint_fp_disabled_attempts",
|
||||
/*revision_number=*/3, widget.get()));
|
||||
/*revision_number=*/4, widget.get()));
|
||||
}
|
||||
|
||||
TEST_F(AuthDialogContentsViewPixelTest, PinAndFingerprintWithPinFail) {
|
||||
@ -254,7 +254,7 @@ TEST_F(AuthDialogContentsViewPixelTest, PinAndFingerprintWithPinFail) {
|
||||
|
||||
// Verify the UI.
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"pin_fingerprint", /*revision_number=*/3, widget.get()));
|
||||
"pin_fingerprint", /*revision_number=*/4, widget.get()));
|
||||
|
||||
AuthDialogContentsView::TestApi dialog_api(
|
||||
static_cast<AuthDialogContentsView*>(widget->GetContentsView()));
|
||||
@ -263,7 +263,7 @@ TEST_F(AuthDialogContentsViewPixelTest, PinAndFingerprintWithPinFail) {
|
||||
|
||||
// Verify the UI.
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"pin_fingerprint_pin_fail", /*revision_number=*/4, widget.get()));
|
||||
"pin_fingerprint_pin_fail", /*revision_number=*/5, widget.get()));
|
||||
}
|
||||
|
||||
TEST_F(AuthDialogContentsViewPixelTest,
|
||||
@ -276,7 +276,7 @@ TEST_F(AuthDialogContentsViewPixelTest,
|
||||
|
||||
// Verify the UI.
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"password_fingerprint", /*revision_number=*/2, widget.get()));
|
||||
"password_fingerprint", /*revision_number=*/3, widget.get()));
|
||||
|
||||
AuthDialogContentsView::TestApi dialog_api(
|
||||
static_cast<AuthDialogContentsView*>(widget->GetContentsView()));
|
||||
@ -286,7 +286,7 @@ TEST_F(AuthDialogContentsViewPixelTest,
|
||||
// Verify the UI.
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"password_fingerprint_password_fail",
|
||||
/*revision_number=*/2, widget.get()));
|
||||
/*revision_number=*/3, widget.get()));
|
||||
}
|
||||
|
||||
TEST_F(AuthDialogContentsViewPixelTest, AllFactorAndThemeChange) {
|
||||
@ -299,13 +299,13 @@ TEST_F(AuthDialogContentsViewPixelTest, AllFactorAndThemeChange) {
|
||||
|
||||
// Verify the UI.
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"fingerprint", /*revision_number=*/3, widget.get()));
|
||||
"fingerprint", /*revision_number=*/4, widget.get()));
|
||||
|
||||
SwitchToLightMode();
|
||||
|
||||
// Verify the UI.
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"fingerprint_light", /*revision_number=*/3, widget.get()));
|
||||
"fingerprint_light", /*revision_number=*/4, widget.get()));
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
@ -235,12 +235,12 @@ TEST_F(LocalAuthenticationRequestControllerImplPixelTest, FailedValidation) {
|
||||
|
||||
// Verify the UI.
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"Ready", /*revision_number=*/4, view));
|
||||
"Ready", /*revision_number=*/5, view));
|
||||
|
||||
SimulateValidation(false);
|
||||
// Verify the UI.
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"Fail", /*revision_number=*/4, view));
|
||||
"Fail", /*revision_number=*/5, view));
|
||||
}
|
||||
|
||||
// Tests local authentication dialog theme change
|
||||
@ -262,7 +262,7 @@ TEST_F(LocalAuthenticationRequestControllerImplPixelTest, ThemeChange) {
|
||||
DarkLightModeControllerImpl::Get()->SetDarkModeEnabledForTest(false);
|
||||
// Verify the UI.
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"Light", /*revision_number=*/3, view));
|
||||
"Light", /*revision_number=*/4, view));
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
@ -197,7 +197,7 @@ TEST_F(LoginAuthUserViewPixeltest,
|
||||
|
||||
views::test::RunScheduledLayout(container_);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"PinWithToggleAutosubmitOff", /*revision_number=*/0, view_));
|
||||
"PinWithToggleAutosubmitOff", /*revision_number=*/1, view_));
|
||||
|
||||
const ui::MouseEvent event(ui::EventType::kMousePressed, gfx::Point(),
|
||||
gfx::Point(), ui::EventTimeForNow(), 0, 0);
|
||||
@ -207,7 +207,7 @@ TEST_F(LoginAuthUserViewPixeltest,
|
||||
ExpectModeVisibility(LoginAuthUserView::InputFieldMode::kPasswordWithToggle);
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"PasswordWithToggle", /*revision_number=*/0, view_));
|
||||
"PasswordWithToggle", /*revision_number=*/1, view_));
|
||||
}
|
||||
|
||||
class LoginAuthUserViewPinOnlyPixeltest : public LoginAuthUserViewPixeltest {
|
||||
@ -232,7 +232,7 @@ TEST_F(LoginAuthUserViewPinOnlyPixeltest, PinOnlyModeWithAutosubmitEnabled) {
|
||||
|
||||
views::test::RunScheduledLayout(container_);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"PinOnlyEmpty", /*revision_number=*/1, view_));
|
||||
"PinOnlyEmpty", /*revision_number=*/2, view_));
|
||||
}
|
||||
|
||||
// Verifies the PIN only with auto submit case after all six pin character
|
||||
@ -276,7 +276,7 @@ TEST_F(LoginAuthUserViewPinOnlyPixeltest, PinOnlyModeWithAutosubmitDisabled) {
|
||||
|
||||
views::test::RunScheduledLayout(container_);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"PinOnlyEmpty", /*revision_number=*/1, view_));
|
||||
"PinOnlyEmpty", /*revision_number=*/2, view_));
|
||||
}
|
||||
|
||||
// Verifies the PIN only with auto submit off case after all six pin character
|
||||
|
@ -116,7 +116,7 @@ TEST_P(QuickInsertPixelTest, UnfocusedMode) {
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"quick_insert_unfocused",
|
||||
/*revision_number=*/0, controller().widget_for_testing()));
|
||||
/*revision_number=*/1, controller().widget_for_testing()));
|
||||
}
|
||||
|
||||
TEST_P(QuickInsertPixelTest, FocusedModeNoSelection) {
|
||||
@ -128,7 +128,7 @@ TEST_P(QuickInsertPixelTest, FocusedModeNoSelection) {
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"quick_insert_focused_no_selection",
|
||||
/*revision_number=*/0, controller().widget_for_testing()));
|
||||
/*revision_number=*/1, controller().widget_for_testing()));
|
||||
}
|
||||
|
||||
TEST_P(QuickInsertPixelTest, FocusedModeHasSelection) {
|
||||
@ -141,7 +141,7 @@ TEST_P(QuickInsertPixelTest, FocusedModeHasSelection) {
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"quick_insert_focused_no_selection",
|
||||
/*revision_number=*/0, controller().widget_for_testing()));
|
||||
/*revision_number=*/1, controller().widget_for_testing()));
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
@ -86,7 +86,7 @@ TEST_P(RoundedDisplayPixelTest, AlwaysOnTopMaskTextures) {
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"always_on_top_rounded_display_mask_textures",
|
||||
/*revision_number=*/2, Shell::GetPrimaryRootWindow()));
|
||||
/*revision_number=*/3, Shell::GetPrimaryRootWindow()));
|
||||
}
|
||||
|
||||
INSTANTIATE_TEST_SUITE_P(
|
||||
|
@ -84,6 +84,6 @@ TEST_P(ScalableIphPixelTest, NotificationNoBodyText) {
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
GetScreenshotName("scalable_iph_notification_no_body_text",
|
||||
IsNotificationWidthIncreaseEnabled()),
|
||||
/*revision_number=*/1, message_view));
|
||||
/*revision_number=*/2, message_view));
|
||||
}
|
||||
} // namespace ash
|
||||
|
@ -69,28 +69,28 @@ TEST_F(LoginShelfViewPixelTest, FocusTraversalFromLockContents) {
|
||||
PressAndReleaseKey(ui::VKEY_TAB);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"focus_on_login_user_expand_button",
|
||||
/*revision_number=*/12, primary_big_user_view_.get(),
|
||||
/*revision_number=*/13, primary_big_user_view_.get(),
|
||||
primary_shelf_window));
|
||||
|
||||
// Trigger the tab key. Check that the login shelf shutdown button is focused.
|
||||
PressAndReleaseKey(ui::VKEY_TAB);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"focus_on_shutdown_button",
|
||||
/*revision_number=*/12, primary_big_user_view_.get(),
|
||||
/*revision_number=*/13, primary_big_user_view_.get(),
|
||||
primary_shelf_window));
|
||||
|
||||
// Trigger the tab key. Check that the browser as guest button is focused.
|
||||
PressAndReleaseKey(ui::VKEY_TAB);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"focus_on_browser_as_guest_button",
|
||||
/*revision_number=*/12, primary_big_user_view_.get(),
|
||||
/*revision_number=*/13, primary_big_user_view_.get(),
|
||||
primary_shelf_window));
|
||||
|
||||
// Trigger the tab key. Check that the add person button is focused.
|
||||
PressAndReleaseKey(ui::VKEY_TAB);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"focus_on_add_person_button",
|
||||
/*revision_number=*/12, primary_big_user_view_.get(),
|
||||
/*revision_number=*/13, primary_big_user_view_.get(),
|
||||
primary_shelf_window));
|
||||
}
|
||||
|
||||
@ -105,13 +105,13 @@ TEST_F(LoginShelfViewPixelTest, FocusTraversalWithinShelf) {
|
||||
aura::Window* primary_shelf_window = GetPrimaryShelf()->GetWindow();
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"focus_on_calendar_view",
|
||||
/*revision_number=*/8, primary_shelf_window));
|
||||
/*revision_number=*/9, primary_shelf_window));
|
||||
|
||||
// Focus on the time view.
|
||||
PressAndReleaseKey(ui::VKEY_TAB);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"focus_on_time_view.rev_0",
|
||||
/*revision_number=*/8, primary_shelf_window));
|
||||
/*revision_number=*/9, primary_shelf_window));
|
||||
|
||||
PressAndReleaseKey(ui::VKEY_TAB, ui::EF_SHIFT_DOWN);
|
||||
PressAndReleaseKey(ui::VKEY_TAB, ui::EF_SHIFT_DOWN);
|
||||
@ -119,7 +119,7 @@ TEST_F(LoginShelfViewPixelTest, FocusTraversalWithinShelf) {
|
||||
// Move the focus back to the add person button.
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"refocus_on_login_shelf",
|
||||
/*revision_number=*/8, primary_shelf_window));
|
||||
/*revision_number=*/9, primary_shelf_window));
|
||||
}
|
||||
|
||||
class LoginShelfWithPolicyWallpaperPixelTestWithRTL
|
||||
@ -148,7 +148,7 @@ TEST_P(LoginShelfWithPolicyWallpaperPixelTestWithRTL,
|
||||
FocusOnShutdownButton();
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"focus_on_shutdown_button",
|
||||
/*revision_number=*/8, primary_big_user_view_.get(),
|
||||
/*revision_number=*/9, primary_big_user_view_.get(),
|
||||
GetPrimaryShelf()->GetWindow()));
|
||||
}
|
||||
|
||||
|
@ -42,7 +42,7 @@ INSTANTIATE_TEST_SUITE_P(RTL, ScrollableShelfViewPixelRTLTest, testing::Bool());
|
||||
TEST_P(ScrollableShelfViewPixelRTLTest, Basics) {
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"overflow",
|
||||
/*revision_number=*/10, GetPrimaryShelf()->GetWindow()));
|
||||
/*revision_number=*/11, GetPrimaryShelf()->GetWindow()));
|
||||
|
||||
ASSERT_TRUE(scrollable_shelf_view_->right_arrow());
|
||||
const gfx::Point right_arrow_center =
|
||||
@ -53,19 +53,19 @@ TEST_P(ScrollableShelfViewPixelRTLTest, Basics) {
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"overflow_end",
|
||||
/*revision_number=*/10, GetPrimaryShelf()->GetWindow()));
|
||||
/*revision_number=*/11, GetPrimaryShelf()->GetWindow()));
|
||||
}
|
||||
|
||||
TEST_P(ScrollableShelfViewPixelRTLTest, LeftRightShelfAlignment) {
|
||||
GetPrimaryShelf()->SetAlignment(ShelfAlignment::kLeft);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"left_shelf_alignment",
|
||||
/*revision_number=*/7, GetPrimaryShelf()->GetWindow()));
|
||||
/*revision_number=*/8, GetPrimaryShelf()->GetWindow()));
|
||||
|
||||
GetPrimaryShelf()->SetAlignment(ShelfAlignment::kRight);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"right_shelf_alignment",
|
||||
/*revision_number=*/7, GetPrimaryShelf()->GetWindow()));
|
||||
/*revision_number=*/8, GetPrimaryShelf()->GetWindow()));
|
||||
}
|
||||
|
||||
class ScrollableShelfViewWithGuestModePixelTest
|
||||
@ -105,7 +105,7 @@ TEST_P(ScrollableShelfViewWithGuestModePixelTest, VerifyShelfContextMenu) {
|
||||
// Verify the shelf context menu and the shelf.
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"shelf_context_menu",
|
||||
/*revision_number=*/24,
|
||||
/*revision_number=*/25,
|
||||
GetPrimaryShelf()
|
||||
->shelf_widget()
|
||||
->shelf_view_for_testing()
|
||||
|
@ -55,7 +55,7 @@ TEST_P(ShelfLayoutManagerPixelRTLTest, AutohideShelfVisibility) {
|
||||
shelf->SetAutoHideBehavior(ShelfAutoHideBehavior::kNever);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"shelf_no_auto_hide",
|
||||
/*revision_number=*/13, shelf->GetWindow(), shelf->hotseat_widget()));
|
||||
/*revision_number=*/14, shelf->GetWindow(), shelf->hotseat_widget()));
|
||||
|
||||
// When the auto-hide is set and a window is shown fullscreen, the shelf
|
||||
// should not be showing on the screen.
|
||||
@ -72,7 +72,7 @@ TEST_P(ShelfLayoutManagerPixelRTLTest, AutohideShelfVisibility) {
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"shelf_show_with_auto_hide",
|
||||
/*revision_number=*/14, shelf->GetWindow(), shelf->hotseat_widget()));
|
||||
/*revision_number=*/15, shelf->GetWindow(), shelf->hotseat_widget()));
|
||||
}
|
||||
|
||||
} // namespace ash
|
||||
|
@ -38,7 +38,7 @@ TEST_F(AccessibilityDetailedViewPixelTest, Basics) {
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"check_view",
|
||||
/*revision_number=*/14, detailed_view_container));
|
||||
/*revision_number=*/15, detailed_view_container));
|
||||
}
|
||||
|
||||
} // namespace ash
|
||||
|
@ -75,7 +75,7 @@ TEST_P(AudioDetailedViewPixelTest, Basics) {
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"qs_audio_detailed_view",
|
||||
/*revision_number=*/16, detailed_view));
|
||||
/*revision_number=*/17, detailed_view));
|
||||
}
|
||||
|
||||
TEST_P(AudioDetailedViewPixelTest, ShowNoiseCancellationButton) {
|
||||
@ -118,7 +118,7 @@ TEST_P(AudioDetailedViewPixelTest, ShowNoiseCancellationButton) {
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"qs_audio_detailed_view",
|
||||
/*revision_number=*/8, detailed_view));
|
||||
/*revision_number=*/9, detailed_view));
|
||||
}
|
||||
|
||||
} // namespace ash
|
||||
|
@ -125,7 +125,7 @@ TEST_P(BluetoothDetailedViewImplPixelTest, Basics) {
|
||||
// Compare pixels.
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
GetScreenshotName("check_view", IsBluetoothWifiQSPodRefreshEnabled()),
|
||||
/*revision_number=*/10, detailed_view));
|
||||
/*revision_number=*/11, detailed_view));
|
||||
}
|
||||
|
||||
TEST_P(BluetoothDetailedViewImplPixelTest, BluetoothUnavailable) {
|
||||
@ -154,7 +154,7 @@ TEST_P(BluetoothDetailedViewImplPixelTest, BluetoothUnavailable) {
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
GetScreenshotName("bluetooth_unavailable_view",
|
||||
IsBluetoothWifiQSPodRefreshEnabled()),
|
||||
/*revision_number=*/1, detailed_view));
|
||||
/*revision_number=*/2, detailed_view));
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
@ -41,7 +41,7 @@ TEST_F(DisplayDetailedViewPixelTest, Basics) {
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"qs_display_detailed_view",
|
||||
/*revision_number=*/12, detailed_view));
|
||||
/*revision_number=*/13, detailed_view));
|
||||
}
|
||||
|
||||
} // namespace ash
|
||||
|
@ -61,7 +61,7 @@ TEST_F(CastDetailedViewPixelTest, Basics) {
|
||||
ASSERT_TRUE(detailed_view);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"check_view",
|
||||
/*revision_number=*/11, detailed_view));
|
||||
/*revision_number=*/12, detailed_view));
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
@ -46,7 +46,7 @@ TEST_F(CastZeroStateViewPixelTest, Basics) {
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"cast_zero_state_view",
|
||||
/*revision_number=*/13, detailed_view));
|
||||
/*revision_number=*/14, detailed_view));
|
||||
}
|
||||
|
||||
} // namespace ash
|
||||
|
@ -78,7 +78,7 @@ TEST_P(ChannelIndicatorPixelTest, ChannelIndicatorArea) {
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
GenerateTestName(),
|
||||
/*revision_number=*/1, GetPrimaryShelf()->GetStatusAreaWidget()));
|
||||
/*revision_number=*/2, GetPrimaryShelf()->GetStatusAreaWidget()));
|
||||
}
|
||||
|
||||
} // namespace ash
|
||||
|
@ -87,7 +87,7 @@ TEST_F(ChannelIndicatorQuickSettingsViewPixelTest, FeedbackButtonVisible) {
|
||||
// `ChannelIndicatorQuickSettingsView`.
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"feedback_button_visible",
|
||||
/*revision_number=*/8, view()));
|
||||
/*revision_number=*/9, view()));
|
||||
}
|
||||
|
||||
} // namespace ash
|
||||
|
@ -68,7 +68,7 @@ TEST_F(IMEDetailedViewPixelTest, Basics) {
|
||||
ASSERT_TRUE(detailed_view);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"check_view",
|
||||
/*revision_number=*/12, detailed_view));
|
||||
/*revision_number=*/13, detailed_view));
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
@ -54,7 +54,7 @@ TEST_F(LocaleDetailedViewPixelTest, Basics) {
|
||||
ASSERT_TRUE(detailed_view);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"check_view",
|
||||
/*revision_number=*/11, detailed_view));
|
||||
/*revision_number=*/12, detailed_view));
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
@ -136,7 +136,7 @@ TEST_P(MahiErrorStatusViewPixelTest, Basics) {
|
||||
mahi_constants::ViewId::kErrorStatusView);
|
||||
ASSERT_TRUE(error_status_view);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
GetScreenShotNameForErrorStatus(GetParam()), /*revision_number=*/8,
|
||||
GetScreenShotNameForErrorStatus(GetParam()), /*revision_number=*/10,
|
||||
error_status_view));
|
||||
}
|
||||
|
||||
@ -165,7 +165,7 @@ TEST_P(MahiErrorStatusViewPixelTest, QuestionAnswerView) {
|
||||
LeftClickOn(send_button);
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
GetScreenShotNameForErrorStatus(GetParam()), /*revision_number=*/5,
|
||||
GetScreenShotNameForErrorStatus(GetParam()), /*revision_number=*/7,
|
||||
mahi_contents_view->GetViewByID(mahi_constants::ViewId::kScrollView)));
|
||||
}
|
||||
|
||||
|
@ -126,7 +126,7 @@ TEST_F(MahiPanelViewPixelTest, MainPanel) {
|
||||
views::test::RunScheduledLayout(widget());
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"panel_view", /*revision_number=*/10, panel_view()));
|
||||
"panel_view", /*revision_number=*/11, panel_view()));
|
||||
}
|
||||
|
||||
TEST_F(MahiPanelViewPixelTest, ContentSourceButton) {
|
||||
@ -141,7 +141,7 @@ TEST_F(MahiPanelViewPixelTest, ContentSourceButton) {
|
||||
views::test::RunScheduledLayout(widget());
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"content_source", /*revision_number=*/2,
|
||||
"content_source", /*revision_number=*/3,
|
||||
panel_view()->GetViewByID(mahi_constants::ViewId::kContentSourceButton)));
|
||||
}
|
||||
|
||||
@ -157,7 +157,7 @@ TEST_F(MahiPanelViewPixelTest, SummaryView) {
|
||||
views::test::RunScheduledLayout(widget());
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"summary_view", /*revision_number=*/7,
|
||||
"summary_view", /*revision_number=*/8,
|
||||
panel_view()->GetViewByID(mahi_constants::ViewId::kScrollView)));
|
||||
}
|
||||
|
||||
@ -176,11 +176,11 @@ TEST_F(MahiPanelViewPixelTest, PanelWithoutFeedbackButtons) {
|
||||
RecreatePanelWidget();
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"scroll_view", /*revision_number=*/2,
|
||||
"scroll_view", /*revision_number=*/3,
|
||||
panel_view()->GetViewByID(mahi_constants::ViewId::kScrollView)));
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"footer", /*revision_number=*/0,
|
||||
"footer", /*revision_number=*/1,
|
||||
panel_view()->GetViewByID(mahi_constants::ViewId::kFooterLabel)));
|
||||
}
|
||||
|
||||
@ -210,7 +210,7 @@ TEST_F(MahiPanelViewPixelTest, QuestionAnswerViewBasic) {
|
||||
views::test::RunScheduledLayout(widget());
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"question_answer_view_basic", /*revision_number=*/7,
|
||||
"question_answer_view_basic", /*revision_number=*/8,
|
||||
panel_view()->GetViewByID(mahi_constants::ViewId::kScrollView)));
|
||||
}
|
||||
|
||||
@ -242,7 +242,7 @@ TEST_F(MahiPanelViewPixelTest, QuestionAnswerViewLongText) {
|
||||
views::test::RunScheduledLayout(widget());
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"question_answer_view_long_text", /*revision_number=*/9,
|
||||
"question_answer_view_long_text", /*revision_number=*/10,
|
||||
panel_view()->GetViewByID(mahi_constants::ViewId::kScrollView)));
|
||||
}
|
||||
|
||||
@ -260,7 +260,7 @@ TEST_F(MahiPanelViewPixelTest, SummaryViewScrollToBottom) {
|
||||
ScrollToBottom();
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"summary_view_bottom", /*revision_number=*/6,
|
||||
"summary_view_bottom", /*revision_number=*/7,
|
||||
panel_view()->GetViewByID(mahi_constants::ViewId::kScrollView)));
|
||||
}
|
||||
|
||||
@ -292,7 +292,7 @@ TEST_F(MahiPanelViewPixelTest, QuestionAnswerViewScrollToBottom) {
|
||||
ScrollToBottom();
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"question_answer_bottom", /*revision_number=*/6,
|
||||
"question_answer_bottom", /*revision_number=*/7,
|
||||
panel_view()->GetViewByID(mahi_constants::ViewId::kScrollView)));
|
||||
}
|
||||
|
||||
|
@ -129,7 +129,7 @@ TEST_F(NetworkDetailedNetworkViewPixelTest, Basics) {
|
||||
// Compare pixels.
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"check_view",
|
||||
/*revision_number=*/12, detailed_view));
|
||||
/*revision_number=*/13, detailed_view));
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
@ -170,7 +170,7 @@ TEST_F(NetworkFeatureTilePixelTest, NoNetworks) {
|
||||
ASSERT_TRUE(tile_view);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"check_tile_view",
|
||||
/*revision_number=*/3, tile_view));
|
||||
/*revision_number=*/4, tile_view));
|
||||
}
|
||||
|
||||
TEST_F(NetworkFeatureTilePixelTest, Ethernet) {
|
||||
@ -182,7 +182,7 @@ TEST_F(NetworkFeatureTilePixelTest, Ethernet) {
|
||||
ASSERT_TRUE(tile_view);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"check_tile_view",
|
||||
/*revision_number=*/2, tile_view));
|
||||
/*revision_number=*/3, tile_view));
|
||||
}
|
||||
|
||||
TEST_F(NetworkFeatureTilePixelTest, Wifi) {
|
||||
@ -194,7 +194,7 @@ TEST_F(NetworkFeatureTilePixelTest, Wifi) {
|
||||
ASSERT_TRUE(tile_view);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"check_tile_view",
|
||||
/*revision_number=*/2, tile_view));
|
||||
/*revision_number=*/3, tile_view));
|
||||
}
|
||||
|
||||
TEST_F(NetworkFeatureTilePixelTest, WifiSecurity) {
|
||||
@ -206,7 +206,7 @@ TEST_F(NetworkFeatureTilePixelTest, WifiSecurity) {
|
||||
ASSERT_TRUE(tile_view);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"check_tile_view",
|
||||
/*revision_number=*/1, tile_view));
|
||||
/*revision_number=*/2, tile_view));
|
||||
}
|
||||
|
||||
TEST_F(NetworkFeatureTilePixelTest, Cellular) {
|
||||
@ -218,7 +218,7 @@ TEST_F(NetworkFeatureTilePixelTest, Cellular) {
|
||||
ASSERT_TRUE(tile_view);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"check_tile_view",
|
||||
/*revision_number=*/2, tile_view));
|
||||
/*revision_number=*/3, tile_view));
|
||||
}
|
||||
|
||||
} // namespace ash
|
||||
|
@ -121,7 +121,7 @@ TEST_F(VpnDetailedViewPixelTest, OnlyBuiltInVpn) {
|
||||
// Compare pixels.
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"check_view",
|
||||
/*revision_number=*/11, vpn_detailed_view_));
|
||||
/*revision_number=*/12, vpn_detailed_view_));
|
||||
}
|
||||
|
||||
TEST_F(VpnDetailedViewPixelTest, MultipleVpns) {
|
||||
@ -130,7 +130,7 @@ TEST_F(VpnDetailedViewPixelTest, MultipleVpns) {
|
||||
// Compare pixels.
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"check_view",
|
||||
/*revision_number=*/11, vpn_detailed_view_));
|
||||
/*revision_number=*/12, vpn_detailed_view_));
|
||||
}
|
||||
|
||||
} // namespace ash
|
||||
|
@ -121,7 +121,7 @@ TEST_P(AshNotificationViewPixelTest, CloseButtonFocused) {
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
GetScreenshotName("close_button_focused",
|
||||
IsNotificationWidthIncreaseEnabled()),
|
||||
/*revision_number=*/2, notification_view));
|
||||
/*revision_number=*/3, notification_view));
|
||||
}
|
||||
|
||||
// Regression test for http://b/267195370. Tests that a notification with no
|
||||
@ -167,7 +167,7 @@ TEST_P(AshNotificationViewPixelTest, ProgressCollapsed) {
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
GetScreenshotName("progress_collapsed",
|
||||
IsNotificationWidthIncreaseEnabled()),
|
||||
/*revision_number=*/2, notification_view));
|
||||
/*revision_number=*/3, notification_view));
|
||||
}
|
||||
|
||||
// Tests the control buttons UI for the case of a notification with just the
|
||||
@ -191,7 +191,7 @@ TEST_P(AshNotificationViewPixelTest, CloseControlButton) {
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
GetScreenshotName("close_control_button",
|
||||
IsNotificationWidthIncreaseEnabled()),
|
||||
/*revision_number=*/2, notification_view));
|
||||
/*revision_number=*/3, notification_view));
|
||||
}
|
||||
|
||||
// Tests the control buttons UI for the case of a notification with both the
|
||||
@ -215,7 +215,7 @@ TEST_P(AshNotificationViewPixelTest, SettingsAndCloseControlButtons) {
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
GetScreenshotName("settings_and_close_control_buttons",
|
||||
IsNotificationWidthIncreaseEnabled()),
|
||||
/*revision_number=*/2, notification_view));
|
||||
/*revision_number=*/3, notification_view));
|
||||
}
|
||||
|
||||
// Tests the inline reply UI for AshNotificationView.
|
||||
@ -241,7 +241,7 @@ TEST_P(AshNotificationViewPixelTest, InlineReply) {
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
GetScreenshotName("inline_reply_focused",
|
||||
IsNotificationWidthIncreaseEnabled()),
|
||||
/*revision_number=*/2, notification_view));
|
||||
/*revision_number=*/3, notification_view));
|
||||
}
|
||||
|
||||
// Tests the focus ring for the expand button in AshNotificationView.
|
||||
@ -258,7 +258,7 @@ TEST_P(AshNotificationViewPixelTest, ExpandButtonFocusRing) {
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
GetScreenshotName("expand_button_focus_ring",
|
||||
IsNotificationWidthIncreaseEnabled()),
|
||||
/*revision_number=*/2, notification_view));
|
||||
/*revision_number=*/3, notification_view));
|
||||
}
|
||||
|
||||
TEST_P(AshNotificationViewPixelTest, NotificationViewFocusRing) {
|
||||
@ -272,7 +272,7 @@ TEST_P(AshNotificationViewPixelTest, NotificationViewFocusRing) {
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
GetScreenshotName("notification_view_focus_ring",
|
||||
IsNotificationWidthIncreaseEnabled()),
|
||||
/*revision_number=*/2, notification_view));
|
||||
/*revision_number=*/3, notification_view));
|
||||
}
|
||||
|
||||
TEST_P(AshNotificationViewPixelTest, NotificationPopupFocusRing) {
|
||||
@ -290,7 +290,7 @@ TEST_P(AshNotificationViewPixelTest, NotificationPopupFocusRing) {
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
GetScreenshotName("notification_popup_focus_ring",
|
||||
IsNotificationWidthIncreaseEnabled()),
|
||||
/*revision_number=*/3, notification_view));
|
||||
/*revision_number=*/4, notification_view));
|
||||
}
|
||||
|
||||
// Tests that a notification's icon is sized and positioned correctly at
|
||||
|
@ -142,7 +142,7 @@ TEST_P(OngoingProcessViewPixelTest, MultilineLabels) {
|
||||
test_api()->ToggleBubble();
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
GenerateTestName(), /*revision_number=*/1,
|
||||
GenerateTestName(), /*revision_number=*/2,
|
||||
test_api()->GetNotificationCenterView()));
|
||||
}
|
||||
|
||||
|
@ -80,7 +80,7 @@ TEST_P(PrivacyIndicatorsTrayItemViewPixelTest, Basics) {
|
||||
SimulateAnimationEnded(privacy_indicators_view);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"dot_view" + GetScreenshotNameSuffix(),
|
||||
/*revision_number=*/1, notification_center_tray));
|
||||
/*revision_number=*/2, notification_center_tray));
|
||||
}
|
||||
|
||||
} // namespace ash
|
||||
|
@ -129,7 +129,7 @@ TEST_P(StatusAreaParameterizedPixelTest, SystemTrayTest) {
|
||||
system_tray->SetIsActive(IsActive());
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"system_tray" + GetScreenshotNameSuffix(), /*revision_number=*/5,
|
||||
"system_tray" + GetScreenshotNameSuffix(), /*revision_number=*/6,
|
||||
system_tray));
|
||||
}
|
||||
|
||||
@ -142,7 +142,7 @@ TEST_P(StatusAreaParameterizedPixelTest, DateTrayTest) {
|
||||
date_tray->SetIsActive(IsActive());
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"date_tray" + GetScreenshotNameSuffix(), /*revision_number=*/5,
|
||||
"date_tray" + GetScreenshotNameSuffix(), /*revision_number=*/6,
|
||||
date_tray));
|
||||
}
|
||||
|
||||
|
@ -133,7 +133,7 @@ TEST_F(CalendarUpNextViewPixelTest,
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"calendar_up_next_single_upcoming_event",
|
||||
/*revision_number=*/9, Widget()));
|
||||
/*revision_number=*/10, Widget()));
|
||||
}
|
||||
|
||||
TEST_F(CalendarUpNextViewPixelTest,
|
||||
@ -160,7 +160,7 @@ TEST_F(CalendarUpNextViewPixelTest,
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"calendar_up_next_multiple_upcoming_events",
|
||||
/*revision_number=*/9, Widget()));
|
||||
/*revision_number=*/10, Widget()));
|
||||
}
|
||||
|
||||
TEST_F(
|
||||
@ -191,7 +191,7 @@ TEST_F(
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"calendar_up_next_multiple_upcoming_events_press_scroll_right_button",
|
||||
/*revision_number=*/8, Widget()));
|
||||
/*revision_number=*/9, Widget()));
|
||||
}
|
||||
|
||||
TEST_F(CalendarUpNextViewPixelTest, ShouldShowJoinMeetingButton) {
|
||||
@ -216,7 +216,7 @@ TEST_F(CalendarUpNextViewPixelTest, ShouldShowJoinMeetingButton) {
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"calendar_up_next_join_button",
|
||||
/*revision_number=*/9, Widget()));
|
||||
/*revision_number=*/10, Widget()));
|
||||
}
|
||||
|
||||
} // namespace ash
|
||||
|
@ -117,7 +117,7 @@ TEST_F(CalendarViewPixelTest, Basics) {
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"calendar_view",
|
||||
/*revision_number=*/11, GetCalendarView()));
|
||||
/*revision_number=*/12, GetCalendarView()));
|
||||
}
|
||||
|
||||
// Tests that the scroll view scrolls up when there are not at least 2 weeks
|
||||
@ -138,7 +138,7 @@ TEST_F(CalendarViewPixelTest, Basics_ShowMoreFutureDates) {
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"calendar_view_more_future_dates",
|
||||
/*revision_number=*/2, GetCalendarView()));
|
||||
/*revision_number=*/3, GetCalendarView()));
|
||||
}
|
||||
|
||||
TEST_F(CalendarViewPixelTest, EventList) {
|
||||
@ -169,7 +169,7 @@ TEST_F(CalendarViewPixelTest, EventList) {
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"event_list_view",
|
||||
/*revision_number=*/12, GetEventListView()));
|
||||
/*revision_number=*/13, GetEventListView()));
|
||||
}
|
||||
|
||||
} // namespace ash
|
||||
|
@ -84,7 +84,7 @@ TEST_F(SystemNudgeViewPixelTest, TextOnly) {
|
||||
std::make_unique<SystemNudgeView>(nudge_data));
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"screenshot", /*revision_number=*/0, GetContentsView()));
|
||||
"screenshot", /*revision_number=*/1, GetContentsView()));
|
||||
}
|
||||
|
||||
TEST_F(SystemNudgeViewPixelTest, TextOnly_LongText) {
|
||||
@ -96,7 +96,7 @@ TEST_F(SystemNudgeViewPixelTest, TextOnly_LongText) {
|
||||
std::make_unique<SystemNudgeView>(nudge_data));
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"screenshot", /*revision_number=*/0, GetContentsView()));
|
||||
"screenshot", /*revision_number=*/1, GetContentsView()));
|
||||
}
|
||||
|
||||
TEST_F(SystemNudgeViewPixelTest, WithButtons) {
|
||||
@ -110,7 +110,7 @@ TEST_F(SystemNudgeViewPixelTest, WithButtons) {
|
||||
std::make_unique<SystemNudgeView>(nudge_data));
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"screenshot", /*revision_number=*/0, GetContentsView()));
|
||||
"screenshot", /*revision_number=*/1, GetContentsView()));
|
||||
}
|
||||
|
||||
TEST_F(SystemNudgeViewPixelTest, TitleAndLeadingImage) {
|
||||
@ -126,7 +126,7 @@ TEST_F(SystemNudgeViewPixelTest, TitleAndLeadingImage) {
|
||||
std::make_unique<SystemNudgeView>(nudge_data));
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"screenshot", /*revision_number=*/0, GetContentsView()));
|
||||
"screenshot", /*revision_number=*/1, GetContentsView()));
|
||||
}
|
||||
|
||||
TEST_F(SystemNudgeViewPixelTest, TitleAndLeadingImageWithButtons) {
|
||||
@ -144,7 +144,7 @@ TEST_F(SystemNudgeViewPixelTest, TitleAndLeadingImageWithButtons) {
|
||||
std::make_unique<SystemNudgeView>(nudge_data));
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"screenshot", /*revision_number=*/0, GetContentsView()));
|
||||
"screenshot", /*revision_number=*/1, GetContentsView()));
|
||||
}
|
||||
|
||||
TEST_F(SystemNudgeViewPixelTest, AnchoredNudgeWithPointyCorner) {
|
||||
@ -160,7 +160,7 @@ TEST_F(SystemNudgeViewPixelTest, AnchoredNudgeWithPointyCorner) {
|
||||
std::make_unique<SystemNudgeView>(nudge_data));
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"screenshot", /*revision_number=*/0, GetContentsView()));
|
||||
"screenshot", /*revision_number=*/1, GetContentsView()));
|
||||
}
|
||||
|
||||
} // namespace ash
|
||||
|
@ -71,7 +71,7 @@ TEST_F(SystemToastViewPixelTest, TextOnly) {
|
||||
GetContentsView()->AddChildView(std::make_unique<SystemToastView>(kTestText));
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"screenshot", /*revision_number=*/5, GetContentsView()));
|
||||
"screenshot", /*revision_number=*/6, GetContentsView()));
|
||||
}
|
||||
|
||||
TEST_F(SystemToastViewPixelTest, WithLeadingIcon) {
|
||||
@ -83,7 +83,7 @@ TEST_F(SystemToastViewPixelTest, WithLeadingIcon) {
|
||||
/*leading_icon=*/kTestIcon));
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"screenshot", /*revision_number=*/6, GetContentsView()));
|
||||
"screenshot", /*revision_number=*/7, GetContentsView()));
|
||||
}
|
||||
|
||||
TEST_F(SystemToastViewPixelTest, WithTextButton) {
|
||||
@ -92,7 +92,7 @@ TEST_F(SystemToastViewPixelTest, WithTextButton) {
|
||||
/*button_text=*/kTestButtonText));
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"screenshot", /*revision_number=*/1, GetContentsView()));
|
||||
"screenshot", /*revision_number=*/2, GetContentsView()));
|
||||
}
|
||||
|
||||
TEST_F(SystemToastViewPixelTest, WithIconButton) {
|
||||
@ -101,7 +101,7 @@ TEST_F(SystemToastViewPixelTest, WithIconButton) {
|
||||
/*button_text=*/kTestButtonText, /*button_icon=*/kTestIcon));
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"screenshot", /*revision_number=*/1, GetContentsView()));
|
||||
"screenshot", /*revision_number=*/2, GetContentsView()));
|
||||
}
|
||||
|
||||
TEST_F(SystemToastViewPixelTest, WithLeadingIconAndTextButton) {
|
||||
@ -113,7 +113,7 @@ TEST_F(SystemToastViewPixelTest, WithLeadingIconAndTextButton) {
|
||||
/*leading_icon=*/kTestIcon));
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"screenshot", /*revision_number=*/1, GetContentsView()));
|
||||
"screenshot", /*revision_number=*/2, GetContentsView()));
|
||||
}
|
||||
|
||||
TEST_F(SystemToastViewPixelTest, Multiline_TextOnly) {
|
||||
@ -121,7 +121,7 @@ TEST_F(SystemToastViewPixelTest, Multiline_TextOnly) {
|
||||
std::make_unique<SystemToastView>(kTestLongText));
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"screenshot", /*revision_number=*/5, GetContentsView()));
|
||||
"screenshot", /*revision_number=*/6, GetContentsView()));
|
||||
}
|
||||
|
||||
TEST_F(SystemToastViewPixelTest, Multiline_WithLeadingIcon) {
|
||||
@ -133,7 +133,7 @@ TEST_F(SystemToastViewPixelTest, Multiline_WithLeadingIcon) {
|
||||
/*leading_icon=*/kTestIcon));
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"screenshot", /*revision_number=*/5, GetContentsView()));
|
||||
"screenshot", /*revision_number=*/6, GetContentsView()));
|
||||
}
|
||||
|
||||
TEST_F(SystemToastViewPixelTest, Multiline_WithTextButton) {
|
||||
@ -142,7 +142,7 @@ TEST_F(SystemToastViewPixelTest, Multiline_WithTextButton) {
|
||||
/*button_text=*/kTestButtonText));
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"screenshot", /*revision_number=*/1, GetContentsView()));
|
||||
"screenshot", /*revision_number=*/2, GetContentsView()));
|
||||
}
|
||||
|
||||
TEST_F(SystemToastViewPixelTest, Multiline_WithLeadingIconAndTextButton) {
|
||||
@ -154,7 +154,7 @@ TEST_F(SystemToastViewPixelTest, Multiline_WithLeadingIconAndTextButton) {
|
||||
/*leading_icon=*/kTestIcon));
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"screenshot", /*revision_number=*/1, GetContentsView()));
|
||||
"screenshot", /*revision_number=*/2, GetContentsView()));
|
||||
}
|
||||
|
||||
} // namespace ash
|
||||
|
@ -42,7 +42,7 @@ TEST_F(DateTrayPixelTest, InactiveDateTrayInBottomAndSideShelfPositions) {
|
||||
// By default `bottom_date_tray` should be inactive.
|
||||
ASSERT_FALSE(bottom_date_tray->is_active());
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"bottom_shelf_inactive_date_tray", /*revision_number=*/0,
|
||||
"bottom_shelf_inactive_date_tray", /*revision_number=*/1,
|
||||
bottom_date_tray));
|
||||
|
||||
// Tests the side shelf.
|
||||
@ -52,7 +52,7 @@ TEST_F(DateTrayPixelTest, InactiveDateTrayInBottomAndSideShelfPositions) {
|
||||
// `side_date_tray` should remain inactive.
|
||||
ASSERT_FALSE(side_date_tray->is_active());
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"side_shelf_inactive_date_tray", /*revision_number=*/0, side_date_tray));
|
||||
"side_shelf_inactive_date_tray", /*revision_number=*/1, side_date_tray));
|
||||
}
|
||||
|
||||
// Tests the active date tray UI for bottom shelf alignment and side shelf
|
||||
@ -68,7 +68,7 @@ TEST_F(DateTrayPixelTest, ActiveDateTrayInBottomAndSideShelfPositions) {
|
||||
bottom_date_tray->SetIsActive(/*is_active=*/true);
|
||||
ASSERT_TRUE(bottom_date_tray->is_active());
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"bottom_shelf_active_date_tray", /*revision_number=*/0,
|
||||
"bottom_shelf_active_date_tray", /*revision_number=*/1,
|
||||
bottom_date_tray));
|
||||
|
||||
// Tests the side shelf.
|
||||
@ -79,7 +79,7 @@ TEST_F(DateTrayPixelTest, ActiveDateTrayInBottomAndSideShelfPositions) {
|
||||
side_date_tray->SetIsActive(/*is_active=*/true);
|
||||
ASSERT_TRUE(side_date_tray->is_active());
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"side_shelf_active_date_tray", /*revision_number=*/0, side_date_tray));
|
||||
"side_shelf_active_date_tray", /*revision_number=*/1, side_date_tray));
|
||||
}
|
||||
|
||||
} // namespace ash
|
||||
|
@ -111,24 +111,24 @@ TEST_F(FeatureTilePixelTest, PrimaryTile) {
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"basic",
|
||||
/*revision_number=*/0, widget_.get()));
|
||||
/*revision_number=*/1, widget_.get()));
|
||||
|
||||
widget_->GetFocusManager()->SetFocusedView(tile);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"focused",
|
||||
/*revision_number=*/0, widget_.get()));
|
||||
/*revision_number=*/1, widget_.get()));
|
||||
|
||||
tile->SetToggled(true);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"toggled",
|
||||
/*revision_number=*/0, widget_.get()));
|
||||
/*revision_number=*/1, widget_.get()));
|
||||
|
||||
// Test eliding.
|
||||
tile->SetLabel(u"A very very long label");
|
||||
tile->SetSubLabel(u"A very very long label");
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"elided",
|
||||
/*revision_number=*/0, widget_.get()));
|
||||
/*revision_number=*/1, widget_.get()));
|
||||
}
|
||||
|
||||
TEST_F(FeatureTilePixelTest, PrimaryTileWithoutDiveInButton) {
|
||||
@ -141,24 +141,24 @@ TEST_F(FeatureTilePixelTest, PrimaryTileWithoutDiveInButton) {
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"basic",
|
||||
/*revision_number=*/0, widget_.get()));
|
||||
/*revision_number=*/1, widget_.get()));
|
||||
|
||||
widget_->GetFocusManager()->SetFocusedView(tile);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"focused",
|
||||
/*revision_number=*/0, widget_.get()));
|
||||
/*revision_number=*/1, widget_.get()));
|
||||
|
||||
tile->SetToggled(true);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"toggled",
|
||||
/*revision_number=*/0, widget_.get()));
|
||||
/*revision_number=*/1, widget_.get()));
|
||||
|
||||
// Test eliding.
|
||||
tile->SetLabel(u"A very very long label");
|
||||
tile->SetSubLabel(u"A very very long label");
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"elided",
|
||||
/*revision_number=*/0, widget_.get()));
|
||||
/*revision_number=*/1, widget_.get()));
|
||||
}
|
||||
|
||||
TEST_F(FeatureTilePixelTest, PrimaryTile_RTL) {
|
||||
@ -178,7 +178,7 @@ TEST_F(FeatureTilePixelTest, PrimaryTile_RTL) {
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"basic",
|
||||
/*revision_number=*/0, widget_.get()));
|
||||
/*revision_number=*/1, widget_.get()));
|
||||
}
|
||||
|
||||
TEST_F(FeatureTilePixelTest, CompactTile) {
|
||||
@ -190,35 +190,35 @@ TEST_F(FeatureTilePixelTest, CompactTile) {
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"basic",
|
||||
/*revision_number=*/1, widget_.get()));
|
||||
/*revision_number=*/2, widget_.get()));
|
||||
|
||||
widget_->GetFocusManager()->SetFocusedView(tile);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"focused",
|
||||
/*revision_number=*/1, widget_.get()));
|
||||
/*revision_number=*/2, widget_.get()));
|
||||
|
||||
tile->SetToggled(true);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"toggled",
|
||||
/*revision_number=*/1, widget_.get()));
|
||||
/*revision_number=*/2, widget_.get()));
|
||||
|
||||
// Test eliding.
|
||||
tile->SetLabel(u"A very very long label");
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"elided",
|
||||
/*revision_number=*/2, widget_.get()));
|
||||
/*revision_number=*/3, widget_.get()));
|
||||
|
||||
// Test font descenders ("g").
|
||||
tile->SetLabel(u"Multi-line ggggg");
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"descenders",
|
||||
/*revision_number=*/0, widget_.get()));
|
||||
/*revision_number=*/1, widget_.get()));
|
||||
|
||||
// Test one-line labels.
|
||||
tile->SetLabel(u"One line");
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"one_line",
|
||||
/*revision_number=*/0, widget_.get()));
|
||||
/*revision_number=*/1, widget_.get()));
|
||||
|
||||
// Test one-line labels with one-line sub-labels.
|
||||
tile->SetLabel(u"One line");
|
||||
@ -226,7 +226,7 @@ TEST_F(FeatureTilePixelTest, CompactTile) {
|
||||
tile->SetSubLabelVisibility(true);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"one_line_with_sub_label",
|
||||
/*revision_number=*/0, widget_.get()));
|
||||
/*revision_number=*/1, widget_.get()));
|
||||
|
||||
// Test eliding with sub-labels.
|
||||
tile->SetLabel(u"A very very long label");
|
||||
@ -234,7 +234,7 @@ TEST_F(FeatureTilePixelTest, CompactTile) {
|
||||
tile->SetSubLabelVisibility(true);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"elided_with_sub_label",
|
||||
/*revision_number=*/0, widget_.get()));
|
||||
/*revision_number=*/1, widget_.get()));
|
||||
}
|
||||
|
||||
class FeatureTileVcDlcUiEnabledPixelTest : public FeatureTilePixelTest {
|
||||
@ -307,21 +307,21 @@ TEST_F(FeatureTileVcDlcUiEnabledPixelTest, CompactTileCanFillContainer) {
|
||||
// Use the default, one-line compact tile that is created during test set-up.
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"basic",
|
||||
/*revision_number=*/1, widget_.get()));
|
||||
/*revision_number=*/2, widget_.get()));
|
||||
|
||||
// Focus the tile (and reset the focus after the screenshot is taken).
|
||||
auto* previous_focused_view = widget_->GetFocusManager()->GetFocusedView();
|
||||
widget_->GetFocusManager()->SetFocusedView(tile());
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"focused",
|
||||
/*revision_number=*/1, widget_.get()));
|
||||
/*revision_number=*/2, widget_.get()));
|
||||
widget_->GetFocusManager()->SetFocusedView(previous_focused_view);
|
||||
|
||||
// Toggle the tile (and reset the toggle state after the screenshot is taken).
|
||||
tile()->SetToggled(true);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"toggled",
|
||||
/*revision_number=*/1, widget_.get()));
|
||||
/*revision_number=*/2, widget_.get()));
|
||||
tile()->SetToggled(false);
|
||||
}
|
||||
|
||||
@ -332,31 +332,31 @@ TEST_F(FeatureTileVcDlcUiEnabledPixelTest, DownloadInProgress) {
|
||||
SetDownloadProgress(tile(), 0);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"0_percent",
|
||||
/*revision_number=*/1, widget_.get()));
|
||||
/*revision_number=*/2, widget_.get()));
|
||||
|
||||
// Set the tile's download to be 1% complete.
|
||||
SetDownloadProgress(tile(), 1);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"1_percent",
|
||||
/*revision_number=*/1, widget_.get()));
|
||||
/*revision_number=*/2, widget_.get()));
|
||||
|
||||
// Set the tile's download to be 50% complete.
|
||||
SetDownloadProgress(tile(), 50);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"50_percent",
|
||||
/*revision_number=*/1, widget_.get()));
|
||||
/*revision_number=*/2, widget_.get()));
|
||||
|
||||
// Set the tile's download to be 99% complete.
|
||||
SetDownloadProgress(tile(), 99);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"99_percent",
|
||||
/*revision_number=*/1, widget_.get()));
|
||||
/*revision_number=*/2, widget_.get()));
|
||||
|
||||
// Set the tile's download to be 100% complete.
|
||||
SetDownloadProgress(tile(), 100);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"100_percent",
|
||||
/*revision_number=*/1, widget_.get()));
|
||||
/*revision_number=*/2, widget_.get()));
|
||||
}
|
||||
|
||||
// Tests the UI of a compact tile that has an error during download.
|
||||
@ -364,7 +364,7 @@ TEST_F(FeatureTileVcDlcUiEnabledPixelTest, ErrorInDlcDownload) {
|
||||
tile()->SetDownloadState(FeatureTile::DownloadState::kError, 0);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"error",
|
||||
/*revision_number=*/1, widget_.get()));
|
||||
/*revision_number=*/2, widget_.get()));
|
||||
}
|
||||
|
||||
// Tests the UI of a compact tile that has a pending download.
|
||||
@ -372,7 +372,7 @@ TEST_F(FeatureTileVcDlcUiEnabledPixelTest, PendingDownload) {
|
||||
tile()->SetDownloadState(FeatureTile::DownloadState::kPending, 0);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"pending",
|
||||
/*revision_number=*/0, widget_.get()));
|
||||
/*revision_number=*/1, widget_.get()));
|
||||
}
|
||||
|
||||
} // namespace ash
|
||||
|
@ -67,7 +67,7 @@ TEST_F(QuickSettingsFooterPixelTest, FooterShouldBeRenderedCorrectly) {
|
||||
InitPowerStatusAndOpenBubble();
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"with_no_extra_button",
|
||||
/*revision_number=*/7, GetFooter()));
|
||||
/*revision_number=*/8, GetFooter()));
|
||||
CloseBubble();
|
||||
|
||||
// Regression test for b/293484037: The settings button is missing when
|
||||
@ -76,7 +76,7 @@ TEST_F(QuickSettingsFooterPixelTest, FooterShouldBeRenderedCorrectly) {
|
||||
InitPowerStatusAndOpenBubble();
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"with_exit_button",
|
||||
/*revision_number=*/7, GetFooter()));
|
||||
/*revision_number=*/8, GetFooter()));
|
||||
CloseBubble();
|
||||
}
|
||||
|
||||
|
@ -17,7 +17,7 @@ using EolNoticeQuickSettingsViewPixelTest =
|
||||
|
||||
TEST_F(EolNoticeQuickSettingsViewPixelTest, Basics) {
|
||||
AddChildView(std::make_unique<EolNoticeQuickSettingsView>());
|
||||
DiffView(/*revision_number=*/0);
|
||||
DiffView(/*revision_number=*/1);
|
||||
}
|
||||
|
||||
} // namespace ash
|
||||
|
@ -17,7 +17,7 @@ using ExtendedUpdatesNoticeQuickSettingsViewPixelTest =
|
||||
|
||||
TEST_F(ExtendedUpdatesNoticeQuickSettingsViewPixelTest, Basics) {
|
||||
AddChildView(std::make_unique<ExtendedUpdatesNoticeQuickSettingsView>());
|
||||
DiffView(/*revision_number=*/1);
|
||||
DiffView(/*revision_number=*/2);
|
||||
}
|
||||
|
||||
} // namespace ash
|
||||
|
@ -234,7 +234,7 @@ TEST_P(BubbleViewPixelTest, Basic) {
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"video_conference_bubble_view_basic",
|
||||
/*revision_number=*/16, bubble_view()));
|
||||
/*revision_number=*/17, bubble_view()));
|
||||
}
|
||||
|
||||
// Pixel test that tests toggled on/off and focused/not focused for the toggle
|
||||
@ -258,14 +258,14 @@ TEST_P(BubbleViewPixelTest, ToggleButton) {
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"video_conference_bubble_view_no_focus_not_toggled",
|
||||
/*revision_number=*/13, toggle_effect_button_container));
|
||||
/*revision_number=*/14, toggle_effect_button_container));
|
||||
|
||||
// Toggle the first button, the UI should change.
|
||||
LeftClickOn(first_toggle_effect_button);
|
||||
ASSERT_EQ(1, office_bunny()->num_activations_for_testing());
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"video_conference_bubble_view_no_focus_toggled",
|
||||
/*revision_number=*/10, toggle_effect_button_container));
|
||||
/*revision_number=*/11, toggle_effect_button_container));
|
||||
|
||||
// Un-toggle the button, then keyboard focus it.
|
||||
LeftClickOn(first_toggle_effect_button);
|
||||
@ -283,7 +283,7 @@ TEST_P(BubbleViewPixelTest, ToggleButton) {
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"video_conference_bubble_view_with_focus_not_toggled",
|
||||
/*revision_number=*/13, toggle_effect_button_container));
|
||||
/*revision_number=*/14, toggle_effect_button_container));
|
||||
|
||||
// Re-toggle the button.
|
||||
event_generator->PressAndReleaseKey(ui::KeyboardCode::VKEY_RETURN);
|
||||
@ -292,7 +292,7 @@ TEST_P(BubbleViewPixelTest, ToggleButton) {
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"video_conference_bubble_view_with_focus_toggled",
|
||||
/*revision_number=*/12, toggle_effect_button_container));
|
||||
/*revision_number=*/13, toggle_effect_button_container));
|
||||
}
|
||||
|
||||
// Pixel test that tests the expanded/collapsed state of the return to app panel
|
||||
@ -313,7 +313,7 @@ TEST_P(BubbleViewPixelTest, ReturnToApp) {
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"video_conference_tray_return_to_app_one_app",
|
||||
/*revision_number=*/8, GetReturnToAppPanel()));
|
||||
/*revision_number=*/9, GetReturnToAppPanel()));
|
||||
|
||||
controller()->AddMediaApp(CreateFakeMediaApp(
|
||||
/*is_capturing_camera=*/false, /*is_capturing_microphone=*/true,
|
||||
@ -329,7 +329,7 @@ TEST_P(BubbleViewPixelTest, ReturnToApp) {
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"video_conference_tray_return_to_app_two_apps_collapsed",
|
||||
/*revision_number=*/8, return_to_app_panel));
|
||||
/*revision_number=*/9, return_to_app_panel));
|
||||
|
||||
// Click the summary row to expand the panel.
|
||||
auto* summary_row = static_cast<video_conference::ReturnToAppButton*>(
|
||||
@ -359,7 +359,7 @@ TEST_P(BubbleViewPixelTest, ReturnToAppLinux) {
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"video_conference_tray_linux_bubble_one_app",
|
||||
/*revision_number=*/9, video_conference_tray()->GetBubbleView()));
|
||||
/*revision_number=*/10, video_conference_tray()->GetBubbleView()));
|
||||
|
||||
controller()->AddMediaApp(CreateFakeMediaApp(
|
||||
/*is_capturing_camera=*/true, /*is_capturing_microphone=*/true,
|
||||
@ -374,7 +374,7 @@ TEST_P(BubbleViewPixelTest, ReturnToAppLinux) {
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"video_conference_tray_linux_bubble_two_app",
|
||||
/*revision_number=*/9, video_conference_tray()->GetBubbleView()));
|
||||
/*revision_number=*/10, video_conference_tray()->GetBubbleView()));
|
||||
}
|
||||
|
||||
TEST_P(BubbleViewPixelTest, OneToggleEffects) {
|
||||
@ -388,7 +388,7 @@ TEST_P(BubbleViewPixelTest, OneToggleEffects) {
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"video_conference_bubble_view_one_toggle_effect",
|
||||
/*revision_number=*/6, GetToggleEffectsView()));
|
||||
/*revision_number=*/7, GetToggleEffectsView()));
|
||||
}
|
||||
|
||||
TEST_P(BubbleViewPixelTest, TwoToggleEffects) {
|
||||
@ -403,7 +403,7 @@ TEST_P(BubbleViewPixelTest, TwoToggleEffects) {
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"video_conference_bubble_view_two_toggle_effects",
|
||||
/*revision_number=*/6, GetToggleEffectsView()));
|
||||
/*revision_number=*/7, GetToggleEffectsView()));
|
||||
}
|
||||
|
||||
TEST_P(BubbleViewPixelTest, ThreeToggleEffects) {
|
||||
@ -423,7 +423,7 @@ TEST_P(BubbleViewPixelTest, ThreeToggleEffects) {
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"video_conference_bubble_view_three_toggle_effects",
|
||||
/*revision_number=*/6, GetToggleEffectsView()));
|
||||
/*revision_number=*/7, GetToggleEffectsView()));
|
||||
}
|
||||
|
||||
TEST_P(BubbleViewPixelTest, DLCUIInErrorShowsWarningLabelSingleError) {
|
||||
@ -443,7 +443,7 @@ TEST_P(BubbleViewPixelTest, DLCUIInErrorShowsWarningLabelSingleError) {
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"one-toggle-effects-view",
|
||||
/*revision_number=*/4, bubble_view()));
|
||||
/*revision_number=*/5, bubble_view()));
|
||||
|
||||
// Add one set-value effect.
|
||||
controller()->GetEffectsManager().RegisterDelegate(shaggy_fur());
|
||||
@ -459,7 +459,7 @@ TEST_P(BubbleViewPixelTest, DLCUIInErrorShowsWarningLabelSingleError) {
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"additional-set-value-view",
|
||||
/*revision_number=*/4, bubble_view()));
|
||||
/*revision_number=*/5, bubble_view()));
|
||||
}
|
||||
|
||||
TEST_P(BubbleViewPixelTest, DLCUIInErrorShowsWarningLabelMaxErrors) {
|
||||
@ -480,7 +480,7 @@ TEST_P(BubbleViewPixelTest, DLCUIInErrorShowsWarningLabelMaxErrors) {
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"one-toggle-effects-view",
|
||||
/*revision_number=*/4, bubble_view()));
|
||||
/*revision_number=*/5, bubble_view()));
|
||||
|
||||
// Add one set-value effect.
|
||||
controller()->GetEffectsManager().RegisterDelegate(shaggy_fur());
|
||||
@ -497,7 +497,7 @@ TEST_P(BubbleViewPixelTest, DLCUIInErrorShowsWarningLabelMaxErrors) {
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"additional-set-value-view",
|
||||
/*revision_number=*/4, bubble_view()));
|
||||
/*revision_number=*/5, bubble_view()));
|
||||
}
|
||||
|
||||
} // namespace ash::video_conference
|
||||
|
@ -77,7 +77,7 @@ TEST_F(TouchSelectionPixelTest, MagnifierOnTextfield) {
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"touch_selection",
|
||||
/*revision_number=*/2, widget.get()));
|
||||
/*revision_number=*/3, widget.get()));
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
@ -98,7 +98,7 @@ TEST_P(HelpBubbleViewAshPixelTest, Appearance) {
|
||||
with_body_icon(), with_buttons(), with_progress());
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"appearance", /*revision_number=*/7, help_bubble_view,
|
||||
"appearance", /*revision_number=*/8, help_bubble_view,
|
||||
help_bubble_view->anchor_widget()));
|
||||
}
|
||||
|
||||
@ -164,7 +164,7 @@ TEST_P(HelpBubbleViewAshArrowPixelTest, Placement) {
|
||||
/*with_buttons=*/true, /*with_progress=*/true);
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"placement", /*revision_number=*/7, help_bubble_view,
|
||||
"placement", /*revision_number=*/8, help_bubble_view,
|
||||
help_bubble_view->anchor_widget()));
|
||||
}
|
||||
|
||||
|
@ -38,7 +38,7 @@ TEST_F(WelcomeTourDialogPixelTest, Appearance) {
|
||||
// Take a screenshot of the Welcome Tour dialog.
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"welcome_tour_dialog",
|
||||
/*revision_number=*/3, WelcomeTourDialog::Get()));
|
||||
/*revision_number=*/4, WelcomeTourDialog::Get()));
|
||||
}
|
||||
|
||||
} // namespace ash
|
||||
|
@ -138,7 +138,7 @@ TEST_F(SnapGroupPixelTest, OverviewGroupItem) {
|
||||
// Verify the `OverviewGroupItem` visuals.
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"overviewgroupitem",
|
||||
/*revision_number=*/2, group_item_widget));
|
||||
/*revision_number=*/3, group_item_widget));
|
||||
|
||||
// Verify the visuals after one of the windows in the group got destroyed.
|
||||
w2.reset();
|
||||
@ -148,7 +148,7 @@ TEST_F(SnapGroupPixelTest, OverviewGroupItem) {
|
||||
ASSERT_TRUE(item_after_destruction);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"remaining_item_widget",
|
||||
/*revision_number=*/2, remaining_item_widget));
|
||||
/*revision_number=*/3, remaining_item_widget));
|
||||
}
|
||||
|
||||
// Visual regression test for Snap Group in window cycle view.
|
||||
@ -186,13 +186,13 @@ TEST_F(SnapGroupPixelTest, WindowCycleView) {
|
||||
// Verify the visuals with secondary-snapped window gets focused.
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"window_cycle_with_snap_group_secondary_focused",
|
||||
/*revision_number=*/2, window_cycle_widget));
|
||||
/*revision_number=*/3, window_cycle_widget));
|
||||
|
||||
// Verify the visuals with primary-snapped window gets focused.
|
||||
event_generator->PressAndReleaseKey(ui::VKEY_TAB, ui::EF_ALT_DOWN);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"window_cycle_with_snap_group_primary_focused",
|
||||
/*revision_number=*/2, window_cycle_widget));
|
||||
/*revision_number=*/3, window_cycle_widget));
|
||||
|
||||
// Verify the visuals after one of the windows in the group got destroyed
|
||||
// while stepping.
|
||||
@ -208,7 +208,7 @@ TEST_F(SnapGroupPixelTest, WindowCycleView) {
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"window_cycle_with_snap_group_window_destruction",
|
||||
/*revision_number=*/2, updated_window_cycle_widget));
|
||||
/*revision_number=*/3, updated_window_cycle_widget));
|
||||
}
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
@ -278,7 +278,7 @@ TEST_F(SnapGroupPixelTest, OverviewGroupItemInPortrait) {
|
||||
// Verify the `OverviewGroupItem` visuals in portrait.
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"overviewgroupitem_in_portrait",
|
||||
/*revision_number=*/2, group_item_widget));
|
||||
/*revision_number=*/3, group_item_widget));
|
||||
}
|
||||
|
||||
// Portrait mode visual regression test for Snap Group visuals in window cycle
|
||||
@ -319,13 +319,13 @@ TEST_F(SnapGroupPixelTest, WindowCycleViewInPortrait) {
|
||||
// Verify the visuals with secondary-snapped window gets focused.
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"window_cycle_with_snap_group_secondary_focused_in_portrait",
|
||||
/*revision_number=*/2, window_cycle_widget));
|
||||
/*revision_number=*/3, window_cycle_widget));
|
||||
|
||||
// Verify the visuals with primary-snapped window gets focused.
|
||||
event_generator->PressAndReleaseKey(ui::VKEY_TAB, ui::EF_ALT_DOWN);
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"window_cycle_with_snap_group_primary_focused_in_portrait",
|
||||
/*revision_number=*/2, window_cycle_widget));
|
||||
/*revision_number=*/3, window_cycle_widget));
|
||||
}
|
||||
|
||||
} // namespace ash
|
||||
|
@ -68,7 +68,7 @@ TEST_F(CoralPixelDiffTest, CoralSelectorView) {
|
||||
|
||||
TabAppSelectionHost* menu = ShowAndGetSelectorMenu(GetEventGenerator());
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"coral_selector_view", /*revision_number=*/5, menu));
|
||||
"coral_selector_view", /*revision_number=*/6, menu));
|
||||
}
|
||||
|
||||
} // namespace ash
|
||||
|
@ -86,7 +86,7 @@ TEST_F(WmPixelDiffTest, OverviewAndDesksBarBasic) {
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"overview_and_desks_bar_basic",
|
||||
/*revision_number=*/17, desk_widget, overview_widget1, overview_widget2,
|
||||
/*revision_number=*/18, desk_widget, overview_widget1, overview_widget2,
|
||||
overview_widget3));
|
||||
}
|
||||
|
||||
@ -165,7 +165,7 @@ TEST_F(WmPixelDiffTest, WindowCycleBasic) {
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"window_cycle_basic",
|
||||
/*revision_number=*/23, widget));
|
||||
/*revision_number=*/24, widget));
|
||||
}
|
||||
|
||||
TEST_F(WmPixelDiffTest, InformedRestoreNoScreenshotDialog) {
|
||||
@ -201,7 +201,7 @@ TEST_F(WmPixelDiffTest, InformedRestoreNoScreenshotDialog) {
|
||||
|
||||
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
|
||||
"informed_restore_no_screenshot",
|
||||
/*revision_number=*/1, widget));
|
||||
/*revision_number=*/2, widget));
|
||||
}
|
||||
|
||||
} // namespace ash
|
||||
|
@ -295,7 +295,7 @@ AX_TEST_F(
|
||||
.expectSpeech('Size 20')
|
||||
.expectSpeech('Red, 100% opacity.')
|
||||
.expectSpeech('Bold')
|
||||
.expectSpeech('Font Tinos')
|
||||
.expectSpeech('Font Tinos (Fontations)')
|
||||
.expectBraille(lineText, {startIndex: 1, endIndex: 1})
|
||||
.call(moveByChar)
|
||||
.expectSpeech('v')
|
||||
@ -337,7 +337,7 @@ AX_TEST_F(
|
||||
.call(moveByChar)
|
||||
.expectSpeech('t')
|
||||
.expectSpeech('Underline')
|
||||
.expectSpeech('Font Gelasio')
|
||||
.expectSpeech('Font Gelasio (Fontations)')
|
||||
.expectBraille(lineText, {startIndex: 13, endIndex: 13})
|
||||
.call(moveByChar)
|
||||
.expectSpeech('e')
|
||||
@ -351,7 +351,7 @@ AX_TEST_F(
|
||||
.call(moveByChar)
|
||||
.expectSpeech(' ')
|
||||
.expectSpeech('Not underline')
|
||||
.expectSpeech('Font Tinos')
|
||||
.expectSpeech('Font Tinos (Fontations)')
|
||||
.expectBraille(lineText, {startIndex: 17, endIndex: 17})
|
||||
.call(moveByChar)
|
||||
.expectSpeech('b')
|
||||
|
Before ![]() (image error) Size: 5.0 KiB After ![]() (image error) Size: 5.0 KiB ![]() ![]() |
Before ![]() (image error) Size: 3.5 KiB After ![]() (image error) Size: 3.6 KiB ![]() ![]() |
@ -15,6 +15,16 @@
|
||||
#include "third_party/blink/public/common/web_preferences/web_preferences.h"
|
||||
|
||||
namespace content {
|
||||
namespace {
|
||||
std::string_view MaybeStripFontationsSuffix(const std::string& font_name) {
|
||||
std::string_view view = font_name;
|
||||
std::size_t pos = view.rfind(" (Fontations)");
|
||||
if (pos != std::string_view::npos) {
|
||||
view.remove_suffix(view.size() - pos);
|
||||
}
|
||||
return view;
|
||||
}
|
||||
} // namespace
|
||||
|
||||
class FontPreferencesBrowserTest : public DevToolsProtocolTest {
|
||||
public:
|
||||
@ -98,14 +108,16 @@ class FontPreferencesBrowserTest : public DevToolsProtocolTest {
|
||||
// Verify that by default, the non-default system font above is not used.
|
||||
web_contents->SetWebPreferences(default_preferences);
|
||||
EXPECT_TRUE(ExecJs(web_contents, "document.body.offsetTop"));
|
||||
EXPECT_NE(GetFirstPlatformFontForBody(), non_default_system_font);
|
||||
EXPECT_NE(MaybeStripFontationsSuffix(GetFirstPlatformFontForBody()),
|
||||
non_default_system_font);
|
||||
|
||||
// Set the preference to that non-default system font and try again.
|
||||
default_preferences_font_family_map[blink::web_pref::kCommonScript] =
|
||||
base::ASCIIToUTF16(non_default_system_font);
|
||||
web_contents->SetWebPreferences(default_preferences);
|
||||
EXPECT_TRUE(ExecJs(web_contents, "document.body.offsetTop"));
|
||||
EXPECT_EQ(GetFirstPlatformFontForBody(), non_default_system_font);
|
||||
EXPECT_EQ(MaybeStripFontationsSuffix(GetFirstPlatformFontForBody()),
|
||||
non_default_system_font);
|
||||
|
||||
// Restore the preference to its default value.
|
||||
default_preferences_font_family_map[blink::web_pref::kCommonScript] =
|
||||
|
@ -1,5 +1,5 @@
|
||||
[document web] offset=0 family-name=Tinos
|
||||
++[landmark] offset=0 family-name=Cousine offset=1 family-name=Arimo
|
||||
++++[paragraph] offset=0 family-name=Cousine
|
||||
[document web] offset=0 family-name=Tinos (Fontations)
|
||||
++[landmark] offset=0 family-name=Cousine (Fontations) offset=1 family-name=Arimo (Fontations)
|
||||
++++[paragraph] offset=0 family-name=Cousine (Fontations)
|
||||
++++++[static] name='Monospace'
|
||||
++++[static] name='Sans serif'
|
||||
|
@ -1,5 +1,5 @@
|
||||
rootWebArea fontFamily='Tinos' fontSize=16.00 fontWeight=400.00
|
||||
++genericContainer ignored fontFamily='Tinos'
|
||||
++++genericContainer fontFamily='Tinos' fontSize=16.00 fontWeight=400.00
|
||||
++++++svgRoot fontFamily='Tinos' fontSize=16.00 fontWeight=400.00
|
||||
++++++++graphicsSymbol fontFamily='Cousine' name='xyz' fontSize=99.00 fontWeight=900.00
|
||||
rootWebArea fontFamily='Tinos (Fontations)' fontSize=16.00 fontWeight=400.00
|
||||
++genericContainer ignored fontFamily='Tinos (Fontations)'
|
||||
++++genericContainer fontFamily='Tinos (Fontations)' fontSize=16.00 fontWeight=400.00
|
||||
++++++svgRoot fontFamily='Tinos (Fontations)' fontSize=16.00 fontWeight=400.00
|
||||
++++++++graphicsSymbol fontFamily='Cousine (Fontations)' name='xyz' fontSize=99.00 fontWeight=900.00
|
||||
|
Before ![]() (image error) Size: 6.3 KiB After ![]() (image error) Size: 6.3 KiB ![]() ![]() |
Before ![]() (image error) Size: 7.8 KiB After ![]() (image error) Size: 6.8 KiB ![]() ![]() |
Before ![]() (image error) Size: 3.6 KiB After ![]() (image error) Size: 3.5 KiB ![]() ![]() |
Before ![]() (image error) Size: 4.2 KiB After ![]() (image error) Size: 3.7 KiB ![]() ![]() |
Before ![]() (image error) Size: 4.6 KiB After ![]() (image error) Size: 4.7 KiB ![]() ![]() |
Before ![]() (image error) Size: 5.2 KiB After ![]() (image error) Size: 5.3 KiB ![]() ![]() |
@ -9,6 +9,6 @@ namespace skia {
|
||||
// SkFontMgr instantiation in skia/ext/font_utils.cc
|
||||
BASE_FEATURE(kFontationsLinuxSystemFonts,
|
||||
"FontationsLinuxSystemFonts",
|
||||
base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
|
||||
} // namespace skia
|
||||
|
6
third_party/blink/web_tests/TestExpectations
vendored
@ -8800,6 +8800,12 @@ crbug.com/339041663 external/wpt/mediacapture-insertable-streams/legacy/MediaStr
|
||||
crbug.com/339041663 external/wpt/mediacapture-insertable-streams/tentative/VideoTrackGenerator.https.html [ Crash Failure Timeout ]
|
||||
# failure from enabling swiftshader on headless shell, combined with a preexisting flaky Crash/Timeout
|
||||
crbug.com/626703 crbug.com/339041663 external/wpt/css/css-grid/subgrid/scrollbar-gutter-002.html [ Crash Failure Pass Timeout ]
|
||||
# More tests that exhibit antialiasing differences only on headless shell, not on content_shell, when run under Fontations
|
||||
crbug.com/397880053 external/wpt/css/css-multicol/multicol-height-002-print.xht [ Failure ]
|
||||
crbug.com/397880053 external/wpt/css/css-page/margin-boxes/auto-margins-001-print.html [ Failure ]
|
||||
crbug.com/397880053 external/wpt/css/css-page/margin-boxes/auto-margins-002-print.html [ Failure ]
|
||||
crbug.com/397880053 external/wpt/css/css-page/page-box-009-print.html [ Failure ]
|
||||
crbug.com/397880053 external/wpt/css/css-page/page-size-010-print.html [ Failure ]
|
||||
|
||||
# Gardener 2024-10-31
|
||||
crbug.com/376589790 [ Win11-arm64 ] fast/js/toString-stack-overflow.html [ Failure Pass ]
|
||||
|
@ -951,10 +951,29 @@ external/wpt/workers/postMessage_block.https.html
|
||||
|
||||
# Tests that exhibit antialiasing differences only on headless shell, not on
|
||||
# content_shell, when run under Fontations. See crbug.com/397880053.
|
||||
external/wpt/css/css-break/grid/monolithic-overflow-print.html
|
||||
external/wpt/css/css-break/transform-024-print.html
|
||||
external/wpt/css/css-grid/grid-fragmentation-between-rows-001-print.tentative.html
|
||||
external/wpt/css/css-multicol/multicol-height-002-print.xht
|
||||
external/wpt/css/css-page/fixedpos-009-print.html
|
||||
external/wpt/css/css-page/margin-boxes/auto-margins-001-print.html
|
||||
external/wpt/css/css-page/margin-boxes/auto-margins-002-print.html
|
||||
external/wpt/css/css-page/margin-boxes/auto-margins-003-print.html
|
||||
external/wpt/css/css-page/margin-boxes/content-002-print.html
|
||||
external/wpt/css/css-page/margin-boxes/dimensions-015-print.tentative.html
|
||||
external/wpt/css/css-page/margin-boxes/overconstrained-001-print.html
|
||||
external/wpt/css/css-page/monolithic-overflow-023-print.html
|
||||
external/wpt/css/css-page/monolithic-overflow-028-print.html
|
||||
external/wpt/css/css-page/page-background-001-print.html
|
||||
external/wpt/css/css-page/page-box-003-print.html
|
||||
external/wpt/css/css-page/page-box-007-print.html
|
||||
external/wpt/css/css-page/page-box-008-print.html
|
||||
external/wpt/css/css-page/page-box-009-print.html
|
||||
external/wpt/css/css-page/page-box-011-print.html
|
||||
external/wpt/css/css-page/page-margin-006-print.html
|
||||
external/wpt/css/css-page/page-margin-007-print.html
|
||||
external/wpt/css/css-page/page-size-010-print.html
|
||||
external/wpt/css/printing/pseudo-animations-print.html
|
||||
|
||||
virtual/atomic-move-range-preservation/external/wpt/dom/nodes/moveBefore/tentative/selection-preserve.html
|
||||
virtual/backface-visibility-interop/external/wpt/css/css-transforms/backface-visibility-001.html
|
||||
|
Before ![]() (image error) Size: 86 KiB |
Before ![]() (image error) Size: 108 KiB |
Before ![]() (image error) Size: 87 KiB |
BIN
third_party/blink/web_tests/flag-specific/highdpi/animations/3d/matrix-transform-type-animation-expected.png
vendored
Before ![]() (image error) Size: 14 KiB After ![]() (image error) Size: 14 KiB ![]() ![]() |
BIN
third_party/blink/web_tests/flag-specific/highdpi/animations/state-at-end-event-expected.png
vendored
Before ![]() (image error) Size: 10 KiB After ![]() (image error) Size: 9.9 KiB ![]() ![]() |
BIN
third_party/blink/web_tests/flag-specific/highdpi/compositing/compositing-visible-descendant-expected.png
vendored
Before ![]() (image error) Size: 9.8 KiB After ![]() (image error) Size: 9.5 KiB ![]() ![]() |
BIN
third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/fixed-position-expected.png
vendored
Before ![]() (image error) Size: 11 KiB After ![]() (image error) Size: 11 KiB ![]() ![]() |
BIN
third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/video-fixed-scrolling-expected.png
vendored
Before ![]() (image error) Size: 78 KiB After ![]() (image error) Size: 77 KiB ![]() ![]() |
BIN
third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/video-opacity-overlay-expected.png
vendored
Before ![]() (image error) Size: 78 KiB After ![]() (image error) Size: 78 KiB ![]() ![]() |
Before ![]() (image error) Size: 15 KiB After ![]() (image error) Size: 14 KiB ![]() ![]() |
BIN
third_party/blink/web_tests/flag-specific/highdpi/compositing/gestures/gesture-tapHighlight-skew-matrix-expected.png
vendored
Before ![]() (image error) Size: 11 KiB After ![]() (image error) Size: 10 KiB ![]() ![]() |
BIN
third_party/blink/web_tests/flag-specific/highdpi/compositing/self-painting-layers-expected.png
vendored
Before ![]() (image error) Size: 53 KiB After ![]() (image error) Size: 53 KiB ![]() ![]() |
BIN
third_party/blink/web_tests/flag-specific/highdpi/compositing/text-on-scaled-surface-expected.png
vendored
Before ![]() (image error) Size: 15 KiB After ![]() (image error) Size: 15 KiB ![]() ![]() |
BIN
third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border-expected.png
vendored
Before ![]() (image error) Size: 183 KiB After ![]() (image error) Size: 178 KiB ![]() ![]() |
BIN
third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_color_inline-expected.png
vendored
Before ![]() (image error) Size: 110 KiB After ![]() (image error) Size: 107 KiB ![]() ![]() |
BIN
third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_style_inline-expected.png
vendored
Before ![]() (image error) Size: 100 KiB After ![]() (image error) Size: 98 KiB ![]() ![]() |
BIN
third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/clear-expected.png
vendored
Before ![]() (image error) Size: 118 KiB After ![]() (image error) Size: 114 KiB ![]() ![]() |
BIN
third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/float-expected.png
vendored
Before ![]() (image error) Size: 117 KiB After ![]() (image error) Size: 114 KiB ![]() ![]() |
BIN
third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/float_on_text_elements-expected.png
vendored
Before ![]() (image error) Size: 182 KiB After ![]() (image error) Size: 176 KiB ![]() ![]() |
BIN
third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/margin-expected.png
vendored
Before ![]() (image error) Size: 123 KiB After ![]() (image error) Size: 118 KiB ![]() ![]() |
BIN
third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/padding_inline-expected.png
vendored
Before ![]() (image error) Size: 176 KiB After ![]() (image error) Size: 172 KiB ![]() ![]() |
BIN
third_party/blink/web_tests/flag-specific/highdpi/css1/cascade/cascade_order-expected.png
vendored
Before ![]() (image error) Size: 160 KiB After ![]() (image error) Size: 156 KiB ![]() ![]() |
BIN
third_party/blink/web_tests/flag-specific/highdpi/css1/classification/display-expected.png
vendored
Before ![]() (image error) Size: 202 KiB After ![]() (image error) Size: 196 KiB ![]() ![]() |
BIN
third_party/blink/web_tests/flag-specific/highdpi/css1/classification/list_style_image-expected.png
vendored
Before ![]() (image error) Size: 90 KiB After ![]() (image error) Size: 88 KiB ![]() ![]() |
BIN
third_party/blink/web_tests/flag-specific/highdpi/css1/color_and_background/background-expected.png
vendored
Before ![]() (image error) Size: 129 KiB After ![]() (image error) Size: 126 KiB ![]() ![]() |
BIN
third_party/blink/web_tests/flag-specific/highdpi/css1/color_and_background/color-expected.png
vendored
Before ![]() (image error) Size: 61 KiB After ![]() (image error) Size: 59 KiB ![]() ![]() |
BIN
third_party/blink/web_tests/flag-specific/highdpi/css1/font_properties/font-expected.png
vendored
Before ![]() (image error) Size: 229 KiB After ![]() (image error) Size: 227 KiB ![]() ![]() |
BIN
third_party/blink/web_tests/flag-specific/highdpi/css1/formatting_model/horizontal_formatting-expected.png
vendored
Before ![]() (image error) Size: 159 KiB After ![]() (image error) Size: 155 KiB ![]() ![]() |