fixing a typo from swift-aws; add more tests.

PerfectlySoft · Jul 7, 2020 · d5f7373 · d5f7373
1 parent a18023f
commit d5f7373
Show file tree

Hide file tree

Showing 2 changed files with 82 additions and 41 deletions.
diff --git a/Package@swift-4.swift b/Package@swift-4.swift
@@ -20,7 +20,7 @@
 //
 
 import PackageDescription
-d
+
 let package = Package(
     name: "INIParser",
     products: [

diff --git a/Tests/INIParserTests/INIParserTests.swift b/Tests/INIParserTests/INIParserTests.swift
@@ -21,49 +21,90 @@ import XCTest
 @testable import INIParser
 
 class INIParserTests: XCTestCase {
-    func testExample() {
-      let raw = """
-; last modified 1 April 2017 by Rockford Wei
-## This is another comment
-  freeVar1 = 1
-  freeVar2 = 2;
-  url = http://example.com/results?limit=10
-  [owner]
-  name =  Rocky
-  organization = PerfectlySoft
-  ;
-  [database]
-      server = 192.0.2.42 ; use IP address in case network name resolution is not working
 
-      port = 143
-      file = \"中文.dat  ' ' \"
-  [汉化]
-  变量1 = 🇨🇳 ;使用utf8
-  变量2 = 加拿大。
-  [ 乱死了 ]
-"""
+  let path = "/tmp/a.ini"
 
-      let path = "/tmp/a.ini"
-      do {
-        try raw.write(to: URL.init(fileURLWithPath: path), atomically: true, encoding: .utf8)
-        let ini = try INIParser(path)
-        XCTAssertEqual(ini.anonymousSection["freeVar1"] ?? "", "1")
-        XCTAssertEqual(ini.anonymousSection["freeVar2"] ?? "", "2")
-        XCTAssertEqual(ini.anonymousSection["url"] ?? "", "http://example.com/results?limit=10")
-        XCTAssertEqual(ini.sections["owner"]?["name"] ?? "", "Rocky")
-        XCTAssertEqual(ini.sections["owner"]?["organization"] ?? "", "PerfectlySoft")
-        XCTAssertEqual(ini.sections["database"]?["server"] ?? "", "192.0.2.42")
-        XCTAssertEqual(ini.sections["database"]?["port"] ?? "", "143")
-        XCTAssertEqual(ini.sections["database"]?["file"] ?? "", "\"中文.dat  \' \' \"")
-        XCTAssertEqual(ini.sections["汉化"]?["变量1"] ?? "", "🇨🇳")
-        XCTAssertEqual(ini.sections["汉化"]?["变量2"] ?? "", "加拿大。")
-      }catch (let err) {
-        XCTFail(err.localizedDescription)
-      }
+  override func setUp() {
+    let raw =
+    """
+    ; last modified 1 April 2017 by Rockford Wei
+    ## This is another comment
+      freeVar1 = 1
+      freeVar2 = 2;
+      url = http://example.com/results?limit=10
+      [owner]
+      name =  Rocky
+      organization = PerfectlySoft
+      ;
+      [database]
+          server = 192.0.2.42 ; use IP address in case network name resolution is not working
+
+          port = 143
+          file = \"中文.dat  ' ' \"
+      [汉化]
+      变量1 = 🇨🇳 ;使用utf8
+      变量2 = 加拿大。
+      [ 乱死了 ]
+    """
+    do {
+      try raw.write(to: URL.init(fileURLWithPath: path), atomically: true, encoding: .utf8)
+    }catch (let err) {
+      XCTFail(err.localizedDescription)
+    }
+  }
+
+  func validate(ini: INIParser) {
+    XCTAssertEqual(ini.anonymousSection["freeVar1"] ?? "", "1")
+    XCTAssertEqual(ini.anonymousSection["freeVar2"] ?? "", "2")
+    XCTAssertEqual(ini.anonymousSection["url"] ?? "", "http://example.com/results?limit=10")
+    XCTAssertEqual(ini.sections["owner"]?["name"] ?? "", "Rocky")
+    XCTAssertEqual(ini.sections["owner"]?["organization"] ?? "", "PerfectlySoft")
+    XCTAssertEqual(ini.sections["database"]?["server"] ?? "", "192.0.2.42")
+    XCTAssertEqual(ini.sections["database"]?["port"] ?? "", "143")
+    XCTAssertEqual(ini.sections["database"]?["file"] ?? "", "\"中文.dat  \' \' \"")
+    XCTAssertEqual(ini.sections["汉化"]?["变量1"] ?? "", "🇨🇳")
+    XCTAssertEqual(ini.sections["汉化"]?["变量2"] ?? "", "加拿大。")
+  }
+
+  func testExample() {
+    do {
+      let ini = try INIParser(path)
+      validate(ini: ini)
+    }catch (let err) {
+      XCTFail(err.localizedDescription)
+    }
+  }
+
+  func testData() {
+    do {
+      let url = URL(fileURLWithPath: path)
+      let data = try Data(contentsOf: url)
+      let ini = try INIParser(data: data)
+      validate(ini: ini)
+    }catch (let err) {
+      XCTFail(err.localizedDescription)
+    }
+  }
+
+  func testString() {
+    do {
+      let url = URL(fileURLWithPath: path)
+      let data = try Data(contentsOf: url)
+      let string = String(data: data, encoding: .utf8) ?? "fault"
+      let ini = try INIParser(string: string)
+      validate(ini: ini)
+    }catch (let err) {
+      XCTFail(err.localizedDescription)
     }
+  }
 
+  override func tearDown() {
+    unlink(path)
+  }
 
-    static var allTests = [
-        ("testExample", testExample),
-    ]
+  static var allTests = [
+    ("testExample", testExample),
+    ("testData", testData),
+    ("testString", testString)
+  ]
 }