Replace OncNetworkParser by the new ONC translator.

chrome/browser/chromeos/cros/network_library_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 <cert.h>
 #include <pk11pub.h>
 
 #include <string>
 #include <vector>
 
 #include "base/at_exit.h"
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/json/json_reader.h"
 #include "base/lazy_instance.h"
 #include "base/path_service.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
-#include "chrome/browser/chromeos/cros/onc_network_parser.h"
 #include "chrome/common/chrome_paths.h"
 #include "chromeos/network/onc/onc_certificate_importer.h"
 #include "chromeos/network/onc/onc_constants.h"
 #include "chromeos/network/onc/onc_utils.h"
 #include "crypto/nss_util.h"
 #include "net/base/crypto_module.h"
 #include "net/base/nss_cert_database.h"
 #include "net/base/x509_certificate.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 258 matching lines @@
   WifiNetwork* wifi1 = cros_->FindWifiNetworkByPath("wifi1");
   ASSERT_NE(static_cast<const WifiNetwork*>(NULL), wifi1);
   EXPECT_TRUE(wifi1->connected());
   cros_->DisconnectFromNetwork(wifi1);
   EXPECT_FALSE(wifi1->connected());
   EXPECT_TRUE(cros_->CanConnectToNetwork(wifi1));
   cros_->ConnectToWifiNetwork(wifi1);
   EXPECT_TRUE(wifi1->connected());
 }
 
-TEST_F(NetworkLibraryStubTest, NetworkConnectOncWifi) {
-  // Import a wireless network via loading an ONC file.
-  scoped_ptr<base::ListValue> network_configs;
-  scoped_ptr<base::ListValue> certificates;
-  GetTestData("cert-pattern.onc", &certificates, &network_configs);
+// TEST_F(NetworkLibraryStubTest, NetworkConnectOncWifi) {
+//   // Import a wireless network via loading an ONC file.
+//   scoped_ptr<base::ListValue> network_configs;
+//   scoped_ptr<base::ListValue> certificates;
 
-  onc::CertificateImporter importer(onc::ONC_SOURCE_USER_IMPORT,
-                                    false /* don't allow webtrust */);
-  EXPECT_EQ(onc::CertificateImporter::IMPORT_OK,
-            importer.ParseAndStoreCertificates(*certificates));
+//   WifiNetwork* wifi = cros_->FindWifiNetworkByPath("wifi_cert_pattern");
 
-  OncNetworkParser parser(*network_configs,
-                          onc::ONC_SOURCE_USER_IMPORT);
-  ASSERT_TRUE(parser.parse_error().empty());
-  EXPECT_EQ(1, parser.GetNetworkConfigsSize());
-  scoped_ptr<Network> network(parser.ParseNetwork(0, NULL));
-  ASSERT_TRUE(network.get());
-  EXPECT_EQ(CLIENT_CERT_TYPE_PATTERN, network->client_cert_type());
+//   onc::CertificateImporter importer(onc::ONC_SOURCE_USER_IMPORT,
+//                                     false /* don't allow webtrust */);
+//   EXPECT_EQ(onc::CertificateImporter::IMPORT_OK,
+//             importer.ParseAndStoreCertificates(*certificates));
 
-  StubEnrollmentDelegate* enrollment_delegate = new StubEnrollmentDelegate();
+//   OncNetworkParser parser(*network_configs,
+//                           onc::ONC_SOURCE_USER_IMPORT);
+//   ASSERT_TRUE(parser.parse_error().empty());
+//   EXPECT_EQ(1, parser.GetNetworkConfigsSize());
+//   scoped_ptr<Network> network(parser.ParseNetwork(0, NULL));
+//   ASSERT_TRUE(network.get());
+//   EXPECT_EQ(CLIENT_CERT_TYPE_PATTERN, network->client_cert_type());
 
-  network->SetEnrollmentDelegate(enrollment_delegate);
-  EXPECT_FALSE(enrollment_delegate->did_enroll);
-  EXPECT_FALSE(enrollment_delegate->correct_args);
-  WifiNetwork* wifi1 = static_cast<WifiNetwork*>(network.get());
+//   StubEnrollmentDelegate* enrollment_delegate = new StubEnrollmentDelegate();
 
-  ASSERT_NE(static_cast<const WifiNetwork*>(NULL), wifi1);
-  EXPECT_FALSE(wifi1->connected());
-  EXPECT_TRUE(cros_->CanConnectToNetwork(wifi1));
-  EXPECT_FALSE(wifi1->connected());
-  wifi1->AttemptConnection(
-      base::Bind(&WifiNetworkConnectCallback, cros_, wifi1));
-  EXPECT_TRUE(wifi1->connected());
-  EXPECT_TRUE(enrollment_delegate->did_enroll);
-  EXPECT_TRUE(enrollment_delegate->correct_args);
-}
+//   network->SetEnrollmentDelegate(enrollment_delegate);
+//   EXPECT_FALSE(enrollment_delegate->did_enroll);
+//   EXPECT_FALSE(enrollment_delegate->correct_args);
+//   WifiNetwork* wifi1 = static_cast<WifiNetwork*>(network.get());
 
-TEST_F(NetworkLibraryStubTest, NetworkConnectOncVPN) {
-  // Import a wireless network via loading an ONC file.
-  scoped_ptr<base::ListValue> network_configs;
-  scoped_ptr<base::ListValue> certificates;
-  GetTestData("cert-pattern-vpn.onc", &certificates, &network_configs);
+//   ASSERT_NE(static_cast<const WifiNetwork*>(NULL), wifi1);
+//   EXPECT_FALSE(wifi1->connected());
+//   EXPECT_TRUE(cros_->CanConnectToNetwork(wifi1));
+//   EXPECT_FALSE(wifi1->connected());
+//   wifi1->AttemptConnection(
+//       base::Bind(&WifiNetworkConnectCallback, cros_, wifi1));
+//   EXPECT_TRUE(wifi1->connected());
+//   EXPECT_TRUE(enrollment_delegate->did_enroll);
+//   EXPECT_TRUE(enrollment_delegate->correct_args);
+// }
 
-  onc::CertificateImporter importer(onc::ONC_SOURCE_USER_IMPORT,
-                                    false /* don't allow webtrust */);
-  EXPECT_EQ(onc::CertificateImporter::IMPORT_OK,
-            importer.ParseAndStoreCertificates(*certificates));
+// TEST_F(NetworkLibraryStubTest, NetworkConnectOncVPN) {
+//   // Import a wireless network via loading an ONC file.
+//   scoped_ptr<base::ListValue> network_configs;
+//   scoped_ptr<base::ListValue> certificates;
+//   GetTestData("cert-pattern-vpn.onc", &certificates, &network_configs);
 
-  OncNetworkParser parser(*network_configs,
-                          onc::ONC_SOURCE_USER_IMPORT);
-  ASSERT_TRUE(parser.parse_error().empty());
-  EXPECT_EQ(1, parser.GetNetworkConfigsSize());
-  scoped_ptr<Network> network(parser.ParseNetwork(0, NULL));
-  ASSERT_TRUE(network.get());
-  EXPECT_EQ(CLIENT_CERT_TYPE_PATTERN, network->client_cert_type());
+//   onc::CertificateImporter importer(onc::ONC_SOURCE_USER_IMPORT,
+//                                     false /* don't allow webtrust */);
+//   EXPECT_EQ(onc::CertificateImporter::IMPORT_OK,
+//             importer.ParseAndStoreCertificates(*certificates));
 
-  StubEnrollmentDelegate* enrollment_delegate = new StubEnrollmentDelegate();
+//   OncNetworkParser parser(*network_configs,
+//                           onc::ONC_SOURCE_USER_IMPORT);
+//   ASSERT_TRUE(parser.parse_error().empty());
+//   EXPECT_EQ(1, parser.GetNetworkConfigsSize());
+//   scoped_ptr<Network> network(parser.ParseNetwork(0, NULL));
+//   ASSERT_TRUE(network.get());
+//   EXPECT_EQ(CLIENT_CERT_TYPE_PATTERN, network->client_cert_type());
 
-  network->SetEnrollmentDelegate(enrollment_delegate);
-  EXPECT_FALSE(enrollment_delegate->did_enroll);
-  EXPECT_FALSE(enrollment_delegate->correct_args);
-  VirtualNetwork* vpn1 = static_cast<VirtualNetwork*>(network.get());
+//   StubEnrollmentDelegate* enrollment_delegate = new StubEnrollmentDelegate();
 
-  ASSERT_NE(static_cast<const VirtualNetwork*>(NULL), vpn1);
-  EXPECT_FALSE(vpn1->connected());
-  EXPECT_TRUE(cros_->CanConnectToNetwork(vpn1));
-  EXPECT_FALSE(vpn1->connected());
-  vpn1->AttemptConnection(
-      base::Bind(&VirtualNetworkConnectCallback, cros_, vpn1));
-  EXPECT_TRUE(vpn1->connected());
-  EXPECT_TRUE(enrollment_delegate->did_enroll);
-  EXPECT_TRUE(enrollment_delegate->correct_args);
-}
+//   network->SetEnrollmentDelegate(enrollment_delegate);
+//   EXPECT_FALSE(enrollment_delegate->did_enroll);
+//   EXPECT_FALSE(enrollment_delegate->correct_args);
+//   VirtualNetwork* vpn1 = static_cast<VirtualNetwork*>(network.get());
+
+//   ASSERT_NE(static_cast<const VirtualNetwork*>(NULL), vpn1);
+//   EXPECT_FALSE(vpn1->connected());
+//   EXPECT_TRUE(cros_->CanConnectToNetwork(vpn1));
+//   EXPECT_FALSE(vpn1->connected());
+//   vpn1->AttemptConnection(
+//       base::Bind(&VirtualNetworkConnectCallback, cros_, vpn1));
+//   EXPECT_TRUE(vpn1->connected());
+//   EXPECT_TRUE(enrollment_delegate->did_enroll);
+//   EXPECT_TRUE(enrollment_delegate->correct_args);
+// }

[stevenjb, 2012/12/21 18:38:36]

Remove?

[Greg Spencer (Chromium), 2012/12/21 19:36:43]

Yes, this should be removed.  We don't check in commented out code.

[pneubeck (no reviews), 2013/01/09 17:04:05]

Done. Added new replacement tests.

 
 TEST_F(NetworkLibraryStubTest, NetworkConnectVPN) {
   VirtualNetwork* vpn1 = cros_->FindVirtualNetworkByPath("vpn1");
   EXPECT_NE(static_cast<const VirtualNetwork*>(NULL), vpn1);
   EXPECT_FALSE(vpn1->connected());
   EXPECT_TRUE(cros_->CanConnectToNetwork(vpn1));
   cros_->ConnectToVirtualNetwork(vpn1);
   EXPECT_TRUE(vpn1->connected());
   ASSERT_NE(static_cast<const VirtualNetwork*>(NULL), cros_->virtual_network());
   EXPECT_EQ("vpn1", cros_->virtual_network()->service_path());
 }
 
 // TODO(stevenjb): Test remembered networks.
 
 // TODO(stevenjb): Test network profiles.
 
 // TODO(stevenjb): Test network devices.
 
 // TODO(stevenjb): Test data plans.
 
 // TODO(stevenjb): Test monitor network / device.
 
 }  // namespace chromeos