removed next/prev/rewind

[pmachines.git] / lib / tools / functional_test.py

diff --git a/lib/tools/functional_test.py b/lib/tools/functional_test.py
index 50323a5cf592b9a4a51fa3ba477cfd633b87c823..eb4c06d18a35e229a43cce7e341c1f94f5a89d2b 100644 (file)
--- a/lib/tools/functional_test.py
+++ b/lib/tools/functional_test.py
@@ -103,6 +103,16 @@ class FunctionalTest(GameObject):
             'enforce res: %s' % res)]
         self._curr_time += time
 
+    def _enforce_resolution(self, time, res):
+        def cback():
+            self._conn.send(['enforce_resolution', res])
+            info('enforce_resolution %s (send)' % res)
+        self._tasks += [(
+            self._curr_time + time,
+            cback,
+            'enforce resolution: %s' % res)]
+        self._curr_time += time
+
     def _verify(self):
         def __verify():
             self._conn.send(['verify'])
@@ -186,15 +196,18 @@ class FunctionalTest(GameObject):
         self._screenshot(FunctionalTest.screenshot_time, 'fullscreen')
         self._event(FunctionalTest.evt_time, 'mouseclick', [(680, 250), 'left'])
         self._screenshot(FunctionalTest.screenshot_time, 'fullscreen')
-        self._event(8 + FunctionalTest.evt_time, 'mouseclick', [(440, 120), 'left'])
+        #self._event(8 + FunctionalTest.evt_time, 'mouseclick', [(440, 120), 'left'])
+        self._event(8 + FunctionalTest.evt_time, 'mouseclick', [(680, 250), 'left'])
         self._screenshot(8 + FunctionalTest.screenshot_time, 'back_from_fullscreen')
         # resolution
         self._event(FunctionalTest.evt_time, 'mouseclick', [(680, 340), 'left'])
         self._screenshot(FunctionalTest.screenshot_time, 'resolutions')
-        self._event(FunctionalTest.evt_time, 'mouseclick', [(1000, 400), 'left'])
+        self._enforce_resolution(FunctionalTest.evt_time, '1440x900')
+        self._event(FunctionalTest.evt_time, 'mouseclick', [(1000, 440), 'left'])
         self._screenshot(FunctionalTest.screenshot_time, '1440x900')
         self._event(FunctionalTest.evt_time, 'mouseclick', [(740, 400), 'left'])
         self._screenshot(FunctionalTest.screenshot_time, 'resolutions_2')
+        self._enforce_resolution(FunctionalTest.evt_time, '1360x768')
         self._event(FunctionalTest.evt_time, 'mouseclick', [(1110, 80), 'left'])
         self._screenshot(FunctionalTest.screenshot_time, '1360x768')
         # antialiasing
@@ -223,10 +236,10 @@ class FunctionalTest(GameObject):
         self._event(FunctionalTest.evt_time, 'mouseclick', [(70, 740), 'left'])  # info
         self._screenshot(FunctionalTest.screenshot_time, 'info')
         self._event(FunctionalTest.evt_time, 'mouseclick', [(850, 490), 'left'])  # close instructions
-        self._event(FunctionalTest.drag_time, 'mousedrag', [(35, 60), (430, 280), 'left'])  # drag a piece
-        self._screenshot(FunctionalTest.screenshot_time, 'domino_dragged')
-        self._event(FunctionalTest.evt_time, 'mouseclick', [(1220, 740), 'left'])  # rewind
-        self._screenshot(FunctionalTest.screenshot_time, 'rewind')
+        # self._event(FunctionalTest.drag_time, 'mousedrag', [(35, 60), (430, 280), 'left'])  # drag a piece
+        # self._screenshot(FunctionalTest.screenshot_time, 'domino_dragged')
+        # self._event(FunctionalTest.evt_time, 'mouseclick', [(1220, 740), 'left'])  # rewind
+        # self._screenshot(FunctionalTest.screenshot_time, 'rewind')
         self._event(FunctionalTest.drag_time, 'mousedrag', [(35, 60), (550, 380), 'left'])  # drag a piece
         # self._event(FunctionalTest.drag_time, 'mousedrag', [(35, 60), (715, 380), 'left'])  # drag a piece
         self._event(FunctionalTest.evt_time, 'mouseclick', [(1340, 740), 'left'])  # play