Introduce CertVerifier::RequestParams

net/cert/multi_threaded_cert_verifier_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 "net/cert/multi_threaded_cert_verifier.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/debug/leak_annotations.h"
 #include "base/files/file_path.h"
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
 #include "net/base/test_data_directory.h"
 #include "net/cert/cert_trust_anchor_provider.h"
+#include "net/cert/cert_verifier.h"
 #include "net/cert/cert_verify_proc.h"
 #include "net/cert/cert_verify_result.h"
 #include "net/cert/x509_certificate.h"
 #include "net/log/net_log.h"
 #include "net/test/cert_test_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::Mock;
 using testing::ReturnRef;
@@ skipping 236 matching lines @@
     error = verifier_.Verify(test_cert.get(), "www.example.com", std::string(),
                              0, NULL, &verify_result, callback.callback(),
                              &request, BoundNetLog());
   }
   ASSERT_EQ(ERR_IO_PENDING, error);
   EXPECT_TRUE(request);
   request.reset();
   // Destroy |verifier| by going out of scope.
 }
 
-TEST_F(MultiThreadedCertVerifierTest, RequestParamsComparators) {
-  SHA1HashValue a_key;
-  memset(a_key.data, 'a', sizeof(a_key.data));
-
-  SHA1HashValue z_key;
-  memset(z_key.data, 'z', sizeof(z_key.data));
-
-  const CertificateList empty_list;
-  CertificateList test_list;
-  test_list.push_back(
-      ImportCertFromFile(GetTestCertsDirectory(), "ok_cert.pem"));
-
-  struct {
-    // Keys to test
-    MultiThreadedCertVerifier::RequestParams key1;
-    MultiThreadedCertVerifier::RequestParams key2;
-
-    // Expectation:
-    // -1 means key1 is less than key2
-    //  0 means key1 equals key2
-    //  1 means key1 is greater than key2
-    int expected_result;
-  } tests[] = {
-      {
-       // Test for basic equivalence.
-       MultiThreadedCertVerifier::RequestParams(
-           a_key, a_key, "www.example.test", std::string(), 0, test_list),
-       MultiThreadedCertVerifier::RequestParams(
-           a_key, a_key, "www.example.test", std::string(), 0, test_list),
-       0,
-      },
-      {
-       // Test that different certificates but with the same CA and for
-       // the same host are different validation keys.
-       MultiThreadedCertVerifier::RequestParams(
-           a_key, a_key, "www.example.test", std::string(), 0, test_list),
-       MultiThreadedCertVerifier::RequestParams(
-           z_key, a_key, "www.example.test", std::string(), 0, test_list),
-       -1,
-      },
-      {
-       // Test that the same EE certificate for the same host, but with
-       // different chains are different validation keys.
-       MultiThreadedCertVerifier::RequestParams(
-           a_key, z_key, "www.example.test", std::string(), 0, test_list),
-       MultiThreadedCertVerifier::RequestParams(
-           a_key, a_key, "www.example.test", std::string(), 0, test_list),
-       1,
-      },
-      {
-       // The same certificate, with the same chain, but for different
-       // hosts are different validation keys.
-       MultiThreadedCertVerifier::RequestParams(
-           a_key, a_key, "www1.example.test", std::string(), 0, test_list),
-       MultiThreadedCertVerifier::RequestParams(
-           a_key, a_key, "www2.example.test", std::string(), 0, test_list),
-       -1,
-      },
-      {
-       // The same certificate, chain, and host, but with different flags
-       // are different validation keys.
-       MultiThreadedCertVerifier::RequestParams(
-           a_key, a_key, "www.example.test", std::string(),
-           CertVerifier::VERIFY_EV_CERT, test_list),
-       MultiThreadedCertVerifier::RequestParams(
-           a_key, a_key, "www.example.test", std::string(), 0, test_list),
-       1,
-      },
-      {
-       // Different additional_trust_anchors.
-       MultiThreadedCertVerifier::RequestParams(
-           a_key, a_key, "www.example.test", std::string(), 0, empty_list),
-       MultiThreadedCertVerifier::RequestParams(
-           a_key, a_key, "www.example.test", std::string(), 0, test_list),
-       -1,
-      },
-      {
-       // Different OCSP responses.
-       MultiThreadedCertVerifier::RequestParams(
-           a_key, a_key, "www.example.test", "ocsp response", 0, test_list),
-       MultiThreadedCertVerifier::RequestParams(
-           a_key, a_key, "www.example.test", std::string(), 0, test_list),
-       -1,
-      },
-  };
-  for (size_t i = 0; i < arraysize(tests); ++i) {
-    SCOPED_TRACE(base::StringPrintf("Test[%" PRIuS "]", i));
-
-    const MultiThreadedCertVerifier::RequestParams& key1 = tests[i].key1;
-    const MultiThreadedCertVerifier::RequestParams& key2 = tests[i].key2;
-
-    switch (tests[i].expected_result) {
-      case -1:
-        EXPECT_TRUE(key1 < key2);
-        EXPECT_FALSE(key2 < key1);
-        break;
-      case 0:
-        EXPECT_FALSE(key1 < key2);
-        EXPECT_FALSE(key2 < key1);
-        break;
-      case 1:
-        EXPECT_FALSE(key1 < key2);
-        EXPECT_TRUE(key2 < key1);
-        break;
-      default:
-        FAIL() << "Invalid expectation. Can be only -1, 0, 1";
-    }
-  }
-}
-
 TEST_F(MultiThreadedCertVerifierTest, CertTrustAnchorProvider) {
   MockCertTrustAnchorProvider trust_provider;
   verifier_.SetCertTrustAnchorProvider(&trust_provider);
 
   scoped_refptr<X509Certificate> test_cert(
       ImportCertFromFile(GetTestCertsDirectory(), "ok_cert.pem"));
   ASSERT_TRUE(test_cert.get());
 
   const CertificateList empty_cert_list;
   CertificateList cert_list;
@@ skipping 114 matching lines @@
   error = callback4.WaitForResult();
   ASSERT_TRUE(IsCertificateError(error));
 
   // Let the other requests automatically cancel.
   ASSERT_EQ(5u, verifier_.requests());
   ASSERT_EQ(0u, verifier_.cache_hits());
   ASSERT_EQ(2u, verifier_.inflight_joins());
 }
 
 }  // namespace net