diff options
| author | samuong <samuong@chromium.org> | 2015-08-07 22:27:27 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-08 05:28:18 +0000 |
| commit | aaa83e77910e8138768a1e9a702b22cada8ce791 (patch) | |
| tree | 75b8f91db59e3e4ebe9fd696e4995819ea64dba2 | |
| parent | e690f1765733865fae0b2ed7691e193ce66e74cb (diff) | |
| download | chromium_src-aaa83e77910e8138768a1e9a702b22cada8ce791.zip chromium_src-aaa83e77910e8138768a1e9a702b22cada8ce791.tar.gz chromium_src-aaa83e77910e8138768a1e9a702b22cada8ce791.tar.bz2 | |
[chromedriver] Modify touch action tests to perform actions on a fixed-sized target.
Previously, these tests were performing touch actions on a div that also logged
the events that were firing. Since this div would change size with every new
event, touch actions would be sent to different places each time.
BUG=
TBR=stgao@chromium.org
Review URL: https://codereview.chromium.org/1278203004
Cr-Commit-Position: refs/heads/master@{#342518}
| -rwxr-xr-x | chrome/test/chromedriver/test/run_py_tests.py | 18 | ||||
| -rw-r--r-- | chrome/test/data/chromedriver/touch_action_tests.html | 6 |
2 files changed, 16 insertions, 8 deletions
diff --git a/chrome/test/chromedriver/test/run_py_tests.py b/chrome/test/chromedriver/test/run_py_tests.py index aa59dda..2d3ccb0 100755 --- a/chrome/test/chromedriver/test/run_py_tests.py +++ b/chrome/test/chromedriver/test/run_py_tests.py @@ -994,16 +994,18 @@ class ChromeDriverTest(ChromeDriverBaseTest): def testTouchSingleTapElement(self): self._driver.Load(self.GetHttpUrlForFile( '/chromedriver/touch_action_tests.html')) + target = self._driver.FindElement('id', 'target') + target.SingleTap() events = self._driver.FindElement('id', 'events') - events.SingleTap() self.assertEquals('events: touchstart touchend', events.GetText()) def testTouchDownMoveUpElement(self): self._driver.Load(self.GetHttpUrlForFile( '/chromedriver/touch_action_tests.html')) - events = self._driver.FindElement('id', 'events') - location = events.GetLocation() + target = self._driver.FindElement('id', 'target') + location = target.GetLocation() self._driver.TouchDown(location['x'], location['y']) + events = self._driver.FindElement('id', 'events') self.assertEquals('events: touchstart', events.GetText()) self._driver.TouchMove(location['x'] + 1, location['y'] + 1) self.assertEquals('events: touchstart touchmove', events.GetText()) @@ -1017,8 +1019,8 @@ class ChromeDriverTest(ChromeDriverBaseTest): scroll_top = 'return document.body.scrollTop;' self.assertEquals(0, self._driver.ExecuteScript(scroll_left)) self.assertEquals(0, self._driver.ExecuteScript(scroll_top)) - events = self._driver.FindElement('id', 'events') - self._driver.TouchScroll(events, 47, 53) + target = self._driver.FindElement('id', 'target') + self._driver.TouchScroll(target, 47, 53) # https://code.google.com/p/chromedriver/issues/detail?id=1179 self.assertAlmostEqual(47, self._driver.ExecuteScript(scroll_left), delta=1) self.assertAlmostEqual(53, self._driver.ExecuteScript(scroll_top), delta=1) @@ -1026,16 +1028,18 @@ class ChromeDriverTest(ChromeDriverBaseTest): def testTouchDoubleTapElement(self): self._driver.Load(self.GetHttpUrlForFile( '/chromedriver/touch_action_tests.html')) + target = self._driver.FindElement('id', 'target') + target.DoubleTap() events = self._driver.FindElement('id', 'events') - events.DoubleTap() self.assertEquals('events: touchstart touchend touchstart touchend', events.GetText()) def testTouchLongPressElement(self): self._driver.Load(self.GetHttpUrlForFile( '/chromedriver/touch_action_tests.html')) + target = self._driver.FindElement('id', 'target') + target.LongPress() events = self._driver.FindElement('id', 'events') - events.LongPress() self.assertEquals('events: touchstart touchcancel', events.GetText()) def testTouchFlickElement(self): diff --git a/chrome/test/data/chromedriver/touch_action_tests.html b/chrome/test/data/chromedriver/touch_action_tests.html index 46c8c8c..7f036dbb 100644 --- a/chrome/test/data/chromedriver/touch_action_tests.html +++ b/chrome/test/data/chromedriver/touch_action_tests.html @@ -6,6 +6,9 @@ <title>Touch Action Test Page</title> </head> <body> + <div id="target"> + Events are logged when tests touch this div. + </div> <div id="events">events: </div> <div id="padding"> We need some padding here so that the page is large enough to test swipe @@ -19,8 +22,9 @@ events.innerHTML += ' ' + evt.type; }; + var target = document.getElementById('target'); for (var i = 0; i < eventTypes.length; i++) { - events.addEventListener(eventTypes[i], eventListener); + target.addEventListener(eventTypes[i], eventListener); } var padding = document.getElementById('padding'); |