Update tests to use the new commitWriteBatch method

Author: dconeybe

Firestore/Example/Tests/Integration/API/FIRAggregateTests.mm

@@ -639,13 +639,7 @@ - (void)testCanRunAggregateCollectionGroupQuery {
     NSString* path = [NSString stringWithFormat:format, collectionGroup];
     [batch setData:@{@"x" : @2} forDocument:[self.db documentWithPath:path]];
   }
-
-  XCTestExpectation* expectation = [self expectationWithDescription:@"commit"];
-  [batch commitWithCompletion:^(NSError* error) {
-    XCTAssertNil(error);
-    [expectation fulfill];
-  }];
-  [self awaitExpectation:expectation];
+  [self commitWriteBatch:batch];
 
   FIRAggregateQuerySnapshot* snapshot =
       [self readSnapshotForAggregate:[[self.db collectionGroupWithID:collectionGroup] aggregate:@[

Firestore/Example/Tests/Integration/API/FIRCountTests.mm

@@ -163,12 +163,7 @@ - (void)testCanRunCollectionGroupCountQuery {
     [batch setData:@{@"x" : @"a"} forDocument:[self.db documentWithPath:path]];
   }
 
-  XCTestExpectation* expectation = [self expectationWithDescription:@"commit"];
-  [batch commitWithCompletion:^(NSError* error) {
-    XCTAssertNil(error);
-    [expectation fulfill];
-  }];
-  [self awaitExpectation:expectation];
+  [self commitWriteBatch:batch];
 
   FIRAggregateQuerySnapshot* snapshot =
       [self readSnapshotForAggregate:[[self.db collectionGroupWithID:collectionGroup] count]];

Firestore/Example/Tests/Integration/API/FIRQueryTests.mm

@@ -790,12 +790,7 @@ - (void)testCollectionGroupQueries {
                                                         withString:collectionGroup];
     [batch setData:@{@"x" : @1} forDocument:[self.db documentWithPath:path]];
   }
-  XCTestExpectation *expectation = [self expectationWithDescription:@"batch written"];
-  [batch commitWithCompletion:^(NSError *error) {
-    XCTAssertNil(error);
-    [expectation fulfill];
-  }];
-  [self awaitExpectations];
+  [self commitWriteBatch:batch];
 
   FIRQuerySnapshot *querySnapshot =
       [self readDocumentSetForRef:[self.db collectionGroupWithID:collectionGroup]];
@@ -821,12 +816,7 @@ - (void)testCollectionGroupQueriesWithStartAtEndAtWithArbitraryDocumentIDs {
                                                         withString:collectionGroup];
     [batch setData:@{@"x" : @1} forDocument:[self.db documentWithPath:path]];
   }
-  XCTestExpectation *expectation = [self expectationWithDescription:@"batch written"];
-  [batch commitWithCompletion:^(NSError *error) {
-    XCTAssertNil(error);
-    [expectation fulfill];
-  }];
-  [self awaitExpectations];
+  [self commitWriteBatch:batch];
 
   FIRQuerySnapshot *querySnapshot = [self
       readDocumentSetForRef:[[[[self.db collectionGroupWithID:collectionGroup]
@@ -858,12 +848,7 @@ - (void)testCollectionGroupQueriesWithWhereFiltersOnArbitraryDocumentIDs {
                                                         withString:collectionGroup];
     [batch setData:@{@"x" : @1} forDocument:[self.db documentWithPath:path]];
   }
-  XCTestExpectation *expectation = [self expectationWithDescription:@"batch written"];
-  [batch commitWithCompletion:^(NSError *error) {
-    XCTAssertNil(error);
-    [expectation fulfill];
-  }];
-  [self awaitExpectations];
+  [self commitWriteBatch:batch];
 
   FIRQuerySnapshot *querySnapshot = [self
       readDocumentSetForRef:[[[self.db collectionGroupWithID:collectionGroup]

Firestore/Example/Tests/Util/FSTIntegrationTestCase.h

@@ -33,6 +33,7 @@
 @class FIRFirestore;
 @class FIRFirestoreSettings;
 @class FIRQuery;
+@class FIRWriteBatch;
 @class FSTEventAccumulator;
 
 NS_ASSUME_NONNULL_BEGIN