aboutsummaryrefslogtreecommitdiffhomepage
path: root/Firestore/Example/Tests/Util
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/Util
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/Util')
-rw-r--r--Firestore/Example/Tests/Util/FSTAssertTests.m2
-rw-r--r--Firestore/Example/Tests/Util/FSTComparisonTests.m2
-rw-r--r--Firestore/Example/Tests/Util/FSTEventAccumulator.m6
-rw-r--r--Firestore/Example/Tests/Util/FSTHelpers.h8
-rw-r--r--Firestore/Example/Tests/Util/FSTHelpers.m40
-rw-r--r--Firestore/Example/Tests/Util/FSTIntegrationTestCase.h2
-rw-r--r--Firestore/Example/Tests/Util/FSTIntegrationTestCase.mm18
-rw-r--r--Firestore/Example/Tests/Util/FSTTestDispatchQueue.h2
-rw-r--r--Firestore/Example/Tests/Util/FSTTestDispatchQueue.m4
-rw-r--r--Firestore/Example/Tests/Util/FSTUtilTests.m2
-rw-r--r--Firestore/Example/Tests/Util/XCTestCase+Await.m2
11 files changed, 44 insertions, 44 deletions
diff --git a/Firestore/Example/Tests/Util/FSTAssertTests.m b/Firestore/Example/Tests/Util/FSTAssertTests.m
index f0734df..0cba03f 100644
--- a/Firestore/Example/Tests/Util/FSTAssertTests.m
+++ b/Firestore/Example/Tests/Util/FSTAssertTests.m
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#import "Util/FSTAssert.h"
+#import "Firestore/Source/Util/FSTAssert.h"
#import <XCTest/XCTest.h>
diff --git a/Firestore/Example/Tests/Util/FSTComparisonTests.m b/Firestore/Example/Tests/Util/FSTComparisonTests.m
index 9728f20..5632e64 100644
--- a/Firestore/Example/Tests/Util/FSTComparisonTests.m
+++ b/Firestore/Example/Tests/Util/FSTComparisonTests.m
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#import "Util/FSTComparison.h"
+#import "Firestore/Source/Util/FSTComparison.h"
#import <XCTest/XCTest.h>
diff --git a/Firestore/Example/Tests/Util/FSTEventAccumulator.m b/Firestore/Example/Tests/Util/FSTEventAccumulator.m
index c7e5b41..b44ec67 100644
--- a/Firestore/Example/Tests/Util/FSTEventAccumulator.m
+++ b/Firestore/Example/Tests/Util/FSTEventAccumulator.m
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-#import "FSTEventAccumulator.h"
+#import "Firestore/Example/Tests/Util/FSTEventAccumulator.h"
#import <XCTest/XCTest.h>
-#import "Util/FSTAssert.h"
+#import "Firestore/Source/Util/FSTAssert.h"
-#import "XCTestCase+Await.h"
+#import "Firestore/Example/Tests/Util/XCTestCase+Await.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/Firestore/Example/Tests/Util/FSTHelpers.h b/Firestore/Example/Tests/Util/FSTHelpers.h
index 3facc9c..91ccbcf 100644
--- a/Firestore/Example/Tests/Util/FSTHelpers.h
+++ b/Firestore/Example/Tests/Util/FSTHelpers.h
@@ -16,10 +16,10 @@
#import <Foundation/Foundation.h>
-#import "API/FIRDocumentReference+Internal.h"
-#import "Core/FSTTypes.h"
-#import "Model/FSTDocumentDictionary.h"
-#import "Model/FSTDocumentKeySet.h"
+#import "Firestore/Source/API/FIRDocumentReference+Internal.h"
+#import "Firestore/Source/Core/FSTTypes.h"
+#import "Firestore/Source/Model/FSTDocumentDictionary.h"
+#import "Firestore/Source/Model/FSTDocumentKeySet.h"
@class FIRGeoPoint;
@class FSTDeleteMutation;
diff --git a/Firestore/Example/Tests/Util/FSTHelpers.m b/Firestore/Example/Tests/Util/FSTHelpers.m
index 3b7f47f..7b24649 100644
--- a/Firestore/Example/Tests/Util/FSTHelpers.m
+++ b/Firestore/Example/Tests/Util/FSTHelpers.m
@@ -14,28 +14,28 @@
* limitations under the License.
*/
-#import "FSTHelpers.h"
-
-#import "API/FIRFieldPath+Internal.h"
-#import "API/FSTUserDataConverter.h"
-#import "Core/FSTQuery.h"
-#import "Core/FSTSnapshotVersion.h"
-#import "Core/FSTTimestamp.h"
-#import "Core/FSTView.h"
+#import "Firestore/Example/Tests/Util/FSTHelpers.h"
+
#import "Firestore/FIRFieldPath.h"
#import "Firestore/FIRGeoPoint.h"
-#import "Local/FSTLocalViewChanges.h"
-#import "Local/FSTQueryData.h"
-#import "Model/FSTDatabaseID.h"
-#import "Model/FSTDocument.h"
-#import "Model/FSTDocumentKey.h"
-#import "Model/FSTDocumentSet.h"
-#import "Model/FSTFieldValue.h"
-#import "Model/FSTMutation.h"
-#import "Model/FSTPath.h"
-#import "Remote/FSTRemoteEvent.h"
-#import "Remote/FSTWatchChange.h"
-#import "Util/FSTAssert.h"
+#import "Firestore/Source/API/FIRFieldPath+Internal.h"
+#import "Firestore/Source/API/FSTUserDataConverter.h"
+#import "Firestore/Source/Core/FSTQuery.h"
+#import "Firestore/Source/Core/FSTSnapshotVersion.h"
+#import "Firestore/Source/Core/FSTTimestamp.h"
+#import "Firestore/Source/Core/FSTView.h"
+#import "Firestore/Source/Local/FSTLocalViewChanges.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/FSTDocumentSet.h"
+#import "Firestore/Source/Model/FSTFieldValue.h"
+#import "Firestore/Source/Model/FSTMutation.h"
+#import "Firestore/Source/Model/FSTPath.h"
+#import "Firestore/Source/Remote/FSTRemoteEvent.h"
+#import "Firestore/Source/Remote/FSTWatchChange.h"
+#import "Firestore/Source/Util/FSTAssert.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/Firestore/Example/Tests/Util/FSTIntegrationTestCase.h b/Firestore/Example/Tests/Util/FSTIntegrationTestCase.h
index 1170080..88f9346 100644
--- a/Firestore/Example/Tests/Util/FSTIntegrationTestCase.h
+++ b/Firestore/Example/Tests/Util/FSTIntegrationTestCase.h
@@ -17,7 +17,7 @@
#import <Foundation/Foundation.h>
#import <XCTest/XCTest.h>
-#import "XCTestCase+Await.h"
+#import "Firestore/Example/Tests/Util/XCTestCase+Await.h"
@class FIRCollectionReference;
@class FIRDocumentSnapshot;
diff --git a/Firestore/Example/Tests/Util/FSTIntegrationTestCase.mm b/Firestore/Example/Tests/Util/FSTIntegrationTestCase.mm
index 4bfdb41..187eb60 100644
--- a/Firestore/Example/Tests/Util/FSTIntegrationTestCase.mm
+++ b/Firestore/Example/Tests/Util/FSTIntegrationTestCase.mm
@@ -14,22 +14,22 @@
* limitations under the License.
*/
-#import "FSTIntegrationTestCase.h"
+#import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h"
#import <FirebaseCommunity/FIRLogger.h>
#import <Firestore/Firestore-umbrella.h>
#import <GRPCClient/GRPCCall+ChannelArg.h>
#import <GRPCClient/GRPCCall+Tests.h>
-#import "API/FIRFirestore+Internal.h"
-#import "Auth/FSTEmptyCredentialsProvider.h"
-#import "Local/FSTLevelDB.h"
-#import "Model/FSTDatabaseID.h"
-#import "Util/FSTDispatchQueue.h"
-#import "Util/FSTUtil.h"
+#import "Firestore/Source/API/FIRFirestore+Internal.h"
+#import "Firestore/Source/Auth/FSTEmptyCredentialsProvider.h"
+#import "Firestore/Source/Local/FSTLevelDB.h"
+#import "Firestore/Source/Model/FSTDatabaseID.h"
+#import "Firestore/Source/Util/FSTDispatchQueue.h"
+#import "Firestore/Source/Util/FSTUtil.h"
-#import "FSTEventAccumulator.h"
-#import "FSTTestDispatchQueue.h"
+#import "Firestore/Example/Tests/Util/FSTEventAccumulator.h"
+#import "Firestore/Example/Tests/Util/FSTTestDispatchQueue.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/Firestore/Example/Tests/Util/FSTTestDispatchQueue.h b/Firestore/Example/Tests/Util/FSTTestDispatchQueue.h
index 4f4e13e..7ecbbaf 100644
--- a/Firestore/Example/Tests/Util/FSTTestDispatchQueue.h
+++ b/Firestore/Example/Tests/Util/FSTTestDispatchQueue.h
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#import "Util/FSTDispatchQueue.h"
+#import "Firestore/Source/Util/FSTDispatchQueue.h"
@class XCTestExpectation;
diff --git a/Firestore/Example/Tests/Util/FSTTestDispatchQueue.m b/Firestore/Example/Tests/Util/FSTTestDispatchQueue.m
index 27b62bc..8124cf2 100644
--- a/Firestore/Example/Tests/Util/FSTTestDispatchQueue.m
+++ b/Firestore/Example/Tests/Util/FSTTestDispatchQueue.m
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-#import "FSTTestDispatchQueue.h"
+#import "Firestore/Example/Tests/Util/FSTTestDispatchQueue.h"
#import <XCTest/XCTestExpectation.h>
-#import "Util/FSTAssert.h"
+#import "Firestore/Source/Util/FSTAssert.h"
@interface FSTTestDispatchQueue ()
diff --git a/Firestore/Example/Tests/Util/FSTUtilTests.m b/Firestore/Example/Tests/Util/FSTUtilTests.m
index 998832d..d59ed7a 100644
--- a/Firestore/Example/Tests/Util/FSTUtilTests.m
+++ b/Firestore/Example/Tests/Util/FSTUtilTests.m
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#import "Util/FSTUtil.h"
+#import "Firestore/Source/Util/FSTUtil.h"
#import <XCTest/XCTest.h>
diff --git a/Firestore/Example/Tests/Util/XCTestCase+Await.m b/Firestore/Example/Tests/Util/XCTestCase+Await.m
index e200c8c..15c67ca 100644
--- a/Firestore/Example/Tests/Util/XCTestCase+Await.m
+++ b/Firestore/Example/Tests/Util/XCTestCase+Await.m
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#import "XCTestCase+Await.h"
+#import "Firestore/Example/Tests/Util/XCTestCase+Await.h"
#import <Foundation/Foundation.h>