| 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 ce84acf890be8f23ef5580fc3d93ba0008ea936c..d089bb410f0584dd9639373eb11d2d9a28220d57 100644
|
| --- a/tools/telemetry/telemetry/page/actions/action_runner_unittest.py
|
| +++ b/tools/telemetry/telemetry/page/actions/action_runner_unittest.py
|
| @@ -142,16 +142,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'))
|
|
|
| def WillFail():
|
| action_runner.ClickElement('#notfound')
|
| @@ -164,17 +164,37 @@ 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'))
|
|
|
| def WillFail():
|
| action_runner.TapElement('#notfound')
|
| self.assertRaises(exceptions.EvaluateException, WillFail)
|
| +
|
| + 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)
|
|
|