ozone: Map TouchEvent::touch_id_ into expected range

ui/events/ozone/evdev/touch_event_converter_evdev_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <errno.h>
 #include <fcntl.h>
 #include <linux/input.h>
 #include <unistd.h>
 
 #include <vector>
@@ skipping 238 matching lines @@
   dev->ConfigureReadMock(mock_kernel_queue_press,
                          arraysize(mock_kernel_queue_press), 0);
   dev->ReadNow();
   EXPECT_EQ(1u, size());
   ui::TouchEventParams event = dispatched_event(0);
   EXPECT_EQ(ui::ET_TOUCH_PRESSED, event.type);
   EXPECT_EQ(base::TimeDelta::FromMicroseconds(1427323282019203),
             event.timestamp);
   EXPECT_EQ(295, event.location.x());
   EXPECT_EQ(421, event.location.y());
-  EXPECT_EQ(0, event.touch_id);
+  EXPECT_EQ(0, event.slot);
   EXPECT_FLOAT_EQ(58.f, event.radii.x());
   EXPECT_FLOAT_EQ(0.13333334f, event.pressure);
 
   // Move.
   dev->ConfigureReadMock(mock_kernel_queue_move,
                          arraysize(mock_kernel_queue_move), 0);
   dev->ReadNow();
   EXPECT_EQ(2u, size());
   event = dispatched_event(1);
   EXPECT_EQ(ui::ET_TOUCH_MOVED, event.type);
   EXPECT_EQ(base::TimeDelta::FromMicroseconds(1427323282034693),
             event.timestamp);
   EXPECT_EQ(312, event.location.x());
   EXPECT_EQ(432, event.location.y());
-  EXPECT_EQ(0, event.touch_id);
+  EXPECT_EQ(0, event.slot);
   EXPECT_FLOAT_EQ(50.f, event.radii.x());
   EXPECT_FLOAT_EQ(0.16862745f, event.pressure);
 
   // Release.
   dev->ConfigureReadMock(mock_kernel_queue_release,
                          arraysize(mock_kernel_queue_release), 0);
   dev->ReadNow();
   EXPECT_EQ(3u, size());
   event = dispatched_event(2);
   EXPECT_EQ(ui::ET_TOUCH_RELEASED, event.type);
   EXPECT_EQ(base::TimeDelta::FromMicroseconds(1427323282144540),
             event.timestamp);
   EXPECT_EQ(312, event.location.x());
   EXPECT_EQ(432, event.location.y());
-  EXPECT_EQ(0, event.touch_id);
+  EXPECT_EQ(0, event.slot);
   EXPECT_FLOAT_EQ(50.f, event.radii.x());
   EXPECT_FLOAT_EQ(0.16862745f, event.pressure);
 }
 
 TEST_F(TouchEventConverterEvdevTest, TwoFingerGesture) {
   ui::MockTouchEventConverterEvdev* dev = device();
 
   InitPixelTouchscreen(dev);
 
   struct input_event mock_kernel_queue_press0[] = {
@@ skipping 29 matching lines @@
   dev->ReadNow();
   EXPECT_EQ(4u, size());
   ui::TouchEventParams ev0 = dispatched_event(2);
   ui::TouchEventParams ev1 = dispatched_event(3);
 
   // Move
   EXPECT_EQ(ui::ET_TOUCH_MOVED, ev0.type);
   EXPECT_EQ(base::TimeDelta::FromMicroseconds(0), ev0.timestamp);
   EXPECT_EQ(40, ev0.location.x());
   EXPECT_EQ(51, ev0.location.y());
-  EXPECT_EQ(0, ev0.touch_id);
+  EXPECT_EQ(0, ev0.slot);
   EXPECT_FLOAT_EQ(0.17647059f, ev0.pressure);
 
   // Press
   EXPECT_EQ(ui::ET_TOUCH_PRESSED, ev1.type);
   EXPECT_EQ(base::TimeDelta::FromMicroseconds(0), ev1.timestamp);
   EXPECT_EQ(101, ev1.location.x());
   EXPECT_EQ(102, ev1.location.y());
-  EXPECT_EQ(1, ev1.touch_id);
+  EXPECT_EQ(1, ev1.slot);
   EXPECT_FLOAT_EQ(0.17647059f, ev1.pressure);
 
   // Stationary 0, Moves 1.
   struct input_event mock_kernel_queue_stationary0_move1[] = {
     {{0, 0}, EV_ABS, ABS_MT_POSITION_X, 40}, {{0, 0}, EV_SYN, SYN_REPORT, 0}
   };
   dev->ConfigureReadMock(mock_kernel_queue_stationary0_move1, 2, 0);
   dev->ReadNow();
   EXPECT_EQ(5u, size());
   ev1 = dispatched_event(4);
 
   EXPECT_EQ(ui::ET_TOUCH_MOVED, ev1.type);
   EXPECT_EQ(base::TimeDelta::FromMicroseconds(0), ev1.timestamp);
   EXPECT_EQ(40, ev1.location.x());
   EXPECT_EQ(102, ev1.location.y());
-  EXPECT_EQ(1, ev1.touch_id);
+  EXPECT_EQ(1, ev1.slot);
   EXPECT_FLOAT_EQ(0.17647059f, ev1.pressure);
 
   // Move 0, stationary 1.
   struct input_event mock_kernel_queue_move0_stationary1[] = {
     {{0, 0}, EV_ABS, ABS_MT_SLOT, 0}, {{0, 0}, EV_ABS, ABS_MT_POSITION_X, 39},
     {{0, 0}, EV_SYN, SYN_REPORT, 0}
   };
   dev->ConfigureReadMock(mock_kernel_queue_move0_stationary1, 3, 0);
   dev->ReadNow();
   EXPECT_EQ(6u, size());
   ev0 = dispatched_event(5);
 
   EXPECT_EQ(ui::ET_TOUCH_MOVED, ev0.type);
   EXPECT_EQ(base::TimeDelta::FromMicroseconds(0), ev0.timestamp);
   EXPECT_EQ(39, ev0.location.x());
   EXPECT_EQ(51, ev0.location.y());
-  EXPECT_EQ(0, ev0.touch_id);
+  EXPECT_EQ(0, ev0.slot);
   EXPECT_FLOAT_EQ(0.17647059f, ev0.pressure);
 
   // Release 0, move 1.
   struct input_event mock_kernel_queue_release0_move1[] = {
     {{0, 0}, EV_ABS, ABS_MT_TRACKING_ID, -1}, {{0, 0}, EV_ABS, ABS_MT_SLOT, 1},
     {{0, 0}, EV_ABS, ABS_MT_POSITION_X, 38}, {{0, 0}, EV_SYN, SYN_REPORT, 0}
   };
   dev->ConfigureReadMock(mock_kernel_queue_release0_move1, 4, 0);
   dev->ReadNow();
   EXPECT_EQ(8u, size());
   ev0 = dispatched_event(6);
   ev1 = dispatched_event(7);
 
   EXPECT_EQ(ui::ET_TOUCH_RELEASED, ev0.type);
   EXPECT_EQ(base::TimeDelta::FromMicroseconds(0), ev0.timestamp);
   EXPECT_EQ(39, ev0.location.x());
   EXPECT_EQ(51, ev0.location.y());
-  EXPECT_EQ(0, ev0.touch_id);
+  EXPECT_EQ(0, ev0.slot);
   EXPECT_FLOAT_EQ(0.17647059f, ev0.pressure);
 
   EXPECT_EQ(ui::ET_TOUCH_MOVED, ev1.type);
   EXPECT_EQ(base::TimeDelta::FromMicroseconds(0), ev1.timestamp);
   EXPECT_EQ(38, ev1.location.x());
   EXPECT_EQ(102, ev1.location.y());
-  EXPECT_EQ(1, ev1.touch_id);
+  EXPECT_EQ(1, ev1.slot);
   EXPECT_FLOAT_EQ(0.17647059f, ev1.pressure);
 
   // Release 1.
   struct input_event mock_kernel_queue_release1[] = {
     {{0, 0}, EV_ABS, ABS_MT_TRACKING_ID, -1}, {{0, 0}, EV_SYN, SYN_REPORT, 0},
   };
   dev->ConfigureReadMock(mock_kernel_queue_release1, 2, 0);
   dev->ReadNow();
   EXPECT_EQ(9u, size());
   ev1 = dispatched_event(8);
 
   EXPECT_EQ(ui::ET_TOUCH_RELEASED, ev1.type);
   EXPECT_EQ(base::TimeDelta::FromMicroseconds(0), ev1.timestamp);
   EXPECT_EQ(38, ev1.location.x());
   EXPECT_EQ(102, ev1.location.y());
-  EXPECT_EQ(1, ev1.touch_id);
+  EXPECT_EQ(1, ev1.slot);
   EXPECT_FLOAT_EQ(0.17647059f, ev1.pressure);
 }
 
 TEST_F(TouchEventConverterEvdevTest, Unsync) {
   ui::MockTouchEventConverterEvdev* dev = device();
 
   InitPixelTouchscreen(dev);
 
   struct input_event mock_kernel_queue_press0[] = {
     {{0, 0}, EV_ABS, ABS_MT_TRACKING_ID, 684},
@@ skipping 49 matching lines @@
       {{0, 0}, EV_SYN, SYN_REPORT, 0},
   };
 
   dev->ConfigureReadMock(mock_kernel_queue_empty_report,
                          arraysize(mock_kernel_queue_empty_report), 0);
   dev->ReadNow();
   EXPECT_EQ(1u, size());
 
   ui::TouchEventParams ev = dispatched_event(0);
   EXPECT_EQ(ET_TOUCH_PRESSED, ev.type);
-  EXPECT_EQ(0, ev.touch_id);
+  EXPECT_EQ(0, ev.slot);
   EXPECT_FLOAT_EQ(50.f, ev.radii.x());
   EXPECT_FLOAT_EQ(0.f, ev.radii.y());
   EXPECT_FLOAT_EQ(0.50196081f, ev.pressure);
 }
 
 // crbug.com/407386
 TEST_F(TouchEventConverterEvdevTest,
        DontChangeMultitouchPositionFromLegacyAxes) {
   ui::MockTouchEventConverterEvdev* dev = device();
 
@@ skipping 21 matching lines @@
   dev->ReadNow();
 
   const unsigned int kExpectedEventCount = 2;
   EXPECT_EQ(kExpectedEventCount, size());
   if (kExpectedEventCount != size())
     return;
 
   ui::TouchEventParams ev0 = dispatched_event(0);
   ui::TouchEventParams ev1 = dispatched_event(1);
 
-  EXPECT_EQ(0, ev0.touch_id);
+  EXPECT_EQ(0, ev0.slot);
   EXPECT_EQ(999, ev0.location.x());
   EXPECT_EQ(888, ev0.location.y());
   EXPECT_FLOAT_EQ(0.21568628f, ev0.pressure);
 
-  EXPECT_EQ(1, ev1.touch_id);
+  EXPECT_EQ(1, ev1.slot);
   EXPECT_EQ(777, ev1.location.x());
   EXPECT_EQ(666, ev1.location.y());
   EXPECT_FLOAT_EQ(0.17254902f, ev1.pressure);
 }
 
 // crbug.com/446939
 TEST_F(TouchEventConverterEvdevTest, CheckSlotLimit) {
   ui::MockTouchEventConverterEvdev* dev = device();
 
   struct input_event mock_kernel_queue[] = {
@@ skipping 173 matching lines @@
   ASSERT_EQ(0u, size());
 
   EventTypeTouchNoiseFilter* filter =
       static_cast<EventTypeTouchNoiseFilter*>(first_filter());
   EXPECT_EQ(1u, filter->num_events(ET_TOUCH_PRESSED));
   EXPECT_EQ(2u, filter->num_events(ET_TOUCH_MOVED));
   EXPECT_EQ(1u, filter->num_events(ET_TOUCH_RELEASED));
 }
 
 }  // namespace ui