Skip to content

Commit 70ec07d

Browse files
committed
Include xcassets and xcstrings when testing code-gen'd resources
1 parent 387f760 commit 70ec07d

File tree

1 file changed

+22
-3
lines changed

1 file changed

+22
-3
lines changed

Tests/XCBuildSupportTests/PIFBuilderTests.swift

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2201,12 +2201,18 @@ final class PIFBuilderTests: XCTestCase {
22012201
"/Foo/Sources/foo/main.swift",
22022202
"/Foo/Sources/foo/Resources/Data.plist",
22032203
"/Foo/Sources/foo/Resources/Database.xcdatamodel",
2204+
"/Foo/Sources/foo/Resources/Assets.xcassets",
2205+
"/Foo/Sources/foo/Resources/Localizable.xcstrings",
22042206
"/Foo/Sources/FooLib/lib.swift",
22052207
"/Foo/Sources/FooLib/Resources/Data.plist",
22062208
"/Foo/Sources/FooLib/Resources/Database.xcdatamodel",
2209+
"/Foo/Sources/FooLib/Resources/Assets.xcassets",
2210+
"/Foo/Sources/FooLib/Resources/Localizable.xcstrings",
22072211
"/Foo/Sources/FooTests/FooTests.swift",
22082212
"/Foo/Sources/FooTests/Resources/Data.plist",
2209-
"/Foo/Sources/FooTests/Resources/Database.xcdatamodel"
2213+
"/Foo/Sources/FooTests/Resources/Database.xcdatamodel",
2214+
"/Foo/Sources/FooTests/Resources/Assets.xcassets",
2215+
"/Foo/Sources/FooTests/Resources/Localizable.xcstrings",
22102216
)
22112217

22122218
let observability = ObservabilitySystem.makeForTesting()
@@ -2216,15 +2222,15 @@ final class PIFBuilderTests: XCTestCase {
22162222
Manifest.createRootManifest(
22172223
displayName: "Foo",
22182224
path: "/Foo",
2219-
toolsVersion: .v5_3,
2225+
toolsVersion: .v5_9,
22202226
products: [
22212227
.init(name: "FooLib", type: .library(.automatic), targets: ["FooLib"]),
22222228
],
22232229
targets: [
22242230
.init(name: "foo", resources: [
22252231
// This is intentionally specific to test that we pick up `.xcdatamodel` implicitly.
22262232
.init(rule: .process(localization: .none), path: "Resources/Data.plist"),
2227-
]),
2233+
], type: .executable),
22282234
.init(name: "FooLib", resources: [
22292235
.init(rule: .process(localization: .none), path: "Resources"),
22302236
]),
@@ -2253,7 +2259,10 @@ final class PIFBuilderTests: XCTestCase {
22532259
try workspace.checkProject("PACKAGE:/Foo") { project in
22542260
project.checkTarget("PACKAGE-PRODUCT:foo") { target in
22552261
XCTAssertEqual(target.dependencies, ["PACKAGE-RESOURCE:foo"])
2262+
// All of these file types can generate code.
22562263
XCTAssert(target.sources.contains("/Foo/Sources/foo/Resources/Database.xcdatamodel"))
2264+
XCTAssert(target.sources.contains("/Foo/Sources/foo/Resources/Assets.xcassets"))
2265+
XCTAssert(target.sources.contains("/Foo/Sources/foo/Resources/Localizable.xcstrings"))
22572266

22582267
target.checkBuildConfiguration("Debug") { configuration in
22592268
configuration.checkBuildSettings { settings in
@@ -2290,6 +2299,8 @@ final class PIFBuilderTests: XCTestCase {
22902299
XCTAssertEqual(target.resources, [
22912300
"/Foo/Sources/foo/Resources/Data.plist",
22922301
"/Foo/Sources/foo/Resources/Database.xcdatamodel",
2302+
"/Foo/Sources/foo/Resources/Assets.xcassets",
2303+
"/Foo/Sources/foo/Resources/Localizable.xcstrings",
22932304
])
22942305

22952306
target.checkBuildConfiguration("Debug") { configuration in
@@ -2322,6 +2333,8 @@ final class PIFBuilderTests: XCTestCase {
23222333
project.checkTarget("PACKAGE-PRODUCT:FooLib") { target in
23232334
XCTAssert(!target.dependencies.contains("PACKAGE-RESOURCE:FooLib"))
23242335
XCTAssert(!target.sources.contains("/Foo/Sources/FooLib/Resources/Database.xcdatamodel"))
2336+
XCTAssert(!target.sources.contains("/Foo/Sources/FooLib/Resources/Assets.xcassets"))
2337+
XCTAssert(!target.sources.contains("/Foo/Sources/FooLib/Resources/Localizable.xcstrings"))
23252338

23262339
target.checkBuildConfiguration("Debug") { configuration in
23272340
configuration.checkBuildSettings { settings in
@@ -2343,6 +2356,8 @@ final class PIFBuilderTests: XCTestCase {
23432356
project.checkTarget("PACKAGE-TARGET:FooLib") { target in
23442357
XCTAssertEqual(target.dependencies, ["PACKAGE-RESOURCE:FooLib"])
23452358
XCTAssert(target.sources.contains("/Foo/Sources/FooLib/Resources/Database.xcdatamodel"))
2359+
XCTAssert(target.sources.contains("/Foo/Sources/FooLib/Resources/Assets.xcassets"))
2360+
XCTAssert(target.sources.contains("/Foo/Sources/FooLib/Resources/Localizable.xcstrings"))
23462361

23472362
target.checkBuildConfiguration("Debug") { configuration in
23482363
configuration.checkBuildSettings { settings in
@@ -2372,6 +2387,8 @@ final class PIFBuilderTests: XCTestCase {
23722387
project.checkTarget("PACKAGE-PRODUCT:FooTests") { target in
23732388
XCTAssertEqual(target.dependencies, ["PACKAGE-RESOURCE:FooTests"])
23742389
XCTAssert(target.sources.contains("/Foo/Sources/FooTests/Resources/Database.xcdatamodel"))
2390+
XCTAssert(target.sources.contains("/Foo/Sources/FooTests/Resources/Assets.xcassets"))
2391+
XCTAssert(target.sources.contains("/Foo/Sources/FooTests/Resources/Localizable.xcstrings"))
23752392

23762393
target.checkBuildConfiguration("Debug") { configuration in
23772394
configuration.checkBuildSettings { settings in
@@ -2408,6 +2425,8 @@ final class PIFBuilderTests: XCTestCase {
24082425
XCTAssertEqual(target.resources, [
24092426
"/Foo/Sources/FooTests/Resources/Data.plist",
24102427
"/Foo/Sources/FooTests/Resources/Database.xcdatamodel",
2428+
"/Foo/Sources/FooTests/Resources/Assets.xcassets",
2429+
"/Foo/Sources/FooTests/Resources/Localizable.xcstrings",
24112430
])
24122431

24132432
target.checkBuildConfiguration("Debug") { configuration in

0 commit comments

Comments
 (0)