X.509-related cleanup

net/base/x509_cert_types_unittest.cc

 // 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.
 
+#include "base/basictypes.h"
 #include "net/base/x509_cert_types.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 //  0:d=0  hl=2 l=  95 cons: SEQUENCE
 //  2:d=1  hl=2 l=  11 cons:  SET
 //  4:d=2  hl=2 l=   9 cons:   SEQUENCE
 //  6:d=3  hl=2 l=   3 prim:    OBJECT            :countryName
 // 11:d=3  hl=2 l=   2 prim:    PRINTABLESTRING   :US
 // 15:d=1  hl=2 l=  23 cons:  SET
 // 17:d=2  hl=2 l=  21 cons:   SEQUENCE
@@ skipping 190 matching lines @@
   0x74, 0x2e, 0x6e, 0x65, 0x74, 0x20, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x65, 0x64,
   0x31, 0x33, 0x30, 0x31, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13, 0x2a, 0x45, 0x6e,
   0x74, 0x72, 0x75, 0x73, 0x74, 0x2e, 0x6e, 0x65, 0x74, 0x20, 0x43, 0x65, 0x72,
   0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x41, 0x75,
   0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x20, 0x28, 0x32, 0x30, 0x34, 0x38,
   0x29
 };
 
 namespace net {
 
+#if defined(OS_MACOSX)  // These should only be implemented on Mac.

[bulach, 2010/11/17 12:16:50]

maybe we should rename this file to x509_cert_types_mac_unittest.cc ? it seems
there are only mac tests here..

 TEST(X509TypesTest, Matching) {
   CertPrincipal spamco;
   spamco.common_name = "SpamCo Dept. Of Certificization";
   spamco.country_name = "EB";
   spamco.organization_names.push_back("SpamCo Holding Company, LLC");
   spamco.organization_names.push_back("SpamCo Evil Masterminds");
   spamco.organization_unit_names.push_back("Class Z Obfuscation Authority");
   ASSERT_TRUE(spamco.Matches(spamco));
 
   CertPrincipal bogus;
@@ skipping 17 matching lines @@
   bogus.locality_name = "Elbosdorf";
   EXPECT_FALSE(bogus.Matches(spamco));
   EXPECT_FALSE(spamco.Matches(bogus));
 
   bogus.locality_name = "";
   bogus.organization_unit_names.push_back("Q Division");
   EXPECT_FALSE(bogus.Matches(spamco));
   EXPECT_FALSE(spamco.Matches(bogus));
 }
 
-#if defined(OS_MACOSX)  // ParseDistinguishedName not implemented for Win/Linux
-
 TEST(X509TypesTest, ParseDNVerisign) {
   CertPrincipal verisign;
   EXPECT_TRUE(verisign.ParseDistinguishedName(VerisignDN, sizeof(VerisignDN)));
   EXPECT_EQ("", verisign.common_name);
   EXPECT_EQ("US", verisign.country_name);
   ASSERT_EQ(1U, verisign.organization_names.size());
   EXPECT_EQ("VeriSign, Inc.", verisign.organization_names[0]);
   ASSERT_EQ(1U, verisign.organization_unit_names.size());
   EXPECT_EQ("Class 1 Public Primary Certification Authority",
             verisign.organization_unit_names[0]);
@@ skipping 67 matching lines @@
   EXPECT_EQ("", entrust.country_name);
   ASSERT_EQ(1U, entrust.organization_names.size());
   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]);
 }
-
 #endif

[wtc, 2010/11/17 21:31:53]

Nit: This ifdef spans a lot of code, so it would be nice to
add a comment to #endif to note the macro that is tested.

 
-}
+}  // namespace net