Index: tools/telemetry/telemetry/page/actions/action_runner_unittest.py |
diff --git a/tools/telemetry/telemetry/page/actions/action_runner_unittest.py b/tools/telemetry/telemetry/page/actions/action_runner_unittest.py |
index 8c0c64b92ce4daf4647959f3ab6165311ff1ee9b..60fe041f2f6c567f1eadf9eae7f3d11594509cca 100644 |
--- a/tools/telemetry/telemetry/page/actions/action_runner_unittest.py |
+++ b/tools/telemetry/telemetry/page/actions/action_runner_unittest.py |
@@ -158,16 +158,16 @@ class ActionRunnerTest(tab_test_case.TabTestCase): |
action_runner.ExecuteJavaScript('valueSettableByTest = 1;') |
action_runner.ClickElement('#test') |
- self.assertEquals(1, action_runner.EvaluateJavaScript('valueToTest')) |
+ self.assertEqual(1, action_runner.EvaluateJavaScript('valueToTest')) |
action_runner.ExecuteJavaScript('valueSettableByTest = 2;') |
action_runner.ClickElement(text='Click/tap me') |
- self.assertEquals(2, action_runner.EvaluateJavaScript('valueToTest')) |
+ self.assertEqual(2, action_runner.EvaluateJavaScript('valueToTest')) |
action_runner.ExecuteJavaScript('valueSettableByTest = 3;') |
action_runner.ClickElement( |
element_function='document.body.firstElementChild') |
- self.assertEquals(3, action_runner.EvaluateJavaScript('valueToTest')) |
+ self.assertEqual(3, action_runner.EvaluateJavaScript('valueToTest')) |
@test.Disabled('debug') |
def testTapElement(self): |
@@ -176,18 +176,38 @@ class ActionRunnerTest(tab_test_case.TabTestCase): |
action_runner.ExecuteJavaScript('valueSettableByTest = 1;') |
action_runner.TapElement('#test') |
- self.assertEquals(1, action_runner.EvaluateJavaScript('valueToTest')) |
+ self.assertEqual(1, action_runner.EvaluateJavaScript('valueToTest')) |
action_runner.ExecuteJavaScript('valueSettableByTest = 2;') |
action_runner.TapElement(text='Click/tap me') |
- self.assertEquals(2, action_runner.EvaluateJavaScript('valueToTest')) |
+ self.assertEqual(2, action_runner.EvaluateJavaScript('valueToTest')) |
action_runner.ExecuteJavaScript('valueSettableByTest = 3;') |
action_runner.TapElement( |
element_function='document.body.firstElementChild') |
- self.assertEquals(3, action_runner.EvaluateJavaScript('valueToTest')) |
+ self.assertEqual(3, action_runner.EvaluateJavaScript('valueToTest')) |
action_runner.ExecuteJavaScript('valueSettableByTest = 4;') |
action_runner.TapElement(element_function=''' |
function(callback) { callback(document.body.firstElementChild); }''') |
- self.assertEquals(4, action_runner.EvaluateJavaScript('valueToTest')) |
+ self.assertEqual(4, action_runner.EvaluateJavaScript('valueToTest')) |
+ |
+ def testSwipe(self): |
+ self.Navigate('page_with_swipeables.html') |
+ action_runner = action_runner_module.ActionRunner(self._tab) |
+ |
+ action_runner.SwipeElement( |
+ selector='#left-right', direction='left', left_start_ratio=0.9) |
+ self.assertTrue(action_runner.EvaluateJavaScript( |
+ 'document.querySelector("#left-right").scrollLeft') > 75) |
+ action_runner.SwipeElement( |
+ selector='#top-bottom', direction='up', top_start_ratio=0.9) |
+ self.assertTrue(action_runner.EvaluateJavaScript( |
+ 'document.querySelector("#top-bottom").scrollTop') > 75) |
+ |
+ action_runner.SwipePage(direction='left', left_start_ratio=0.9) |
+ self.assertTrue(action_runner.EvaluateJavaScript( |
+ 'document.body.scrollLeft') > 75) |
+ action_runner.SwipePage(direction='up', top_start_ratio=0.9) |
+ self.assertTrue(action_runner.EvaluateJavaScript( |
+ 'document.body.scrollTop') > 75) |