git.iko.soy/unity8
on xenial help sign in
Fix indicators_client geometry.
0a301aeMichał Sawicz
tests/autopilot/unity8/indicators_client/tests/__init__.py+8−5
compare with xenial
unifiedsplit
@@ -30,19 +30,22 @@ class IndicatorsTestCase(AutopilotTestCase):
30
30
31 """A common test case class that provides several useful methods for indicator tests."""
31 """A common test case class that provides several useful methods for indicator tests."""
32
32
33+ geometry = None
34+ grid_unit = None
35+
33 if model() == 'Desktop':
36 if model() == 'Desktop':
34 scenarios = [
37 scenarios = [
35− ('with mouse', dict(input_device_class=Mouse, grid_unit="12")),
38+ ('with mouse', dict(input_device_class=Mouse, geometry="400x800", grid_unit="12")),
36 ]
39 ]
37 else:
40 else:
38 scenarios = [
41 scenarios = [
39− ('with touch', dict(input_device_class=Touch, grid_unit="0")),
42+ ('with touch', dict(input_device_class=Touch)),
40 ]
43 ]
41
44
42 def setUp(self, geometry, grid_size):
45 def setUp(self, geometry, grid_size):
43 self.pointing_device = Pointer(self.input_device_class.create())
46 self.pointing_device = Pointer(self.input_device_class.create())
44 super(IndicatorsTestCase, self).setUp()
47 super(IndicatorsTestCase, self).setUp()
45− if grid_size != "0":
48+ if grid_size is not None:
46 self.patch_environment("GRID_UNIT_PX", str(grid_size))
49 self.patch_environment("GRID_UNIT_PX", str(grid_size))
47 self.grid_size = int(grid_size)
50 self.grid_size = int(grid_size)
48 else:
51 else:
@@ -54,7 +57,7 @@ class IndicatorsTestCase(AutopilotTestCase):
54 self.launch_test_local(geometry)
57 self.launch_test_local(geometry)
55
58
56 def launch_test_local(self, geometry):
59 def launch_test_local(self, geometry):
57− if geometry != "0x0":
60+ if geometry is None:
58 self.app = self.launch_test_application(get_binary_path("indicators-client"),
61 self.app = self.launch_test_application(get_binary_path("indicators-client"),
59 "-geometry", geometry, app_type='qt')
62 "-geometry", geometry, app_type='qt')
60 else:
63 else:
@@ -62,7 +65,7 @@ class IndicatorsTestCase(AutopilotTestCase):
62 app_type='qt')
65 app_type='qt')
63
66
64 def launch_test_installed(self, geometry):
67 def launch_test_installed(self, geometry):
65− if geometry != "0x0":
68+ if geometry is not None:
66 self.app = self.launch_test_application("indicators-client", "-geometry", geometry, app_type='qt')
69 self.app = self.launch_test_application("indicators-client", "-geometry", geometry, app_type='qt')
67 else:
70 else:
68 self.app = self.launch_test_application("indicators-client", app_type='qt')
71 self.app = self.launch_test_application("indicators-client", app_type='qt')
tests/autopilot/unity8/indicators_client/tests/test_battery.py+1−1
@@ -18,7 +18,7 @@ import math
18
18
19class TestDisplayMenus(IndicatorsTestCase):
19class TestDisplayMenus(IndicatorsTestCase):
20 def setUp(self):
20 def setUp(self):
21− super(TestDisplayMenus, self).setUp("400x800", self.grid_unit)
21+ super(TestDisplayMenus, self).setUp(self.geometry, self.grid_unit)
22
22
23 # This opens the messaging menu so you don't have to do that in
23 # This opens the messaging menu so you don't have to do that in
24 # every test case
24 # every test case