Create ActionRunner wrapper API over TapAction and ClickElementAction.

tools/perf/page_sets/top_25.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 # pylint: disable=W0401,W0614
 from telemetry.page.actions.all_page_actions import *
 from telemetry.page import page as page_module
 from telemetry.page import page_set as page_set_module
 
 
+def _GetCurrentLocation(action_runner):
+  return action_runner.EvaluateJavaScript('document.location.href')
+
+
+def _WaitForLocationChange(action_runner, old_href):
+  action_runner.WaitForJavaScriptCondition(
+      'document.location.href != "%s"' % old_href)
+
+
 class Top25Page(page_module.Page):
 
   def __init__(self, url, page_set, name=''):
     super(Top25Page, self).__init__(url=url, page_set=page_set, name=name)
     self.credentials_path = 'data/credentials.json'
     self.user_agent_type = 'desktop'
     self.archive_data_file = 'data/top_25.json'
 
   def RunSmoothness(self, action_runner):
     action_runner.RunAction(ScrollAction())
@@ skipping 13 matching lines @@
     super(GoogleWebSearchPage, self).__init__(
       url='https://www.google.com/#hl=en&q=barack+obama',
       page_set=page_set)
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
     action_runner.WaitForElement(text='Next')
 
   def RunStressMemory(self, action_runner):
     action_runner.RunAction(ScrollAction())
-    action_runner.RunAction(ClickElementAction(
-      {
-        'text' : 'Next',
-        'wait_until': {
-          'condition': 'href_change'
-        }
-      }))
+    old_href = _GetCurrentLocation(action_runner)
+    action_runner.ClickElement(text='Next')
+    _WaitForLocationChange(action_runner, old_href)
     action_runner.WaitForElement(text='Next')
     action_runner.RunAction(ScrollAction())
-    action_runner.RunAction(ClickElementAction(
-      {
-        'text' : 'Next',
-        'wait_until': {
-          'condition': 'href_change'
-        }
-      }))
+    old_href = _GetCurrentLocation(action_runner)
+    action_runner.ClickElement(text='Next')
+    _WaitForLocationChange(action_runner, old_href)
     action_runner.WaitForElement(text='Next')
     action_runner.RunAction(ScrollAction())
-    action_runner.RunAction(ClickElementAction(
-      {
-        'text' : 'Next',
-        'wait_until': {
-          'condition': 'href_change'
-        }
-      }))
+    old_href = _GetCurrentLocation(action_runner)
+    action_runner.ClickElement(text='Next')
+    _WaitForLocationChange(action_runner, old_href)
     action_runner.WaitForElement(text='Previous')
     action_runner.RunAction(ScrollAction())
-    action_runner.RunAction(ClickElementAction(
-      {
-        'text' : 'Previous',
-        'wait_until': {
-          'condition': 'href_change'
-        }
-      }))
+    old_href = _GetCurrentLocation(action_runner)
+    action_runner.ClickElement(text='Previous')
+    _WaitForLocationChange(action_runner, old_href)
     action_runner.WaitForElement(text='Previous')
     action_runner.RunAction(ScrollAction())
-    action_runner.RunAction(ClickElementAction(
-      {
-        'text' : 'Previous',
-        'wait_until': {
-          'condition': 'href_change'
-        }
-      }))
+    old_href = _GetCurrentLocation(action_runner)
+    action_runner.ClickElement(text='Previous')
+    _WaitForLocationChange(action_runner, old_href)
     action_runner.WaitForElement(text='Previous')
     action_runner.RunAction(ScrollAction())
-    action_runner.RunAction(ClickElementAction(
-      {
-        'text' : 'Previous',
-        'wait_until': {
-          'condition': 'href_change'
-        }
-      }))
+    old_href = _GetCurrentLocation(action_runner)
+    action_runner.ClickElement(text='Previous')
+    _WaitForLocationChange(action_runner, old_href)
     action_runner.WaitForElement(text='Images')
     action_runner.RunAction(ScrollAction())
-    action_runner.RunAction(ClickElementAction(
-      {
-        'text' : 'Images',
-        'wait_until': {
-          'condition': 'href_change'
-        }
-      }))
+    old_href = _GetCurrentLocation(action_runner)
+    action_runner.ClickElement(text='Images')
+    _WaitForLocationChange(action_runner, old_href)
     action_runner.WaitForElement(text='Images')
 
 
 class GmailPage(Top25Page):
 
   """ Why: productivity, top google properties """
 
   def __init__(self, page_set):
     super(GmailPage, self).__init__(
       url='https://mail.google.com/mail/',
       page_set=page_set)
 
     self.credentials = 'google'
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
     action_runner.WaitForJavaScriptCondition(
         'window.gmonkey !== undefined &&'
         'document.getElementById("gb") !== null')
 
   def RunStressMemory(self, action_runner):
-    action_runner.RunAction(ClickElementAction(
-      {
-        'wait_until': {
-          'condition': 'href_change'
-        },
-        'selector': 'a[href="https://mail.google.com/mail/u/0/?shva=1#starred"]'
-      }))
-    action_runner.RunAction(ClickElementAction(
-      {
-        'wait_until': {
-          'condition': 'href_change'
-        },
-        'selector': 'a[href="https://mail.google.com/mail/u/0/?shva=1#inbox"]'
-      }))
+    old_href = _GetCurrentLocation(action_runner)
+    action_runner.ClickElement(
+        'a[href="https://mail.google.com/mail/u/0/?shva=1#starred"]')
+    _WaitForLocationChange(action_runner, old_href)
+    old_href = _GetCurrentLocation(action_runner)
+    action_runner.ClickElement(
+        'a[href="https://mail.google.com/mail/u/0/?shva=1#inbox"]')
+    _WaitForLocationChange(action_runner, old_href)
 
   def RunSmoothness(self, action_runner):
     action_runner.RunAction(ScrollAction(
       {
         'scrollable_element_function': '''
           function(callback) {
             gmonkey.load('2.0', function(api) {
               callback(api.getScrollableElement());
             });
           }'''
@@ skipping 18 matching lines @@
     action_runner.ExecuteJavaScript('''
         (function() {
           var elem = document.createElement('meta');
           elem.name='viewport';
           elem.content='initial-scale=1';
           document.body.appendChild(elem);
         })();''')
     action_runner.Wait(1)
 
   def RunStressMemory(self, action_runner):
-    action_runner.RunAction(ClickElementAction(
-      {
-        'selector': 'div[class~="navForward"]'
-      }))
+    action_runner.ClickElement('div[class~="navForward"]')
     action_runner.Wait(2)
     action_runner.WaitForElement('div[class~="navForward"]')
-    action_runner.RunAction(ClickElementAction(
-      {
-        'selector': 'div[class~="navForward"]'
-      }))
+    action_runner.ClickElement('div[class~="navForward"]')
     action_runner.Wait(2)
     action_runner.WaitForElement('div[class~="navForward"]')
-    action_runner.RunAction(ClickElementAction(
-      {
-        'selector': 'div[class~="navForward"]'
-      }))
+    action_runner.ClickElement('div[class~="navForward"]')
     action_runner.Wait(2)
     action_runner.WaitForElement('div[class~="navForward"]')
-    action_runner.RunAction(ClickElementAction(
-      {
-        'selector': 'div[class~="navForward"]'
-      }))
+    action_runner.ClickElement('div[class~="navForward"]')
     action_runner.Wait(2)
     action_runner.WaitForElement('div[class~="navBack"]')
-    action_runner.RunAction(ClickElementAction(
-      {
-        'selector': 'div[class~="navBack"]'
-      }))
+    action_runner.ClickElement('div[class~="navBack"]')
     action_runner.Wait(2)
     action_runner.WaitForElement('div[class~="navBack"]')
-    action_runner.RunAction(ClickElementAction(
-      {
-        'selector': 'div[class~="navBack"]'
-      }))
+    action_runner.ClickElement('div[class~="navBack"]')
     action_runner.Wait(2)
     action_runner.WaitForElement('div[class~="navBack"]')
-    action_runner.RunAction(ClickElementAction(
-      {
-        'selector': 'div[class~="navBack"]'
-      }))
+    action_runner.ClickElement('div[class~="navBack"]')
     action_runner.Wait(2)
     action_runner.WaitForElement('div[class~="navBack"]')
-    action_runner.RunAction(ClickElementAction(
-      {
-        'selector': 'div[class~="navBack"]'
-      }))
+    action_runner.ClickElement('div[class~="navBack"]')
     action_runner.Wait(2)
     action_runner.WaitForElement('div[class~="navBack"]')
 
   def RunSmoothness(self, action_runner):
     action_runner.RunAction(ScrollAction(
       {
         'scrollable_element_function': '''
           function(callback) {
             callback(document.getElementById('scrolltimedeventswk'));
           }'''
@@ skipping 50 matching lines @@
       url='https://plus.google.com/110031535020051778989/posts',
       page_set=page_set)
 
     self.credentials = 'google'
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
     action_runner.WaitForElement(text='Home')
 
   def RunStressMemory(self, action_runner):
-    action_runner.RunAction(ClickElementAction(
-      {
-        'text' : 'Home'
-      }))
+    action_runner.ClickElement(text='Home')
     action_runner.Wait(2)
     action_runner.WaitForElement(text='Profile')
-    action_runner.RunAction(ClickElementAction(
-      {
-        'text' : 'Profile'
-      }))
+    action_runner.ClickElement(text='Profile')
     action_runner.Wait(2)
     action_runner.WaitForElement(text='Explore')
-    action_runner.RunAction(ClickElementAction(
-      {
-        'text' : 'Explore'
-      }))
+    action_runner.ClickElement(text='Explore')
     action_runner.Wait(2)
     action_runner.WaitForElement(text='Events')
-    action_runner.RunAction(ClickElementAction(
-      {
-        'text' : 'Events'
-      }))
+    action_runner.ClickElement(text='Events')
     action_runner.Wait(2)
     action_runner.WaitForElement(text='Communities')
-    action_runner.RunAction(ClickElementAction(
-      {
-        'text' : 'Communities'
-      }))
+    action_runner.ClickElement(text='Communities')
     action_runner.Wait(2)
     action_runner.WaitForElement(text='Home')
 
   def RunSmoothness(self, action_runner):
     action_runner.RunAction(ScrollAction(
       {
         "scroll_is_infinite": True
       }))
 
 
@@ skipping 22 matching lines @@
     super(BlogspotPage, self).__init__(
       url='http://googlewebmastercentral.blogspot.com/',
       page_set=page_set,
       name='Blogger')
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
     action_runner.WaitForElement(text='accessibility')
 
   def RunStressMemory(self, action_runner):
-    action_runner.RunAction(ClickElementAction({'text' : 'accessibility'}))
+    action_runner.ClickElement(text='accessibility')
     action_runner.WaitForNavigate()
     action_runner.RunAction(ScrollAction())
-    action_runner.RunAction(ClickElementAction({'text' : 'advanced'}))
+    action_runner.ClickElement(text='advanced')
     action_runner.WaitForNavigate()
     action_runner.RunAction(ScrollAction())
-    action_runner.RunAction(ClickElementAction({'text' : 'beginner'}))
+    action_runner.ClickElement(text='beginner')
     action_runner.WaitForNavigate()
     action_runner.RunAction(ScrollAction())
-    action_runner.RunAction(ClickElementAction({'text' : 'Home'}))
+    action_runner.ClickElement(text='Home')
     action_runner.WaitForNavigate()
 
 
 class WordpressPage(Top25Page):
 
   """ Why: #18 (Alexa global), Picked an interesting post """
 
   def __init__(self, page_set):
     super(WordpressPage, self).__init__(
       # pylint: disable=C0301
       url='http://en.blog.wordpress.com/2012/09/04/freshly-pressed-editors-picks-for-august-2012/',
       page_set=page_set,
       name='Wordpress')
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
     action_runner.WaitForElement(
         # pylint: disable=C0301
         'a[href="http://en.blog.wordpress.com/2012/08/30/new-themes-able-and-sight/"]')
 
   def RunStressMemory(self, action_runner):
     action_runner.RunAction(ScrollAction())
-    action_runner.RunAction(ClickElementAction(
-      {'selector':
-          # pylint: disable=C0301
-          'a[href="http://en.blog.wordpress.com/2012/08/30/new-themes-able-and-sight/"]'
-      }))
+    action_runner.ClickElement(
+        # pylint: disable=C0301
+        'a[href="http://en.blog.wordpress.com/2012/08/30/new-themes-able-and-sight/"]')
     action_runner.WaitForNavigate()
     action_runner.RunAction(ScrollAction())
-    action_runner.RunAction(ClickElementAction({'text' : 'Features'}))
+    action_runner.ClickElement(text='Features')
     action_runner.WaitForNavigate()
     action_runner.RunAction(ScrollAction())
-    action_runner.RunAction(ClickElementAction({'text' : 'News'}))
+    action_runner.ClickElement(text='News')
     action_runner.WaitForNavigate()
     action_runner.RunAction(ScrollAction())
 
 
 class FacebookPage(Top25Page):
 
   """ Why: top social,Public profile """
 
   def __init__(self, page_set):
     super(FacebookPage, self).__init__(
       url='http://www.facebook.com/barackobama',
       page_set=page_set,
       name='Facebook')
     self.credentials = 'facebook'
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
     action_runner.WaitForElement(text='About')
 
   def RunStressMemory(self, action_runner):
-    action_runner.RunAction(ClickElementAction({'text' : 'About'}))
+    action_runner.ClickElement(text='About')
     action_runner.WaitForNavigate()
-    action_runner.RunAction(ClickElementAction(
-      {
-        'text' : 'The Audacity of Hope',
-      }))
+    action_runner.ClickElement(text='The Audacity of Hope')
     action_runner.WaitForNavigate()
-    action_runner.RunAction(ClickElementAction(
-      {
-        'text' : 'Back to Barack Obama\'s Timeline',
-      }))
+    action_runner.ClickElement(text='Back to Barack Obama\'s Timeline')
     action_runner.WaitForNavigate()
-    action_runner.RunAction(ClickElementAction(
-      {
-        'text' : 'About',
-      }))
+    action_runner.ClickElement(text='About')
     action_runner.WaitForNavigate()
-    action_runner.RunAction(ClickElementAction(
-      {
-        'text' : 'Elected to U.S. Senate',
-      }))
+    action_runner.ClickElement(text='Elected to U.S. Senate')
     action_runner.WaitForNavigate()
-    action_runner.RunAction(ClickElementAction(
-      {
-        'text' : 'Home',
-      }))
+    action_runner.ClickElement(text='Home')
     action_runner.WaitForNavigate()
 
   def RunSmoothness(self, action_runner):
     action_runner.RunAction(ScrollAction(
       {
         'scroll_is_infinite': True
       }))
 
 
 class LinkedinPage(Top25Page):
@@ skipping 142 matching lines @@
       # Why: #1 Alexa reference
       'http://answers.yahoo.com',
       # Why: #1 Alexa sports
       'http://sports.yahoo.com/',
       # Why: top tech blog
       'http://techcrunch.com'
     ]
 
     for url in other_urls:
       self.AddPage(Top25Page(url, self))