Skip to content

Commit 0c8536e

Browse files
paulb777paulb777
committed
Port Storage unit tests to Swift for corresponding Swift ports (#9521)
1 parent cd10144 commit 0c8536e

16 files changed

Lines changed: 448 additions & 305 deletions

File tree

‎.github/workflows/storage.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,10 @@ jobs:
5555
cache_key: ${{ matrix.os }}
5656
- name: Initialize xcodebuild
5757
run: scripts/setup_spm_tests.sh
58-
- name: iOS Unit Tests
58+
- name: Objective-C Unit Tests
5959
run: scripts/third_party/travis/retry.sh ./scripts/build.sh StorageUnit iOS spm
60+
- name: Swift Unit Tests
61+
run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseStorageUnit iOS spm
6062

6163
spm-cron:
6264
# Don't run on private repo.

‎Example/watchOSSample/Podfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ target 'SampleWatchAppWatchKitExtension' do
1010
pod 'FirebaseCore', :path => '../../'
1111
pod 'FirebaseCoreInternal', :path => '../../'
1212
pod 'FirebaseMessaging', :path => '../../'
13+
pod 'FirebaseCoreExtension', :path => '../../'
1314
pod 'FirebaseCoreInternal', :path => '../../'
1415
pod 'FirebaseCoreDiagnostics', :path => '../../'
1516
pod 'FirebaseInstallations', :path => '../../'

‎FirebaseAppCheck/Interop/FIRAppCheckInterop.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
2323
NS_SWIFT_NAME(AppCheckTokenHandlerInterop)
2424
typedef void (^FIRAppCheckTokenHandlerInterop)(id<FIRAppCheckTokenResultInterop> tokenResult);
2525

26-
NS_SWIFT_NAME(AppCheckInterop) @protocol FIRAppCheckInterop<NSObject>
26+
NS_SWIFT_NAME(AppCheckInterop) @protocol FIRAppCheckInterop
2727

2828
/// Retrieve a cached or generate a new FAA Token. If forcingRefresh == YES always generates a new
2929
/// token and updates the cache.

‎FirebaseCore.podspec‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ Firebase Core includes FIRApp and FIROptions which provide central configuration
9595
'FirebaseCore/Tests/SwiftUnit/**/*.swift',
9696
'FirebaseCore/Tests/SwiftUnit/**/*.h',
9797
'FirebaseCore/Tests/SwiftUnit/SwiftTestingUtilities/*',
98+
'SharedTestUtilities/ExceptionCatcher.[mh]',
9899
'SharedTestUtilities/FIROptionsMock.[mh]',
99100
]
100101
swift_unit_tests.pod_target_xcconfig = {

‎FirebaseCore/Tests/SwiftUnit/FirebaseCore-unit-Bridging-Header.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
// limitations under the License.
1414

1515
#import "FirebaseCore/Extension/FirebaseCoreInternal.h"
16-
#import "FirebaseCore/Tests/SwiftUnit/SwiftTestingUtilities/ExceptionCatcher.h"
16+
#import "SharedTestUtilities/ExceptionCatcher.h"
1717
#import "SharedTestUtilities/FIROptionsMock.h"

‎FirebaseMessaging/Interop/FIRMessagingInterop.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
NS_ASSUME_NONNULL_BEGIN
2020

2121
/** Connector for bridging communication between Firebase SDKs and FIRMessaging API. */
22-
NS_SWIFT_NAME(MessagingInterop) @protocol FIRMessagingInterop<NSObject>
22+
NS_SWIFT_NAME(MessagingInterop) @protocol FIRMessagingInterop
2323

2424
/**
2525
* The FCM registration token is used to identify this device so that FCM can send notifications to

‎FirebaseStorage/Tests/Unit/FIRStorageComponentTests.m‎

Lines changed: 0 additions & 123 deletions
This file was deleted.

0 commit comments

Comments
 (0)