Separating ONC<->Shill translation from the ONC signature.

chromeos/network/onc/onc_validator_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_validator.h"
 
 #include <string>
 #include <utility>
 
 #include "base/logging.h"
@@ skipping 138 matching lines @@
                                 &kToplevelConfigurationSignature,
                                 false),
                       OncParams("encrypted.onc",
                                 &kToplevelConfigurationSignature,
                                 true),
                       OncParams("managed_vpn.onc",
                                 &kNetworkConfigurationSignature,
                                 true),
                       OncParams("managed_ethernet.onc",
                                 &kNetworkConfigurationSignature,
-                                true)));
+                                true),
+                      OncParams("translation_of_shill_wifi_with_state.onc",
+                                &kNetworkWithStateSignature,
+                                false)));
 
 namespace {
 
 struct RepairParams {
   // Both arguments are strings to identify the object that is expected as the
   // validation result. They may either be used as filenames or as dictionary
   // keys.
   RepairParams(std::string strict_repaired,
                std::string liberal_repaired)
       : location_of_strict_repaired(strict_repaired),
@@ skipping 94 matching lines @@
                                   &kNetworkConfigurationSignature,
                                   true),
                         RepairParams("", "managed-network-repaired")),
          std::make_pair(OncParams("network-missing-required",
                                   &kNetworkConfigurationSignature,
                                   false),
                         RepairParams("", "network-missing-required")),
          std::make_pair(OncParams("managed-network-missing-required",
                                   &kNetworkConfigurationSignature,
                                   true),
-                        RepairParams("", "managed-network-missing-required"))));
+                        RepairParams("", "managed-network-missing-required")),
+         // Ensure that state values from Shill aren't accepted as
+         // configuration.
+         std::make_pair(OncParams("network-state-field",
+                                  &kNetworkConfigurationSignature,
+                                  false),
+                        RepairParams("", "network-repaired")),
+         std::make_pair(OncParams("network-nested-state-field",
+                                  &kNetworkConfigurationSignature,
+                                  false),
+                        RepairParams("",
+                                     "network-nested-state-field-repaired"))));
 
 // Strict and liberal validator repair identically.
 INSTANTIATE_TEST_CASE_P(
     StrictAndLiberalRepairIdentically,
     ONCValidatorTestRepairable,
     ::testing::Values(
          std::make_pair(OncParams("toplevel-invalid-network",
                                   &kToplevelConfigurationSignature,
                                   false),
                         RepairParams("toplevel-repaired",
@@ skipping 53 matching lines @@
          std::make_pair(OncParams("managed-network-wrong-type",
                                   &kNetworkConfigurationSignature, true),
                         RepairParams("", "")),
          std::make_pair(OncParams("network-with-client-cert-pattern",
                                   &kNetworkConfigurationSignature, true,
                                   ONC_SOURCE_DEVICE_POLICY),
                         RepairParams("", ""))));
 
 }  // namespace onc
 }  // namespace chromeos