Skip to content

Commit a9a0a10

Browse files
authored
SPM: Core ObjC unit tests (#5959)
1 parent 09c03e3 commit a9a0a10

17 files changed

+170
-69
lines changed

.github/workflows/spm.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,13 @@ jobs:
1717
runs-on: macOS-latest
1818
steps:
1919
- uses: actions/checkout@v2
20+
- name: Xcode 12
21+
run: sudo xcode-select -s /Applications/Xcode_12_beta.app/Contents/Developer
2022
- name: Build
2123
run: swift build
22-
- name: Run
23-
run: swift test
24+
- name: Initialize xcodebuild
25+
run: xcodebuild -list
26+
- name: Core ObjC Unit Tests macOS
27+
run: xcodebuild -scheme Firebase-Package test
28+
- name: Core ObjC Unit Tests iOS
29+
run: xcodebuild -scheme Firebase-Package test -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 11'

FirebaseCore.podspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ Firebase Core includes FIRApp and FIROptions which provide central configuration
5959

6060
s.test_spec 'swift-unit' do |swift_unit_tests|
6161
swift_unit_tests.platforms = {:ios => '8.0', :osx => '10.11', :tvos => '10.0'}
62-
swift_unit_tests.source_files = 'FirebaseCore/Tests/Unit/Swift/**/*.swift',
63-
'FirebaseCore/Tests/Unit/Swift/**/*.h',
64-
'FirebaseCore/Tests/Unit/Swift/SwiftTestingUtilities/*'
62+
swift_unit_tests.source_files = 'FirebaseCore/Tests/SwiftUnit/**/*.swift',
63+
'FirebaseCore/Tests/SwiftUnit/**/*.h',
64+
'FirebaseCore/Tests/SwiftUnit/SwiftTestingUtilities/*'
6565
swift_unit_tests.resources = 'FirebaseCore/Tests/Unit/Resources/GoogleService-Info.plist'
6666
swift_unit_tests.pod_target_xcconfig = {
67-
'SWIFT_OBJC_BRIDGING_HEADER' => '$(PODS_TARGET_SRCROOT)/FirebaseCore/Tests/Unit/Swift/FirebaseCore-unit-Bridging-Header.h'
67+
'SWIFT_OBJC_BRIDGING_HEADER' => '$(PODS_TARGET_SRCROOT)/FirebaseCore/Tests/SwiftUnit/FirebaseCore-unit-Bridging-Header.h'
6868
}
6969
end
7070
end

FirebaseCore/Tests/Unit/Swift/FirebaseCore-unit-Bridging-Header.h renamed to FirebaseCore/Tests/SwiftUnit/FirebaseCore-unit-Bridging-Header.h

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

1515
#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
16-
#import "FirebaseCore/Tests/Unit/Swift/SwiftTestingUtilities/ExceptionCatcher.h"
16+
#import "FirebaseCore/Tests/SwiftUnit/SwiftTestingUtilities/ExceptionCatcher.h"

FirebaseCore/Tests/Unit/Swift/SwiftTestingUtilities/ExceptionCatcher.m renamed to FirebaseCore/Tests/SwiftUnit/SwiftTestingUtilities/ExceptionCatcher.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#import "FirebaseCore/Tests/Unit/Swift/SwiftTestingUtilities/ExceptionCatcher.h"
15+
#import "FirebaseCore/Tests/SwiftUnit/SwiftTestingUtilities/ExceptionCatcher.h"
1616
#import "FirebaseCore/Sources/Private/FIRErrorCode.h"
1717

1818
@implementation ExceptionCatcher

FirebaseCore/Tests/Unit/FIRAppTest.m

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,10 @@ - (void)setUp {
6868
_observerMock = OCMObserverMock();
6969
_mockCoreDiagnosticsConnector = OCMClassMock([FIRCoreDiagnosticsConnector class]);
7070

71+
#if SWIFT_PACKAGE
72+
[self mockFIROptions];
73+
#endif
74+
7175
OCMStub(ClassMethod([self.mockCoreDiagnosticsConnector logCoreTelemetryWithOptions:[OCMArg any]]))
7276
.andDo(^(NSInvocation *invocation){
7377
});

0 commit comments

Comments
 (0)