Refactor resource helper to correctly get resource URLs when building…

… in Xcode (#132)

* Move test fixtures into their own Resources directory
* Update `ResourceHelper` to work with both Bundle.main and Bundle.module (Xcode and SPM)
* Update Swift tools version in Package manifest to 5.5

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.0
+// swift-tools-version:5.5
 
 import PackageDescription
 
@@ -21,7 +21,10 @@ let package = Package(
         .testTarget(
             name: "SwiftCSVTests",
             dependencies: ["SwiftCSV"],
-            path: "SwiftCSVTests"),
+            path: "SwiftCSVTests",
+            resources: [
+                .copy("TestData")
+            ]),
     ],
     swiftLanguageVersions: [.v5, .v4_2]
 )

SwiftCSVTests/PerformanceTest.swift

@@ -13,7 +13,13 @@ class PerformanceTest: XCTestCase {
     var csv: CSV<Named>!
 
     override func setUpWithError() throws {
-        let csvURL = ResourceHelper.url(forResource: "large", withExtension: "csv")!
+        let testFilePath = "TestData/large"
+        let testFileExtension = "csv"
+        guard let csvURL = ResourceHelper.url(forResource: testFilePath, withExtension: testFileExtension) else {
+            XCTAssertNotNil(nil, "Could not get URL for \(testFilePath).\(testFileExtension) from Test Bundle")
+            return
+        }
+
         csv = try CSV<Named>(url: csvURL)
     }
 

SwiftCSVTests/QuotedTests.swift

@@ -35,7 +35,12 @@ class QuotedTests: XCTestCase {
     }
 
     func testEmbeddedQuotes() throws {
-        let csvURL = ResourceHelper.url(forResource: "wonderland", withExtension: "csv")!
+		let testFilePath = "TestData/wonderland"
+		let testFileExtension = "csv"
+		guard let csvURL = ResourceHelper.url(forResource: testFilePath, withExtension: testFileExtension) else {
+			XCTAssertNotNil(nil, "Could not get URL for \(testFilePath).\(testFileExtension) from Test Bundle")
+			return
+		}
         csv = try CSV(url: csvURL)
 
         /*

SwiftCSVTests/ResourceHelper.swift

@@ -1,16 +1,26 @@
 import Foundation
 
 // Find url of resource.
-// This is a workaround for SwiftPM, becasue SwiftPM is not yet support for include resources with targets.(https://bugs.swift.org/browse/SR-2866)
+// This is a workaround for Xcode, when testing from the Xcode project (not the SPM package) bundle.module is not available...
+
 struct ResourceHelper {
     static func url(forResource name: String, withExtension type: String) -> URL? {
+
+#if SWIFT_PACKAGE
+        return Bundle.module.url(forResource: name, withExtension: type)
+#else
+        //	Xcode project
         let bundle = Bundle(for: NamedViewTests.self)
-        if let url = bundle.url(forResource: name, withExtension: type) {
-            return url
-        } else if let realBundle = Bundle(path: "\(bundle.bundlePath)/../../../../SwiftCSVTests") {
-            return realBundle.url(forResource: name, withExtension: type)
-        } else {
-            return nil
+
+        //	In Xcode, folders are stripped from the resources folder.
+        var finalName = name
+        var slashCharSet = CharacterSet()
+        slashCharSet.insert("/")
+        let parts = name.components(separatedBy: slashCharSet)
+        if parts.count > 1 {
+            finalName = parts.last!
         }
+        return bundle.url(forResource: finalName, withExtension: type)
+#endif
     }
 }

SwiftCSVTests/URLTests.swift

@@ -13,7 +13,12 @@ class URLTests: XCTestCase {
     var csv: CSV<Named>!
 
     func testEmptyFields() throws {
-        let csvURL = ResourceHelper.url(forResource: "empty_fields", withExtension: "csv")!
+        let testFilePath = "TestData/empty_fields"
+        let testFileExtension = "csv"
+        guard let csvURL = ResourceHelper.url(forResource: testFilePath, withExtension: testFileExtension) else {
+            XCTAssertNotNil(nil, "Could not get URL for \(testFilePath).\(testFileExtension) from Test Bundle")
+            return
+        }
         csv = try CSV<Named>(url: csvURL)
         let expected = [
             ["id": "1", "name": "John", "age": "23"],
@@ -29,7 +34,12 @@ class URLTests: XCTestCase {
     }
 
     func testQuotes() throws {
-        let csvURL = ResourceHelper.url(forResource: "quotes", withExtension: "csv")!
+        let testFilePath = "TestData/quotes"
+        let testFileExtension = "csv"
+        guard let csvURL = ResourceHelper.url(forResource: testFilePath, withExtension: testFileExtension) else {
+            XCTAssertNotNil(nil, "Could not get URL for \(testFilePath).\(testFileExtension) from Test Bundle")
+            return
+        }
         csv = try CSV<Named>(url: csvURL)
         let expected = [
             ["id": "4", "name, first": "Alex", "name, last": "Smith"],
@@ -62,7 +72,12 @@ class URLTests: XCTestCase {
     }
 
     func testUTF8() throws {
-        let csvURL = ResourceHelper.url(forResource: "utf8_with_bom", withExtension: "csv")!
+        let testFilePath = "TestData/utf8_with_bom"
+        let testFileExtension = "csv"
+        guard let csvURL = ResourceHelper.url(forResource: testFilePath, withExtension: testFileExtension) else {
+            XCTAssertNotNil(nil, "Could not get URL for \(testFilePath).\(testFileExtension) from Test Bundle")
+            return
+        }
         csv = try CSV(url: csvURL)
 
         XCTAssertFalse(csv.header.first!.hasPrefix("\u{FEFF}"))
@@ -81,7 +96,12 @@ class URLTests: XCTestCase {
     }
 
     func testUTF8Delimited() throws {
-        let csvURL = ResourceHelper.url(forResource: "utf8_with_bom", withExtension: "csv")!
+        let testFilePath = "TestData/utf8_with_bom"
+        let testFileExtension = "csv"
+        guard let csvURL = ResourceHelper.url(forResource: testFilePath, withExtension: testFileExtension) else {
+            XCTAssertNotNil(nil, "Could not get URL for \(testFilePath).\(testFileExtension) from Test Bundle")
+            return
+        }
         csv = try CSV(url: csvURL, delimiter: .comma)
 
         XCTAssertFalse(csv.header.first!.hasPrefix("\u{FEFF}"))