Merge remote_test_util and remote_testing libraries (#5254)

These two libraries duplicate each other in purpose:

  * firebase_firestore_remote_test_util
  * firebase_firestore_remote_testing

Additionally, several of the testing utilities in remote_test_util are
really only applicable to tests in the remote library anyway. These have
been put directly into firebase_firestore_remote_test.

Author: wilhuff

Firestore/Example/Firestore.xcodeproj/project.pbxproj

@@ -29,7 +29,7 @@ if(APPLE)
       FirebaseFirestore
       firebase_firestore_local_testing
       firebase_firestore_objc_test_util
-      firebase_firestore_remote_test_util
+      firebase_firestore_remote_testing
     # Force this to run in the project-wide binary directory so that relative
     # paths used during compilation are usable.
     WORKING_DIRECTORY ${PROJECT_BINARY_DIR}

Firestore/Example/Tests/SpecTests/CMakeLists.txt

@@ -35,7 +35,7 @@
 #include "Firestore/core/src/firebase/firestore/util/async_queue.h"
 #include "Firestore/core/src/firebase/firestore/util/log.h"
 #include "Firestore/core/src/firebase/firestore/util/string_apple.h"
-#include "Firestore/core/test/firebase/firestore/util/create_noop_connectivity_monitor.h"
+#include "Firestore/core/test/firebase/firestore/remote/create_noop_connectivity_monitor.h"
 #include "absl/memory/memory.h"
 #include "grpcpp/completion_queue.h"
 
@@ -51,13 +51,13 @@
 using firebase::firestore::model::SnapshotVersion;
 using firebase::firestore::model::TargetId;
 using firebase::firestore::remote::ConnectivityMonitor;
+using firebase::firestore::remote::CreateNoOpConnectivityMonitor;
 using firebase::firestore::remote::GrpcConnection;
 using firebase::firestore::remote::WatchChange;
 using firebase::firestore::remote::WatchStream;
 using firebase::firestore::remote::WatchTargetChange;
 using firebase::firestore::remote::WriteStream;
 using firebase::firestore::util::AsyncQueue;
-using firebase::firestore::util::CreateNoOpConnectivityMonitor;
 using firebase::firestore::util::Status;
 
 namespace firebase {

Firestore/Example/Tests/SpecTests/FSTMockDatastore.mm

@@ -15,9 +15,12 @@
 firebase_ios_cc_library(
   firebase_firestore_remote_testing
   SOURCES
+    create_noop_connectivity_monitor.cc
+    create_noop_connectivity_monitor.h
     fake_target_metadata_provider.cc
     fake_target_metadata_provider.h
   DEPENDS
+    absl_memory
     firebase_firestore_remote
 )
 
@@ -26,8 +29,12 @@ firebase_ios_cc_test(
   SOURCES
     datastore_test.cc
     exponential_backoff_test.cc
+    fake_credentials_provider.cc
+    fake_credentials_provider.h
     grpc_connection_test.cc
     grpc_stream_test.cc
+    grpc_stream_tester.cc
+    grpc_stream_tester.h
     grpc_streaming_reader_test.cc
     grpc_unary_call_test.cc
     remote_event_test.cc
@@ -42,7 +49,6 @@ firebase_ios_cc_test(
     firebase_firestore_local
     firebase_firestore_remote
     firebase_firestore_remote_testing
-    firebase_firestore_remote_test_util
     firebase_firestore_testutil
     firebase_firestore_util_async_std
     GMock::GMock

Firestore/core/test/firebase/firestore/remote/CMakeLists.txt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google
+ * Copyright 2018 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-#include "Firestore/core/test/firebase/firestore/util/create_noop_connectivity_monitor.h"
+#include "Firestore/core/test/firebase/firestore/remote/create_noop_connectivity_monitor.h"
 
 #include "absl/memory/memory.h"
 
 namespace firebase {
 namespace firestore {
-namespace util {
+namespace remote {
 
-std::unique_ptr<remote::ConnectivityMonitor> CreateNoOpConnectivityMonitor() {
+std::unique_ptr<ConnectivityMonitor> CreateNoOpConnectivityMonitor() {
   // The default implementation does nothing
-  return absl::make_unique<remote::ConnectivityMonitor>(nullptr);
+  return absl::make_unique<ConnectivityMonitor>(nullptr);
 }
 
-}  // namespace util
+}  // namespace remote
 }  // namespace firestore
 }  // namespace firebase

Firestore/core/test/firebase/firestore/util/create_noop_connectivity_monitor.cc renamed to Firestore/core/test/firebase/firestore/remote/create_noop_connectivity_monitor.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google
+ * Copyright 2018 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-#ifndef FIRESTORE_CORE_TEST_FIREBASE_FIRESTORE_UTIL_CREATE_NOOP_CONNECTIVITY_MONITOR_H_
-#define FIRESTORE_CORE_TEST_FIREBASE_FIRESTORE_UTIL_CREATE_NOOP_CONNECTIVITY_MONITOR_H_
+#ifndef FIRESTORE_CORE_TEST_FIREBASE_FIRESTORE_REMOTE_CREATE_NOOP_CONNECTIVITY_MONITOR_H_
+#define FIRESTORE_CORE_TEST_FIREBASE_FIRESTORE_REMOTE_CREATE_NOOP_CONNECTIVITY_MONITOR_H_
 
 #include <memory>
 
 #include "Firestore/core/src/firebase/firestore/remote/connectivity_monitor.h"
 
 namespace firebase {
 namespace firestore {
-namespace util {
+namespace remote {
 
-std::unique_ptr<remote::ConnectivityMonitor> CreateNoOpConnectivityMonitor();
+std::unique_ptr<ConnectivityMonitor> CreateNoOpConnectivityMonitor();
 
-}  // namespace util
+}  // namespace remote
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIRESTORE_CORE_TEST_FIREBASE_FIRESTORE_UTIL_CREATE_NOOP_CONNECTIVITY_MONITOR_H_
+#endif  // FIRESTORE_CORE_TEST_FIREBASE_FIRESTORE_REMOTE_CREATE_NOOP_CONNECTIVITY_MONITOR_H_

Firestore/core/test/firebase/firestore/util/create_noop_connectivity_monitor.h renamed to Firestore/core/test/firebase/firestore/remote/create_noop_connectivity_monitor.h

@@ -32,10 +32,10 @@
 #include "Firestore/core/src/firebase/firestore/util/status.h"
 #include "Firestore/core/src/firebase/firestore/util/statusor.h"
 #include "Firestore/core/src/firebase/firestore/util/string_apple.h"
+#include "Firestore/core/test/firebase/firestore/remote/fake_credentials_provider.h"
+#include "Firestore/core/test/firebase/firestore/remote/grpc_stream_tester.h"
 #include "Firestore/core/test/firebase/firestore/testutil/async_testing.h"
 #include "Firestore/core/test/firebase/firestore/testutil/testutil.h"
-#include "Firestore/core/test/firebase/firestore/util/fake_credentials_provider.h"
-#include "Firestore/core/test/firebase/firestore/util/grpc_stream_tester.h"
 #include "absl/memory/memory.h"
 #include "absl/strings/str_cat.h"
 #include "gmock/gmock.h"
@@ -57,12 +57,7 @@ using nanopb::Message;
 using testing::Not;
 using testutil::Value;
 using util::AsyncQueue;
-using util::CompletionEndState;
-using util::CompletionResult;
 using util::Executor;
-using util::FakeCredentialsProvider;
-using util::FakeGrpcQueue;
-using util::GrpcStreamTester;
 using util::Status;
 using util::StatusOr;
 

Firestore/core/test/firebase/firestore/remote/datastore_test.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google
+ * Copyright 2018 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "Firestore/core/test/firebase/firestore/util/fake_credentials_provider.h"
+#include "Firestore/core/test/firebase/firestore/remote/fake_credentials_provider.h"
 
 #include <utility>
 
@@ -24,7 +24,7 @@
 
 namespace firebase {
 namespace firestore {
-namespace util {
+namespace remote {
 
 using auth::EmptyCredentialsProvider;
 using auth::TokenListener;
@@ -65,6 +65,6 @@ void FakeCredentialsProvider::FailGetToken() {
   fail_get_token_ = true;
 }
 
-}  // namespace util
+}  // namespace remote
 }  // namespace firestore
 }  // namespace firebase

Firestore/core/test/firebase/firestore/util/fake_credentials_provider.cc renamed to Firestore/core/test/firebase/firestore/remote/fake_credentials_provider.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google
+ * Copyright 2018 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIRESTORE_CORE_TEST_FIREBASE_FIRESTORE_UTIL_FAKE_CREDENTIALS_PROVIDER_H_
-#define FIRESTORE_CORE_TEST_FIREBASE_FIRESTORE_UTIL_FAKE_CREDENTIALS_PROVIDER_H_
+#ifndef FIRESTORE_CORE_TEST_FIREBASE_FIRESTORE_REMOTE_FAKE_CREDENTIALS_PROVIDER_H_
+#define FIRESTORE_CORE_TEST_FIREBASE_FIRESTORE_REMOTE_FAKE_CREDENTIALS_PROVIDER_H_
 
 #include <string>
 #include <vector>
@@ -24,7 +24,7 @@
 
 namespace firebase {
 namespace firestore {
-namespace util {
+namespace remote {
 
 class FakeCredentialsProvider : public auth::EmptyCredentialsProvider {
  public:
@@ -50,8 +50,8 @@ class FakeCredentialsProvider : public auth::EmptyCredentialsProvider {
   auth::TokenListener delayed_token_listener_;
 };
 
-}  // namespace util
+}  // namespace remote
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIRESTORE_CORE_TEST_FIREBASE_FIRESTORE_UTIL_FAKE_CREDENTIALS_PROVIDER_H_
+#endif  // FIRESTORE_CORE_TEST_FIREBASE_FIRESTORE_REMOTE_FAKE_CREDENTIALS_PROVIDER_H_

Firestore/core/test/firebase/firestore/util/fake_credentials_provider.h renamed to Firestore/core/test/firebase/firestore/remote/fake_credentials_provider.h

@@ -26,8 +26,8 @@
 #include "Firestore/core/src/firebase/firestore/util/async_queue.h"
 #include "Firestore/core/src/firebase/firestore/util/status.h"
 #include "Firestore/core/src/firebase/firestore/util/statusor.h"
+#include "Firestore/core/test/firebase/firestore/remote/grpc_stream_tester.h"
 #include "Firestore/core/test/firebase/firestore/testutil/async_testing.h"
-#include "Firestore/core/test/firebase/firestore/util/grpc_stream_tester.h"
 #include "absl/memory/memory.h"
 #include "gtest/gtest.h"
 
@@ -39,7 +39,6 @@ using auth::Token;
 using auth::User;
 using core::DatabaseInfo;
 using util::AsyncQueue;
-using util::GrpcStreamTester;
 using util::Status;
 using util::StatusOr;