Included testcase for the implementation of XDG specification.

Author: mamabusi

Foundation/NSHTTPCookieStorage.swift

@@ -7,6 +7,7 @@
 // See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 import Dispatch
+import CoreFoundation
 
 /*!
     @enum NSHTTPCookieAcceptPolicy
@@ -46,8 +47,7 @@ open class HTTPCookieStorage: NSObject {
         allCookies = [:]
         cookieAcceptPolicy = .always
         super.init()
-        //TODO: cookieFilePath = filePath(path: _CFXDGCreateConfigHomePath()._swiftObject, fileName: "/.cookies." + cookieStorageName)
-        cookieFilePath = filePath(path: NSHomeDirectory() + "/.config", fileName: "/.cookies." + cookieStorageName)
+        cookieFilePath = filePath(path: _CFXDGCreateConfigHomePath()._swiftObject, fileName: "/.cookies." + cookieStorageName)
         loadPersistedCookies()
     }
 

TestFoundation/TestNSHTTPCookieStorage.swift

@@ -30,6 +30,7 @@ class TestNSHTTPCookieStorage: XCTestCase {
             ("test_setCookiesForURL", test_setCookiesForURL),
             ("test_getCookiesForURL", test_getCookiesForURL),
             ("test_setCookiesForURLWithMainDocumentURL", test_setCookiesForURLWithMainDocumentURL),
+            ("test_cookieInXDGSpecPath", test_cookieInXDGSpecPath),
         ]
     }
 
@@ -213,4 +214,43 @@ class TestNSHTTPCookieStorage: XCTestCase {
         storage.setCookies([simpleCookie1], for: url1, mainDocumentURL: mainUrl)
         XCTAssertEqual(storage.cookies(for: url1!)!.count, 0)
     }
+
+    func test_cookieInXDGSpecPath() {
+        //Test without setting the environment variable
+        let testCookie = HTTPCookie(properties: [
+           .name: "TestCookie0",
+           .value: "Test @#$%^$&*99mam",
+           .path: "/",
+           .domain: "sample.com",
+        ])!
+        let storage = HTTPCookieStorage.shared
+        storage.setCookie(testCookie)
+        XCTAssertEqual(storage.cookies!.count, 3)
+        var destPath: String
+        if let xdg_config_home = getenv("XDG_CONFIG_HOME") {
+            destPath = String(utf8String: xdg_config_home)! + "/.cookies.shared"
+        } else {
+            destPath = NSHomeDirectory() + "/.config/.cookies.shared"
+        }
+        let fm = FileManager.default
+        var isDir = false
+        let exists = fm.fileExists(atPath: destPath, isDirectory: &isDir)
+        XCTAssertTrue(exists)
+        //Test by setting the environmental variable
+        let bundle = Bundle.main
+        let bundlePath = bundle.bundlePath
+        var pathIndex = bundlePath.range(of: "/", options: .backwards)?.lowerBound
+        let task = Process()
+        task.launchPath = bundlePath.substring(to: pathIndex!) + "/xdgTestHelper/xdgTestHelper"
+        var environment = ProcessInfo.processInfo.environment
+        environment["XDG_CONFIG_HOME"] =  NSHomeDirectory() + "/TestXDG"
+        task.environment = environment
+        // Launch the task
+        task.launch()
+        task.waitUntilExit()
+        let status = task.terminationStatus
+        XCTAssertEqual(status, 0)
+        let terminationReason = task.terminationReason
+        XCTAssertEqual(terminationReason, Process.TerminationReason.exit)
+    }
 }

build.py

@@ -487,6 +487,9 @@
 Configuration.current.extra_ld_flags += ' -L'+Configuration.current.variables["LIBDISPATCH_BUILD_DIR"]+'/src/.libs'
 
 foundation_tests.add_dependency(foundation_tests_resources)
+xdgTestHelper = SwiftExecutable('xdgTestHelper', ['TestFoundation/XDGTestHelper.swift'])
+foundation_tests.add_dependency(xdgTestHelper)
+foundation.add_phase(xdgTestHelper)
 foundation.add_phase(foundation_tests_resources)
 foundation.add_phase(foundation_tests)
 

lib/phases.py

@@ -417,6 +417,7 @@ class SwiftExecutable(BuildPhase):
     def __init__(self, executableName, sources):
         BuildAction.__init__(self, output=executableName)
         self.executableName = executableName
+        self.name = executableName
         self.sources = sources
 
     def generate(self):