Resolve certificate references in ONC by PEM.

chromeos/network/onc/onc_translator_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_translator.h"
 
+#include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "chromeos/network/onc/onc_constants.h"
 #include "chromeos/network/onc/onc_signature.h"
 #include "chromeos/network/onc/onc_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {
 namespace onc {
 
+namespace {
+

[Mattias Nissler (ping if slow), 2013/06/24 12:45:09]

remove :)

[pneubeck (no reviews), 2013/06/24 15:35:41]

Done.

+}  // namespace
+
 // First parameter: Filename of source ONC.
 // Second parameter: Filename of expected translated Shill json.
 class ONCTranslatorOncToShillTest
     : public ::testing::TestWithParam<std::pair<std::string, std::string> > {
 };
 
 // Test the translation from ONC to Shill json.
 TEST_P(ONCTranslatorOncToShillTest, Translate) {
   std::string source_onc_filename = GetParam().first;
   scoped_ptr<const base::DictionaryValue> onc_network(
       test_utils::ReadTestDictionary(source_onc_filename));
   std::string result_shill_filename = GetParam().second;
   scoped_ptr<const base::DictionaryValue> expected_shill_network(
       test_utils::ReadTestDictionary(result_shill_filename));
 
   scoped_ptr<base::DictionaryValue> translation(TranslateONCObjectToShill(
-      &kNetworkConfigurationSignature, *onc_network));
+      &kNetworkConfigurationSignature, *onc_network,
+      base::Bind(&test_utils::FakeFingerprintToPEM)));
 
   EXPECT_TRUE(test_utils::Equals(expected_shill_network.get(),
                                  translation.get()));
 }
 
 // Test different network types, such that each ONC object type is tested at
 // least once.
 INSTANTIATE_TEST_CASE_P(
     ONCTranslatorOncToShillTest,
     ONCTranslatorOncToShillTest,
     ::testing::Values(
         std::make_pair("managed_ethernet.onc", "shill_ethernet.json"),
         std::make_pair("valid_wifi_psk.onc", "shill_wifi_psk.json"),
         std::make_pair("valid_wifi_clientcert.onc",
                        "shill_wifi_clientcert.json"),
         std::make_pair("valid_wifi_clientref.onc",
                        "shill_wifi_clientref.json"),
         std::make_pair("valid_l2tpipsec.onc", "shill_l2tpipsec.json"),
         std::make_pair("valid_l2tpipsec_clientcert.onc",
                        "shill_l2tpipsec_clientcert.json"),
-        std::make_pair("valid_openvpn.onc", "shill_openvpn.json"),
+        std::make_pair("valid_openvpn_with_cert_fingerprints.onc",
+                       "shill_openvpn.json"),
         std::make_pair("valid_openvpn_clientcert.onc",
                        "shill_openvpn_clientcert.json")));
 
 // First parameter: Filename of source Shill json.
 // Second parameter: Filename of expected translated ONC network part.
 //
 // Note: This translation direction doesn't have to reconstruct all of the ONC
 // fields, as Chrome doesn't need all of a Service's properties.
 class ONCTranslatorShillToOncTest
     : public ::testing::TestWithParam<std::pair<std::string, std::string> > {
@@ skipping 15 matching lines @@
                                  translation.get()));
 }
 
 INSTANTIATE_TEST_CASE_P(
     ONCTranslatorShillToOncTest,
     ONCTranslatorShillToOncTest,
     ::testing::Values(
          std::make_pair("shill_l2tpipsec.json",
                         "translation_of_shill_l2tpipsec.onc"),
          std::make_pair("shill_openvpn.json",
-                        "valid_openvpn.onc"),
+                        "translation_of_shill_openvpn.onc"),
          std::make_pair("shill_openvpn_with_errors.json",
                         "translation_of_shill_openvpn_with_errors.onc"),
          std::make_pair("shill_wifi_with_state.json",
                         "translation_of_shill_wifi_with_state.onc")));
 
 }  // namespace onc
 }  // namespace chromeos