Sanitize PrefStore interface.

chrome/browser/prefs/pref_service_unittest.cc

 // Copyright (c) 2010 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 <string>
 
 #include "app/test/data/resource.h"
 #include "base/command_line.h"
 #include "base/scoped_ptr.h"
 #include "base/values.h"
@@ skipping 128 matching lines @@
   // Make sure obs2 still works after removing obs.
   registrar.Remove(pref_name, &obs);
   EXPECT_CALL(obs, Observe(_, _, _)).Times(0);
   obs2.Expect(&prefs, pref_name, &expected_new_pref_value);
   // This should only fire the observer in obs2.
   prefs.SetString(pref_name, new_pref_value);
   Mock::VerifyAndClearExpectations(&obs);
   Mock::VerifyAndClearExpectations(&obs2);
 }
 
+#if 0

[Paweł Hajdan Jr., 2010/12/07 17:30:00]

Please DISABLE the test if needed. Otherwise bit rot is extremely likely to
happen. By the way, all disabled tests should have a bug with Tests-Disabled
label.

[Mattias Nissler (ping if slow), 2010/12/08 09:22:39]

Actually, I intended to temporary disable them for development, since I feel
these tests do not really belong here. They are really proxy policy integration
tests, not PrefService unit tests. Danno, should we just remove them or move the
code somewhere else?

 TEST(PrefServiceTest, ProxyFromCommandLineNotPolicy) {

[danno, 2010/12/08 09:32:50]

This test can be removed. It is covered by the CommandLinePrefStoreTests.

[Mattias Nissler (ping if slow), 2010/12/09 10:20:20]

Done.

   CommandLine command_line(CommandLine::NO_PROGRAM);
   command_line.AppendSwitch(switches::kProxyAutoDetect);
-  TestingPrefService prefs(NULL, NULL, &command_line);
+  PrefService prefs(NULL, NULL, &command_line);
   browser::RegisterUserPrefs(&prefs);
   EXPECT_TRUE(prefs.GetBoolean(prefs::kProxyAutoDetect));
   const PrefService::Preference* pref =
       prefs.FindPreference(prefs::kProxyAutoDetect);
   ASSERT_TRUE(pref);
   EXPECT_FALSE(pref->IsManaged());
 }
 
 TEST(PrefServiceTest, ProxyPolicyOverridesCommandLineOptions) {

[danno, 2010/12/08 09:32:50]

This test shouldn't be removed, it should be re-written. It's still important:
AFAIK, nowhere else in the code do we tests that setting a managed proxy policy
automatically sets non-affected proxy preference to their default value.

[Mattias Nissler (ping if slow), 2010/12/09 10:20:20]

Done.

   CommandLine command_line(CommandLine::NO_PROGRAM);
   command_line.AppendSwitchASCII(switches::kProxyBypassList, "123");
   command_line.AppendSwitchASCII(switches::kProxyPacUrl, "456");
   command_line.AppendSwitchASCII(switches::kProxyServer, "789");
   scoped_ptr<policy::MockConfigurationPolicyProvider> provider(
       new policy::MockConfigurationPolicyProvider());
   Value* mode_value = Value::CreateIntegerValue(
       policy::kPolicyManuallyConfiguredProxyMode);
   provider->AddPolicy(policy::kPolicyProxyServerMode, mode_value);
   provider->AddPolicy(policy::kPolicyProxyBypassList,
@@ skipping 113 matching lines @@
   // auto-detect should be overridden. The default pref store must be
   // in place with the appropriate default value for this to work.
   TestingPrefService prefs2(provider.get(), NULL, &command_line);
   browser::RegisterUserPrefs(&prefs2);
   EXPECT_FALSE(prefs2.GetBoolean(prefs::kProxyAutoDetect));
   EXPECT_TRUE(prefs2.GetBoolean(prefs::kNoProxyServer));
   EXPECT_EQ(std::string(), prefs2.GetString(prefs::kProxyServer));
   EXPECT_EQ(std::string(), prefs2.GetString(prefs::kProxyPacUrl));
   EXPECT_EQ(std::string(), prefs2.GetString(prefs::kProxyBypassList));
 }
+#endif
 
 class PrefServiceSetValueTest : public testing::Test {
  protected:
   static const char kName[];
   static const char kValue[];
 
   PrefServiceSetValueTest()
       : null_value_(Value::CreateNullValue()) {}
 
   TestingPrefService prefs_;
@@ skipping 74 matching lines @@
   Mock::VerifyAndClearExpectations(&observer_);
 
   EXPECT_CALL(observer_, Observe(_, _, _)).Times(0);
   prefs_.Set(kName, new_value);
   Mock::VerifyAndClearExpectations(&observer_);
 
   observer_.Expect(&prefs_, kName, null_value_.get());
   prefs_.Set(kName, *null_value_);
   Mock::VerifyAndClearExpectations(&observer_);
 }