review feedback

rsgowman · rsgowman · commit 9f2ee5f7f393 · 2018-04-13T18:17:35.000-04:00
diff --git a/Firestore/Example/Firestore.xcodeproj/project.pbxproj b/Firestore/Example/Firestore.xcodeproj/project.pbxproj
@@ -131,7 +131,7 @@
 		6003F5B1195388D20070C39A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58D195388D20070C39A /* Foundation.framework */; };
 		6003F5B2195388D20070C39A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F591195388D20070C39A /* UIKit.framework */; };
 		6003F5BA195388D20070C39A /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6003F5B8195388D20070C39A /* InfoPlist.strings */; };
-		61287373203C92C5000EAD3F /* FIRSourceTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 61287372203C92C5000EAD3F /* FIRSourceTests.mm */; };
+		6161B5032047140C00A99DBB /* FIRFirestoreSourceTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6161B5012047140400A99DBB /* FIRFirestoreSourceTests.mm */; };
 		6ED54761B845349D43DB6B78 /* Pods_Firestore_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 75A6FE51C1A02DF38F62FAAD /* Pods_Firestore_Example.framework */; };
 		71719F9F1E33DC2100824A3D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 71719F9D1E33DC2100824A3D /* LaunchScreen.storyboard */; };
 		7346E61D20325C6900FD6CEF /* FSTDispatchQueueTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7346E61C20325C6900FD6CEF /* FSTDispatchQueueTests.mm */; };
@@ -356,7 +356,7 @@
 		6003F5AF195388D20070C39A /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
 		6003F5B7195388D20070C39A /* Tests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Tests-Info.plist"; sourceTree = "<group>"; };
 		6003F5B9195388D20070C39A /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		61287372203C92C5000EAD3F /* FIRSourceTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FIRSourceTests.mm; sourceTree = "<group>"; };
+		6161B5012047140400A99DBB /* FIRFirestoreSourceTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FIRFirestoreSourceTests.mm; sourceTree = "<group>"; };
 		69F6A10DBD6187489481CD76 /* Pods_Firestore_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Firestore_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		71719F9E1E33DC2100824A3D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		7346E61C20325C6900FD6CEF /* FSTDispatchQueueTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FSTDispatchQueueTests.mm; sourceTree = "<group>"; };
@@ -884,7 +884,7 @@
 		DE51B1BC1F0D48AC0013853F /* API */ = {
 			isa = PBXGroup;
 			children = (
-				61287372203C92C5000EAD3F /* FIRSourceTests.mm */,
+				6161B5012047140400A99DBB /* FIRFirestoreSourceTests.mm */,
 				5492E070202154D600B64F25 /* FIRCursorTests.mm */,
 				5492E06C202154D500B64F25 /* FIRDatabaseTests.mm */,
 				5492E06A202154D500B64F25 /* FIRFieldsTests.mm */,
@@ -1558,7 +1558,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				61287373203C92C5000EAD3F /* FIRSourceTests.mm in Sources */,
+				6161B5032047140C00A99DBB /* FIRFirestoreSourceTests.mm in Sources */,
 				5492E076202154D600B64F25 /* FIRValidationTests.mm in Sources */,
 				5492E072202154D600B64F25 /* FIRQueryTests.mm in Sources */,
 				5491BC731FB44593008B3588 /* FSTIntegrationTestCase.mm in Sources */,
diff --git a/Firestore/Example/SwiftBuildTest/main.swift b/Firestore/Example/SwiftBuildTest/main.swift
@@ -32,10 +32,10 @@ func main() {
   addDocument(to: collectionRef)
 
   readDocument(at: documentRef)
-  readDocumentWithOptions(at: documentRef)
+  readDocumentWithSource(at: documentRef)
 
   readDocuments(matching: query)
-  readDocumentsWithOptions(matching: query)
+  readDocumentsWithSource(matching: query)
 
   listenToDocument(at: documentRef)
 
@@ -219,7 +219,7 @@ func readDocument(at docRef: DocumentReference) {
   }
 }
 
-func readDocumentWithOptions(at docRef: DocumentReference) {
+func readDocumentWithSource(at docRef: DocumentReference) {
   docRef.getDocument(source: FirestoreSource.default) { document, error in
   }
   docRef.getDocument(source: .server) { document, error in
@@ -238,7 +238,7 @@ func readDocuments(matching query: Query) {
   }
 }
 
-func readDocumentsWithOptions(matching query: Query) {
+func readDocumentsWithSource(matching query: Query) {
   query.getDocuments(source: FirestoreSource.default) { querySnapshot, error in
   }
   query.getDocuments(source: .server) { querySnapshot, error in
diff --git a/Firestore/Example/Tests/Integration/API/FIRFirestoreSourceTests.mm b/Firestore/Example/Tests/Integration/API/FIRFirestoreSourceTests.mm

Original file line number	Diff line number	Diff line change
`@@ -32,10 +32,10 @@ func main() {`
`32`	`32`	`addDocument(to: collectionRef)`
`33`	`33`
`34`	`34`	`readDocument(at: documentRef)`
`35`		`- readDocumentWithOptions(at: documentRef)`
	`35`	`+ readDocumentWithSource(at: documentRef)`
`36`	`36`
`37`	`37`	`readDocuments(matching: query)`
`38`		`- readDocumentsWithOptions(matching: query)`
	`38`	`+ readDocumentsWithSource(matching: query)`
`39`	`39`
`40`	`40`	`listenToDocument(at: documentRef)`
`41`	`41`
`@@ -219,7 +219,7 @@ func readDocument(at docRef: DocumentReference) {`
`219`	`219`	`}`
`220`	`220`	`}`
`221`	`221`
`222`		`-func readDocumentWithOptions(at docRef: DocumentReference) {`
	`222`	`+func readDocumentWithSource(at docRef: DocumentReference) {`
`223`	`223`	`docRef.getDocument(source: FirestoreSource.default) { document, error in`
`224`	`224`	`}`
`225`	`225`	`docRef.getDocument(source: .server) { document, error in`
`@@ -238,7 +238,7 @@ func readDocuments(matching query: Query) {`
`238`	`238`	`}`
`239`	`239`	`}`
`240`	`240`
`241`		`-func readDocumentsWithOptions(matching query: Query) {`
	`241`	`+func readDocumentsWithSource(matching query: Query) {`
`242`	`242`	`query.getDocuments(source: FirestoreSource.default) { querySnapshot, error in`
`243`	`243`	`}`
`244`	`244`	`query.getDocuments(source: .server) { querySnapshot, error in`