← Back to branch summary

~3v1n0/unity/unity-decorations

« back to all changes in this revision

Viewing changes to tests/autopilot/unity/tests/launcher/test_scroll.py

  • Committer: Marco Trevisan (Treviño)
  • Date: 2014-01-23 11:16:00 UTC
  • mfrom: (3566.1.63 trunk)
  • Revision ID: mail@3v1n0.net-20140123111600-0rq63qp2hxdpunj6
Merging with trunk, again

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/autopilot/unity/tests/launcher/test_scroll.py
44
44
        launcher_instance = self.get_launcher()
45
45
        (x, y, w, h) = launcher_instance.geometry
46
46
 
47
 
        icons = self.unity.launcher.model.get_launcher_icons()
 
47
        icons = self.unity.launcher.model.get_launcher_icons_for_monitor(self.launcher_monitor)
48
48
        num_icons = self.unity.launcher.model.num_launcher_icons()
49
49
 
50
50
        last_icon = icons[num_icons - 1]
76
76
        launcher_instance = self.get_launcher()
77
77
        (x, y, w, h) = launcher_instance.geometry
78
78
 
79
 
        icons = self.unity.launcher.model.get_launcher_icons()
 
79
        icons = self.unity.launcher.model.get_launcher_icons_for_monitor(self.launcher_monitor)
80
80
        num_icons = self.unity.launcher.model.num_launcher_icons()
81
81
 
82
82
        first_icon = icons[0]
83
83
        last_icon = icons[num_icons - 1]
84
84
 
 
85
        launcher_instance.move_mouse_over_launcher()
 
86
 
85
87
        # Move to the last icon in order to expand the top of the Launcher
86
88
        launcher_instance.move_mouse_to_icon(last_icon)
87
89