Adding more ONC validation tests.

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 109 matching lines @@
   ExpectValid();
 }
 
 // The parameters are:
 // OncParams(string: Filename of a ONC file that is to be validated,
 //           OncValueSignature: signature of that ONC,
 //           bool: true if the ONC is managed).
 INSTANTIATE_TEST_CASE_P(
     ONCValidatorValidTest,
     ONCValidatorValidTest,
-    ::testing::Values(OncParams("managed_toplevel.onc",
+    ::testing::Values(OncParams("managed_toplevel1.onc",
+                                &kToplevelConfigurationSignature,
+                                true),
+                      OncParams("managed_toplevel2.onc",
+                                &kToplevelConfigurationSignature,
+                                true),
+                      // Test a configuration generated by CPanel.
+                      OncParams("managed_toplevel_cpanel.onc",
                                 &kToplevelConfigurationSignature,
                                 true),
                       OncParams("encrypted.onc",
                                 &kToplevelConfigurationSignature,
                                 true),
                       OncParams("managed_vpn.onc",
                                 &kNetworkConfigurationSignature,
                                 true),
                       OncParams("managed_ethernet.onc",
                                 &kNetworkConfigurationSignature,
@@ skipping 128 matching lines @@
                                   &kToplevelConfigurationSignature,
                                   true),
                         RepairParams("toplevel-repaired",
                                      "toplevel-repaired")),
          // Ignore recommended arrays in unmanaged ONC.
          std::make_pair(OncParams("network-with-illegal-recommended",
                                   &kNetworkConfigurationSignature,
                                   false),
                         RepairParams("network-repaired", "network-repaired"))));
 
+// Strict and liberal validator both repair, but with different results.
+INSTANTIATE_TEST_CASE_P(
+    StrictAndLiberalRepairDifferently,
+    ONCValidatorTestRepairable,
+    ::testing::Values(
+         std::make_pair(OncParams("toplevel-with-nested-warning",
+                                  &kToplevelConfigurationSignature,
+                                  false),
+                        RepairParams("toplevel-empty", "toplevel-repaired"))));
+
 // Strict and liberal validator return both INVALID.
 INSTANTIATE_TEST_CASE_P(
     StrictAndLiberalInvalid,
     ONCValidatorTestRepairable,
     ::testing::Values(
          std::make_pair(OncParams("network-unknown-value",
                                   &kNetworkConfigurationSignature, false),
                         RepairParams("", "")),
          std::make_pair(OncParams("managed-network-unknown-value",
                                   &kNetworkConfigurationSignature, true),
                         RepairParams("", "")),
          std::make_pair(OncParams("network-value-out-of-range",
                                   &kNetworkConfigurationSignature, false),
                         RepairParams("", "")),
          std::make_pair(OncParams("managed-network-value-out-of-range",
                                   &kNetworkConfigurationSignature, true),
                         RepairParams("", "")),
          std::make_pair(OncParams("network-wrong-type",
                                   &kNetworkConfigurationSignature, false),
                         RepairParams("", "")),
          std::make_pair(OncParams("managed-network-wrong-type",
                                   &kNetworkConfigurationSignature, true),
                         RepairParams("", ""))));
 
 }  // namespace onc
 }  // namespace chromeos