Skip to content

Commit a2230e2

Browse files
authored
[App Check] Prefix test module names with Firebase (#11359)
Renamed AppCheckUnit to FirebaseAppCheckUnit and AppCheckUnitSwift to FirebaseAppCheckUnitSwift. This is in preparation for extracting core App Check functionality into a separate SDK.
1 parent 2937104 commit a2230e2

File tree

4 files changed

+21
-20
lines changed

4 files changed

+21
-20
lines changed

.github/workflows/app_check.yml renamed to .github/workflows/firebase_app_check.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
name: app_check
1+
name: firebase_app_check
22

33
on:
44
pull_request:
55
paths:
66
- 'FirebaseAppCheck**'
7-
- '.github/workflows/app_check.yml'
7+
- '.github/workflows/firebase_app_check.yml'
88
- 'Gemfile*'
99
schedule:
1010
# Run every day at 11pm (PST) - cron uses UTC times
@@ -65,7 +65,7 @@ jobs:
6565
- name: Initialize xcodebuild
6666
run: scripts/setup_spm_tests.sh
6767
- name: iOS Unit Tests
68-
run: scripts/third_party/travis/retry.sh ./scripts/build.sh AppCheckUnit iOS spm ${{ matrix.diagnostic }}
68+
run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseAppCheckUnit iOS spm ${{ matrix.diagnostic }}
6969
- name: Upload raw logs if failed
7070
if: ${{ failure() }}
7171
uses: actions/upload-artifact@v2
@@ -107,6 +107,6 @@ jobs:
107107
- name: Initialize xcodebuild
108108
run: scripts/setup_spm_tests.sh
109109
- name: Unit Tests
110-
run: scripts/third_party/travis/retry.sh ./scripts/build.sh AppCheckUnit ${{ matrix.target }} spm
110+
run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseAppCheckUnit ${{ matrix.target }} spm
111111
- name: Swift Unit Tests
112-
run: scripts/third_party/travis/retry.sh ./scripts/build.sh AppCheckUnitSwift ${{ matrix.target }} spm
112+
run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseAppCheckUnitSwift ${{ matrix.target }} spm

Package.swift

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1277,7 +1277,7 @@ let package = Package(
12771277
]
12781278
),
12791279
.testTarget(
1280-
name: "AppCheckUnit",
1280+
name: "FirebaseAppCheckUnit",
12811281
dependencies: [
12821282
"FirebaseAppCheck",
12831283
"SharedTestUtilities",
@@ -1286,7 +1286,8 @@ let package = Package(
12861286
],
12871287
path: "FirebaseAppCheck/Tests",
12881288
exclude: [
1289-
// Disable Swift tests as mixed targets are not supported (Xcode 12.3).
1289+
// Swift tests are in the target `FirebaseAppCheckUnitSwift` since mixed language targets
1290+
// are not supported (as of Xcode 14.3).
12901291
"Unit/Swift",
12911292
],
12921293
resources: [
@@ -1297,7 +1298,7 @@ let package = Package(
12971298
]
12981299
),
12991300
.testTarget(
1300-
name: "AppCheckUnitSwift",
1301+
name: "FirebaseAppCheckUnitSwift",
13011302
dependencies: ["FirebaseAppCheck"],
13021303
path: "FirebaseAppCheck/Tests/Unit/Swift",
13031304
cSettings: [

scripts/spm_test_schemes/AppCheckUnit.xcscheme renamed to scripts/spm_test_schemes/FirebaseAppCheckUnit.xcscheme

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
buildForAnalyzing = "YES">
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "AppCheckUnit"
18-
BuildableName = "AppCheckUnit"
19-
BlueprintName = "AppCheckUnit"
17+
BlueprintIdentifier = "FirebaseAppCheckUnit"
18+
BuildableName = "FirebaseAppCheckUnit"
19+
BlueprintName = "FirebaseAppCheckUnit"
2020
ReferencedContainer = "container:">
2121
</BuildableReference>
2222
</BuildActionEntry>
@@ -32,9 +32,9 @@
3232
skipped = "NO">
3333
<BuildableReference
3434
BuildableIdentifier = "primary"
35-
BlueprintIdentifier = "AppCheckUnit"
36-
BuildableName = "AppCheckUnit"
37-
BlueprintName = "AppCheckUnit"
35+
BlueprintIdentifier = "FirebaseAppCheckUnit"
36+
BuildableName = "FirebaseAppCheckUnit"
37+
BlueprintName = "FirebaseAppCheckUnit"
3838
ReferencedContainer = "container:">
3939
</BuildableReference>
4040
</TestableReference>

scripts/spm_test_schemes/AppCheckUnitSwift.xcscheme renamed to scripts/spm_test_schemes/FirebaseAppCheckUnitSwift.xcscheme

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
buildForAnalyzing = "YES">
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "AppCheckUnitSwift"
18-
BuildableName = "AppCheckUnitSwift"
19-
BlueprintName = "AppCheckUnitSwift"
17+
BlueprintIdentifier = "FirebaseAppCheckUnitSwift"
18+
BuildableName = "FirebaseAppCheckUnitSwift"
19+
BlueprintName = "FirebaseAppCheckUnitSwift"
2020
ReferencedContainer = "container:">
2121
</BuildableReference>
2222
</BuildActionEntry>
@@ -32,9 +32,9 @@
3232
skipped = "NO">
3333
<BuildableReference
3434
BuildableIdentifier = "primary"
35-
BlueprintIdentifier = "AppCheckUnitSwift"
36-
BuildableName = "AppCheckUnitSwift"
37-
BlueprintName = "AppCheckUnitSwift"
35+
BlueprintIdentifier = "FirebaseAppCheckUnitSwift"
36+
BuildableName = "FirebaseAppCheckUnitSwift"
37+
BlueprintName = "FirebaseAppCheckUnitSwift"
3838
ReferencedContainer = "container:">
3939
</BuildableReference>
4040
</TestableReference>

0 commit comments

Comments
 (0)