@@ -596,17 +596,17 @@ class PackageDescription4_2LoadingTests: PackageDescriptionLoadingTests {
596
596
597
597
let manifestLoader = ManifestLoader ( toolchain: try UserToolchain . default, cacheDir: path, delegate: delegate)
598
598
599
- func check( loader: ManifestLoader , expectCached: Bool ) {
599
+ func check( loader: ManifestLoader , expectCached: Bool ) throws {
600
600
delegate. clear ( )
601
601
delegate. prepare ( expectParsing: !expectCached)
602
602
603
- let manifest = try ! loader. load (
603
+ let manifest = try XCTUnwrap ( loader. load (
604
604
manifestPath: manifestPath,
605
605
packageKind: . fileSystem( manifestPath. parentDirectory) ,
606
606
toolsVersion: . v4_2,
607
607
fileSystem: fs,
608
608
observabilityScope: observability. topScope
609
- )
609
+ ) )
610
610
611
611
XCTAssertNoDiagnostics ( observability. diagnostics)
612
612
XCTAssertEqual ( try delegate. loaded ( timeout: . now( ) + 1 ) , [ manifestPath] )
@@ -615,20 +615,20 @@ class PackageDescription4_2LoadingTests: PackageDescriptionLoadingTests {
615
615
XCTAssertEqual ( manifest. targets [ 0 ] . name, " foo " )
616
616
}
617
617
618
- check ( loader: manifestLoader, expectCached: false )
619
- check ( loader: manifestLoader, expectCached: true )
618
+ try check ( loader: manifestLoader, expectCached: false )
619
+ try check ( loader: manifestLoader, expectCached: true )
620
620
621
621
try withCustomEnv ( [ " SWIFTPM_MANIFEST_CACHE_TEST " : " 1 " ] ) {
622
- check ( loader: manifestLoader, expectCached: false )
623
- check ( loader: manifestLoader, expectCached: true )
622
+ try check ( loader: manifestLoader, expectCached: false )
623
+ try check ( loader: manifestLoader, expectCached: true )
624
624
}
625
625
626
626
try withCustomEnv ( [ " SWIFTPM_MANIFEST_CACHE_TEST " : " 2 " ] ) {
627
- check ( loader: manifestLoader, expectCached: false )
628
- check ( loader: manifestLoader, expectCached: true )
627
+ try check ( loader: manifestLoader, expectCached: false )
628
+ try check ( loader: manifestLoader, expectCached: true )
629
629
}
630
630
631
- check ( loader: manifestLoader, expectCached: true )
631
+ try check ( loader: manifestLoader, expectCached: true )
632
632
}
633
633
}
634
634
@@ -658,17 +658,17 @@ class PackageDescription4_2LoadingTests: PackageDescriptionLoadingTests {
658
658
659
659
let manifestLoader = ManifestLoader ( toolchain: try UserToolchain . default, cacheDir: path, delegate: delegate)
660
660
661
- func check( loader: ManifestLoader , expectCached: Bool ) {
661
+ func check( loader: ManifestLoader , expectCached: Bool ) throws {
662
662
delegate. clear ( )
663
663
delegate. prepare ( expectParsing: !expectCached)
664
664
665
- let manifest = try ! loader. load (
665
+ let manifest = try XCTUnwrap ( loader. load (
666
666
manifestPath: manifestPath,
667
667
packageKind: . fileSystem( manifestPath. parentDirectory) ,
668
668
toolsVersion: . v4_2,
669
669
fileSystem: fs,
670
670
observabilityScope: observability. topScope
671
- )
671
+ ) )
672
672
673
673
XCTAssertNoDiagnostics ( observability. diagnostics)
674
674
XCTAssertEqual ( try delegate. loaded ( timeout: . now( ) + 1 ) , [ manifestPath] )
@@ -677,9 +677,9 @@ class PackageDescription4_2LoadingTests: PackageDescriptionLoadingTests {
677
677
XCTAssertEqual ( manifest. targets [ 0 ] . name, " foo " )
678
678
}
679
679
680
- check ( loader: manifestLoader, expectCached: false )
680
+ try check ( loader: manifestLoader, expectCached: false )
681
681
for _ in 0 ..< 2 {
682
- check ( loader: manifestLoader, expectCached: true )
682
+ try check ( loader: manifestLoader, expectCached: true )
683
683
}
684
684
685
685
try fs. writeFileContents (
@@ -700,14 +700,14 @@ class PackageDescription4_2LoadingTests: PackageDescriptionLoadingTests {
700
700
"""
701
701
)
702
702
703
- check ( loader: manifestLoader, expectCached: false )
703
+ try check ( loader: manifestLoader, expectCached: false )
704
704
for _ in 0 ..< 2 {
705
- check ( loader: manifestLoader, expectCached: true )
705
+ try check ( loader: manifestLoader, expectCached: true )
706
706
}
707
707
708
708
let noCacheLoader = ManifestLoader ( toolchain: try UserToolchain . default, delegate: delegate)
709
709
for _ in 0 ..< 2 {
710
- check ( loader: noCacheLoader, expectCached: false )
710
+ try check ( loader: noCacheLoader, expectCached: false )
711
711
}
712
712
713
713
// Resetting the cache should allow us to remove the cache
0 commit comments