d245b9f · unity8 · git.iko.soy

git.iko.soy/unity8

Prepare unity8 to the _uinput refactors in autopilot.

commitd245b9fab3f10c17bc3ae115c0fef7de6602213a authorLeo Arias <leo.arias@canonical.com> dateTue 18 Feb 2014, 11:40 (13 years ago) parent8142dd4 743c3c3

3 files changed+27−4

compare with xenial

unifiedsplit

tests/autopilot/unity8/shell/__init__.py+11−2 tests/autopilot/unity8/shell/emulators/hud.py+8−1 tests/autopilot/unity8/shell/tests/test_hud.py+8−1

tests/autopilot/unity8/shell/__init__.py+11−2

@@ -50,13 +50,22 @@ def disable_qml_mocking(fn):

5050

5151class DragMixin(object):

5252 def _drag(self, x1, y1, x2, y2):

53+ # XXX This ugly code is here just temporarily, waiting for drag

54+ # improvements to land on autopilot so we don't have to access device

55+ # private internal attributes. --elopio - 2014-02-12

5356 cur_x = x1

5457 cur_y = y1

5558 dx = 1.0 * (x2 - x1) / 100

5659 dy = 1.0 * (y2 - y1) / 100

5760 for i in range(0, 100):

58− self.touch._finger_move(int(cur_x), int(cur_y))

61+ try:

62+ self.touch._finger_move(int(cur_x), int(cur_y))

63+ except AttributeError:

64+ self.touch._device.finger_move(int(cur_x), int(cur_y))

5965 sleep(0.002)

6066 cur_x += dx

6167 cur_y += dy

62− self.touch._finger_move(int(x2), int(y2))

68+ try:

69+ self.touch._finger_move(int(x2), int(y2))

70+ except AttributeError:

71+ self.touch._device.finger_move(int(x2), int(y2))

tests/autopilot/unity8/shell/emulators/hud.py+8−1

@@ -54,7 +54,14 @@ class Hud(UnityEmulatorBase, DragMixin):

5454 except AssertionError:

5555 raise

5656 finally:

57− if self.touch._touch_finger is not None:

57+ # XXX This ugly code is here just temporarily, waiting for uinput

58+ # improvements to land on autopilot so we don't have to access

59+ # device private internal attributes. --elopio - 2014-02-12

60+ try:

61+ pressed = self.touch._touch_finger is not None

62+ except AttributeError:

63+ pressed = self.touch.pressed

64+ if pressed:

5865 self.touch.release()

5966

6067 def dismiss(self):

tests/autopilot/unity8/shell/tests/test_hud.py+8−1

@@ -184,5 +184,12 @@ class TestHud(UnityTestCase, DragMixin):

184184 # we don't.

185185 def _maybe_release_finger(self):

186186 """Only release the finger if it is in fact down."""

187− if self.touch._touch_finger is not None:

187+ # XXX This ugly code is here just temporarily, waiting for uinput

188+ # improvements to land on autopilot so we don't have to access device

189+ # private internal attributes. --elopio - 2014-02-12

190+ try:

191+ pressed = self.touch._touch_finger is not None

192+ except AttributeError:

193+ pressed = self.touch.pressed

194+ if pressed:

188195 self.touch.release()