Clean up

Author: dongjoon-hyun

Tests/SparkConnectTests/SQLTests.swift

@@ -30,7 +30,11 @@ struct SQLTests {
 
   let regexID = /#\d+L?/
   let regexPlanId = /plan_id=\d+/
-  let regexLocation = /file:\w+/
+  let regexLocation = /file:\S+/
+
+  private func cleanUp(_ str: String) -> String {
+    return removeID(removeLocation(str))
+  }
 
   private func removeID(_ str: String) -> String {
     return str.replacing(regexPlanId, with: "plan_id=").replacing(regexID, with: "#")
@@ -49,6 +53,11 @@ struct SQLTests {
     #expect(removeID("plan_id=123") == "plan_id=")
   }
 
+  @Test
+  func removeLocation() {
+    #expect(removeLocation("file:/abc") == "*")
+  }
+
 #if !os(Linux)
   @Test
   func runAll() async throws {
@@ -59,8 +68,8 @@ struct SQLTests {
 
       let sql = try String(contentsOf: URL(fileURLWithPath: "\(path)/\(name)"), encoding: .utf8)
       let jsonData = try encoder.encode(try await spark.sql(sql).collect())
-      let answer = removeID(String(data: jsonData, encoding: .utf8)!)
-      let expected = removeID(try String(contentsOf: URL(fileURLWithPath: "\(path)/\(name).json"), encoding: .utf8))
+      let answer = cleanUp(String(data: jsonData, encoding: .utf8)!)
+      let expected = cleanUp(try String(contentsOf: URL(fileURLWithPath: "\(path)/\(name).json"), encoding: .utf8))
       #expect(answer == expected.trimmingCharacters(in: .whitespacesAndNewlines))
     }
     await spark.stop()