Refactor ModelTypePayloadMap and ObjectIdPayloadMap to StateMaps.

sync/notifier/object_id_state_map_test_util.cc

Index: sync/notifier/object_id_state_map_test_util.cc
diff --git a/sync/notifier/object_id_state_map_test_util.cc b/sync/notifier/object_id_state_map_test_util.cc
new file mode 100644
index 0000000000000000000000000000000000000000..94178ab4ecd905a9ae088a32718d6b4546951506
--- /dev/null
+++ b/sync/notifier/object_id_state_map_test_util.cc
@@ -0,0 +1,109 @@
+// 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 "sync/notifier/object_id_state_map_test_util.h"
+
+#include <algorithm>

[akalin, 2012/08/22 22:24:31]

newline after <algorithm>

[dcheng, 2012/08/22 22:53:19]

Done.

+#include "base/basictypes.h"
+
+using ::testing::MakeMatcher;

[akalin, 2012/08/22 22:24:31]

move into namespace

[dcheng, 2012/08/22 22:53:19]

Done.

+using ::testing::MatchResultListener;
+using ::testing::Matcher;
+using ::testing::MatcherInterface;
+using ::testing::PrintToString;
+
+namespace syncer {
+
+namespace {
+
+class ObjectIdStateMapEqMatcher
+    : public MatcherInterface<const ObjectIdStateMap&> {
+ public:
+  explicit ObjectIdStateMapEqMatcher(const ObjectIdStateMap& expected);
+
+  virtual bool MatchAndExplain(const ObjectIdStateMap& actual,
+                               MatchResultListener* listener) const;
+  virtual void DescribeTo(::std::ostream* os) const;
+  virtual void DescribeNegationTo(::std::ostream* os) const;
+
+ private:
+  ObjectIdStateMap expected_;

[akalin, 2012/08/22 22:24:31]

const

[dcheng, 2012/08/22 22:53:19]

Done.

+
+  DISALLOW_COPY_AND_ASSIGN(ObjectIdStateMapEqMatcher);
+};
+
+ObjectIdStateMapEqMatcher::ObjectIdStateMapEqMatcher(
+    const ObjectIdStateMap& expected) : expected_(expected) {
+}
+
+bool ObjectIdStateMapEqMatcher::MatchAndExplain(
+    const ObjectIdStateMap& actual, MatchResultListener* listener) const {
+  ObjectIdStateMap expected_only;
+  ObjectIdStateMap actual_only;
+  typedef std::pair<invalidation::ObjectId,
+                    std::pair<InvalidationState, InvalidationState> >
+      ValueDifference;
+  std::vector<ValueDifference> value_differences;
+
+  std::set_difference(expected_.begin(), expected_.end(),
+                      actual.begin(), actual.end(),
+                      std::inserter(expected_only, expected_only.begin()),
+                      expected_.value_comp());
+  std::set_difference(actual.begin(), actual.end(),
+                      expected_.begin(), expected_.end(),
+                      std::inserter(actual_only, actual_only.begin()),
+                      actual.value_comp());
+
+  for (ObjectIdStateMap::const_iterator it = expected_.begin();
+       it != expected_.end(); ++it) {
+    ObjectIdStateMap::const_iterator find_it =
+        actual.find(it->first);
+    if (find_it != actual.end() &&
+        !Matches(Eq(it->second))(find_it->second)) {
+      value_differences.push_back(std::make_pair(
+          it->first, std::make_pair(it->second, find_it->second)));
+    }
+  }
+
+  if (expected_only.empty() && actual_only.empty() && value_differences.empty())
+    return true;
+
+  bool printed_header = false;
+  if (!actual_only.empty()) {
+    *listener << " which has these unexpected elements: "
+              << PrintToString(actual_only);
+    printed_header = true;
+  }
+
+  if (!expected_only.empty()) {
+    *listener << (printed_header ? ",\nand" : "which")
+              << " doesn't have these expected elements: "
+              << PrintToString(expected_only);
+    printed_header = true;
+  }
+
+  if (!value_differences.empty()) {
+    *listener << (printed_header ? ",\nand" : "which")
+              << " differ in the following values: "
+              << PrintToString(value_differences);
+  }
+
+  return false;
+}
+
+void ObjectIdStateMapEqMatcher::DescribeTo(::std::ostream* os) const {
+  *os << " is equal to " << PrintToString(expected_);
+}
+
+void ObjectIdStateMapEqMatcher::DescribeNegationTo(::std::ostream* os) const {
+  *os << " isn't equal to " << PrintToString(expected_);
+}
+
+}  // namespace
+
+Matcher<const ObjectIdStateMap&> Eq(const ObjectIdStateMap& expected) {
+  return MakeMatcher(new ObjectIdStateMapEqMatcher(expected));
+}
+
+}  // namespace syncer