Adding instant tests for popup handling and search query length 100 character...

chrome/test/functional/instant.py

 #!/usr/bin/python
 
 # Copyright (c) 2010 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.
 
 import os
 
 import pyauto_functional  # Must be imported before pyauto
 import pyauto
+import urlparse
 
 
 class InstantTest(pyauto.PyUITest):
   """TestCase for Omnibox Instant feature."""
 
   def setUp(self):
     pyauto.PyUITest.setUp(self)
     self.SetPrefs(pyauto.kInstantEnabled, True)
 
   def _DoneLoading(self):
     info = self.GetInstantInfo()
     return info.get('current') and not info.get('loading')
 
+  def _DoneLoadingQuery(self, query):

[Nirnimesh, 2011/01/20 00:39:23]

Add a docstring to explain what it's doing. 

[Huyen, 2011/01/20 02:44:37]

Done.

+    self.assertTrue(self.WaitUntil(self._DoneLoading))
+    location = self.GetInstantInfo().get('location')
+    if location is None:
+      return False
+    else:

[Nirnimesh, 2011/01/20 00:39:23]

else: is redundant

[Huyen, 2011/01/20 02:44:37]

Polished the logic here a bit. Should be better now. :)

+      q = urlparse.parse_qs(location).get('q')
+      if q is None:
+        return False
+      elif q == query:
+        return True
+
   def testInstantNavigation(self):
     """Test that instant navigates based on omnibox input."""
     self.SetOmniboxText('google.com')
     self.assertTrue(self.WaitUntil(self._DoneLoading))
     location = self.GetInstantInfo()['location']
     self.assertTrue('google.com' in location,
                     msg='No google.com in %s' % location)
 
     self.SetOmniboxText('google.es')
     self.assertTrue(self.WaitUntil(self._DoneLoading))
@@ skipping 22 matching lines @@
     self.assertTrue(self.WaitUntil(self._DoneLoading))
     history = self.GetHistoryInfo().History()
     self.assertEqual(0, len(history))
 
   def testInstantDisabledForJavaScript(self):
     """Test that instant is disabled for javascript URLs."""
     self.SetOmniboxText('javascript:')
     self.assertFalse(self.GetInstantInfo()['active'],
                      'Instant enabled for javascript URL.')
 
+  def testInstantDisablesPopupsOnPrefetch(self):
+    """Test that instant disables popups when prefetching."""
+    file_url = self.GetFileURLForPath(os.path.join(
+        self.DataDir(), 'popup_blocker', 'popup-blocked-to-post-blank.html'))
+    self.SetOmniboxText(file_url)
+    self.assertTrue(self.WaitUntil(self._DoneLoading))
+    location = self.GetInstantInfo()['location']
+    self.assertTrue(file_url in location,
+                    msg='Prefetched page is not %s' % file_url)
+    blocked_popups = self.GetBlockedPopupsInfo()
+    self.assertEqual(0, len(blocked_popups),
+                     msg='Unexpected popup in instant preview.')
+
+  def testInstantLoadsFor100CharsLongQuery(self):
+    """Test that instant loads for search query of 100 characters."""
+    query = '#' * 100
+    self.SetOmniboxText(query)
+    self.assertTrue(self.WaitUntil(self._DoneLoadingQuery, args=[query]))
+
 
 if __name__ == '__main__':
   pyauto_functional.Main()