Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(145)

Unified Diff: chromeos/network/onc/onc_translator_unittest.cc

Issue 16946002: Resolve certificate references in ONC by PEM. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed tests. Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chromeos/network/onc/onc_translator_unittest.cc
diff --git a/chromeos/network/onc/onc_translator_unittest.cc b/chromeos/network/onc/onc_translator_unittest.cc
index 5365b0b7d3c41d30859a8699172a804ba9888106..c06dab4cde990de2a5a1646ef9866ff47c838243 100644
--- a/chromeos/network/onc/onc_translator_unittest.cc
+++ b/chromeos/network/onc/onc_translator_unittest.cc
@@ -4,6 +4,7 @@
#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"
@@ -14,6 +15,10 @@
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
@@ -30,7 +35,8 @@ TEST_P(ONCTranslatorOncToShillTest, Translate) {
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()));
@@ -51,7 +57,8 @@ INSTANTIATE_TEST_CASE_P(
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")));
@@ -87,7 +94,7 @@ INSTANTIATE_TEST_CASE_P(
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",

Powered by Google App Engine
This is Rietveld 408576698