Add LazySyncableAdapter

blimp/helium/lazy_syncable_adapter_unittest.cc

+// Copyright 2016 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 "blimp/helium/lazy_syncable_adapter.h"
+
+#include <stdint.h>
+
+#include "base/bind.h"
+#include "base/bind_helpers.h"
+#include "blimp/helium/helium_test.h"
+#include "blimp/helium/serializable_struct.h"
+#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+using testing::_;
+using testing::DoAll;
+using testing::Return;
+using testing::SaveArg;
+
+namespace blimp {
+namespace helium {
+namespace {
+
+struct TestSyncableChangeset : public SerializableStruct {
+  TestSyncableChangeset() : value(this) {}
+  ~TestSyncableChangeset() override {}
+
+  TestSyncableChangeset& operator=(const TestSyncableChangeset& other) {
+    value.Set(other.value());
+    return *this;
+  }
+
+  Field<int32_t> value;
+};
+
+class MockSyncable : public LazySyncable<TestSyncableChangeset> {
+ public:
+  MockSyncable() {}
+  ~MockSyncable() = default;
+
+  // LazySyncable implementation.
+  MOCK_CONST_METHOD1(CreateChangesetMock, TestSyncableChangeset*(Revision));
+  MOCK_METHOD1(ApplyChangeset, void(const TestSyncableChangeset&));
+  MOCK_METHOD1(SetLocalUpdateCallback, void(const base::Closure&));
+  MOCK_CONST_METHOD1(ValidateChangeset, bool(const TestSyncableChangeset&));
+  MOCK_METHOD1(ReleaseBefore, void(Revision));
+  MOCK_CONST_METHOD0(GetRevision, Revision());
+  MOCK_METHOD2(PrepareToCreateChangeset, void(Revision, base::Closure));
+
+  std::unique_ptr<TestSyncableChangeset> CreateChangeset(Revision from) const {
+    return base::WrapUnique<TestSyncableChangeset>(CreateChangesetMock(from));
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(MockSyncable);
+};
+
+class LazySyncableAdapterTest : public HeliumTest {
+ public:
+  LazySyncableAdapterTest()
+      : adapter_(&syncable_), callback_(base::Bind(&base::DoNothing)) {}
+  ~LazySyncableAdapterTest() override = default;
+
+ protected:
+  MockSyncable syncable_;
+  LazySyncableAdapter<TestSyncableChangeset> adapter_;
+  base::Closure callback_;

[Kevin M, 2016/12/02 18:28:03]

Nit: it seems unnecessary to bind a class member for something so trivial - why
not just Bind(DoNothing) in the calls directly?

[steimel, 2016/12/03 00:29:41]

Done. Slight change in how those are working since now I'm checking that it's
sending the correct callback

+  Revision revision_ = 42;

[Kevin M, 2016/12/02 18:28:03]

Make this a constexpr at the top instead of a class member.

[steimel, 2016/12/03 00:29:41]

Done.

+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(LazySyncableAdapterTest);
+};
+
+TEST_F(LazySyncableAdapterTest, ForwardsSetLocalCallback) {
+  EXPECT_CALL(syncable_, SetLocalUpdateCallback(_)).Times(1);

[Kevin M, 2016/12/02 18:28:03]

nit: Times(1) is superfluous; remove it?

[steimel, 2016/12/03 00:29:41]

Done.

+  adapter_.SetLocalUpdateCallback(callback_);
+}
+
+TEST_F(LazySyncableAdapterTest, ForwardsReleaseBefore) {
+  EXPECT_CALL(syncable_, ReleaseBefore(revision_)).Times(1);
+  adapter_.ReleaseBefore(revision_);
+}
+
+TEST_F(LazySyncableAdapterTest, ForwardsGetRevision) {
+  EXPECT_CALL(syncable_, GetRevision()).Times(1).WillOnce(Return(revision_));
+  EXPECT_EQ(revision_, adapter_.GetRevision());
+}
+
+TEST_F(LazySyncableAdapterTest, ForwardsPrepareToCreateChangeset) {
+  EXPECT_CALL(syncable_, PrepareToCreateChangeset(revision_, _)).Times(1);
+  adapter_.PrepareToCreateChangeset(revision_, callback_);
+}
+
+TEST_F(LazySyncableAdapterTest, SerializesParsesForwardsChangesets) {
+  std::unique_ptr<TestSyncableChangeset> changeset =
+      base::MakeUnique<TestSyncableChangeset>();
+  changeset->value.Set(33);
+
+  EXPECT_CALL(syncable_, CreateChangesetMock(revision_))
+      .Times(1)
+      .WillOnce(Return(changeset.release()));
+  std::unique_ptr<std::string> string_changeset =
+      adapter_.CreateChangeset(revision_);
+
+  TestSyncableChangeset validate_changeset;
+  EXPECT_CALL(syncable_, ValidateChangeset(_))
+      .Times(1)
+      .WillOnce(DoAll(SaveArg<0>(&validate_changeset), Return(true)));

[Kevin M, 2016/12/02 18:28:03]

Instead of saving the arg, try this in the matcher expectations:

Field(&TestSyncableChangeset::value, Equals(33))

This is possible because value supports operator().

[steimel, 2016/12/03 00:29:41]

Discussed offline and sticking with SaveArg

+  EXPECT_EQ(true, adapter_.ValidateChangeset(*string_changeset));
+  EXPECT_EQ(33, validate_changeset.value());
+
+  TestSyncableChangeset apply_changeset;
+  EXPECT_CALL(syncable_, ApplyChangeset(_))
+      .Times(1)
+      .WillOnce(SaveArg<0>(&apply_changeset));
+  adapter_.ApplyChangeset(*string_changeset);
+  EXPECT_EQ(33, apply_changeset.value());
+}
+
+}  // namespace
+}  // namespace helium
+}  // namespace blimp