Extending ONC validator's logging. Completing toplevel validation.

chromeos/network/onc/onc_merger_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_merger.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/values.h"
@@ skipping 36 matching lines @@
 namespace merger {
 
 class ONCMergerTest : public testing::Test {
  public:
   scoped_ptr<const base::DictionaryValue> user_;
   scoped_ptr<const base::DictionaryValue> policy_;
   scoped_ptr<const base::DictionaryValue> policy_without_recommended_;
   scoped_ptr<const base::DictionaryValue> device_policy_;
 
   virtual void SetUp() {
-    policy_ = test_utils::ReadTestDictionary("policy.onc");
+    policy_ = test_utils::ReadTestDictionary("managed_vpn.onc");
     policy_without_recommended_ =
-        test_utils::ReadTestDictionary("policy_without_recommended.onc");
+        test_utils::ReadTestDictionary("managed_vpn_without_recommended.onc");
     user_ = test_utils::ReadTestDictionary("user.onc");
     device_policy_ = test_utils::ReadTestDictionary("device_policy.onc");
   }
 };
 
 TEST_F(ONCMergerTest, MandatoryValueOverwritesUserValue) {
   scoped_ptr<base::DictionaryValue> merged(
       MergeSettingsWithPolicies(policy_.get(), NULL, user_.get(), NULL));
   EXPECT_TRUE(HaveSameValueAt(*merged, *policy_, "Type"));
   EXPECT_TRUE(HaveSameValueAt(*merged, *policy_, "IPConfigs"));
@@ skipping 67 matching lines @@
 TEST_F(ONCMergerTest, MandatoryDevicePolicyOverwritesRecommendedUserPolicy) {
   scoped_ptr<base::DictionaryValue> merged(MergeSettingsWithPolicies(
       policy_.get(), device_policy_.get(), user_.get(), NULL));
   EXPECT_TRUE(HaveSameValueAt(*merged, *device_policy_,
                               "VPN.OpenVPN.Username"));
 }
 
 }  // namespace merger
 }  // namespace onc
 }  // namespace chromeos