Port Storage unit tests to Swift for corresponding Swift ports (fireb…

…ase#9521)
MojtabaHs · Apr 4, 2022 · 0c8536e · 0c8536e
1 parent cd10144
commit 0c8536e
Show file tree

Hide file tree

Showing 16 changed files with 448 additions and 305 deletions.
diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml
@@ -55,8 +55,10 @@ jobs:
         cache_key: ${{ matrix.os }}
     - name: Initialize xcodebuild
       run: scripts/setup_spm_tests.sh
-    - name: iOS Unit Tests
+    - name: Objective-C Unit Tests
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh StorageUnit iOS spm
+    - name: Swift Unit Tests
+      run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseStorageUnit iOS spm
 
   spm-cron:
     # Don't run on private repo.

diff --git a/Example/watchOSSample/Podfile b/Example/watchOSSample/Podfile
@@ -10,6 +10,7 @@ target 'SampleWatchAppWatchKitExtension' do
   pod 'FirebaseCore', :path => '../../'
   pod 'FirebaseCoreInternal', :path => '../../'
   pod 'FirebaseMessaging', :path => '../../'
+  pod 'FirebaseCoreExtension', :path => '../../'
   pod 'FirebaseCoreInternal', :path => '../../'
   pod 'FirebaseCoreDiagnostics', :path => '../../'
   pod 'FirebaseInstallations', :path => '../../'

diff --git a/FirebaseAppCheck/Interop/FIRAppCheckInterop.h b/FirebaseAppCheck/Interop/FIRAppCheckInterop.h
@@ -23,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
 NS_SWIFT_NAME(AppCheckTokenHandlerInterop)
 typedef void (^FIRAppCheckTokenHandlerInterop)(id<FIRAppCheckTokenResultInterop> tokenResult);
 
-NS_SWIFT_NAME(AppCheckInterop) @protocol FIRAppCheckInterop<NSObject>
+NS_SWIFT_NAME(AppCheckInterop) @protocol FIRAppCheckInterop
 
 /// Retrieve a cached or generate a new FAA Token. If forcingRefresh == YES always generates a new
 /// token and updates the cache.

diff --git a/FirebaseCore.podspec b/FirebaseCore.podspec
@@ -95,6 +95,7 @@ Firebase Core includes FIRApp and FIROptions which provide central configuration
       'FirebaseCore/Tests/SwiftUnit/**/*.swift',
       'FirebaseCore/Tests/SwiftUnit/**/*.h',
       'FirebaseCore/Tests/SwiftUnit/SwiftTestingUtilities/*',
+      'SharedTestUtilities/ExceptionCatcher.[mh]',
       'SharedTestUtilities/FIROptionsMock.[mh]',
     ]
     swift_unit_tests.pod_target_xcconfig = {

diff --git a/FirebaseCore/Tests/SwiftUnit/FirebaseCore-unit-Bridging-Header.h b/FirebaseCore/Tests/SwiftUnit/FirebaseCore-unit-Bridging-Header.h
@@ -13,5 +13,5 @@
 // limitations under the License.
 
 #import "FirebaseCore/Extension/FirebaseCoreInternal.h"
-#import "FirebaseCore/Tests/SwiftUnit/SwiftTestingUtilities/ExceptionCatcher.h"
+#import "SharedTestUtilities/ExceptionCatcher.h"
 #import "SharedTestUtilities/FIROptionsMock.h"
diff --git a/FirebaseMessaging/Interop/FIRMessagingInterop.h b/FirebaseMessaging/Interop/FIRMessagingInterop.h
@@ -19,7 +19,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 /** Connector for bridging communication between Firebase SDKs and FIRMessaging API. */
-NS_SWIFT_NAME(MessagingInterop) @protocol FIRMessagingInterop<NSObject>
+NS_SWIFT_NAME(MessagingInterop) @protocol FIRMessagingInterop
 
 /**
  * The FCM registration token is used to identify this device so that FCM can send notifications to

diff --git a/FirebaseStorage/Tests/Unit/FIRStorageComponentTests.m b/FirebaseStorage/Tests/Unit/FIRStorageComponentTests.m