Merge pull request #54 from GetToSet/ethanwong/spm-resource-bundle

Adopt resource bundles for the SPM test target.
BoltDocs · Apr 29, 2023 · 4a3fd19 · 4a3fd19
2 parents 2166f9c + d404d99
commit 4a3fd19
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/Gzip.xcodeproj/project.pbxproj b/Gzip.xcodeproj/project.pbxproj
@@ -225,7 +225,6 @@
 			isa = PBXGroup;
 			children = (
 				2A7DC79E1FB6AFC900539D90 /* GzipTests */,
-				2A8219C61D65AFB300D65063 /* test.txt.gz */,
 			);
 			path = Tests;
 			sourceTree = "<group>";
@@ -234,6 +233,7 @@
 			isa = PBXGroup;
 			children = (
 				2A58A75C1B00F414005FBBC2 /* GzipTests.swift */,
+				2A8219C61D65AFB300D65063 /* test.txt.gz */,
 			);
 			path = GzipTests;
 			sourceTree = "<group>";

diff --git a/Package.swift b/Package.swift
@@ -10,7 +10,11 @@ let package = Package(
     targets: [
         .target(name: "Gzip", dependencies: ["system-zlib"]),
         .target(name: "system-zlib"),
-        .testTarget(name: "GzipTests", dependencies: ["Gzip"]),
+        .testTarget(
+          name: "GzipTests",
+          dependencies: ["Gzip"],
+          resources: [.copy("./test.txt.gz")]
+        ),
     ],
     swiftLanguageVersions: [
         .v5,

diff --git a/Tests/GzipTests/GzipTests.swift b/Tests/GzipTests/GzipTests.swift
@@ -127,10 +127,7 @@ private extension XCTestCase {
     func bundleFile(name: String) -> URL {
 
         #if SWIFT_PACKAGE
-            return URL(fileURLWithPath: #file)
-                .deletingLastPathComponent()
-                .deletingLastPathComponent()
-                .appendingPathComponent(name)
+            return Bundle.module.url(forResource: name, withExtension: nil)!
         #else
             return Bundle(for: type(of: self)).url(forResource: name, withExtension: nil)!
         #endif

diff --git a/Tests/test.txt.gz → Tests/GzipTests/test.txt.gz b/Tests/test.txt.gz → Tests/GzipTests/test.txt.gz