Feature/swift testing

.github/workflows/swift.yml

@@ -31,9 +31,13 @@ jobs:
         path: getargv-swift
         fetch-tags: true
         fetch-depth: 0 # until https://github.com/actions/checkout/issues/1471 fixed
+    - uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: latest-stable
     - uses: swift-actions/setup-swift@v2
       with:
-        swift-version: '5.10'
+        swift-version: '6.0'
+        # https://www.swift.org/download/
     - name: Build
       run: swift build -v
       working-directory: getargv-swift

.spi.yml

@@ -3,4 +3,4 @@ builder:
   configs:
     - documentation_targets: [ SwiftGetargv, Cgetargv ]
       platform: macosSpm
-      swift_version: '5.10'
+      swift_version: '6.0'

Package.swift

@@ -1,32 +1,67 @@
-// swift-tools-version:5.10
+// swift-tools-version:6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
-  name: "Cgetargv",
-  platforms: [.macOS(.v10_13)],
-  products: [
-    .library(name: "SwiftGetargv", targets: ["SwiftGetargv"]),
-    .library(name: "Cgetargv", targets: ["Cgetargv"])
-  ],
-  dependencies: [
-    .package(url: "https://github.com/apple/swift-argument-parser", from: "1.5.0"),
-    .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.3.0"),
-  ],
-  targets: [
-    .executableTarget(name: "getargv2", dependencies: [ "SwiftGetargv", .product(
-                                                                     name: "ArgumentParser",
-                                                                     package: "swift-argument-parser"
-                                                                   )]),
-    .executableTarget(name: "getargv", dependencies: [ "Cgetargv", .product(
-                                                                     name: "ArgumentParser",
-                                                                     package: "swift-argument-parser"
-                                                                   )]),
-    .target(name: "SwiftGetargv", dependencies: [ "Cgetargv" ]),
-    .systemLibrary(name: "Cgetargv",  pkgConfig: "getargv",  providers: [ .brew(["libgetagv"]) ]),
-    .testTarget(name: "SwiftGetargvTests", dependencies: [ "SwiftGetargv" ]),
-    .testTarget(name: "CgetargvTests", dependencies: [ "Cgetargv" ])
-  ],
-  cLanguageStandard: .c99 // https://developer.apple.com/documentation/packagedescription/clanguagestandard
+    name: "Cgetargv",
+    platforms: [.macOS(.v10_15)],
+    products: [
+        .library(name: "SwiftGetargv", targets: ["SwiftGetargv"]),
+        .library(name: "Cgetargv",     targets: ["Cgetargv"])
+    ],
+    dependencies: [
+        .package(url: "https://github.com/apple/swift-argument-parser", from: "1.5.0"),
+        .package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.4.3"),
+        .package(url: "https://github.com/swiftlang/swift-testing",     from: "0.11.0"),
+    ],
+    targets: [
+        .executableTarget(
+            name: "getargv2",
+            dependencies: [
+                "SwiftGetargv",
+                .product(
+                    name: "ArgumentParser",
+                    package: "swift-argument-parser"
+                )
+            ]
+        ),
+        .executableTarget(
+            name: "getargv",
+            dependencies: [
+                "Cgetargv",
+                .product(
+                    name: "ArgumentParser",
+                    package: "swift-argument-parser"
+                )
+            ]
+        ),
+        .target(name: "SwiftGetargv", dependencies: [ "Cgetargv" ]),
+        .systemLibrary(
+            name: "Cgetargv",
+            pkgConfig: "getargv",
+            providers: [ .brew(["libgetagv"]) ]
+        ),
+        .testTarget(
+            name: "SwiftGetargvTests",
+            dependencies: [
+                "SwiftGetargv",
+                .product(
+                    name: "Testing",
+                    package: "swift-testing"
+                )
+            ]
+        ),
+        .testTarget(
+            name: "CgetargvTests",
+            dependencies: [
+                "Cgetargv",
+                .product(
+                    name: "Testing",
+                    package: "swift-testing"
+                )
+            ]
+        )
+    ],
+    cLanguageStandard: .c99 // https://developer.apple.com/documentation/packagedescription/clanguagestandard
 )

Tests/CgetargvTests/Test.swift

@@ -1,42 +1,40 @@
 import Foundation
-import XCTest
+import Testing
 
 @testable import Cgetargv
 
-final class CgetargvTests: XCTestCase {
-    func testGetArgvOfPid() {
-        let options = GetArgvOptions(skip: 0, pid: getpid(), nuls: true)
-        var res = ArgvResult()
-        XCTAssert(withUnsafePointer(to: options, { get_argv_of_pid($0, &res) }))
-
-        let expectedOutput = ProcessInfo.processInfo.arguments.joined(separator: " ")
-        let actualOutput = String(cString: res.start_pointer)
-
-        XCTAssertEqual(actualOutput, expectedOutput, "The Args are not correct.")
-    }
+@Suite()
+struct CgetargvTests {
 
-    func testGetArgvOfPidWithNuls() {
-        let options = GetArgvOptions(skip: 0, pid: getpid(), nuls: false)
+    @Test("test getArgvOfPid NUL replacement", arguments: zip([true, false], [" ", "\0"]))
+    func GetArgvOfPidNuls(nuls: Bool, separator: String) throws {
+        let options = GetArgvOptions(skip: 0, pid: getpid(), nuls: nuls)
         var res = ArgvResult()
-        XCTAssert(withUnsafePointer(to: options, { get_argv_of_pid($0, &res) }))
+        try #require(withUnsafePointer(to: options, { get_argv_of_pid($0, &res) }))
 
-        let expectedOutput = ProcessInfo.processInfo.arguments.flatMap { $0.utf8CString }
-        let actualOutput = Array(
-            UnsafeBufferPointer<CChar>(start: res.start_pointer!, count: res.end_pointer - res.start_pointer + 1))
+        let expectedOutput = CommandLine.arguments.joined(separator: separator).utf8CString.withUnsafeBufferPointer { bytes -> Data in
+            Data(buffer: bytes)
+        }
+
+        let count = (res.start_pointer == nil || res.end_pointer == res.start_pointer) ? 0 : res.end_pointer - res.start_pointer + 1
+        let actualOutput = Data(
+            buffer: UnsafeBufferPointer<CChar>(start: res.start_pointer!, count: count)
+        )
 
-        XCTAssertEqual(actualOutput, expectedOutput, "The Args are not correct.")
+        #expect(actualOutput == expectedOutput)
     }
 
-    func testGetArgvAndArgcOfPid() {
+    @Test("test getArgvAndArgcOfPid")
+    func testGetArgvAndArgcOfPid() throws {
         let pid = getpid()
         var res = ArgvArgcResult()
-        XCTAssert(get_argv_and_argc_of_pid(pid, &res))
+        try #require(get_argv_and_argc_of_pid(pid, &res))
 
         let expectedOutput = ProcessInfo.processInfo.arguments
         let actualOutput = Array(
             UnsafeBufferPointer<UnsafeMutablePointer<CChar>?>(start: res.argv, count: Int(res.argc))
         ).map { String(cString: $0!) }
 
-        XCTAssertEqual(actualOutput, expectedOutput, "The Args are not correct.")
+        #expect(actualOutput == expectedOutput)
     }
 }

Tests/SwiftGetargvTests/Test.swift

@@ -1,39 +1,28 @@
 import Foundation
-import XCTest
+import Testing
 
 @testable import SwiftGetargv
 
-final class SwiftGetargvTests: XCTestCase {
-    func testGetArgvOfPid() {
-        let expectedOutput = CommandLine.arguments.joined(separator: " ").utf8CString
+@Suite()
+struct SwiftGetargvTests {
 
-        switch getArgvOfPid(pid: getpid(), nuls: true) {
-        case .success(let actualOutput):
-            XCTAssertEqual(actualOutput.array, Array(expectedOutput), "The Args are not correct.")
-        case .failure(let error):
-            XCTFail("getArgvOfPid failed with \(error)")
-        }
-    }
+    @available(macOS 11.0, *)
+    @Test("test getArgvOfPid NUL replacement", arguments: zip([true, false], [" ", "\0"]))
+        func GetArgvOfPidNuls(nuls: Bool, separator: String) throws {
+            let expectedOutput = CommandLine.arguments.joined(separator: separator).utf8CString
 
-    func testGetArgvOfPidWithNuls() {
-        let expectedOutput = CommandLine.arguments.flatMap { $0.utf8CString }
+            let actualOutput = try #require(try getArgvOfPid(pid: getpid(), nuls: nuls).get())
 
-        switch getArgvOfPid(pid: getpid()) {
-        case .success(let actualOutput):
-            XCTAssertEqual(actualOutput.array, expectedOutput, "The Args are not correct.")
-        case .failure(let error):
-            XCTFail("getArgvOfPid failed with \(error)")
+            #expect(actualOutput.array == Array(expectedOutput))
         }
-    }
 
-    func testGetArgvAndArgcOfPid() {
-        let expectedOutput = CommandLine.arguments
+    @available(macOS 11.0, *)
+    @Test("test getArgvAndArgcOfPid")
+        func testGetArgvAndArgcOfPid() throws {
+            let expectedOutput = CommandLine.arguments
+
+            let actualOutput = try #require(try getArgvAndArgcOfPid(pid: getpid(), encoding: String.Encoding.nonLossyASCII).get())
 
-        switch getArgvAndArgcOfPid(pid: getpid(), encoding: String.Encoding.nonLossyASCII) {
-        case .success(let actualOutput):
-            XCTAssertEqual(actualOutput, expectedOutput, "The Args are not correct.")
-        case .failure(let error):
-            XCTFail("getArgvAndArgcOfPid failed with \(error)")
+            #expect(actualOutput == expectedOutput)
         }
-    }
 }