Index: net/cert/x509_cert_types_unittest.cc |
diff --git a/net/cert/x509_cert_types_unittest.cc b/net/cert/x509_cert_types_unittest.cc |
index 38fd3e9526647f86448d2f2692905d0db7f61521..7590d24ae32ae72af55dfd3f3766d99c09793051 100644 |
--- a/net/cert/x509_cert_types_unittest.cc |
+++ b/net/cert/x509_cert_types_unittest.cc |
@@ -80,8 +80,8 @@ TEST(X509TypesTest, ParseDNStartcom) { |
TEST(X509TypesTest, ParseDNUserTrust) { |
CertPrincipal usertrust; |
- EXPECT_TRUE(usertrust.ParseDistinguishedName(UserTrustDN, |
- sizeof(UserTrustDN))); |
+ EXPECT_TRUE( |
+ usertrust.ParseDistinguishedName(UserTrustDN, sizeof(UserTrustDN))); |
EXPECT_EQ("UTN-USERFirst-Client Authentication and Email", |
usertrust.common_name); |
EXPECT_EQ("US", usertrust.country_name); |
@@ -90,56 +90,51 @@ TEST(X509TypesTest, ParseDNUserTrust) { |
ASSERT_EQ(1U, usertrust.organization_names.size()); |
EXPECT_EQ("The USERTRUST Network", usertrust.organization_names[0]); |
ASSERT_EQ(1U, usertrust.organization_unit_names.size()); |
- EXPECT_EQ("http://www.usertrust.com", |
- usertrust.organization_unit_names[0]); |
+ EXPECT_EQ("http://www.usertrust.com", usertrust.organization_unit_names[0]); |
} |
TEST(X509TypesTest, ParseDNTurkTrust) { |
// Note: This tests parsing UTF8STRINGs. |
CertPrincipal turktrust; |
- EXPECT_TRUE(turktrust.ParseDistinguishedName(TurkTrustDN, |
- sizeof(TurkTrustDN))); |
+ EXPECT_TRUE( |
+ turktrust.ParseDistinguishedName(TurkTrustDN, sizeof(TurkTrustDN))); |
EXPECT_EQ("TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı", |
turktrust.common_name); |
EXPECT_EQ("TR", turktrust.country_name); |
EXPECT_EQ("Ankara", turktrust.locality_name); |
ASSERT_EQ(1U, turktrust.organization_names.size()); |
- EXPECT_EQ("TÜRKTRUST Bilgi İletişim ve Bilişim Güvenliği Hizmetleri A.Ş. (c) Kasım 2005", |
- turktrust.organization_names[0]); |
+ EXPECT_EQ( |
+ "TÜRKTRUST Bilgi İletişim ve Bilişim Güvenliği Hizmetleri A.Ş. (c) Kasım " |
+ "2005", |
+ turktrust.organization_names[0]); |
} |
TEST(X509TypesTest, ParseDNATrust) { |
// Note: This tests parsing 16-bit BMPSTRINGs. |
CertPrincipal atrust; |
- EXPECT_TRUE(atrust.ParseDistinguishedName(ATrustQual01DN, |
- sizeof(ATrustQual01DN))); |
- EXPECT_EQ("A-Trust-Qual-01", |
- atrust.common_name); |
+ EXPECT_TRUE( |
+ atrust.ParseDistinguishedName(ATrustQual01DN, sizeof(ATrustQual01DN))); |
+ EXPECT_EQ("A-Trust-Qual-01", atrust.common_name); |
EXPECT_EQ("AT", atrust.country_name); |
ASSERT_EQ(1U, atrust.organization_names.size()); |
EXPECT_EQ("A-Trust Ges. für Sicherheitssysteme im elektr. Datenverkehr GmbH", |
atrust.organization_names[0]); |
ASSERT_EQ(1U, atrust.organization_unit_names.size()); |
- EXPECT_EQ("A-Trust-Qual-01", |
- atrust.organization_unit_names[0]); |
+ EXPECT_EQ("A-Trust-Qual-01", atrust.organization_unit_names[0]); |
} |
TEST(X509TypesTest, ParseDNEntrust) { |
// Note: This tests parsing T61STRINGs and fields with multiple values. |
CertPrincipal entrust; |
- EXPECT_TRUE(entrust.ParseDistinguishedName(EntrustDN, |
- sizeof(EntrustDN))); |
- EXPECT_EQ("Entrust.net Certification Authority (2048)", |
- entrust.common_name); |
+ EXPECT_TRUE(entrust.ParseDistinguishedName(EntrustDN, sizeof(EntrustDN))); |
+ EXPECT_EQ("Entrust.net Certification Authority (2048)", entrust.common_name); |
EXPECT_EQ("", entrust.country_name); |
ASSERT_EQ(1U, entrust.organization_names.size()); |
- EXPECT_EQ("Entrust.net", |
- entrust.organization_names[0]); |
+ EXPECT_EQ("Entrust.net", entrust.organization_names[0]); |
ASSERT_EQ(2U, entrust.organization_unit_names.size()); |
EXPECT_EQ("www.entrust.net/CPS_2048 incorp. by ref. (limits liab.)", |
entrust.organization_unit_names[0]); |
- EXPECT_EQ("(c) 1999 Entrust.net Limited", |
- entrust.organization_unit_names[1]); |
+ EXPECT_EQ("(c) 1999 Entrust.net Limited", entrust.organization_unit_names[1]); |
} |
#endif |
@@ -149,73 +144,54 @@ const struct CertDateTestData { |
bool is_valid; |
base::Time::Exploded expected_result; |
} kCertDateTimeData[] = { |
- { CERT_DATE_FORMAT_UTC_TIME, |
- "120101000000Z", |
- true, |
- { 2012, 1, 0, 1, 0, 0, 0 } }, |
- { CERT_DATE_FORMAT_GENERALIZED_TIME, |
- "20120101000000Z", |
- true, |
- { 2012, 1, 0, 1, 0, 0, 0 } }, |
- { CERT_DATE_FORMAT_UTC_TIME, |
- "490101000000Z", |
- true, |
- { 2049, 1, 0, 1, 0, 0, 0 } }, |
- { CERT_DATE_FORMAT_UTC_TIME, |
- "500101000000Z", |
- true, |
- { 1950, 1, 0, 1, 0, 0, 0 } }, |
- { CERT_DATE_FORMAT_GENERALIZED_TIME, |
- "19500101000000Z", |
- true, |
- { 1950, 1, 0, 1, 0, 0, 0 } }, |
- { CERT_DATE_FORMAT_UTC_TIME, |
- "AB0101000000Z", |
- false, |
- { 0 } }, |
- { CERT_DATE_FORMAT_GENERALIZED_TIME, |
- "19AB0101000000Z", |
- false, |
- { 0 } }, |
- { CERT_DATE_FORMAT_UTC_TIME, |
- "", |
- false, |
- { 0 } }, |
- { CERT_DATE_FORMAT_UTC_TIME, |
- "A", |
- false, |
- { 0 } }, |
- { CERT_DATE_FORMAT_GENERALIZED_TIME, |
- "20121301000000Z", |
- false, |
- { 0 } }, |
- { CERT_DATE_FORMAT_GENERALIZED_TIME, |
- "20120101123000Z", |
- true, |
- { 2012, 1, 0, 1, 12, 30, 0 } }, |
+ {CERT_DATE_FORMAT_UTC_TIME, |
+ "120101000000Z", |
+ true, |
+ {2012, 1, 0, 1, 0, 0, 0}}, |
+ {CERT_DATE_FORMAT_GENERALIZED_TIME, |
+ "20120101000000Z", |
+ true, |
+ {2012, 1, 0, 1, 0, 0, 0}}, |
+ {CERT_DATE_FORMAT_UTC_TIME, |
+ "490101000000Z", |
+ true, |
+ {2049, 1, 0, 1, 0, 0, 0}}, |
+ {CERT_DATE_FORMAT_UTC_TIME, |
+ "500101000000Z", |
+ true, |
+ {1950, 1, 0, 1, 0, 0, 0}}, |
+ {CERT_DATE_FORMAT_GENERALIZED_TIME, |
+ "19500101000000Z", |
+ true, |
+ {1950, 1, 0, 1, 0, 0, 0}}, |
+ {CERT_DATE_FORMAT_UTC_TIME, "AB0101000000Z", false, {0}}, |
+ {CERT_DATE_FORMAT_GENERALIZED_TIME, "19AB0101000000Z", false, {0}}, |
+ {CERT_DATE_FORMAT_UTC_TIME, "", false, {0}}, |
+ {CERT_DATE_FORMAT_UTC_TIME, "A", false, {0}}, |
+ {CERT_DATE_FORMAT_GENERALIZED_TIME, "20121301000000Z", false, {0}}, |
+ {CERT_DATE_FORMAT_GENERALIZED_TIME, |
+ "20120101123000Z", |
+ true, |
+ {2012, 1, 0, 1, 12, 30, 0}}, |
}; |
// GTest pretty printer. |
void PrintTo(const CertDateTestData& data, std::ostream* os) { |
*os << " format: " << data.format |
<< "; date string: " << base::StringPiece(data.date_string) |
- << "; valid: " << data.is_valid |
- << "; expected date: " |
- << (data.is_valid ? |
- base::Time::FromUTCExploded(data.expected_result) |
- .ToInternalValue() : |
- 0U); |
+ << "; valid: " << data.is_valid << "; expected date: " |
+ << (data.is_valid ? base::Time::FromUTCExploded(data.expected_result) |
+ .ToInternalValue() |
+ : 0U); |
} |
class X509CertTypesDateTest : public testing::TestWithParam<CertDateTestData> { |
- public: |
- virtual ~X509CertTypesDateTest() {} |
- virtual void SetUp() { |
- test_data_ = GetParam(); |
- } |
- |
- protected: |
- CertDateTestData test_data_; |
+ public: |
+ virtual ~X509CertTypesDateTest() {} |
+ virtual void SetUp() { test_data_ = GetParam(); } |
+ |
+ protected: |
+ CertDateTestData test_data_; |
}; |
TEST_P(X509CertTypesDateTest, Parse) { |
@@ -230,9 +206,9 @@ TEST_P(X509CertTypesDateTest, Parse) { |
// least that the times have the same truncating behaviour. |
// Note: Compared as internal values so that mismatches can be cleanly |
// printed by GTest (eg: without PrintTo overrides). |
- EXPECT_EQ(base::Time::FromUTCExploded(test_data_.expected_result) |
- .ToInternalValue(), |
- parsed_date.ToInternalValue()); |
+ EXPECT_EQ( |
+ base::Time::FromUTCExploded(test_data_.expected_result).ToInternalValue(), |
+ parsed_date.ToInternalValue()); |
} |
INSTANTIATE_TEST_CASE_P(, |
X509CertTypesDateTest, |