Port FSTQueryListener to C++

Firestore/Example/Tests/Core/FSTEventManagerTests.mm

@@ -19,7 +19,9 @@
 #import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
 
+#include <memory>
 #include <utility>
+#include <vector>
 
 #import "Firestore/Source/Core/FSTQuery.h"
 #import "Firestore/Source/Core/FSTSyncEngine.h"
@@ -31,26 +33,31 @@
 #include "Firestore/core/src/firebase/firestore/model/document_set.h"
 #include "Firestore/core/src/firebase/firestore/model/types.h"
 #include "Firestore/core/src/firebase/firestore/util/statusor.h"
+#include "Firestore/core/test/firebase/firestore/testutil/xcgmock.h"
 
+using firebase::firestore::core::ListenOptions;
 using firebase::firestore::core::ViewSnapshot;
 using firebase::firestore::core::ViewSnapshotHandler;
 using firebase::firestore::model::DocumentKeySet;
 using firebase::firestore::model::DocumentSet;
 using firebase::firestore::model::OnlineState;
 using firebase::firestore::util::StatusOr;
+using testing::ElementsAre;
 
 NS_ASSUME_NONNULL_BEGIN
 
-/**
- * Converts an OnlineState to an NSNumber, usually for the purpose of adding
- * it to an NSArray or similar container. There's no direct conversion from a
- * strongly-typed enum to an integral type that could be passed to an NSNumber
- * initializer.
- */
-static NSNumber *ToNSNumber(OnlineState state) {
-  return @(static_cast<std::underlying_type<OnlineState>::type>(state));
+namespace {
+
+ViewSnapshotHandler NoopViewSnapshotHandler() {
+  return [](const StatusOr<ViewSnapshot> &) {};
+}
+
+std::shared_ptr<QueryListener> NoopQueryListener(FSTQuery *query) {
+  return QueryListener::Create(query, NoopViewSnapshotHandler());
 }
 
+}  // namespace
+
 // FSTEventManager implements this delegate privately
 @interface FSTEventManager () <FSTSyncEngineDelegate>
 @end
@@ -60,16 +67,10 @@ @interface FSTEventManagerTests : XCTestCase
 
 @implementation FSTEventManagerTests
 
-- (FSTQueryListener *)noopListenerForQuery:(FSTQuery *)query {
-  return [[FSTQueryListener alloc] initWithQuery:query
-                                         options:ListenOptions::DefaultOptions()
-                             viewSnapshotHandler:[](const StatusOr<ViewSnapshot> &) {}];
-}
-
 - (void)testHandlesManyListenersPerQuery {
   FSTQuery *query = FSTTestQuery("foo/bar");
-  FSTQueryListener *listener1 = [self noopListenerForQuery:query];
-  FSTQueryListener *listener2 = [self noopListenerForQuery:query];
+  auto listener1 = NoopQueryListener(query);
+  auto listener2 = NoopQueryListener(query);
 
   FSTSyncEngine *syncEngineMock = OCMStrictClassMock([FSTSyncEngine class]);
   OCMExpect([syncEngineMock setSyncEngineDelegate:[OCMArg any]]);
@@ -89,7 +90,7 @@ - (void)testHandlesManyListenersPerQuery {
 
 - (void)testHandlesUnlistenOnUnknownListenerGracefully {
   FSTQuery *query = FSTTestQuery("foo/bar");
-  FSTQueryListener *listener = [self noopListenerForQuery:query];
+  auto listener = NoopQueryListener(query);
 
   FSTSyncEngine *syncEngineMock = OCMStrictClassMock([FSTSyncEngine class]);
   OCMExpect([syncEngineMock setSyncEngineDelegate:[OCMArg any]]);
@@ -99,13 +100,6 @@ - (void)testHandlesUnlistenOnUnknownListenerGracefully {
   OCMVerifyAll((id)syncEngineMock);
 }
 
-- (FSTQueryListener *)queryListenerForQuery:(FSTQuery *)query
-                                withHandler:(ViewSnapshotHandler &&)handler {
-  return [[FSTQueryListener alloc] initWithQuery:query
-                                         options:ListenOptions::DefaultOptions()
-                             viewSnapshotHandler:std::move(handler)];
-}
-
 - (ViewSnapshot)makeEmptyViewSnapshotWithQuery:(FSTQuery *)query {
   DocumentSet emptyDocs{query.comparator};
   // sync_state_changed has to be `true` to prevent an assertion about a meaningless view snapshot.
@@ -118,23 +112,17 @@ - (void)testNotifiesListenersInTheRightOrder {
   FSTQuery *query2 = FSTTestQuery("bar/baz");
   NSMutableArray *eventOrder = [NSMutableArray array];
 
-  FSTQueryListener *listener1 =
-      [self queryListenerForQuery:query1
-                      withHandler:[eventOrder](const StatusOr<ViewSnapshot> &) {
-                        [eventOrder addObject:@"listener1"];
-                      }];
+  auto listener1 = QueryListener::Create(query1, [eventOrder](const StatusOr<ViewSnapshot> &) {
+    [eventOrder addObject:@"listener1"];
+  });
 
-  FSTQueryListener *listener2 =
-      [self queryListenerForQuery:query2
-                      withHandler:[eventOrder](const StatusOr<ViewSnapshot> &) {
-                        [eventOrder addObject:@"listener2"];
-                      }];
+  auto listener2 = QueryListener::Create(query2, [eventOrder](const StatusOr<ViewSnapshot> &) {
+    [eventOrder addObject:@"listener2"];
+  });
 
-  FSTQueryListener *listener3 =
-      [self queryListenerForQuery:query1
-                      withHandler:[eventOrder](const StatusOr<ViewSnapshot> &) {
-                        [eventOrder addObject:@"listener3"];
-                      }];
+  auto listener3 = QueryListener::Create(query1, [eventOrder](const StatusOr<ViewSnapshot> &) {
+    [eventOrder addObject:@"listener3"];
+  });
 
   FSTSyncEngine *syncEngineMock = OCMClassMock([FSTSyncEngine class]);
   FSTEventManager *eventManager = [FSTEventManager eventManagerWithSyncEngine:syncEngineMock];
@@ -155,27 +143,31 @@ - (void)testNotifiesListenersInTheRightOrder {
 
 - (void)testWillForwardOnlineStateChanges {
   FSTQuery *query = FSTTestQuery("foo/bar");
-  FSTQueryListener *fakeListener = OCMClassMock([FSTQueryListener class]);
-  NSMutableArray *events = [NSMutableArray array];
-  OCMStub([fakeListener query]).andReturn(query);
-  OCMStub([fakeListener applyChangedOnlineState:OnlineState::Unknown])
-      .andDo(^(NSInvocation *invocation) {
-        [events addObject:ToNSNumber(OnlineState::Unknown)];
-      });
-  OCMStub([fakeListener applyChangedOnlineState:OnlineState::Online])
-      .andDo(^(NSInvocation *invocation) {
-        [events addObject:ToNSNumber(OnlineState::Online)];
-      });
+
+  class FakeQueryListener : public QueryListener {
+   public:
+    explicit FakeQueryListener(FSTQuery *query)
+        : QueryListener(query, ListenOptions::DefaultOptions(), NoopViewSnapshotHandler()) {
+    }
+
+    void OnOnlineStateChanged(OnlineState online_state) override {
+      events.push_back(online_state);
+    }
+
+    std::vector<OnlineState> events;
+  };
+
+  auto fake_listener = std::make_shared<FakeQueryListener>(query);
 
   FSTSyncEngine *syncEngineMock = OCMClassMock([FSTSyncEngine class]);
   OCMExpect([syncEngineMock setSyncEngineDelegate:[OCMArg any]]);
   FSTEventManager *eventManager = [FSTEventManager eventManagerWithSyncEngine:syncEngineMock];
 
-  [eventManager addListener:fakeListener];
-  XCTAssertEqualObjects(events, @[ ToNSNumber(OnlineState::Unknown) ]);
+  [eventManager addListener:fake_listener];
+  XC_ASSERT_THAT(fake_listener->events, ElementsAre(OnlineState::Unknown));
+
   [eventManager applyChangedOnlineState:OnlineState::Online];
-  XCTAssertEqualObjects(events,
-                        (@[ ToNSNumber(OnlineState::Unknown), ToNSNumber(OnlineState::Online) ]));
+  XC_ASSERT_THAT(fake_listener->events, ElementsAre(OnlineState::Unknown, OnlineState::Online));
 }
 
 @end