Fixed the problems and confirm the conformance

swiftcsv · Jul 15, 2024 · d0839bf · d0839bf
1 parent 67b115e
commit d0839bf
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/SwiftCSV/Array+duplicates.swift b/SwiftCSV/Array+duplicates.swift
@@ -1,5 +1,5 @@
 //
-//  Extension.swift
+//  Array+duplicates.swift
 //
 //
 //  Created by 胡逸飞 on 2024/4/26.

diff --git a/SwiftCSV/Parser.swift b/SwiftCSV/Parser.swift
@@ -130,7 +130,7 @@ enum Parser {
         // Check for duplicate column names
         let duplicateColumns = header.duplicates()
         if !duplicateColumns.isEmpty {
-            throw CSVParseError.generic(message: "Duplicate column names found: \(duplicateColumns.joined(separator: ", "))")
+            throw CSVParseError.duplicateColumns(columnNames: duplicateColumns)
         }
 
         // Start after the header

diff --git a/SwiftCSV/ParsingState.swift b/SwiftCSV/ParsingState.swift
@@ -6,16 +6,20 @@
 //  Copyright © 2016 Naoto Kaneko. All rights reserved.
 //
 
-public enum CSVParseError: Error, Equatable {
+public enum CSVParseError: Error {
     case generic(message: String)
     case quotation(message: String)
+    case duplicateColumns(columnNames: [String])
+
 
     public static func == (lhs: CSVParseError, rhs: CSVParseError) -> Bool {
         switch (lhs, rhs) {
         case (.generic(let message1), .generic(let message2)):
             return message1 == message2
         case (.quotation(let message1), .quotation(let message2)):
             return message1 == message2
+        case (.duplicateColumns(let columns1), .duplicateColumns(let columns2)):
+            return columns1 == columns2
         default:
             return false
         }

diff --git a/SwiftCSVTests/DuplicateColumnNameHandlingTests.swift b/SwiftCSVTests/DuplicateColumnNameHandlingTests.swift
@@ -19,7 +19,12 @@ class DuplicateColumnNameHandlingTests: XCTestCase {
         """
 
         XCTAssertThrowsError(try CSV<Named>(string: csvString)) { error in
-            XCTAssertEqual(error as? CSVParseError, CSVParseError.generic(message: "Duplicate column names found: name"))
+            switch error as? CSVParseError {
+            case .duplicateColumns(let columnNames):
+                XCTAssertEqual(["name"], columnNames)
+            default:
+                XCTFail("Expected CSVParseError.duplicateColumns")
+            }
         }
     }