Have Firestore integration tests run all tests (#3342)

* Rename FIRQueryTests to FIRQueryUnitTests

* Make IntegrationTests targets run everything

The incremental cost of running all tests is an extra two seconds of run
time, but not starting the simulator three times during a build cuts
build times by ~25%.

* sync_project.rb generated changes

* sync_project.rb generated changes

* Remove AllTests_iOS aggregate target

* Add unit test deps to Firestore_IntegrationTests_*

* Fix BasicCompileTests on macOS and tvOS

* Run Firestore IntegrationTests only on Travis

This cuts build time for the job by about 25%, primarily due to not
having to start/deploy to the simulator repeatedly.

Author: wilhuff

Firestore/Example/Firestore.xcodeproj/project.pbxproj

@@ -51,7 +51,9 @@ target 'Firestore_Example_iOS' do
     inherit! :search_paths
 
     pod 'FirebaseFirestoreSwift', :path => '../../'
+    pod 'GoogleBenchmark', :podspec => 'GoogleBenchmark.podspec'
     pod 'GoogleTest', :podspec => 'GoogleTest.podspec'
+    pod 'ProtobufCpp', :podspec => 'ProtobufCpp.podspec'
 
     pod 'OCMock'
     pod 'leveldb-library'
@@ -94,7 +96,9 @@ target 'Firestore_Example_macOS' do
     inherit! :search_paths
 
     pod 'FirebaseFirestoreSwift', :path => '../../'
+    pod 'GoogleBenchmark', :podspec => 'GoogleBenchmark.podspec'
     pod 'GoogleTest', :podspec => 'GoogleTest.podspec'
+    pod 'ProtobufCpp', :podspec => 'ProtobufCpp.podspec'
 
     pod 'OCMock'
     pod 'leveldb-library'
@@ -125,7 +129,9 @@ target 'Firestore_Example_tvOS' do
     inherit! :search_paths
 
     pod 'FirebaseFirestoreSwift', :path => '../../'
+    pod 'GoogleBenchmark', :podspec => 'GoogleBenchmark.podspec'
     pod 'GoogleTest', :podspec => 'GoogleTest.podspec'
+    pod 'ProtobufCpp', :podspec => 'ProtobufCpp.podspec'
 
     pod 'OCMock'
     pod 'leveldb-library'

Firestore/Example/Firestore.xcodeproj/xcshareddata/xcschemes/AllTests_iOS.xcscheme

@@ -29,10 +29,10 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface FIRQueryTests : XCTestCase
+@interface FIRQueryUnitTests : XCTestCase
 @end
 
-@implementation FIRQueryTests
+@implementation FIRQueryUnitTests
 
 - (void)testEquals {
   std::shared_ptr<api::Firestore> firestore = FSTTestFirestore().wrapped;

Firestore/Example/Podfile

@@ -19,7 +19,15 @@
 
 import Foundation
 import XCTest
-import Firebase
+
+// The Firebase pod is only available on iOS. On other platforms, import
+// Firestore directly and disable any tests that inspect types at the Firebase
+// level.
+#if os(iOS)
+  import Firebase
+#else
+  import FirebaseFirestore
+#endif
 
 class BasicCompileTests: XCTestCase {
   func testCompiled() {
@@ -423,10 +431,14 @@ func types() {
   let _: Firestore
   let _: FirestoreSettings
   let _: GeoPoint
-  let _: Firebase.GeoPoint
+  #if os(iOS)
+    let _: Firebase.GeoPoint
+  #endif
   let _: FirebaseFirestore.GeoPoint
   let _: Timestamp
-  let _: Firebase.Timestamp
+  #if os(iOS)
+    let _: Firebase.Timestamp
+  #endif
   let _: FirebaseFirestore.Timestamp
   let _: ListenerRegistration
   let _: Query

Firestore/Example/Tests/API/FIRQueryTests.mm renamed to Firestore/Example/Tests/API/FIRQueryUnitTests.mm

@@ -308,26 +308,18 @@ case "$product-$method-$platform" in
     "${firestore_emulator}" start
     trap '"${firestore_emulator}" stop' ERR EXIT
 
-    RunXcodebuild \
-        -workspace 'Firestore/Example/Firestore.xcworkspace' \
-        -scheme "Firestore_Tests_$platform" \
-        "${xcb_flags[@]}" \
-        build \
-        test
-
-    # Firestore_SwiftTests_iOS require Swift 4, which needs Xcode 9
-    if [[ "$platform" == 'iOS' && "$xcode_major" -ge 9 ]]; then
+    if [[ "$xcode_major" -lt 9 ]]; then
+      # When building and testing for Xcode 8, only test unit tests.
       RunXcodebuild \
           -workspace 'Firestore/Example/Firestore.xcworkspace' \
-          -scheme "Firestore_SwiftTests_iOS" \
+          -scheme "Firestore_Tests_$platform" \
           "${xcb_flags[@]}" \
           build \
           test
-    fi
 
-    # Firestore_IntegrationTests_iOS require Swift 4, which needs Xcode 9
-    # Other non-iOS platforms don't have swift integration tests yet.
-    if [[ "$platform" != 'iOS' || "$xcode_major" -ge 9 ]]; then
+    else
+      # IntegrationTests run all the tests, including Swift tests, which
+      # require Swift 4.0 and Xcode 9+.
       RunXcodebuild \
           -workspace 'Firestore/Example/Firestore.xcworkspace' \
           -scheme "Firestore_IntegrationTests_$platform" \

Firestore/Swift/Tests/API/BasicCompileTests.swift

@@ -118,6 +118,7 @@ def sync_firestore(test_only)
 
       # Other dependencies that assume #includes are relative to their roots.
       '"${PODS_ROOT}/../../../Firestore/third_party/abseil-cpp"',
+      '"${PODS_ROOT}/GoogleBenchmark/include"',
       '"${PODS_ROOT}/GoogleTest/googlemock/include"',
       '"${PODS_ROOT}/GoogleTest/googletest/include"',
       '"${PODS_ROOT}/leveldb-library/include"',
@@ -178,14 +179,15 @@ def sync_firestore(test_only)
   ['iOS', 'macOS', 'tvOS'].each do |platform|
     s.target "Firestore_IntegrationTests_#{platform}" do |t|
       t.source_files = [
-        'Firestore/Example/Tests/Integration/**',
-        'Firestore/Example/Tests/Util/FSTEventAccumulator.mm',
-        'Firestore/Example/Tests/Util/FSTHelpers.mm',
-        'Firestore/Example/Tests/Util/FSTIntegrationTestCase.mm',
-        'Firestore/Example/Tests/Util/XCTestCase+Await.mm',
-        'Firestore/Example/Tests/en.lproj/InfoPlist.strings',
-        'Firestore/Swift/Tests/Integration/**',
-        'Firestore/core/test/firebase/firestore/testutil/**',
+        'Firestore/Example/Tests/**',
+        'Firestore/Protos/cpp/**',
+        'Firestore/Swift/Tests/**',
+        'Firestore/core/test/**',
+        'Firestore/third_party/Immutable/Tests/**',
+      ]
+      t.exclude_files = [
+        # needs to be in project but not in target
+        'Firestore/Example/Tests/Tests-Info.plist',
       ]
       t.xcconfig = xcconfig_objc + xcconfig_swift
     end