Merge

Author: schmidt-sebastian

Firestore/Example/Firestore.xcodeproj/project.pbxproj

@@ -59,8 +59,6 @@
 		AFE6114F0D4DAECBA7B7C089 /* Pods_Firestore_IntegrationTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B2FA635DF5D116A67A7441CD /* Pods_Firestore_IntegrationTests.framework */; };
 		C4E749275AD0FBDF9F4716A8 /* Pods_SwiftBuildTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 32AD40BF6B0E849B07FFD05E /* Pods_SwiftBuildTest.framework */; };
 		D5B2532E4676014F57A7EAB9 /* FSTStreamTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D5B25C0D4AADFCA3ADB883E4 /* FSTStreamTests.m */; };
-		D5B25B66FE2390963E000FDE /* FIRTestDispatchQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = D5B25F48D1536205E8E67F2A /* FIRTestDispatchQueue.m */; };
-		D5B25EF6FF29F02249573A35 /* FIRTestDispatchQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = D5B25F48D1536205E8E67F2A /* FIRTestDispatchQueue.m */; };
 		DE03B2C91F2149D600A30B9C /* FSTTransactionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DE51B1C61F0D48AC0013853F /* FSTTransactionTests.m */; };
 		DE03B2D41F2149D600A30B9C /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F5AF195388D20070C39A /* XCTest.framework */; };
 		DE03B2D51F2149D600A30B9C /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F591195388D20070C39A /* UIKit.framework */; };
@@ -225,8 +223,6 @@
 		CE00BABB5A3AAB44A4C209E2 /* Pods-Firestore_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Firestore_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Firestore_Tests/Pods-Firestore_Tests.debug.xcconfig"; sourceTree = "<group>"; };
 		D3CC3DC5338DCAF43A211155 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
 		D5B25C0D4AADFCA3ADB883E4 /* FSTStreamTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FSTStreamTests.m; sourceTree = "<group>"; };
-		D5B25C8BBBB84E96C06ED244 /* FIRTestDispatchQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FIRTestDispatchQueue.h; sourceTree = "<group>"; };
-		D5B25F48D1536205E8E67F2A /* FIRTestDispatchQueue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FIRTestDispatchQueue.m; sourceTree = "<group>"; };
 		DB17FEDFB80770611A935A60 /* Pods-Firestore_IntegrationTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Firestore_IntegrationTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-Firestore_IntegrationTests/Pods-Firestore_IntegrationTests.release.xcconfig"; sourceTree = "<group>"; };
 		DE03B2E91F2149D600A30B9C /* Firestore_IntegrationTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Firestore_IntegrationTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		DE03B3621F215E1600A30B9C /* CAcert.pem */ = {isa = PBXFileReference; lastKnownFileType = text; path = CAcert.pem; sourceTree = "<group>"; };
@@ -565,8 +561,6 @@
 				DE51B18A1F0D48AC0013853F /* FSTUtilTests.m */,
 				54E9282A1F339CAD00C1953E /* XCTestCase+Await.h */,
 				54E9282B1F339CAD00C1953E /* XCTestCase+Await.m */,
-				D5B25F48D1536205E8E67F2A /* FIRTestDispatchQueue.m */,
-				D5B25C8BBBB84E96C06ED244 /* FIRTestDispatchQueue.h */,
 			);
 			path = Util;
 			sourceTree = "<group>";
@@ -1181,7 +1175,6 @@
 				DE51B1CD1F0D48CD0013853F /* FSTDatabaseInfoTests.m in Sources */,
 				DE51B1F21F0D49140013853F /* FSTPathTests.m in Sources */,
 				DE51B1DD1F0D490D0013853F /* FSTLocalStoreTests.m in Sources */,
-				D5B25B66FE2390963E000FDE /* FIRTestDispatchQueue.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1206,7 +1199,6 @@
 				DE03B2C91F2149D600A30B9C /* FSTTransactionTests.m in Sources */,
 				54DA12B11F315F3800DD57A1 /* FIRValidationTests.m in Sources */,
 				D5B2532E4676014F57A7EAB9 /* FSTStreamTests.m in Sources */,
-				D5B25EF6FF29F02249573A35 /* FIRTestDispatchQueue.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

Firestore/Example/Tests/Integration/API/FIRDatabaseTests.m

@@ -845,22 +845,4 @@ - (void)testCantGetDocumentsWhileOffline {
   [self awaitExpectations];
 }
 
-- (void)testWriteStreamReconnectsAfterIdle {
-  FIRDocumentReference *doc = [self documentRef];
-  FIRFirestore *firestore = doc.firestore;
-
-  [self writeDocumentRef:doc data:@{@"foo" : @"bar"}];
-  [self waitForIdle:firestore];
-  [self writeDocumentRef:doc data:@{@"foo" : @"bar"}];
-}
-
-- (void)testWatchStreamReconnectsAfterIdle {
-  FIRDocumentReference *doc = [self documentRef];
-  FIRFirestore *firestore = doc.firestore;
-
-  [self readSnapshotForRef:[self documentRef] online:YES];
-  [self waitForIdle:firestore];
-  [self readSnapshotForRef:[self documentRef] online:YES];
-}
-
 @end

Firestore/Example/Tests/Util/FIRTestDispatchQueue.h

@@ -56,8 +56,6 @@ NS_ASSUME_NONNULL_BEGIN
 - (FIRCollectionReference *)collectionRefWithDocuments:
     (NSDictionary<NSString *, NSDictionary<NSString *, id> *> *)documents;
 
-- (void)waitForIdle:(FIRFirestore *)firestore;
-
 - (void)writeAllDocuments:(NSDictionary<NSString *, NSDictionary<NSString *, id> *> *)documents
              toCollection:(FIRCollectionReference *)collection;
 
@@ -69,8 +67,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (FIRQuerySnapshot *)readDocumentSetForRef:(FIRQuery *)query;
 
-- (FIRDocumentSnapshot *)readSnapshotForRef:(FIRDocumentReference *)query online:(BOOL)online;
-
 - (void)writeDocumentRef:(FIRDocumentReference *)ref data:(NSDictionary<NSString *, id> *)data;
 
 - (void)updateDocumentRef:(FIRDocumentReference *)ref data:(NSDictionary<NSString *, id> *)data;

Firestore/Example/Tests/Util/FIRTestDispatchQueue.m

@@ -29,15 +29,10 @@
 #import "Util/FSTDispatchQueue.h"
 #import "Util/FSTUtil.h"
 
-#import "FIRTestDispatchQueue.h"
 #import "FSTEventAccumulator.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface FIRFirestore (Testing)
-@property(nonatomic, strong) FSTDispatchQueue *workerDispatchQueue;
-@end
-
 @implementation FSTIntegrationTestCase {
   NSMutableArray<FIRFirestore *> *_firestores;
 }
@@ -126,7 +121,7 @@ + (FIRFirestoreSettings *)settings {
 - (FIRFirestore *)firestoreWithProjectID:(NSString *)projectID {
   NSString *persistenceKey = [NSString stringWithFormat:@"db%lu", (unsigned long)_firestores.count];
 
-  FSTTestDispatchQueue *workerDispatchQueue = [FSTTestDispatchQueue
+  FSTDispatchQueue *workerDispatchQueue = [FSTDispatchQueue
       queueWith:dispatch_queue_create("com.google.firebase.firestore", DISPATCH_QUEUE_SERIAL)];
 
   FSTEmptyCredentialsProvider *credentialsProvider = [[FSTEmptyCredentialsProvider alloc] init];
@@ -147,14 +142,6 @@ - (FIRFirestore *)firestoreWithProjectID:(NSString *)projectID {
   return firestore;
 }
 
-- (void)waitForIdle:(FIRFirestore *)firestore {
-  XCTestExpectation *expectation = [self expectationWithDescription:@"idle"];
-  // Note that we wait on any task that is scheduled with a delay. Currently, the idle timeout is
-  // the only task that uses delays.
-  [((FSTTestDispatchQueue *)firestore.workerDispatchQueue) fulfillOnExecution:expectation];
-  [self awaitExpectations];
-}
-
 - (void)shutdownFirestore:(FIRFirestore *)firestore {
   XCTestExpectation *shutdownCompletion = [self expectationWithDescription:@"shutdown"];
   [firestore shutdownWithCompletion:^(NSError *_Nullable error) {
@@ -235,26 +222,6 @@ - (FIRQuerySnapshot *)readDocumentSetForRef:(FIRQuery *)query {
   return result;
 }
 
-- (FIRDocumentSnapshot *)readSnapshotForRef:(FIRDocumentReference *)ref online:(BOOL)online {
-  __block FIRDocumentSnapshot *result;
-
-  XCTestExpectation *expectation = [self expectationWithDescription:@"listener"];
-  id<FIRListenerRegistration> listener = [ref
-      addSnapshotListenerWithOptions:[[FIRDocumentListenOptions options] includeMetadataChanges:YES]
-                            listener:^(FIRDocumentSnapshot *snapshot, NSError *error) {
-                              XCTAssertNil(error);
-                              if (!online || !snapshot.metadata.fromCache) {
-                                result = snapshot;
-                                [expectation fulfill];
-                              }
-                            }];
-
-  [self awaitExpectations];
-  [listener remove];
-
-  return result;
-}
-
 - (void)writeDocumentRef:(FIRDocumentReference *)ref data:(NSDictionary<NSString *, id> *)data {
   XCTestExpectation *expectation = [self expectationWithDescription:@"setData"];
   [ref setData:data

Firestore/Example/Tests/Util/FSTIntegrationTestCase.h

@@ -23,8 +23,6 @@ NS_ASSUME_NONNULL_BEGIN
 /** Creates and returns an FSTDispatchQueue wrapping the specified dispatch_queue_t. */
 + (instancetype)queueWith:(dispatch_queue_t)dispatchQueue;
 
-- (instancetype)initWithQueue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER;
-
 - (instancetype)init __attribute__((unavailable("Use static constructor method.")));
 
 /**
@@ -41,17 +39,6 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (void)dispatchAsync:(void (^)(void))block;
 
-/**
- * Schedules a callback after the specified delay.
- *
- * Same as dispatch_after() except it asserts that we're not already on the queue, since this
- * generally indicates a bug (and can lead to re-ordering of operations, etc).
- *
- * @param block The block to run.
- * @param delay The delay (in seconds) after which to run the block.
- */
-- (void)dispatchAsync:(void (^)(void))block after:(NSTimeInterval)delay;
-
 /**
  * Unlike dispatchAsync: this method does not require you to dispatch to a different queue than
  * the current one (thus it is equivalent to a raw dispatch_async()).
@@ -63,20 +50,6 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (void)dispatchAsyncAllowingSameQueue:(void (^)(void))block;
 
-/**
- * Schedules a callback after the specified delay.
- *
- * Unlike dispatchAsync: this method does not require you to dispatch to a different queue than
- * the current one (thus it is equivalent to a raw dispatch_async()).
- *
- * This is useful, e.g. for dispatching to the user's queue directly from user API call (in which
- * case we don't know if we're already on the user's queue or not).
- *
- * @param block The block to run.
- * @param delay The delay (in seconds) after which to run the block.
- */
-- (void)dispatchAsyncAllowingSameQueue:(void (^)(void))block after:(NSTimeInterval)delay;
-
 /** The underlying wrapped dispatch_queue_t */
 @property(nonatomic, strong, readonly) dispatch_queue_t queue;
 

Firestore/Example/Tests/Util/FSTIntegrationTestCase.m

@@ -52,25 +52,10 @@ - (void)dispatchAsync:(void (^)(void))block {
   dispatch_async(self.queue, block);
 }
 
-- (void)dispatchAsync:(void (^)(void))block after:(NSTimeInterval)delay {
-  FSTAssert(
-      ![self onTargetQueue],
-      @"dispatchAsync:after: called when we are already running on target dispatch queue '%@'",
-      [self targetQueueLabel]);
-
-  dispatch_time_t delayNs = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delay * NSEC_PER_SEC));
-  dispatch_after(delayNs, self.queue, block);
-}
-
 - (void)dispatchAsyncAllowingSameQueue:(void (^)(void))block {
   dispatch_async(self.queue, block);
 }
 
-- (void)dispatchAsyncAllowingSameQueue:(void (^)(void))block after:(NSTimeInterval)delay {
-  dispatch_time_t delayNs = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(delay * NSEC_PER_SEC));
-  dispatch_after(delayNs, self.queue, block);
-}
-
 #pragma mark - Private Methods
 
 - (NSString *)currentQueueLabel {