aboutsummaryrefslogtreecommitdiffhomepage
path: root/Firestore/Example/Tests/Remote
diff options
context:
space:
mode:
authorGravatar Gil <mcg@google.com>2017-11-16 20:52:01 -0800
committerGravatar GitHub <noreply@github.com>2017-11-16 20:52:01 -0800
commit4fbc96904fe86b3a0cdb91bfa6d96491221eb6b9 (patch)
treeb1737ee79405b7c80c2a03f6598c3ba71df2d05f /Firestore/Example/Tests/Remote
parent88b7e74e3102fc8de453f22a44fd5cb4c91472e3 (diff)
Use fully qualified imports in Firestore (#467)
This simplifies the import process back into google3 and allows us to add additional directories to the project without needing to update the project files for each directory we add. This shows up most clearly in the change to Firestore/Example/Firestore.xcodeproj/project.pbxproj: this no longer needs to list essentially every directory in the project as a header search path. * Clang-format configuration for C++ files * Add support C++-only sources to the podspec * Podspec support for fully qualified imports * xcodeproj changes for fully-qualified imports * Use fully-qualified imports in Firestore sources
Diffstat (limited to 'Firestore/Example/Tests/Remote')
-rw-r--r--Firestore/Example/Tests/Remote/FSTDatastoreTests.m2
-rw-r--r--Firestore/Example/Tests/Remote/FSTRemoteEventTests.m16
-rw-r--r--Firestore/Example/Tests/Remote/FSTSerializerBetaTests.m48
-rw-r--r--Firestore/Example/Tests/Remote/FSTWatchChange+Testing.h4
-rw-r--r--Firestore/Example/Tests/Remote/FSTWatchChange+Testing.m6
-rw-r--r--Firestore/Example/Tests/Remote/FSTWatchChangeTests.m10
6 files changed, 43 insertions, 43 deletions
diff --git a/Firestore/Example/Tests/Remote/FSTDatastoreTests.m b/Firestore/Example/Tests/Remote/FSTDatastoreTests.m
index 511de72..8c1c16f 100644
--- a/Firestore/Example/Tests/Remote/FSTDatastoreTests.m
+++ b/Firestore/Example/Tests/Remote/FSTDatastoreTests.m
@@ -15,7 +15,7 @@
*/
#import "Firestore/FIRFirestoreErrors.h"
-#import "Remote/FSTDatastore.h"
+#import "Firestore/Source/Remote/FSTDatastore.h"
#import <GRPCClient/GRPCCall.h>
#import <XCTest/XCTest.h>
diff --git a/Firestore/Example/Tests/Remote/FSTRemoteEventTests.m b/Firestore/Example/Tests/Remote/FSTRemoteEventTests.m
index a172af7..a947eb4 100644
--- a/Firestore/Example/Tests/Remote/FSTRemoteEventTests.m
+++ b/Firestore/Example/Tests/Remote/FSTRemoteEventTests.m
@@ -14,18 +14,18 @@
* limitations under the License.
*/
-#import "Remote/FSTRemoteEvent.h"
+#import "Firestore/Source/Remote/FSTRemoteEvent.h"
#import <XCTest/XCTest.h>
-#import "Local/FSTQueryData.h"
-#import "Model/FSTDocument.h"
-#import "Model/FSTDocumentKey.h"
-#import "Remote/FSTExistenceFilter.h"
-#import "Remote/FSTWatchChange.h"
+#import "Firestore/Source/Local/FSTQueryData.h"
+#import "Firestore/Source/Model/FSTDocument.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
+#import "Firestore/Source/Remote/FSTExistenceFilter.h"
+#import "Firestore/Source/Remote/FSTWatchChange.h"
-#import "FSTHelpers.h"
-#import "FSTWatchChange+Testing.h"
+#import "Firestore/Example/Tests/Remote/FSTWatchChange+Testing.h"
+#import "Firestore/Example/Tests/Util/FSTHelpers.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/Firestore/Example/Tests/Remote/FSTSerializerBetaTests.m b/Firestore/Example/Tests/Remote/FSTSerializerBetaTests.m
index c4cf9df..54aa955 100644
--- a/Firestore/Example/Tests/Remote/FSTSerializerBetaTests.m
+++ b/Firestore/Example/Tests/Remote/FSTSerializerBetaTests.m
@@ -14,37 +14,37 @@
* limitations under the License.
*/
-#import "Remote/FSTSerializerBeta.h"
+#import "Firestore/Source/Remote/FSTSerializerBeta.h"
#import <GRPCClient/GRPCCall.h>
#import <XCTest/XCTest.h>
-#import "Core/FSTQuery.h"
-#import "Core/FSTSnapshotVersion.h"
-#import "Core/FSTTimestamp.h"
#import "Firestore/FIRFieldPath.h"
#import "Firestore/FIRFirestoreErrors.h"
#import "Firestore/FIRGeoPoint.h"
-#import "Local/FSTQueryData.h"
-#import "Model/FSTDatabaseID.h"
-#import "Model/FSTDocument.h"
-#import "Model/FSTDocumentKey.h"
-#import "Model/FSTFieldValue.h"
-#import "Model/FSTMutation.h"
-#import "Model/FSTMutationBatch.h"
-#import "Model/FSTPath.h"
-#import "Protos/objc/firestore/local/MaybeDocument.pbobjc.h"
-#import "Protos/objc/firestore/local/Mutation.pbobjc.h"
-#import "Protos/objc/google/firestore/v1beta1/Common.pbobjc.h"
-#import "Protos/objc/google/firestore/v1beta1/Document.pbobjc.h"
-#import "Protos/objc/google/firestore/v1beta1/Firestore.pbobjc.h"
-#import "Protos/objc/google/firestore/v1beta1/Query.pbobjc.h"
-#import "Protos/objc/google/firestore/v1beta1/Write.pbobjc.h"
-#import "Protos/objc/google/rpc/Status.pbobjc.h"
-#import "Protos/objc/google/type/Latlng.pbobjc.h"
-#import "Remote/FSTWatchChange.h"
-
-#import "FSTHelpers.h"
+#import "Firestore/Protos/objc/firestore/local/MaybeDocument.pbobjc.h"
+#import "Firestore/Protos/objc/firestore/local/Mutation.pbobjc.h"
+#import "Firestore/Protos/objc/google/firestore/v1beta1/Common.pbobjc.h"
+#import "Firestore/Protos/objc/google/firestore/v1beta1/Document.pbobjc.h"
+#import "Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbobjc.h"
+#import "Firestore/Protos/objc/google/firestore/v1beta1/Query.pbobjc.h"
+#import "Firestore/Protos/objc/google/firestore/v1beta1/Write.pbobjc.h"
+#import "Firestore/Protos/objc/google/rpc/Status.pbobjc.h"
+#import "Firestore/Protos/objc/google/type/Latlng.pbobjc.h"
+#import "Firestore/Source/Core/FSTQuery.h"
+#import "Firestore/Source/Core/FSTSnapshotVersion.h"
+#import "Firestore/Source/Core/FSTTimestamp.h"
+#import "Firestore/Source/Local/FSTQueryData.h"
+#import "Firestore/Source/Model/FSTDatabaseID.h"
+#import "Firestore/Source/Model/FSTDocument.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
+#import "Firestore/Source/Model/FSTFieldValue.h"
+#import "Firestore/Source/Model/FSTMutation.h"
+#import "Firestore/Source/Model/FSTMutationBatch.h"
+#import "Firestore/Source/Model/FSTPath.h"
+#import "Firestore/Source/Remote/FSTWatchChange.h"
+
+#import "Firestore/Example/Tests/Util/FSTHelpers.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/Firestore/Example/Tests/Remote/FSTWatchChange+Testing.h b/Firestore/Example/Tests/Remote/FSTWatchChange+Testing.h
index f94fe05..73d8e34 100644
--- a/Firestore/Example/Tests/Remote/FSTWatchChange+Testing.h
+++ b/Firestore/Example/Tests/Remote/FSTWatchChange+Testing.h
@@ -16,8 +16,8 @@
#import <Foundation/Foundation.h>
-#import "Core/FSTTypes.h"
-#import "Remote/FSTWatchChange.h"
+#import "Firestore/Source/Core/FSTTypes.h"
+#import "Firestore/Source/Remote/FSTWatchChange.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/Firestore/Example/Tests/Remote/FSTWatchChange+Testing.m b/Firestore/Example/Tests/Remote/FSTWatchChange+Testing.m
index cb5e479..6bb314d 100644
--- a/Firestore/Example/Tests/Remote/FSTWatchChange+Testing.m
+++ b/Firestore/Example/Tests/Remote/FSTWatchChange+Testing.m
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-#import "FSTWatchChange+Testing.h"
+#import "Firestore/Example/Tests/Remote/FSTWatchChange+Testing.h"
-#import "Model/FSTDocument.h"
-#import "Remote/FSTWatchChange.h"
+#import "Firestore/Source/Model/FSTDocument.h"
+#import "Firestore/Source/Remote/FSTWatchChange.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/Firestore/Example/Tests/Remote/FSTWatchChangeTests.m b/Firestore/Example/Tests/Remote/FSTWatchChangeTests.m
index ccbd644..df2496b 100644
--- a/Firestore/Example/Tests/Remote/FSTWatchChangeTests.m
+++ b/Firestore/Example/Tests/Remote/FSTWatchChangeTests.m
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-#import "Remote/FSTWatchChange.h"
+#import "Firestore/Source/Remote/FSTWatchChange.h"
#import <XCTest/XCTest.h>
-#import "Model/FSTDocument.h"
-#import "Remote/FSTExistenceFilter.h"
+#import "Firestore/Source/Model/FSTDocument.h"
+#import "Firestore/Source/Remote/FSTExistenceFilter.h"
-#import "FSTHelpers.h"
-#import "FSTWatchChange+Testing.h"
+#import "Firestore/Example/Tests/Remote/FSTWatchChange+Testing.h"
+#import "Firestore/Example/Tests/Util/FSTHelpers.h"
NS_ASSUME_NONNULL_BEGIN