Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1343)

Unified Diff: chrome/browser/ui/views/certificate_selector_browsertest.cc

Issue 1918143005: Add a serial number column to the certificate selector dialog and fix its size. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: msw comments Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/certificate_selector.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/certificate_selector_browsertest.cc
diff --git a/chrome/browser/ui/views/certificate_selector_browsertest.cc b/chrome/browser/ui/views/certificate_selector_browsertest.cc
index e917720d11a6826101962496b50d8f42408cf9ad..5824ccce718b371b1a61f234918242debabed39e 100644
--- a/chrome/browser/ui/views/certificate_selector_browsertest.cc
+++ b/chrome/browser/ui/views/certificate_selector_browsertest.cc
@@ -11,6 +11,7 @@
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/grit/generated_resources.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/interactive_test_utils.h"
#include "content/public/test/browser_test_utils.h"
@@ -18,6 +19,7 @@
#include "net/cert/x509_certificate.h"
#include "net/test/cert_test_util.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/base/models/table_model.h"
#include "ui/views/controls/label.h"
namespace {
@@ -55,6 +57,8 @@ class TestCertificateSelector : public chrome::CertificateSelector {
canceled_ = canceled;
}
+ using chrome::CertificateSelector::table_model_for_testing;
+
void set_on_destroy(base::Closure on_destroy) { on_destroy_ = on_destroy; }
private:
@@ -102,6 +106,27 @@ class CertificateSelectorTest : public InProcessBrowserTest {
} // namespace
+IN_PROC_BROWSER_TEST_F(CertificateSelectorTest, GetRowText) {
+ ui::TableModel* model = selector_->table_model_for_testing();
+ EXPECT_EQ(base::UTF8ToUTF16("Client Cert A"),
+ model->GetText(0, IDS_CERT_SELECTOR_SUBJECT_COLUMN));
+ EXPECT_EQ(base::UTF8ToUTF16("B CA"),
+ model->GetText(0, IDS_CERT_SELECTOR_ISSUER_COLUMN));
+ EXPECT_EQ(base::string16(),
+ model->GetText(0, IDS_CERT_SELECTOR_PROVIDER_COLUMN));
+ EXPECT_EQ(base::UTF8ToUTF16("1000"),
+ model->GetText(0, IDS_CERT_SELECTOR_SERIAL_COLUMN));
+
+ EXPECT_EQ(base::UTF8ToUTF16("Client Cert D"),
+ model->GetText(1, IDS_CERT_SELECTOR_SUBJECT_COLUMN));
+ EXPECT_EQ(base::UTF8ToUTF16("E CA"),
+ model->GetText(1, IDS_CERT_SELECTOR_ISSUER_COLUMN));
+ EXPECT_EQ(base::string16(),
+ model->GetText(1, IDS_CERT_SELECTOR_PROVIDER_COLUMN));
+ EXPECT_EQ(base::UTF8ToUTF16("1002"),
+ model->GetText(1, IDS_CERT_SELECTOR_SERIAL_COLUMN));
+}
+
IN_PROC_BROWSER_TEST_F(CertificateSelectorTest, GetSelectedCert) {
EXPECT_EQ(client_1_.get(), selector_->GetSelectedCert());
EXPECT_TRUE(ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_DOWN, false,
« no previous file with comments | « chrome/browser/ui/views/certificate_selector.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698