Skip to content

Commit 5f0118d

Browse files
charlotteliangcharlotteliang
authored
Update all the header path to pod repo relative (#3527)
* update all the path to pod repo relative * fix a few missed out headers * reorder the headers
1 parent 92cd109 commit 5f0118d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+196
-202
lines changed

‎Example/Messaging/Tests/FIRInstanceIDWithFCMTest.m‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,15 @@
1414
* limitations under the License.
1515
*/
1616

17+
#import <OCMock/OCMock.h>
1718
#import <XCTest/XCTest.h>
1819

1920
#import <FirebaseCore/FIRAppInternal.h>
2021
#import <FirebaseInstanceID/FirebaseInstanceID.h>
2122
#import <FirebaseMessaging/FIRMessaging.h>
2223

23-
#import <OCMock/OCMock.h>
24-
2524
#import "Firebase/Messaging/FIRMessaging_Private.h"
26-
#import "FIRMessagingTestUtilities.h"
25+
#import "Example/Messaging/Tests/FIRMessagingTestUtilities.h"
2726

2827
@interface FIRInstanceID (ExposedForTest)
2928
- (BOOL)isFCMAutoInitEnabled;

‎Example/Messaging/Tests/FIRMessagingClientTest.m‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,15 @@
2323
#import <FirebaseInstanceID/FIRInstanceID_Private.h>
2424
#import <GoogleUtilities/GULReachabilityChecker.h>
2525

26-
#import "Firebase/Messaging/Protos/GtalkCore.pbobjc.h"
27-
26+
#import "Example/Messaging/Tests/FIRMessagingFakeConnection.h"
2827
#import "Firebase/Messaging/FIRMessagingClient.h"
2928
#import "Firebase/Messaging/FIRMessagingConnection.h"
3029
#import "Firebase/Messaging/FIRMessagingDataMessageManager.h"
3130
#import "Firebase/Messaging/FIRMessagingRmqManager.h"
3231
#import "Firebase/Messaging/FIRMessagingSecureSocket.h"
3332
#import "Firebase/Messaging/FIRMessagingUtilities.h"
3433
#import "Firebase/Messaging/NSError+FIRMessaging.h"
35-
#import "FIRMessagingFakeConnection.h"
34+
#import "Firebase/Messaging/Protos/GtalkCore.pbobjc.h"
3635

3736
static NSString *const kDeviceAuthId = @"123456";
3837
static NSString *const kSecretToken = @"56789";

‎Example/Messaging/Tests/FIRMessagingConnectionTest.m‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,17 @@
1414
* limitations under the License.
1515
*/
1616

17-
#import <XCTest/XCTest.h>
18-
1917
#import <OCMock/OCMock.h>
18+
#import <XCTest/XCTest.h>
2019

21-
#import "Firebase/Messaging/Protos/GtalkCore.pbobjc.h"
22-
20+
#import "Example/Messaging/Tests/FIRMessagingFakeConnection.h"
2321
#import "Firebase/Messaging/FIRMessagingClient.h"
2422
#import "Firebase/Messaging/FIRMessagingConnection.h"
2523
#import "Firebase/Messaging/FIRMessagingDataMessageManager.h"
2624
#import "Firebase/Messaging/FIRMessagingRmqManager.h"
2725
#import "Firebase/Messaging/FIRMessagingSecureSocket.h"
2826
#import "Firebase/Messaging/FIRMessagingUtilities.h"
29-
#import "FIRMessagingFakeConnection.h"
27+
#import "Firebase/Messaging/Protos/GtalkCore.pbobjc.h"
3028

3129
static NSString *const kDeviceAuthId = @"123456";
3230
static NSString *const kSecretToken = @"56789";

‎Example/Messaging/Tests/FIRMessagingContextManagerServiceTest.m‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17-
#import <XCTest/XCTest.h>
18-
1917
#import <OCMock/OCMock.h>
18+
#import <XCTest/XCTest.h>
2019

2120
#import "Firebase/Messaging/FIRMessagingContextManagerService.h"
2221

‎Example/Messaging/Tests/FIRMessagingDataMessageManagerTest.m‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,11 @@
1414
* limitations under the License.
1515
*/
1616

17-
#import <XCTest/XCTest.h>
18-
1917
#import <OCMock/OCMock.h>
18+
#import <XCTest/XCTest.h>
2019

2120
#import <FirebaseMessaging/FIRMessaging.h>
22-
#import "Firebase/Messaging/Protos/GtalkCore.pbobjc.h"
21+
2322
#import "Firebase/Messaging/FIRMessagingClient.h"
2423
#import "Firebase/Messaging/FIRMessagingConnection.h"
2524
#import "Firebase/Messaging/FIRMessagingDataMessageManager.h"
@@ -31,6 +30,7 @@
3130
#import "Firebase/Messaging/FIRMessagingConstants.h"
3231
#import "Firebase/Messaging/FIRMessagingDefines.h"
3332
#import "Firebase/Messaging/NSError+FIRMessaging.h"
33+
#import "Firebase/Messaging/Protos/GtalkCore.pbobjc.h"
3434

3535
static NSString *const kMessagePersistentID = @"abcdef123";
3636
static NSString *const kMessageFrom = @"com.example.gcm";

‎Example/Messaging/Tests/FIRMessagingFakeConnection.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
#import "FIRMessagingFakeConnection.h"
17+
#import "Example/Messaging/Tests/FIRMessagingFakeConnection.h"
1818

1919
#import <OCMock/OCMock.h>
2020

‎Example/Messaging/Tests/FIRMessagingFakeSocket.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
#import "FIRMessagingFakeSocket.h"
17+
#import "Example/Messaging/Tests/FIRMessagingFakeSocket.h"
1818

1919
#import "Firebase/Messaging/FIRMessagingConstants.h"
2020
#import "Firebase/Messaging/FIRMessagingDefines.h"

‎Example/Messaging/Tests/FIRMessagingLinkHandlingTest.m‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
* limitations under the License.
1515
*/
1616

17-
#import <XCTest/XCTest.h>
18-
1917
#import <OCMock/OCMock.h>
18+
#import <XCTest/XCTest.h>
2019

2120
#import <FirebaseMessaging/FIRMessaging.h>
21+
22+
#import "Example/Messaging/Tests/FIRMessagingTestNotificationUtilities.h"
23+
#import "Example/Messaging/Tests/FIRMessagingTestUtilities.h"
2224
#import "Firebase/Messaging/FIRMessagingConstants.h"
2325

24-
#import "FIRMessagingTestNotificationUtilities.h"
25-
#import "FIRMessagingTestUtilities.h"
2626

2727
NSString *const kFIRMessagingTestsLinkHandlingSuiteName = @"com.messaging.test_linkhandling";
2828

‎Example/Messaging/Tests/FIRMessagingRemoteNotificationsProxyTest.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
__MAC_OS_X_VERSION_MAX_ALLOWED >= __MAC_10_14
2020
#import <UserNotifications/UserNotifications.h>
2121
#endif
22-
#import <XCTest/XCTest.h>
2322
#import <OCMock/OCMock.h>
23+
#import <XCTest/XCTest.h>
2424

2525
#import <FirebaseMessaging/FIRMessaging.h>
2626
#import <GoogleUtilities/GULAppDelegateSwizzler.h>

‎Example/Messaging/Tests/FIRMessagingRmqManagerTest.m‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@
1616

1717
#import <XCTest/XCTest.h>
1818

19-
#import "Firebase/Messaging/Protos/GtalkCore.pbobjc.h"
20-
2119
#import "Firebase/Messaging/FIRMessagingPersistentSyncMessage.h"
2220
#import "Firebase/Messaging/FIRMessagingRmqManager.h"
2321
#import "Firebase/Messaging/FIRMessagingUtilities.h"
22+
#import "Firebase/Messaging/Protos/GtalkCore.pbobjc.h"
2423

2524
static NSString *const kRmqDatabaseName = @"rmq-test-db";
2625
static NSString *const kRmqDataMessageCategory = @"com.google.gcm-rmq-test";

0 commit comments

Comments
 (0)