Take 2

Author: var-const

Firestore/Example/Firestore.xcodeproj/project.pbxproj

@@ -206,8 +206,6 @@
 		B67BF44A216EB43000CA9097 /* create_noop_connectivity_monitor.cc in Sources */ = {isa = PBXBuildFile; fileRef = B67BF448216EB43000CA9097 /* create_noop_connectivity_monitor.cc */; };
 		B686F2AF2023DDEE0028D6BE /* field_path_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = B686F2AD2023DDB20028D6BE /* field_path_test.cc */; };
 		B686F2B22025000D0028D6BE /* resource_path_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = B686F2B02024FFD70028D6BE /* resource_path_test.cc */; };
-		B69CF05C219B9106004C434D /* FSTFirestoreClient+Testing.mm in Sources */ = {isa = PBXBuildFile; fileRef = B69CF058219B9105004C434D /* FSTFirestoreClient+Testing.mm */; };
-		B69CF05D219B9106004C434D /* FIRFirestore+Testing.mm in Sources */ = {isa = PBXBuildFile; fileRef = B69CF059219B9105004C434D /* FIRFirestore+Testing.mm */; };
 		B6BBE43121262CF400C6A53E /* grpc_stream_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = B6BBE42F21262CF400C6A53E /* grpc_stream_test.cc */; };
 		B6D1B68520E2AB1B00B35856 /* exponential_backoff_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = B6D1B68420E2AB1A00B35856 /* exponential_backoff_test.cc */; };
 		B6D9649121544D4F00EB9CFB /* grpc_connection_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = B6D9649021544D4F00EB9CFB /* grpc_connection_test.cc */; };
@@ -526,10 +524,7 @@
 		B67BF448216EB43000CA9097 /* create_noop_connectivity_monitor.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = create_noop_connectivity_monitor.cc; sourceTree = "<group>"; };
 		B686F2AD2023DDB20028D6BE /* field_path_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = field_path_test.cc; sourceTree = "<group>"; };
 		B686F2B02024FFD70028D6BE /* resource_path_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resource_path_test.cc; sourceTree = "<group>"; };
-		B69CF058219B9105004C434D /* FSTFirestoreClient+Testing.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "FSTFirestoreClient+Testing.mm"; sourceTree = "<group>"; };
-		B69CF059219B9105004C434D /* FIRFirestore+Testing.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "FIRFirestore+Testing.mm"; sourceTree = "<group>"; };
 		B69CF05A219B9105004C434D /* FIRFirestore+Testing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "FIRFirestore+Testing.h"; sourceTree = "<group>"; };
-		B69CF05B219B9105004C434D /* FSTFirestoreClient+Testing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "FSTFirestoreClient+Testing.h"; sourceTree = "<group>"; };
 		B6BBE42F21262CF400C6A53E /* grpc_stream_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = grpc_stream_test.cc; sourceTree = "<group>"; };
 		B6D1B68420E2AB1A00B35856 /* exponential_backoff_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = exponential_backoff_test.cc; sourceTree = "<group>"; };
 		B6D9649021544D4F00EB9CFB /* grpc_connection_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = grpc_connection_test.cc; sourceTree = "<group>"; };
@@ -1166,9 +1161,6 @@
 			isa = PBXGroup;
 			children = (
 				B69CF05A219B9105004C434D /* FIRFirestore+Testing.h */,
-				B69CF059219B9105004C434D /* FIRFirestore+Testing.mm */,
-				B69CF05B219B9105004C434D /* FSTFirestoreClient+Testing.h */,
-				B69CF058219B9105004C434D /* FSTFirestoreClient+Testing.mm */,
 				54E9281C1F33950B00C1953E /* FSTEventAccumulator.h */,
 				5492E0392021401F00B64F25 /* FSTEventAccumulator.mm */,
 				DE51B1881F0D48AC0013853F /* FSTHelpers.h */,
@@ -2033,7 +2025,6 @@
 			files = (
 				73866AA12082B0A5009BB4FF /* FIRArrayTransformTests.mm in Sources */,
 				5492E079202154D600B64F25 /* FIRCursorTests.mm in Sources */,
-				B69CF05D219B9106004C434D /* FIRFirestore+Testing.mm in Sources */,
 				5492E075202154D600B64F25 /* FIRDatabaseTests.mm in Sources */,
 				5492E073202154D600B64F25 /* FIRFieldsTests.mm in Sources */,
 				6161B5032047140C00A99DBB /* FIRFirestoreSourceTests.mm in Sources */,
@@ -2049,7 +2040,6 @@
 				5491BC731FB44593008B3588 /* FSTIntegrationTestCase.mm in Sources */,
 				5492E080202154EC00B64F25 /* FSTSmokeTests.mm in Sources */,
 				5492E07F202154EC00B64F25 /* FSTTransactionTests.mm in Sources */,
-				B69CF05C219B9106004C434D /* FSTFirestoreClient+Testing.mm in Sources */,
 				5492E0442021457E00B64F25 /* XCTestCase+Await.mm in Sources */,
 				B67BF44A216EB43000CA9097 /* create_noop_connectivity_monitor.cc in Sources */,
 				EBFC611B1BF195D0EC710AF4 /* app_testing.mm in Sources */,

Firestore/Source/API/FIRFirestore.mm

@@ -89,6 +89,10 @@ @implementation FIRFirestore {
   FSTFirestoreClient *_client;
 }
 
+- (AsyncQueue*)workerQueue {
+  return [_client workerQueue];
+}
+
 + (NSMutableDictionary<NSString *, FIRFirestore *> *)instances {
   static dispatch_once_t token = 0;
   static NSMutableDictionary<NSString *, FIRFirestore *> *instances;

Firestore/Source/Core/FSTFirestoreClient.h

@@ -117,6 +117,9 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (firebase::firestore::util::Executor *)userExecutor;
 
+/** For testing only. */
+- (firebase::firestore::util::AsyncQueue *)workerQueue;
+
 @end
 
 NS_ASSUME_NONNULL_END

Firestore/Source/Core/FSTFirestoreClient.mm

@@ -103,6 +103,10 @@ - (Executor *)userExecutor {
   return _userExecutor.get();
 }
 
+- (AsyncQueue*)workerQueue {
+  return _workerQueue.get();
+}
+
 + (instancetype)clientWithDatabaseInfo:(const DatabaseInfo &)databaseInfo
                         usePersistence:(BOOL)usePersistence
                    credentialsProvider: