Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move away from resource helper. #131

Closed
wants to merge 6 commits into from
Closed

Move away from resource helper. #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
50f8845
Move test data files into their own directory.
Diggory Aug 19, 2023
05eeeaa
Move test data files into their own directory.
Diggory Aug 19, 2023
9a1e151
Merge branch 'MoveAwayFromResourceHelper' of https://github.com/Diggo…
Diggory Aug 19, 2023
e608764
Removed caveman debug printing.
Diggory Aug 19, 2023
fbfa9a4
Delete ResourceHelper.swift
Diggory Aug 24, 2023
33ec245
Merge branch 'swiftcsv:master' into MoveAwayFromResourceHelper
Diggory Aug 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.0
// swift-tools-version:5.5

import PackageDescription

Expand All @@ -21,7 +21,10 @@ let package = Package(
.testTarget(
name: "SwiftCSVTests",
dependencies: ["SwiftCSV"],
path: "SwiftCSVTests"),
path: "SwiftCSVTests",
resources: [
.copy("TestData")
]),
],
swiftLanguageVersions: [.v5, .v4_2]
)
5 changes: 4 additions & 1 deletion SwiftCSVTests/PerformanceTest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ class PerformanceTest: XCTestCase {
var csv: CSV<Named>!

override func setUpWithError() throws {
let csvURL = ResourceHelper.url(forResource: "large", withExtension: "csv")!
guard let csvURL = Bundle.module.url(forResource: "TestData/large", withExtension: "csv") else {
XCTAssertNotNil(nil, "Could not get URL for Large.csv from Test Bundle")
return
}
csv = try CSV<Named>(url: csvURL)
}

Expand Down
5 changes: 4 additions & 1 deletion SwiftCSVTests/QuotedTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@ class QuotedTests: XCTestCase {
}

func testEmbeddedQuotes() throws {
let csvURL = ResourceHelper.url(forResource: "wonderland", withExtension: "csv")!
guard let csvURL = Bundle.module.url(forResource: "TestData/wonderland", withExtension: "csv") else {
XCTAssertNotNil(nil, "Could not get URL for Wonderland.csv from Test Bundle")
return
}
csv = try CSV(url: csvURL)

/*
Expand Down
16 changes: 0 additions & 16 deletions SwiftCSVTests/ResourceHelper.swift
View file
Open in desktop

This file was deleted.

0 SwiftCSVTests/empty_fields.csv → SwiftCSVTests/TestData/empty_fields.csv
View file
Open in desktop
File renamed without changes.
0 SwiftCSVTests/large.csv → SwiftCSVTests/TestData/large.csv
View file
Open in desktop
File renamed without changes.
0 SwiftCSVTests/quotes.csv → SwiftCSVTests/TestData/quotes.csv
View file
Open in desktop
File renamed without changes.
0 SwiftCSVTests/utf8_with_bom.csv → SwiftCSVTests/TestData/utf8_with_bom.csv
View file
Open in desktop
File renamed without changes.
0 SwiftCSVTests/wonderland.csv → SwiftCSVTests/TestData/wonderland.csv
View file
Open in desktop
File renamed without changes.
23 changes: 19 additions & 4 deletions SwiftCSVTests/URLTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ class URLTests: XCTestCase {
var csv: CSV<Named>!

func testEmptyFields() throws {
let csvURL = ResourceHelper.url(forResource: "empty_fields", withExtension: "csv")!
guard let csvURL = Bundle.module.url(forResource: "TestData/empty_fields", withExtension: "csv") else {
XCTAssertNotNil(nil, "Could not get URL for empty_fields.csv from Test Bundle")
return
}
csv = try CSV<Named>(url: csvURL)
let expected = [
["id": "1", "name": "John", "age": "23"],
Expand All @@ -29,7 +32,11 @@ class URLTests: XCTestCase {
}

func testQuotes() throws {
let csvURL = ResourceHelper.url(forResource: "quotes", withExtension: "csv")!
guard let csvURL = Bundle.module.url(forResource: "TestData/quotes", withExtension: "csv") else {
XCTAssertNotNil(nil, "Could not get URL for quotes.csv from Test Bundle")
return
}

csv = try CSV<Named>(url: csvURL)
let expected = [
["id": "4", "name, first": "Alex", "name, last": "Smith"],
Expand Down Expand Up @@ -62,7 +69,11 @@ class URLTests: XCTestCase {
}

func testUTF8() throws {
let csvURL = ResourceHelper.url(forResource: "utf8_with_bom", withExtension: "csv")!
guard let csvURL = Bundle.module.url(forResource: "TestData/utf8_with_bom", withExtension: "csv") else {
XCTAssertNotNil(nil, "Could not get URL for utf8_with_bom.csv from Test Bundle")
return
}

csv = try CSV(url: csvURL)

XCTAssertFalse(csv.header.first!.hasPrefix("\u{FEFF}"))
Expand All @@ -81,7 +92,11 @@ class URLTests: XCTestCase {
}

func testUTF8Delimited() throws {
let csvURL = ResourceHelper.url(forResource: "utf8_with_bom", withExtension: "csv")!
guard let csvURL = Bundle.module.url(forResource: "TestData/utf8_with_bom", withExtension: "csv") else {
XCTAssertNotNil(nil, "Could not get URL for utf8_with_bom.csv from Test Bundle")
return
}

csv = try CSV(url: csvURL, delimiter: .comma)

XCTAssertFalse(csv.header.first!.hasPrefix("\u{FEFF}"))
Expand Down
Loading