normalize

Author: dongjoon-hyun

Tests/SparkConnectTests/Resources/queries/describe_database.sql.answer

@@ -1,9 +1,9 @@
-+--------------+----------------------------------------+
-|     info_name|                              info_value|
-+--------------+----------------------------------------+
-|  Catalog Name|                           spark_catalog|
-|Namespace Name|                                 default|
-|       Comment|                        default database|
++--------------+--------------------------------------------+
+|     info_name|                                  info_value|
++--------------+--------------------------------------------+
+|  Catalog Name|                               spark_catalog|
+|Namespace Name|                                     default|
+|       Comment|                            default database|
 |      Location|*|
-|         Owner|                                     *|
-+--------------+----------------------------------------+
+|         Owner|                                    dongjoon|
++--------------+--------------------------------------------+

Tests/SparkConnectTests/SQLTests.swift

@@ -49,6 +49,10 @@ struct SQLTests {
     return str.replacing(regexOwner, with: "*")
   }
 
+  private func normalize(_ str: String) -> String {
+    return str.replacing(/[-]+/, with: "-").replacing(/[ ]+/, with: " ")
+  }
+
   @Test
   func testRemoveID() {
     #expect(removeID("123") == "123")
@@ -69,6 +73,12 @@ struct SQLTests {
     #expect(removeOwner("185") == "*")
   }
 
+  @Test
+  func testNormalize() {
+    #expect(normalize("+------+------------------+") == "+-+-+")
+    #expect(normalize("+      +                  +") == "+ + +")
+  }
+
   let queriesForSpark4Only: [String] = [
     "create_scala_function.sql",
     "create_table_function.sql",
@@ -97,7 +107,7 @@ struct SQLTests {
         fm.createFile(atPath: path, contents: answer.data(using: .utf8)!, attributes: nil)
       } else {
         let expected = cleanUp(try String(contentsOf: URL(fileURLWithPath: "\(path)/\(name).answer"), encoding: .utf8))
-        #expect(answer == expected.trimmingCharacters(in: .whitespacesAndNewlines))
+        #expect(normalize(answer) == normalize(expected.trimmingCharacters(in: .whitespacesAndNewlines)))
       }
     }
     await spark.stop()