← Back to branch summary

~alan-griffiths/mir/dont-trace-forks

« back to all changes in this revision

Viewing changes to tests/unit-tests/input/android/test_input_translator.cpp

  • Committer: Tarmac
  • Author(s): Robert Carr, robert.carr at canonical
  • Date: 2015-05-21 02:17:18 UTC
  • mfrom: (2573.10.2 unify-touch-tooltype)
  • Revision ID: tarmac-20150521021718-kkzasssbi2316lqi
Unify MirMotionTooltype and MirTouchTooltype.

Approved by PS Jenkins bot, Andreas Pokorny, Alberto Aguirre, Kevin DuBois, Alexandros Frantzis.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unit-tests/input/android/test_input_translator.cpp
279
279
    pointer.orientation = 18.0f;
280
280
    pointer.vscroll = 19.0f;
281
281
    pointer.hscroll = 20.0f;
282
 
    pointer.tool_type = mir_motion_tool_type_finger;
 
282
    pointer.tool_type = mir_touch_tooltype_finger;
283
283
 
284
284
    coords[0].setAxisValue(AMOTION_EVENT_AXIS_X, pointer.x);
285
285
    coords[0].setAxisValue(AMOTION_EVENT_AXIS_Y, pointer.y);
291
291
    coords[0].setAxisValue(AMOTION_EVENT_AXIS_VSCROLL, pointer.vscroll);
292
292
    coords[0].setAxisValue(AMOTION_EVENT_AXIS_HSCROLL, pointer.hscroll);
293
293
    properties[0].id = pointer.id;
294
 
    properties[0].toolType = pointer.tool_type;
 
294
    properties[0].toolType = AMOTION_EVENT_TOOL_TYPE_FINGER;
295
295
    InSequence seq;
296
296
    EXPECT_CALL(dispatcher, dispatch(mt::MirTouchEventMatches(expected))).Times(1);
297
297