Pref service: expose all read-only PrefStores through Mojo

services/preferences/public/cpp/tests/pref_store_client_unittest.cc

Index: services/preferences/public/cpp/tests/pref_store_client_unittest.cc
diff --git a/services/preferences/public/cpp/tests/pref_store_client_unittest.cc b/services/preferences/public/cpp/tests/pref_store_client_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..8273136800fd3e9b7df510a959f0fe397f2d207e
--- /dev/null
+++ b/services/preferences/public/cpp/tests/pref_store_client_unittest.cc
@@ -0,0 +1,173 @@
+// Copyright 2017 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 "services/preferences/public/cpp/pref_store_client.h"
+
+#include "base/macros.h"
+#include "base/memory/ptr_util.h"
+#include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
+#include "base/values.h"
+#include "services/preferences/public/interfaces/preferences.mojom.h"
+#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+using testing::Invoke;
+using testing::WithArg;
+using testing::WithoutArgs;
+using testing::_;
+
+namespace prefs {
+
+namespace {
+
+class PrefStoreObserverMock : public PrefStore::Observer {
+ public:
+  MOCK_METHOD1(OnPrefValueChanged, void(const std::string&));
+  MOCK_METHOD1(OnInitializationCompleted, void(bool succeeded));
+};
+
+class PrefStoreConnectorMock : public mojom::PrefStoreConnector {
+ public:
+  MOCK_METHOD1(Connect, void(const ConnectCallback&));
+};
+
+}  // namespace
+
+class PrefStoreClientTest : public testing::Test {
+ public:
+  PrefStoreClientTest() = default;
+  ~PrefStoreClientTest() override {}
+
+  PrefStoreObserverMock* observer() { return &observer_; }
+  PrefStoreClient* store() { return store_.get(); }
+
+  bool initialized() { return store_->initialized_; }
+  void OnPrefChanged(const std::string& key, const base::Value& value) {
+    observer_ptr_->OnPrefChanged(key, value.CreateDeepCopy());
+  }
+  void OnInitializationCompleted() {
+    observer_ptr_->OnInitializationCompleted(true);
+  }
+
+  // testing::Test:
+  void SetUp() override;

[Sam McNally, 2017/03/03 03:47:58]

Why are these out of line?

[tibell, 2017/03/07 00:52:52]

Done.

+  void TearDown() override;
+
+ private:
+  mojom::PrefStoreObserverPtr observer_ptr_;
+  PrefStoreObserverMock observer_;
+  scoped_refptr<PrefStoreClient> store_;
+
+  // Required by mojo binding code within PrefStoreClient.
+  base::MessageLoop message_loop_;
+
+  DISALLOW_COPY_AND_ASSIGN(PrefStoreClientTest);
+};
+
+void PrefStoreClientTest::SetUp() {
+  mojom::PrefStoreConnectionPtr connection_ptr =
+      mojom::PrefStoreConnection::New();
+  connection_ptr->observer = mojo::MakeRequest(&observer_ptr_);
+  connection_ptr->initial_prefs = base::MakeUnique<base::DictionaryValue>();

[Sam McNally, 2017/03/03 03:47:58]

Add tests for |initial_prefs| not being empty and |is_initialized| being true.

[tibell, 2017/03/07 00:52:52]

Done.

[Sam McNally, 2017/03/07 01:47:13]

I don't see one covering |is_initialized| being true.

+  connection_ptr->is_initialized = false;
+  store_ = new PrefStoreClient(std::move(connection_ptr));
+  store_->AddObserver(&observer_);
+}
+
+void PrefStoreClientTest::TearDown() {
+  store_->RemoveObserver(&observer_);
+  store_ = nullptr;
+}
+
+// Tests that observers are notified upon the completion of initialization, and
+// that values become available.
+TEST_F(PrefStoreClientTest, Initialization) {
+  // The store should start out uninitialized if the backing store does.
+  EXPECT_FALSE(initialized());
+  EXPECT_CALL(*observer(), OnInitializationCompleted(_)).Times(0);
+
+  testing::Mock::VerifyAndClearExpectations(observer());
+
+  const char key[] = "hey";
+  const int kValue = 42;
+  base::FundamentalValue pref(kValue);
+
+  // PrefStore notifies of PreferencesChanged, completing
+  // initialization.
+  base::RunLoop loop;
+  EXPECT_CALL(*observer(), OnInitializationCompleted(true));
+  EXPECT_CALL(*observer(), OnPrefValueChanged(key))
+      .WillOnce(WithoutArgs(Invoke([&loop]() { loop.Quit(); })));
+  OnInitializationCompleted();
+  OnPrefChanged(key, pref);
+  loop.Run();
+  EXPECT_TRUE(initialized());
+
+  const base::Value* value = nullptr;
+  int actual_value;
+  EXPECT_TRUE(store()->GetValue(key, &value));
+  ASSERT_TRUE(value);
+  EXPECT_TRUE(value->GetAsInteger(&actual_value));
+  EXPECT_EQ(kValue, actual_value);
+}
+
+// Test that when initialized with multiple keys, that observers receive a
+// notification for each key.
+TEST_F(PrefStoreClientTest, MultipleKeyInitialization) {
+  const char key1[] = "hey";
+  const char key2[] = "listen";
+
+  EXPECT_FALSE(initialized());
+  EXPECT_CALL(*observer(), OnInitializationCompleted(_)).Times(0);
+
+  testing::Mock::VerifyAndClearExpectations(observer());
+
+  const int kValue = 42;
+  base::FundamentalValue pref1(kValue);
+  base::StringValue pref2("look");
+
+  base::DictionaryValue prefs;
+  prefs.Set(key1, pref1.CreateDeepCopy());
+  prefs.Set(key2, pref2.CreateDeepCopy());
+
+  // The observer should be notified of all keys set.
+  base::RunLoop loop;
+  EXPECT_CALL(*observer(), OnInitializationCompleted(true));
+  EXPECT_CALL(*observer(), OnPrefValueChanged(key1));
+  EXPECT_CALL(*observer(), OnPrefValueChanged(key2))
+      .WillOnce(WithoutArgs(Invoke([&loop]() { loop.Quit(); })));
+  OnInitializationCompleted();
+  OnPrefChanged(key1, pref1);
+  OnPrefChanged(key2, pref2);
+  loop.Run();
+  EXPECT_TRUE(initialized());
+}
+
+// Tests that multiple PrefStore::Observers can be added to a PrefStoreClient
+// and that they are each notified of changes.
+TEST_F(PrefStoreClientTest, MultipleObservers) {
+  PrefStoreObserverMock observer2;
+  store()->AddObserver(&observer2);
+
+  const char key[] = "hey";
+  const int kValue = 42;
+  base::FundamentalValue pref(kValue);
+
+  // PrefStore notifies of PreferencesChanged, completing
+  // initialization.
+  base::RunLoop loop;
+  EXPECT_CALL(*observer(), OnInitializationCompleted(true));
+  EXPECT_CALL(observer2, OnInitializationCompleted(true));
+  EXPECT_CALL(*observer(), OnPrefValueChanged(key));
+  EXPECT_CALL(observer2, OnPrefValueChanged(key))
+      .WillOnce(WithoutArgs(Invoke([&loop]() { loop.Quit(); })));
+  OnInitializationCompleted();
+  OnPrefChanged(key, pref);
+  loop.Run();
+
+  store()->RemoveObserver(&observer2);
+}
+
+}  // namespace prefs