Make CertificateHandler a proper interface of CertificateImporter.

chromeos/network/onc/onc_certificate_importer_impl_unittest.cc

 // Copyright (c) 2012 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 "chromeos/network/onc/onc_certificate_importer.h"
+#include "chromeos/network/onc/onc_certificate_importer_impl.h"
 
 #include <cert.h>
 #include <certdb.h>
 #include <keyhi.h>
 #include <pk11pub.h>
 #include <string>
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
@@ skipping 32 matching lines @@
     return net::SERVER_CERT;
   return net::UNKNOWN_CERT;
 }
 #else
 net::CertType GetCertType(net::X509Certificate::OSCertHandle cert) {
   NOTIMPLEMENTED();
   return net::UNKNOWN_CERT;
 }
 #endif  // USE_NSS
 
-class ONCCertificateImporterTest : public testing::Test {
+class ONCCertificateImporterImplTest : public testing::Test {
  public:
   virtual void SetUp() {
     ASSERT_TRUE(test_nssdb_.is_open());
 
     slot_ = net::NSSCertDatabase::GetInstance()->GetPublicModule();
 
     // Don't run the test if the setup failed.
     ASSERT_TRUE(slot_->os_module_handle());
 
     // Test db should be empty at start of test.
     EXPECT_EQ(0ul, ListCertsInSlot().size());
   }
 
   virtual void TearDown() {
     EXPECT_TRUE(CleanupSlotContents());
     EXPECT_EQ(0ul, ListCertsInSlot().size());
   }
 
-  virtual ~ONCCertificateImporterTest() {}
+  virtual ~ONCCertificateImporterImplTest() {}
 
  protected:
-  void AddCertificatesFromFile(
-      std::string filename,
-      CertificateImporter::ParseResult expected_parse_result) {
+  void AddCertificatesFromFile(std::string filename, bool expected_success) {
     scoped_ptr<base::DictionaryValue> onc =
         test_utils::ReadTestDictionary(filename);
     base::Value* certificates_value = NULL;
     base::ListValue* certificates = NULL;
     onc->RemoveWithoutPathExpansion(toplevel_config::kCertificates,
                                     &certificates_value);
     certificates_value->GetAsList(&certificates);
     onc_certificates_.reset(certificates);
 
     web_trust_certificates_.clear();
     imported_server_and_ca_certs_.clear();
-    CertificateImporter importer(true /* allow web trust */);
-    EXPECT_EQ(expected_parse_result,
-              importer.ParseAndStoreCertificates(
-                  *certificates,
-                  &web_trust_certificates_,
-                  &imported_server_and_ca_certs_));
+    CertificateImporterImpl importer;
+    EXPECT_EQ(
+        expected_success,
+        importer.ParseAndStoreCertificates(true,  // allow web trust
+                                           *certificates,
+                                           &web_trust_certificates_,
+                                           &imported_server_and_ca_certs_));
 
     result_list_.clear();
     result_list_ = ListCertsInSlot();
   }
 
   void AddCertificateFromFile(std::string filename,
                               net::CertType expected_type,
                               std::string* guid) {
     std::string guid_temporary;
     if (!guid)
       guid = &guid_temporary;
 
-    AddCertificatesFromFile(filename, CertificateImporter::IMPORT_OK);
+    AddCertificatesFromFile(filename, true);
     ASSERT_EQ(1ul, result_list_.size());
     EXPECT_EQ(expected_type, GetCertType(result_list_[0]->os_cert_handle()));
 
     base::DictionaryValue* certificate = NULL;
     onc_certificates_->GetDictionary(0, &certificate);
     certificate->GetStringWithoutPathExpansion(certificate::kGUID, guid);
 
     if (expected_type == net::SERVER_CERT || expected_type == net::CA_CERT) {
       EXPECT_EQ(1u, imported_server_and_ca_certs_.size());
       EXPECT_TRUE(imported_server_and_ca_certs_[*guid]->Equals(
           result_list_[0]));
     } else {  // net::USER_CERT
       EXPECT_TRUE(imported_server_and_ca_certs_.empty());
-      CertificateImporter::ListCertsWithNickname(*guid, &result_list_);
+      CertificateImporterImpl::ListCertsWithNickname(*guid, &result_list_);
     }
   }
 
   scoped_ptr<base::ListValue> onc_certificates_;
   scoped_refptr<net::CryptoModule> slot_;
   net::CertificateList result_list_;
   net::CertificateList web_trust_certificates_;
-  CertificateImporter::CertsByGUID imported_server_and_ca_certs_;
+  CertificateImporterImpl::CertsByGUID imported_server_and_ca_certs_;
 
  private:
   net::CertificateList ListCertsInSlot() {
     net::CertificateList result;
     CERTCertList* cert_list = PK11_ListCertsInSlot(slot_->os_module_handle());
     for (CERTCertListNode* node = CERT_LIST_HEAD(cert_list);
          !CERT_LIST_END(node, cert_list);
          node = CERT_LIST_NEXT(node)) {
       result.push_back(net::X509Certificate::CreateFromHandle(
           node->cert, net::X509Certificate::OSCertHandles()));
@@ skipping 12 matching lines @@
       if (!net::NSSCertDatabase::GetInstance()->DeleteCertAndKey(certs[i]
                                                                      .get()))
         ok = false;
     }
     return ok;
   }
 
   crypto::ScopedTestNSSDB test_nssdb_;
 };
 
-TEST_F(ONCCertificateImporterTest, MultipleCertificates) {
-  AddCertificatesFromFile("managed_toplevel2.onc",
-                          CertificateImporter::IMPORT_OK);
+TEST_F(ONCCertificateImporterImplTest, MultipleCertificates) {
+  AddCertificatesFromFile("managed_toplevel2.onc", true);
   EXPECT_EQ(onc_certificates_->GetSize(), result_list_.size());
   EXPECT_EQ(2ul, imported_server_and_ca_certs_.size());
 }
 
-TEST_F(ONCCertificateImporterTest, MultipleCertificatesWithFailures) {
-  AddCertificatesFromFile("toplevel_partially_invalid.onc",
-                          CertificateImporter::IMPORT_INCOMPLETE);
+TEST_F(ONCCertificateImporterImplTest, MultipleCertificatesWithFailures) {
+  AddCertificatesFromFile("toplevel_partially_invalid.onc", false);
   EXPECT_EQ(3ul, onc_certificates_->GetSize());
   EXPECT_EQ(1ul, result_list_.size());
   EXPECT_TRUE(imported_server_and_ca_certs_.empty());
 }
 
-TEST_F(ONCCertificateImporterTest, AddClientCertificate) {
+TEST_F(ONCCertificateImporterImplTest, AddClientCertificate) {
   std::string guid;
   AddCertificateFromFile("certificate-client.onc", net::USER_CERT, &guid);
   EXPECT_TRUE(web_trust_certificates_.empty());
 
   SECKEYPrivateKeyList* privkey_list =
       PK11_ListPrivKeysInSlot(slot_->os_module_handle(), NULL, NULL);
   EXPECT_TRUE(privkey_list);
   if (privkey_list) {
     SECKEYPrivateKeyListNode* node = PRIVKEY_LIST_HEAD(privkey_list);
     int count = 0;
@@ skipping 16 matching lines @@
     int count = 0;
     while (!PUBKEY_LIST_END(node, pubkey_list)) {
       count++;
       node = PUBKEY_LIST_NEXT(node);
     }
     EXPECT_EQ(1, count);
     SECKEY_DestroyPublicKeyList(pubkey_list);
   }
 }
 
-TEST_F(ONCCertificateImporterTest, AddServerCertificateWithWebTrust) {
+TEST_F(ONCCertificateImporterImplTest, AddServerCertificateWithWebTrust) {
   AddCertificateFromFile("certificate-server.onc", net::SERVER_CERT, NULL);
 
   SECKEYPrivateKeyList* privkey_list =
       PK11_ListPrivKeysInSlot(slot_->os_module_handle(), NULL, NULL);
   EXPECT_FALSE(privkey_list);
 
   SECKEYPublicKeyList* pubkey_list =
       PK11_ListPublicKeysInSlot(slot_->os_module_handle(), NULL);
   EXPECT_FALSE(pubkey_list);
 
   ASSERT_EQ(1u, web_trust_certificates_.size());
   ASSERT_EQ(1u, result_list_.size());
   EXPECT_TRUE(CERT_CompareCerts(result_list_[0]->os_cert_handle(),
                                 web_trust_certificates_[0]->os_cert_handle()));
 }
 
-TEST_F(ONCCertificateImporterTest, AddWebAuthorityCertificateWithWebTrust) {
+TEST_F(ONCCertificateImporterImplTest, AddWebAuthorityCertificateWithWebTrust) {
   AddCertificateFromFile("certificate-web-authority.onc", net::CA_CERT, NULL);
 
   SECKEYPrivateKeyList* privkey_list =
       PK11_ListPrivKeysInSlot(slot_->os_module_handle(), NULL, NULL);
   EXPECT_FALSE(privkey_list);
 
   SECKEYPublicKeyList* pubkey_list =
       PK11_ListPublicKeysInSlot(slot_->os_module_handle(), NULL);
   EXPECT_FALSE(pubkey_list);
 
   ASSERT_EQ(1u, web_trust_certificates_.size());
   ASSERT_EQ(1u, result_list_.size());
   EXPECT_TRUE(CERT_CompareCerts(result_list_[0]->os_cert_handle(),
                                 web_trust_certificates_[0]->os_cert_handle()));
 }
 
-TEST_F(ONCCertificateImporterTest, AddAuthorityCertificateWithoutWebTrust) {
+TEST_F(ONCCertificateImporterImplTest, AddAuthorityCertificateWithoutWebTrust) {
   AddCertificateFromFile("certificate-authority.onc", net::CA_CERT, NULL);
   EXPECT_TRUE(web_trust_certificates_.empty());
 
   SECKEYPrivateKeyList* privkey_list =
       PK11_ListPrivKeysInSlot(slot_->os_module_handle(), NULL, NULL);
   EXPECT_FALSE(privkey_list);
 
   SECKEYPublicKeyList* pubkey_list =
       PK11_ListPublicKeysInSlot(slot_->os_module_handle(), NULL);
   EXPECT_FALSE(pubkey_list);
 }
 
 struct CertParam {
   CertParam(net::CertType certificate_type,
             const char* original_filename,
             const char* update_filename)
       : cert_type(certificate_type),
         original_file(original_filename),
         update_file(update_filename) {}
 
   net::CertType cert_type;
   const char* original_file;
   const char* update_file;
 };
 
-class ONCCertificateImporterTestWithParam :
-      public ONCCertificateImporterTest,
+class ONCCertificateImporterImplTestWithParam :
+      public ONCCertificateImporterImplTest,
       public testing::WithParamInterface<CertParam> {
 };
 
-TEST_P(ONCCertificateImporterTestWithParam, UpdateCertificate) {
+TEST_P(ONCCertificateImporterImplTestWithParam, UpdateCertificate) {
   // First we import a certificate.
   {
     SCOPED_TRACE("Import original certificate");
     AddCertificateFromFile(GetParam().original_file, GetParam().cert_type,
                            NULL);
   }
 
   // Now we import the same certificate with a different GUID. In case of a
   // client cert, the cert should be retrievable via the new GUID.
   {
     SCOPED_TRACE("Import updated certificate");
     AddCertificateFromFile(GetParam().update_file, GetParam().cert_type, NULL);
   }
 }
 
-TEST_P(ONCCertificateImporterTestWithParam, ReimportCertificate) {
+TEST_P(ONCCertificateImporterImplTestWithParam, ReimportCertificate) {
   // Verify that reimporting a client certificate works.
   for (int i = 0; i < 2; ++i) {
     SCOPED_TRACE("Import certificate, iteration " + base::IntToString(i));
     AddCertificateFromFile(GetParam().original_file, GetParam().cert_type,
                            NULL);
   }
 }
 
 INSTANTIATE_TEST_CASE_P(
-    ONCCertificateImporterTestWithParam,
-    ONCCertificateImporterTestWithParam,
+    ONCCertificateImporterImplTestWithParam,
+    ONCCertificateImporterImplTestWithParam,
     ::testing::Values(
         CertParam(net::USER_CERT,
                   "certificate-client.onc",
                   "certificate-client-update.onc"),
         CertParam(net::SERVER_CERT,
                   "certificate-server.onc",
                   "certificate-server-update.onc"),
         CertParam(net::CA_CERT,
                   "certificate-web-authority.onc",
                   "certificate-web-authority-update.onc")));
 
 }  // namespace onc
 }  // namespace chromeos