Exposed GetSecurityState and GetPageType to pyAuto.

chrome/test/functional/https.py

Index: chrome/test/functional/https.py
===================================================================
--- chrome/test/functional/https.py	(revision 125203)
+++ chrome/test/functional/https.py	(working copy)
@@ -90,6 +90,43 @@
       self.assertEqual(self.GetActiveTabTitle(), first_page_title,
                        msg="Did not go back to previous page correctly.")
 
+  def testSSLCertOK(self):
+    """Verify Certificate OK does not display interstitial page."""

[dennis_jeffrey, 2012/03/09 02:07:47]

This test is doing more than that; it's actually asserting that the page type is
"normal"

[dyu1, 2012/03/14 19:00:10]

Done.

+    url = self._https_server_ok.GetURL('google.html').spec()
+    self.NavigateToURL(url)
+    tab_proxy = self.GetBrowserWindow(0).GetTab(0)
+    result_dict = tab_proxy.GetPageType()
+    self.assertTrue(result_dict, msg='Could not determine the type of the page')
+    self.assertNotEqual(result_dict['page_type'], pyauto.PAGE_TYPE_INTERSTITIAL,
+                        msg="Cert OK displayed interstitial page.")

[dennis_jeffrey, 2012/03/09 02:07:47]

Isn't this assertion redundant?  You're already asserting in the next line below
that the page type is a particular type.

[dyu1, 2012/03/14 19:00:10]

Well one is NotEqual and one is Equal. The errors are different and needs to be
checked which interstitial type is actually showing up.

On 2012/03/09 02:07:47, dennis_jeffrey wrote:

[dennis_jeffrey, 2012/03/14 21:55:26]

I still don't understand why both assertions are needed.  If we only assert that
the page type is NORMAL, and the assertion passes, then doesn't that already
imply that the page type is neither ERROR nor INTERSTITIAL?

[dyu1, 2012/03/14 22:32:32]

Done.

+    self.assertEqual(result_dict['page_type'], pyauto.PAGE_TYPE_NORMAL,
+                     msg="Cert OK displayed error page.")

[dennis_jeffrey, 2012/03/09 02:07:47]

Change the error message to say that the page type is not "normal" as expected,
then also print the actual page type identified.

[dyu1, 2012/03/14 19:00:10]

If it's not a normal page it will display and error page. Should I just say
"Cert OK displayed error page. Should display a normal page." ?

On 2012/03/09 02:07:47, dennis_jeffrey wrote:

[dennis_jeffrey, 2012/03/14 21:55:26]

You're right that if it's not a normal page, it will be the error page.  But
that's only because we've asserted above that the page type is not INTERSTITIAL.
 And it implicitly assumes that there are only 3 page types: NORMAL, ERROR, or
INTERSTITAL.  If another page type is added later, this implicit assumption will
be invalid.  I think a cleaner solution is to only have 1 assertion: assert that
the page type is normal.  If that assertion fails, we should include in the
error message which page type it actually was.

[dyu1, 2012/03/14 22:32:32]

Done.

 
+  def testSSLCertIsExpiredAndCertNameMismatches(self):
+    """Verify Certificate Expiration and Certificate Mismatched name."""
+    for server, cert_status_flag, msg in zip((self._https_server_expired,
+                self._https_server_mismatched),
+        (pyauto.CERT_STATUS_DATE_INVALID,
+         pyauto.CERT_STATUS_COMMON_NAME_INVALID),
+        ('Cert has not expired', 'Cert name does not mismatch')):

[dennis_jeffrey, 2012/03/09 02:07:47]

nit: I recommend this indentation:

for server, cert_status_flag, msg in zip(
    (self._https_server_expired, self._https_server_mismatched),
    (pyauto.CERT_STATUS_DATE_INVALID,
     pyauto.CERT_STATUS_COMMON_NAME_INVALID),
    ('Cert has not expired', 'Cert name does not mismatch')):

[dyu1, 2012/03/14 19:00:10]

Done.

+      self.NavigateToURL(server.GetURL('google.html').spec())
+      result_dict = self.GetBrowserWindow(0).GetTab(0).GetSecurityState()
+      self.assertTrue(result_dict, msg='Could not get security state info')
+      self.assertTrue(
+          result_dict['ssl_cert_status'] & pyauto.uint32_ptr.frompointer(
+              cert_status_flag).value(), msg=msg)

[dennis_jeffrey, 2012/03/09 02:07:47]

nit: move the msg=msg down to the next line, and indent it to line up underneath
the "result_dict" in line 116 above:

self.assertTrue(
    result_dict['ssl_cert_status'] & pyauto.uint32_ptr.frompointer(
        cert_status_flag).value(),
    msg=msg)

[dyu1, 2012/03/14 19:00:10]

Done.

+
+  def testSSLCertAuthorityOK(self):
+    """Verify Certificate OK is valid."""
+    self.NavigateToURL(
+        self._https_server_mismatched.GetURL('google.html').spec())
+    result_dict = self.GetBrowserWindow(0).GetTab(0).GetSecurityState()
+    self.assertTrue(result_dict, msg='Could not get security state info')
+    self.assertFalse(
+        result_dict['ssl_cert_status'] & pyauto.uint32_ptr.frompointer(
+            pyauto.CERT_STATUS_AUTHORITY_INVALID).value(),
+        msg='Cert OK is invalid')
+
+
 if __name__ == '__main__':
   pyauto_functional.Main()