New PyAuto tests for cookies.

chrome/test/functional/cookies.py

Index: chrome/test/functional/cookies.py
diff --git a/chrome/test/functional/cookies.py b/chrome/test/functional/cookies.py
index 5a3a60bcbd541d110126e47b6d941740f1c9640e..4b3cc28929099d051725fe7da9892381203cec50 100644
--- a/chrome/test/functional/cookies.py
+++ b/chrome/test/functional/cookies.py
@@ -12,7 +12,32 @@ import pyauto
 class CookiesTest(pyauto.PyUITest):
   """Tests for Cookies."""
 
-  def testCookies(self):
+  def _ClearCookiesAndCheck(self, url):
+    self.ClearBrowsingData(['COOKIES'], 'EVERYTHING')
+    cookie_data = self.GetCookie(pyauto.GURL(url))
+    self.assertEqual(0, len(cookie_data))
+
+  def _CookieCheckRegularWindow(self, url):
+    """Check the cookie for the given URL in a regular window."""
+    self._ClearCookiesAndCheck(url)
+    # Assert that the cookie data isn't empty after navigating to the url.
+    self.NavigateToURL(url)
+    cookie_data = self.GetCookie(pyauto.GURL(url))
+    self.assertNotEqual(0, len(cookie_data))
+    # Restart the browser and ensure the cookie data is the same.
+    self.RestartBrowser(clear_profile=False)
+    self.assertEqual(cookie_data, self.GetCookie(pyauto.GURL(url)))
+
+  def _CookieCheckIncognitoWindow(self, url):
+    """Check the cookie for the given URL in an incognito window."""
+    self._ClearCookiesAndCheck(url)
+    # Navigate to the URL in an incognito window and verify no cookie is set.
+    self.RunCommand(pyauto.IDC_NEW_INCOGNITO_WINDOW)
+    self.NavigateToURL(url, 1, 0)
+    cookie_data = self.GetCookie(pyauto.GURL(url))
+    self.assertEqual(0, len(cookie_data))
+
+  def testSetCookies(self):
     """Test setting cookies and getting the value."""
     cookie_url = pyauto.GURL(self.GetFileURLForPath(
         os.path.join(self.DataDir(), 'title1.html')))
@@ -20,6 +45,25 @@ class CookiesTest(pyauto.PyUITest):
     self.SetCookie(cookie_url, cookie_val)
     self.assertEqual(cookie_val, self.GetCookie(cookie_url))
 
+  def testCookiesHttp(self):
+    """Test cookies set over HTTP for incognito and regular windows."""
+    http_url = 'http://www.google.com'
+    self._CookieCheckRegularWindow(http_url)
+    self._CookieCheckIncognitoWindow(http_url)
+
+  def testCookiesHttps(self):
+    """Test cookies set over HTTPS for incognito and regular windows."""
+    https_url = 'https://www.google.com'
+    self._CookieCheckRegularWindow(https_url)
+    self._CookieCheckIncognitoWindow(https_url)
+
+  def testCookiesFile(self):
+    """Test cookies set from an HTML file for incognito and regular windows."""
+    file_url = self.GetFileURLForPath(
+        os.path.join(self.DataDir(), 'setcookie.html'))
+    self._CookieCheckRegularWindow(file_url)
+    self._CookieCheckIncognitoWindow(file_url)
+
 
 if __name__ == '__main__':
   pyauto_functional.Main()