Cleanup

Author: schmidt-sebastian

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

@@ -858,9 +858,9 @@ - (void)testWatchStreamReconnectsAfterIdle {
   FIRDocumentReference *doc = [self documentRef];
   FIRFirestore *firestore = doc.firestore;
 
-  [self readSnapshotForRef:[self documentRef] online:YES];
+  [self readSnapshotForRef:[self documentRef] requireOnline:YES];
   [self waitForIdle:firestore];
-  [self readSnapshotForRef:[self documentRef] online:YES];
+  [self readSnapshotForRef:[self documentRef] requireOnline:YES];
 }
 
 @end

Firestore/Example/Tests/Integration/FSTStreamTests.m

@@ -20,9 +20,9 @@
 
 #import "Auth/FSTEmptyCredentialsProvider.h"
 #import "Core/FSTDatabaseInfo.h"
-#import "FSTTestDispatchQueue.h"
 #import "FSTHelpers.h"
 #import "FSTIntegrationTestCase.h"
+#import "FSTTestDispatchQueue.h"
 #import "Model/FSTDatabaseID.h"
 #import "Remote/FSTDatastore.h"
 #import "Util/FSTAssert.h"

Firestore/Example/Tests/Util/FSTIntegrationTestCase.h

@@ -69,7 +69,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (FIRQuerySnapshot *)readDocumentSetForRef:(FIRQuery *)query;
 
-- (FIRDocumentSnapshot *)readSnapshotForRef:(FIRDocumentReference *)query online:(BOOL)online;
+- (FIRDocumentSnapshot *)readSnapshotForRef:(FIRDocumentReference *)query
+                              requireOnline:(BOOL)online;
 
 - (void)writeDocumentRef:(FIRDocumentReference *)ref data:(NSDictionary<NSString *, id> *)data;
 

Firestore/Example/Tests/Util/FSTIntegrationTestCase.m

@@ -235,7 +235,7 @@ - (FIRQuerySnapshot *)readDocumentSetForRef:(FIRQuery *)query {
   return result;
 }
 
-- (FIRDocumentSnapshot *)readSnapshotForRef:(FIRDocumentReference *)ref online:(BOOL)online {
+- (FIRDocumentSnapshot *)readSnapshotForRef:(FIRDocumentReference *)ref requireOnline:(BOOL)online {
   __block FIRDocumentSnapshot *result;
 
   XCTestExpectation *expectation = [self expectationWithDescription:@"listener"];

Firestore/Example/Tests/Util/FSTTestDispatchQueue.m

@@ -28,6 +28,8 @@ @interface FSTTestDispatchQueue ()
 
 @implementation FSTTestDispatchQueue
 
+static const NSTimeInterval kMaxDispatchDelay = 1.0;
+
 + (instancetype)queueWith:(dispatch_queue_t)dispatchQueue {
   return [[FSTTestDispatchQueue alloc] initWithQueue:dispatchQueue];
 }
@@ -38,20 +40,20 @@ - (instancetype)initWithQueue:(dispatch_queue_t)dispatchQueue {
 
 - (void)dispatchAsync:(void (^)(void))block after:(NSTimeInterval)delay {
   [super dispatchAsyncAllowingSameQueue:^() {
-          block();
-          [_expectation fulfill];
-          _expectation = nil;
-      }
-                                  after:MIN(delay, 1.0)];
+    block();
+    [_expectation fulfill];
+    _expectation = nil;
+  }
+                                  after:MIN(delay, kMaxDispatchDelay)];
 }
 
 - (void)dispatchAsyncAllowingSameQueue:(void (^)(void))block after:(NSTimeInterval)delay {
   [super dispatchAsyncAllowingSameQueue:^() {
-          block();
-          [_expectation fulfill];
-          _expectation = nil;
-      }
-                                  after:MIN(delay, 1.0)];
+    block();
+    [_expectation fulfill];
+    _expectation = nil;
+  }
+                                  after:MIN(delay, kMaxDispatchDelay)];
 }
 
 - (void)fulfillOnExecution:(XCTestExpectation*)expectation {

Firestore/Source/Remote/FSTDatastore.h

@@ -213,7 +213,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
-#pragma mark - FSTWatchStream
+#pragma mark - FSTWatchStreamDelegate
 
 /** A protocol defining the events that can be emitted by the FSTWatchStream. */
 @protocol FSTWatchStreamDelegate <NSObject>
@@ -240,6 +240,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+#pragma mark - FSTWatchStream
+
 /**
  * An FSTStream that implements the StreamingWatch RPC.
  *
@@ -276,7 +278,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
-#pragma mark - FSTWriteStream
+#pragma mark - FSTWriteStreamDelegate
 
 @protocol FSTWriteStreamDelegate <NSObject>
 
@@ -308,6 +310,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+#pragma mark - FSTWriteStream
+
 /**
  * An FSTStream that implements the StreamingWrite RPC.
  *

Firestore/Source/Remote/FSTDatastore.m

@@ -120,7 +120,7 @@ - (instancetype)initWithDatabase:(FSTDatabaseInfo *)database
 - (instancetype)initWithDatabase:(FSTDatabaseInfo *)database
              workerDispatchQueue:(FSTDispatchQueue *)workerDispatchQueue
                      credentials:(id<FSTCredentialsProvider>)credentials
-            responseMessageClass:(Class)responseMessageClassNS_UNAVAILABLE;
+            responseMessageClass:(Class)responseMessageClass NS_UNAVAILABLE;
 
 @end