Commit 27568230 authored by Victor Costan's avatar Victor Costan Committed by Commit Bot

test: Replace _TEST_CASE_ with _TEST_SUITE_ in /ui/ozone/platform/wayland.

Googletest is (at last) converging with industry-standard terminology
[1]. We previously called test suites "test cases", which was rather
confusing for folks coming from any other testing framework.

Chrome now has a googltest version that supports _TEST_SUITE_ macros
instead of _TEST_CASE_, so this CL cleans up some of the outdated usage.

[1] https://github.com/google/googletest/blob/master/googletest/docs/primer.md#beware-of-the-nomenclature

This CL was uploaded by git cl split.

R=tonikitoo@igalia.com

Bug: 925652
Change-Id: I700e98ab09e7f15d3aaded10bf66c1ae309a0605
Reviewed-on: https://chromium-review.googlesource.com/c/1438258
Commit-Queue: Maksim Sisov <msisov@igalia.com>
Reviewed-by: default avatarMaksim Sisov <msisov@igalia.com>
Cr-Commit-Position: refs/heads/master@{#626410}
parent 103d5c52
...@@ -192,12 +192,12 @@ TEST_P(WaylandDataDeviceManagerTest, ReceiveDrag) { ...@@ -192,12 +192,12 @@ TEST_P(WaylandDataDeviceManagerTest, ReceiveDrag) {
data_device_manager_->data_device()->OnLeave(); data_device_manager_->data_device()->OnLeave();
} }
INSTANTIATE_TEST_CASE_P(XdgVersionV5Test, INSTANTIATE_TEST_SUITE_P(XdgVersionV5Test,
WaylandDataDeviceManagerTest, WaylandDataDeviceManagerTest,
::testing::Values(kXdgShellV5)); ::testing::Values(kXdgShellV5));
INSTANTIATE_TEST_CASE_P(XdgVersionV6Test, INSTANTIATE_TEST_SUITE_P(XdgVersionV6Test,
WaylandDataDeviceManagerTest, WaylandDataDeviceManagerTest,
::testing::Values(kXdgShellV6)); ::testing::Values(kXdgShellV6));
} // namespace ui } // namespace ui
...@@ -130,11 +130,11 @@ TEST_P(WaylandInputMethodContextTest, OnCommit) { ...@@ -130,11 +130,11 @@ TEST_P(WaylandInputMethodContextTest, OnCommit) {
EXPECT_TRUE(input_method_context_delegate_->was_on_commit_called()); EXPECT_TRUE(input_method_context_delegate_->was_on_commit_called());
} }
INSTANTIATE_TEST_CASE_P(XdgVersionV5Test, INSTANTIATE_TEST_SUITE_P(XdgVersionV5Test,
WaylandInputMethodContextTest, WaylandInputMethodContextTest,
::testing::Values(kXdgShellV5)); ::testing::Values(kXdgShellV5));
INSTANTIATE_TEST_CASE_P(XdgVersionV6Test, INSTANTIATE_TEST_SUITE_P(XdgVersionV6Test,
WaylandInputMethodContextTest, WaylandInputMethodContextTest,
::testing::Values(kXdgShellV6)); ::testing::Values(kXdgShellV6));
} // namespace ui } // namespace ui
...@@ -468,11 +468,11 @@ TEST_P(WaylandKeyboardTest, NoEventAutoRepeatBeforeTimeout) { ...@@ -468,11 +468,11 @@ TEST_P(WaylandKeyboardTest, NoEventAutoRepeatBeforeTimeout) {
EXPECT_EQ(ET_KEY_RELEASED, key_event2->type()); EXPECT_EQ(ET_KEY_RELEASED, key_event2->type());
} }
INSTANTIATE_TEST_CASE_P(XdgVersionV5Test, INSTANTIATE_TEST_SUITE_P(XdgVersionV5Test,
WaylandKeyboardTest, WaylandKeyboardTest,
::testing::Values(kXdgShellV5)); ::testing::Values(kXdgShellV5));
INSTANTIATE_TEST_CASE_P(XdgVersionV6Test, INSTANTIATE_TEST_SUITE_P(XdgVersionV6Test,
WaylandKeyboardTest, WaylandKeyboardTest,
::testing::Values(kXdgShellV6)); ::testing::Values(kXdgShellV6));
} // namespace ui } // namespace ui
...@@ -290,11 +290,11 @@ TEST_P(WaylandPointerTest, AxisHorizontal) { ...@@ -290,11 +290,11 @@ TEST_P(WaylandPointerTest, AxisHorizontal) {
EXPECT_EQ(gfx::PointF(50, 75), mouse_wheel_event->root_location_f()); EXPECT_EQ(gfx::PointF(50, 75), mouse_wheel_event->root_location_f());
} }
INSTANTIATE_TEST_CASE_P(XdgVersionV5Test, INSTANTIATE_TEST_SUITE_P(XdgVersionV5Test,
WaylandPointerTest, WaylandPointerTest,
::testing::Values(kXdgShellV5)); ::testing::Values(kXdgShellV5));
INSTANTIATE_TEST_CASE_P(XdgVersionV6Test, INSTANTIATE_TEST_SUITE_P(XdgVersionV6Test,
WaylandPointerTest, WaylandPointerTest,
::testing::Values(kXdgShellV6)); ::testing::Values(kXdgShellV6));
} // namespace ui } // namespace ui
...@@ -281,11 +281,11 @@ TEST_P(WaylandScreenTest, GetAcceleratedWidgetAtScreenPoint) { ...@@ -281,11 +281,11 @@ TEST_P(WaylandScreenTest, GetAcceleratedWidgetAtScreenPoint) {
window_->set_pointer_focus(false); window_->set_pointer_focus(false);
} }
INSTANTIATE_TEST_CASE_P(XdgVersionV5Test, INSTANTIATE_TEST_SUITE_P(XdgVersionV5Test,
WaylandScreenTest, WaylandScreenTest,
::testing::Values(kXdgShellV5)); ::testing::Values(kXdgShellV5));
INSTANTIATE_TEST_CASE_P(XdgVersionV6Test, INSTANTIATE_TEST_SUITE_P(XdgVersionV6Test,
WaylandScreenTest, WaylandScreenTest,
::testing::Values(kXdgShellV6)); ::testing::Values(kXdgShellV6));
} // namespace ui } // namespace ui
...@@ -80,11 +80,11 @@ TEST_P(WaylandSurfaceFactoryTest, CanvasResize) { ...@@ -80,11 +80,11 @@ TEST_P(WaylandSurfaceFactoryTest, CanvasResize) {
EXPECT_EQ(wl_shm_buffer_get_height(buffer), 50); EXPECT_EQ(wl_shm_buffer_get_height(buffer), 50);
} }
INSTANTIATE_TEST_CASE_P(XdgVersionV5Test, INSTANTIATE_TEST_SUITE_P(XdgVersionV5Test,
WaylandSurfaceFactoryTest, WaylandSurfaceFactoryTest,
::testing::Values(kXdgShellV5)); ::testing::Values(kXdgShellV5));
INSTANTIATE_TEST_CASE_P(XdgVersionV6Test, INSTANTIATE_TEST_SUITE_P(XdgVersionV6Test,
WaylandSurfaceFactoryTest, WaylandSurfaceFactoryTest,
::testing::Values(kXdgShellV6)); ::testing::Values(kXdgShellV6));
} // namespace ui } // namespace ui
...@@ -79,11 +79,11 @@ TEST_P(WaylandTouchTest, KeypressAndMotion) { ...@@ -79,11 +79,11 @@ TEST_P(WaylandTouchTest, KeypressAndMotion) {
CheckEventType(ui::ET_TOUCH_RELEASED, event.get()); CheckEventType(ui::ET_TOUCH_RELEASED, event.get());
} }
INSTANTIATE_TEST_CASE_P(XdgVersionV5Test, INSTANTIATE_TEST_SUITE_P(XdgVersionV5Test,
WaylandTouchTest, WaylandTouchTest,
::testing::Values(kXdgShellV5)); ::testing::Values(kXdgShellV5));
INSTANTIATE_TEST_CASE_P(XdgVersionV6Test, INSTANTIATE_TEST_SUITE_P(XdgVersionV6Test,
WaylandTouchTest, WaylandTouchTest,
::testing::Values(kXdgShellV6)); ::testing::Values(kXdgShellV6));
} // namespace ui } // namespace ui
...@@ -723,11 +723,11 @@ TEST_P(WaylandWindowTest, DispatchWindowResize) { ...@@ -723,11 +723,11 @@ TEST_P(WaylandWindowTest, DispatchWindowResize) {
} }
} }
INSTANTIATE_TEST_CASE_P(XdgVersionV5Test, INSTANTIATE_TEST_SUITE_P(XdgVersionV5Test,
WaylandWindowTest, WaylandWindowTest,
::testing::Values(kXdgShellV5)); ::testing::Values(kXdgShellV5));
INSTANTIATE_TEST_CASE_P(XdgVersionV6Test, INSTANTIATE_TEST_SUITE_P(XdgVersionV6Test,
WaylandWindowTest, WaylandWindowTest,
::testing::Values(kXdgShellV6)); ::testing::Values(kXdgShellV6));
} // namespace ui } // namespace ui
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment