Remove cruft related to FIRESTORE_STUB_BUILD. (#484)

* Remove cruft related to FIRESTORE_STUB_BUILD.

* Fix typo.

* Remove remaining traces.

Author: ehsannas

firestore/integration_test_internal/src/collection_reference_test.cc

@@ -4,8 +4,6 @@
 #include "firestore/src/common/wrapper_assertions.h"
 #if defined(__ANDROID__)
 #include "firestore/src/android/collection_reference_android.h"
-#elif defined(FIRESTORE_STUB_BUILD)
-#include "firestore/src/stub/collection_reference_stub.h"
 #endif  // defined(__ANDROID__)
 
 #include "gmock/gmock.h"
@@ -14,7 +12,7 @@
 namespace firebase {
 namespace firestore {
 
-#if defined(__ANDROID__) || defined(FIRESTORE_STUB_BUILD)
+#if defined(__ANDROID__)
 
 using CollectionReferenceTest = testing::Test;
 
@@ -28,7 +26,7 @@ TEST_F(CollectionReferenceTest, Assignment) {
                                             CollectionReferenceInternal>();
 }
 
-#endif  // defined(__ANDROID__) || defined(FIRESTORE_STUB_BUILD)
+#endif  // defined(__ANDROID__)
 
 }  // namespace firestore
 }  // namespace firebase

firestore/integration_test_internal/src/document_change_test.cc

@@ -1,7 +1,5 @@
 #if defined(__ANDROID__)
 #include "firestore/src/android/document_change_android.h"
-#elif defined(FIRESTORE_STUB_BUILD)
-#include "firestore/src/stub/document_change_stub.h"
 #endif  // defined(__ANDROID__)
 
 #include "firebase/firestore.h"
@@ -13,7 +11,7 @@
 namespace firebase {
 namespace firestore {
 
-#if defined(__ANDROID__) || defined(FIRESTORE_STUB_BUILD)
+#if defined(__ANDROID__)
 
 using DocumentChangeTest = FirestoreIntegrationTest;
 
@@ -76,7 +74,7 @@ TEST_F(DocumentChangeTest, TestDocumentChanges) {
   EXPECT_EQ(changes[0].new_index(), 0);
 }
 
-#endif  // defined(__ANDROID__) || defined(FIRESTORE_STUB_BUILD)
+#endif  // defined(__ANDROID__)
 
 }  // namespace firestore
 }  // namespace firebase

firestore/integration_test_internal/src/document_reference_test.cc

@@ -9,14 +9,12 @@
 #if defined(__ANDROID__)
 #include "firestore/src/android/converter_android.h"
 #include "firestore/src/android/document_reference_android.h"
-#elif defined(FIRESTORE_STUB_BUILD)
-#include "firestore/src/stub/document_reference_stub.h"
 #endif  // defined(__ANDROID__)
 
 namespace firebase {
 namespace firestore {
 
-#if defined(__ANDROID__) || defined(FIRESTORE_STUB_BUILD)
+#if defined(__ANDROID__)
 
 using DocumentReferenceTest = FirestoreIntegrationTest;
 
@@ -30,7 +28,7 @@ TEST_F(DocumentReferenceTest, Assignment) {
                                             DocumentReferenceInternal>();
 }
 
-#endif  // defined(__ANDROID__) || defined(FIRESTORE_STUB_BUILD)
+#endif  // defined(__ANDROID__)
 
 #if defined(__ANDROID__)
 

firestore/integration_test_internal/src/document_snapshot_test.cc

@@ -4,9 +4,6 @@
 #if defined(__ANDROID__)
 #include "firestore/src/android/document_snapshot_android.h"
 #include "firestore/src/common/wrapper_assertions.h"
-#elif defined(FIRESTORE_STUB_BUILD)
-#include "firestore/src/common/wrapper_assertions.h"
-#include "firestore/src/stub/document_snapshot_stub.h"
 #endif  // defined(__ANDROID__)
 
 #include "gmock/gmock.h"
@@ -15,7 +12,7 @@
 namespace firebase {
 namespace firestore {
 
-#if defined(__ANDROID__) || defined(FIRESTORE_STUB_BUILD)
+#if defined(__ANDROID__)
 
 using DocumentSnapshotTest = testing::Test;
 

firestore/integration_test_internal/src/field_value_test.cc

@@ -5,8 +5,6 @@
 #if defined(__ANDROID__)
 #include "firestore/src/android/field_value_android.h"
 #include "firestore/src/common/wrapper_assertions.h"
-#elif defined(FIRESTORE_STUB_BUILD)
-#include "firestore/src/stub/field_value_stub.h"
 #else
 #include "firestore/src/main/field_value_main.h"
 #endif  // defined(__ANDROID__)
@@ -39,7 +37,7 @@ TEST_F(FieldValueTest, TestFieldValueTypes) {
   FieldValue::ArrayRemove(std::vector<FieldValue>{FieldValue::Null()});
 }
 
-#if defined(__ANDROID__) || defined(FIRESTORE_STUB_BUILD)
+#if defined(__ANDROID__)
 
 TEST_F(FieldValueTest, Construction) {
   testutil::AssertWrapperConstructionContract<FieldValue>();
@@ -49,9 +47,7 @@ TEST_F(FieldValueTest, Assignment) {
   testutil::AssertWrapperAssignmentContract<FieldValue>();
 }
 
-#endif  // defined(__ANDROID__) || defined(FIRESTORE_STUB_BUILD)
-
-#if !defined(FIRESTORE_STUB_BUILD)
+#endif  // defined(__ANDROID__)
 
 TEST_F(FieldValueTest, TestNullType) {
   FieldValue value = FieldValue::Null();
@@ -355,7 +351,5 @@ TEST_F(FieldValueTest, TestIncrementChoosesTheCorrectType) {
   // clang-format on
 }
 
-#endif  // !defined(FIRESTORE_STUB_BUILD)
-
 }  // namespace firestore
 }  // namespace firebase

firestore/integration_test_internal/src/firestore_test.cc

@@ -7,10 +7,6 @@
 #endif
 #include <stdexcept>
 
-#if !defined(FIRESTORE_STUB_BUILD)
-#include "app/src/semaphore.h"
-#endif
-
 #if defined(__ANDROID__)
 #include "android/firestore_integration_test_android.h"
 #include "firestore/src/android/exception_android.h"
@@ -93,24 +89,6 @@ TEST_F(FirestoreIntegrationTest, TestCanCreateCollectionAndDocumentReferences) {
   // If any of these assert, the test will fail.
 }
 
-#if defined(FIRESTORE_STUB_BUILD)
-
-TEST_F(FirestoreIntegrationTest, TestStubsReturnFailedFutures) {
-  Firestore* db = TestFirestore();
-  Future<void> future = db->EnableNetwork();
-  Await(future);
-  EXPECT_EQ(FutureStatus::kFutureStatusComplete, future.status());
-  EXPECT_EQ(Error::kErrorFailedPrecondition, future.error());
-
-  future = db->Document("foo/bar").Set(
-      MapFieldValue{{"foo", FieldValue::String("bar")}});
-  Await(future);
-  EXPECT_EQ(FutureStatus::kFutureStatusComplete, future.status());
-  EXPECT_EQ(Error::kErrorFailedPrecondition, future.error());
-}
-
-#else  // defined(FIRESTORE_STUB_BUILD)
-
 TEST_F(FirestoreIntegrationTest, TestCanReadNonExistentDocuments) {
   DocumentReference doc = Collection("rooms").Document();
 
@@ -1565,7 +1543,5 @@ TEST_F(FirestoreAndroidIntegrationTest,
 }
 #endif  // defined(__ANDROID__)
 
-#endif  // defined(FIRESTORE_STUB_BUILD)
-
 }  // namespace firestore
 }  // namespace firebase

firestore/integration_test_internal/src/includes_test.cc

@@ -38,16 +38,6 @@ TEST_F(IncludesTest, TestIncludingFirestoreHeaderIsSufficient) {
 #if defined(__ANDROID__)
     App* app =
         App::Create(app_framework::GetJniEnv(), app_framework::GetActivity());
-
-#elif defined(FIRESTORE_STUB_BUILD)
-    // Stubs don't load values from `GoogleService-Info.plist`/etc., so the app
-    // has to be configured explicitly.
-    AppOptions options;
-    options.set_project_id("foo");
-    options.set_app_id("foo");
-    options.set_api_key("foo");
-    App* app = App::Create(options);
-
 #else
     App* app = App::Create();
 #endif  // defined(__ANDROID__)

firestore/integration_test_internal/src/listener_registration_test.cc

@@ -5,8 +5,6 @@
 #if defined(__ANDROID__)
 #include "firestore/src/android/listener_registration_android.h"
 #include "firestore/src/common/wrapper_assertions.h"
-#elif defined(FIRESTORE_STUB_BUILD)
-#include "firestore/src/stub/listener_registration_stub.h"
 #endif  // defined(__ANDROID__)
 
 #include "gmock/gmock.h"
@@ -29,9 +27,6 @@ class ListenerRegistrationTest : public FirestoreIntegrationTest {
   }
 };
 
-// These tests don't work with stubs.
-#if !defined(FIRESTORE_STUB_BUILD)
-
 TEST_F(ListenerRegistrationTest, TestCanBeRemoved) {
   CollectionReference collection = Collection();
   DocumentReference document = collection.Document();
@@ -120,8 +115,6 @@ TEST_F(ListenerRegistrationTest, TestCanBeRemovedIndependently) {
   EXPECT_EQ(3, listener_two.event_count());
 }
 
-#endif  // defined(FIRESTORE_STUB_BUILD)
-
 #if defined(__ANDROID__)
 // TODO(b/136011600): the mechanism for creating internals doesn't work on iOS.
 // The most valuable test is making sure that a copy of a registration can be

firestore/integration_test_internal/src/query_network_test.cc

@@ -6,8 +6,6 @@
 #include "util/event_accumulator.h"
 #if defined(__ANDROID__)
 #include "firestore/src/android/query_android.h"
-#elif defined(FIRESTORE_STUB_BUILD)
-#include "firestore/src/stub/query_stub.h"
 #endif  // defined(__ANDROID__)
 
 #include "gmock/gmock.h"

firestore/integration_test_internal/src/query_snapshot_test.cc

@@ -4,8 +4,6 @@
 #include "firestore/src/common/wrapper_assertions.h"
 #if defined(__ANDROID__)
 #include "firestore/src/android/query_snapshot_android.h"
-#elif defined(FIRESTORE_STUB_BUILD)
-#include "firestore/src/stub/query_snapshot_stub.h"
 #endif  // defined(__ANDROID__)
 
 #include "gmock/gmock.h"
@@ -14,7 +12,7 @@
 namespace firebase {
 namespace firestore {
 
-#if defined(__ANDROID__) || defined(FIRESTORE_STUB_BUILD)
+#if defined(__ANDROID__)
 
 using QuerySnapshotTest = testing::Test;
 
@@ -28,7 +26,7 @@ TEST_F(QuerySnapshotTest, Assignment) {
                                             QuerySnapshotInternal>();
 }
 
-#endif  // defined(__ANDROID__) || defined(FIRESTORE_STUB_BUILD)
+#endif  // defined(__ANDROID__)
 
 }  // namespace firestore
 }  // namespace firebase