Skip to content

Fix typo s/descrition/description/ #44

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix typo s/descrition/description/ #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@ It is currently all in memory so not suitable for very large files.
### TL;DR

```swift
let inputString = "Year,Make,Model,Description,Price\r\n1997,Ford,E350,descrition,3000.00\r\n1999,Chevy,Venture,another description,4900.00\r\n"
let inputString = "Year,Make,Model,Description,Price\r\n1997,Ford,E350,description,3000.00\r\n1999,Chevy,Venture,another description,4900.00\r\n"

let csv = CSwiftV(with: inputString)

let rows = csv.rows // [
// ["1997","Ford","E350","descrition","3000.00"],
// ["1997","Ford","E350","description","3000.00"],
// ["1999","Chevy","Venture","another description","4900.00"]
// ]

let headers = csv.headers // ["Year","Make","Model","Description","Price"]

let keyedRows = csv.keyedRows // [
// ["Year":"1997","Make":"Ford","Model":"E350","Description":"descrition","Price":"3000.00"],
// ["Year":"1997","Make":"Ford","Model":"E350","Description":"description","Price":"3000.00"],
// ["Year":"1999","Make":"Chevy","Model":"Venture","Description":"another, description","Price":"4900.00"]
// ]

Expand Down
52 changes: 26 additions & 26 deletions Tests/CSwiftVTests/CSwiftVTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,27 @@ import XCTest

@testable import CSwiftV

public let emptyColumns = "Year,Make,Model,Description,Price\r\n1997,Ford,,descrition,3000.00\r\n1999,Chevy,Venture,another description,\r\n"
public let emptyColumns = "Year,Make,Model,Description,Price\r\n1997,Ford,,description,3000.00\r\n1999,Chevy,Venture,another description,\r\n"

public let newLineSeparation = "Year,Make,Model,Description,Price\r\n1997,Ford,E350,descrition,3000.00\r\n1999,Chevy,Venture,another description,4900.00\r\n"
public let newLineSeparation = "Year,Make,Model,Description,Price\r\n1997,Ford,E350,description,3000.00\r\n1999,Chevy,Venture,another description,4900.00\r\n"

public let newLineSeparationNoCR = "Year,Make,Model,Description,Price\n1997,Ford,E350,descrition,3000.00\n1999,Chevy,Venture,another description,4900.00\n"
public let newLineSeparationNoCR = "Year,Make,Model,Description,Price\n1997,Ford,E350,description,3000.00\n1999,Chevy,Venture,another description,4900.00\n"

public let newLineSeparationNoEnd = "Year,Make,Model,Description,Price\r\n1997,Ford,E350,descrition,3000.00\r\n1999,Chevy,Venture,another description,4900.00"
public let newLineSeparationNoEnd = "Year,Make,Model,Description,Price\r\n1997,Ford,E350,description,3000.00\r\n1999,Chevy,Venture,another description,4900.00"

public let withoutHeader = "1997,Ford,E350,descrition,3000.00\r\n1999,Chevy,Venture,another description,4900.00"
public let withoutHeader = "1997,Ford,E350,description,3000.00\r\n1999,Chevy,Venture,another description,4900.00"

public let longerColumns = "Year,Make,Model,Description,Price\r\n1997,Ford,E350,descrition,3000.00\r\n1999,Chevy,Venture,another description,4900.00,extra column\r\n"
public let longerColumns = "Year,Make,Model,Description,Price\r\n1997,Ford,E350,description,3000.00\r\n1999,Chevy,Venture,another description,4900.00,extra column\r\n"

public let withRandomQuotes = "Year,Make,Model,Description,Price\r\n1997,Ford,\"E350\",descrition,3000.00\r\n1999,Chevy,Venture,\"another description\",4900.00"
public let withRandomQuotes = "Year,Make,Model,Description,Price\r\n1997,Ford,\"E350\",description,3000.00\r\n1999,Chevy,Venture,\"another description\",4900.00"

public let withCommasInQuotes = "Year,Make,Model,Description,Price\r\n1997,Ford,\"E350\",descrition,3000.00\r\n1999,Chevy,Venture,\"another, amazing, description\",4900.00"
public let withCommasInQuotes = "Year,Make,Model,Description,Price\r\n1997,Ford,\"E350\",description,3000.00\r\n1999,Chevy,Venture,\"another, amazing, description\",4900.00"

public let withQuotesInQuotes = "Year,Make,Model,Description,Price\r\n1997,Ford,\"E350\",descrition,3000.00\r\n1999,Chevy,Venture,\"another, \"\"amazing\"\", description\",4900.00"
public let withQuotesInQuotes = "Year,Make,Model,Description,Price\r\n1997,Ford,\"E350\",description,3000.00\r\n1999,Chevy,Venture,\"another, \"\"amazing\"\", description\",4900.00"

public let withNewLinesInQuotes = "Year,Make,Model,Description,Price\n1997,Ford,\"E350\",descrition,3000.00\n1999,Chevy,Venture,\"another, \"\"amazing\"\",\n\ndescription\n\",4900.00\n"
public let withNewLinesInQuotes = "Year,Make,Model,Description,Price\n1997,Ford,\"E350\",description,3000.00\n1999,Chevy,Venture,\"another, \"\"amazing\"\",\n\ndescription\n\",4900.00\n"

public let withTabSeparator = "Year\tMake\tModel\tDescription\tPrice\r\n1997\tFord\t\"E350\"\tdescrition\t3000.00\r\n1999\tChevy\tVenture\t\"another\t \"\"amazing\"\"\t description\"\t4900.00\r\n"
public let withTabSeparator = "Year\tMake\tModel\tDescription\tPrice\r\n1997\tFord\t\"E350\"\tdescription\t3000.00\r\n1999\tChevy\tVenture\t\"another\t \"\"amazing\"\"\t description\"\t4900.00\r\n"

public let singleString = "1999,Chevy,Venture,\"another, \"\"amazing\"\",\n\ndescription\n\",4900.00"

Expand Down Expand Up @@ -60,7 +60,7 @@ class CSwiftVTests: XCTestCase {
let arrayUnderTest = CSwiftV(with: testString).rows

let expectedArray = [
["1997","Ford","E350","descrition","3000.00"],
["1997","Ford","E350","description","3000.00"],
["1999","Chevy","Venture","another description","4900.00"]
]

Expand All @@ -74,7 +74,7 @@ class CSwiftVTests: XCTestCase {
let arrayUnderTest = CSwiftV(with: testString).rows

let expectedArray = [
["1997","Ford","E350","descrition","3000.00"],
["1997","Ford","E350","description","3000.00"],
["1999","Chevy","Venture","another description","4900.00"]
]

Expand All @@ -95,7 +95,7 @@ class CSwiftVTests: XCTestCase {
let arrayUnderTest = CSwiftV(with: testString).rows

let expectedArray = [
["1997","Ford","E350","descrition","3000.00"],
["1997","Ford","E350","description","3000.00"],
["1999","Chevy","Venture","another description","4900.00"]
]

Expand Down Expand Up @@ -142,7 +142,7 @@ class CSwiftVTests: XCTestCase {
//XCTAssertNil(arrayUnderTest)

let expectedArray = [
["1997","Ford","E350","descrition","3000.00"],
["1997","Ford","E350","description","3000.00"],
["1999","Chevy","Venture","another description","4900.00"]
]

Expand All @@ -157,15 +157,15 @@ class CSwiftVTests: XCTestCase {
let csv = CSwiftV(with: testString)

let expectedArray = [
["1997","Ford","E350","descrition","3000.00"],
["1997","Ford","E350","description","3000.00"],
["1999","Chevy","Venture","another description","4900.00","extra column"]
]

XCTAssertEqual(csv.rows[0], expectedArray[0])
XCTAssertEqual(csv.rows[1], expectedArray[1])

let expectedKeyedRows = [
["Year":"1997", "Make": "Ford", "Model": "E350", "Description": "descrition", "Price":"3000.00"],
["Year":"1997", "Make": "Ford", "Model": "E350", "Description": "description", "Price":"3000.00"],
["Year":"1999", "Make": "Chevy", "Model": "Venture", "Description":"another description", "Price":"4900.00"]
]

Expand Down Expand Up @@ -199,7 +199,7 @@ class CSwiftVTests: XCTestCase {
let arrayUnderTest = CSwiftV(with: testString).rows

let expectedArray = [
["1997","Ford","\"E350\"","descrition","3000.00"],
["1997","Ford","\"E350\"","description","3000.00"],
["1999","Chevy","Venture","\"another description\"","4900.00"]
]

Expand All @@ -221,7 +221,7 @@ class CSwiftVTests: XCTestCase {
let arrayUnderTest = CSwiftV(with: testString).rows

let expectedArray = [
["1997","Ford","\"E350\"","descrition","3000.00"],
["1997","Ford","\"E350\"","description","3000.00"],
["1999","Chevy","Venture","\"another, amazing, description\"","4900.00"]
]

Expand All @@ -236,7 +236,7 @@ class CSwiftVTests: XCTestCase {
let arrayUnderTest = CSwiftV(with: testString).rows

let expectedArray = [
["1997","Ford","\"E350\"","descrition","3000.00"],
["1997","Ford","\"E350\"","description","3000.00"],
["1999","Chevy","Venture","\"another, \"\"amazing\"\",\n\ndescription\n\"","4900.00"]
]

Expand All @@ -257,7 +257,7 @@ class CSwiftVTests: XCTestCase {
let arrayUnderTest = CSwiftV(with: testString).rows

let expectedArray = [
["1997","Ford","\"E350\"","descrition","3000.00"],
["1997","Ford","\"E350\"","description","3000.00"],
["1999","Chevy","Venture","\"another, \"\"amazing\"\", description\"","4900.00"]
]

Expand All @@ -272,7 +272,7 @@ class CSwiftVTests: XCTestCase {
let arrayUnderTest = CSwiftV(with: testString).keyedRows!

let expectedArray = [
["Year":"1997","Make":"Ford","Model":"\"E350\"","Description":"descrition","Price":"3000.00"],
["Year":"1997","Make":"Ford","Model":"\"E350\"","Description":"description","Price":"3000.00"],
["Year":"1999","Make":"Chevy","Model":"Venture","Description":"\"another, \"\"amazing\"\", description\"","Price":"4900.00"]
]

Expand All @@ -287,7 +287,7 @@ class CSwiftVTests: XCTestCase {
let arrayUnderTest = CSwiftV(with: testString, separator:"\t").keyedRows!

let expectedArray = [
["Year":"1997","Make":"Ford","Model":"\"E350\"","Description":"descrition","Price":"3000.00"],
["Year":"1997","Make":"Ford","Model":"\"E350\"","Description":"description","Price":"3000.00"],
["Year":"1999","Make":"Chevy","Model":"Venture","Description":"\"another\t \"\"amazing\"\"\t description\"","Price":"4900.00"]
]

Expand All @@ -302,7 +302,7 @@ class CSwiftVTests: XCTestCase {

let expectedArray = [
"Year,Make,Model,Description,Price",
"1997,Ford,\"E350\",descrition,3000.00",
"1997,Ford,\"E350\",description,3000.00",
"1999,Chevy,Venture,\"another, \"\"amazing\"\",\n\ndescription\n\",4900.00"
]

Expand Down Expand Up @@ -332,15 +332,15 @@ class CSwiftVTests: XCTestCase {
let csv = CSwiftV(with: testString)

let expectedArray = [
["1997","Ford","","descrition","3000.00"],
["1997","Ford","","description","3000.00"],
["1999","Chevy","Venture","another description",""]
]

XCTAssertEqual(csv.rows[0], expectedArray[0])
XCTAssertEqual(csv.rows[1], expectedArray[1])

let expectedKeyedRows = [
["Year":"1997", "Make": "Ford", "Description":"descrition", "Price":"3000.00"],
["Year":"1997", "Make": "Ford", "Description":"description", "Price":"3000.00"],
["Year":"1999", "Make": "Chevy", "Model":"Venture", "Description":"another description"]
]

Expand Down