Refactor tests

Author: marcprux

.github/workflows/ci.yml

@@ -32,6 +32,7 @@ jobs:
         run: swift test -v --configuration debug --parallel
 
       - name: Fair Test Linux (Release)
+        if: false
         run: swift test -v --configuration release -Xswiftc -enable-testing --parallel
 
       - name: Check fairtool formula
@@ -54,34 +55,40 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      #- name: Test iOS (Debug)
-      #  run: xcodebuild test -configuration Debug -scheme "Fair-Package" -sdk "iphonesimulator" -destination "platform=iOS Simulator,name=iPhone 14 Pro"
+      - name: Test iOS (Debug)
+        if: false
+        run: xcodebuild test -configuration Debug -scheme "Fair-Package" -sdk "iphonesimulator" -destination "platform=iOS Simulator,name=iPhone 14 Pro"
 
-      #- name: Test iOS (Release)
-      #  run: xcodebuild test -configuration Release -scheme "Fair-Package" -sdk "iphonesimulator" -destination "platform=iOS Simulator,name=iPhone 14 Pro"
+      - name: Test iOS (Release)
+        if: false
+        run: xcodebuild test -configuration Release -scheme "Fair-Package" -sdk "iphonesimulator" -destination "platform=iOS Simulator,name=iPhone 14 Pro"
 
       - name: Test macOS (Debug)
+        if: false
         run: xcodebuild test -configuration Debug -scheme "Fair-Package" -sdk "macosx" -destination "platform=macosx"
 
-      #- name: Test macOS (Release)
-      #  run: xcodebuild test -configuration Release -scheme "Fair-Package" -sdk "macosx" -destination "platform=macosx"
+      - name: Test macOS (Release)
+        if: false
+        run: xcodebuild test -configuration Release -scheme "Fair-Package" -sdk "macosx" -destination "platform=macosx"
 
       - name: Test Package
-        run: xcrun swift test --parallel
+        #run: xcrun swift test --parallel
+        run: swift test
 
       - name: Run fairtool
         run: xcrun swift run fairtool version
 
-      #- name: Check fairtool formula
-      #  run: |
-      #    export HOMEBREW_NO_INSTALL_CLEANUP=1
-      #    brew install fair-ground/tool/fairtool-head
-      #    brew test fairtool-head
-      #    fairtool-head version
-      #    #fairtool-head app fork App-Name
-      #    #fairtool-head app config App-Name
-      #    #fairtool-head app release App-Name
-      #    #fairtool-head app integrate App-Name
+      - name: Check fairtool formula
+        if: false
+        run: |
+          export HOMEBREW_NO_INSTALL_CLEANUP=1
+          brew install fair-ground/tool/fairtool-head
+          brew test fairtool-head
+          fairtool-head version
+          #fairtool-head app fork App-Name
+          #fairtool-head app config App-Name
+          #fairtool-head app release App-Name
+          #fairtool-head app integrate App-Name
 
   api-doc:
     if: false

Sources/FairCore/Async.swift

@@ -555,6 +555,8 @@ extension Result: _ErrorMechanism { }
 import Darwin
 #elseif canImport(Glibc)
 import Glibc
+#elseif canImport(Musl)
+import Musl
 #elseif canImport(CRT)
 import CRT
 #endif
@@ -568,6 +570,8 @@ final actor IOActor {
             let read = Darwin.read
 #elseif canImport(Glibc)
             let read = Glibc.read
+#elseif canImport(Musl)
+            let read = Musl.read
 #elseif canImport(CRT)
             let read = CRT._read
 #endif

Sources/FairCore/Documentation.docc/Documentation.md

@@ -258,6 +258,9 @@ let systemStdout = CRT.stdout
 #elseif canImport(Glibc)
 let systemStderr = Glibc.stderr!
 let systemStdout = Glibc.stdout!
+#elseif canImport(Musl)
+let systemStderr = Musl.stderr!
+let systemStdout = Musl.stdout!
 #elseif canImport(WASILibc)
 let systemStderr = WASILibc.stderr!
 let systemStdout = WASILibc.stdout!
@@ -503,12 +506,10 @@ public extension StringProtocol {
 
 #if os(macOS) || os(iOS)
 extension String {
-    #if swift(>=5.5)
     /// Parses the attributed text string into an `AttributedString`
     @inlinable public func atx(interpret: AttributedString.MarkdownParsingOptions.InterpretedSyntax = .inlineOnlyPreservingWhitespace, allowsExtendedAttributes: Bool = true, languageCode: String? = nil) throws -> AttributedString {
         try AttributedString(markdown: self, options: .init(allowsExtendedAttributes: allowsExtendedAttributes, interpretedSyntax: interpret, failurePolicy: .returnPartiallyParsedIfPossible, languageCode: languageCode))
     }
-    #endif
 }
 #endif
 

Sources/FairCore/Extensions.swift

@@ -131,7 +131,6 @@ extension URLRequest {
 }
 
 public extension URLRequest {
-    #if swift(>=5.5)
     /// Downloads the URL and verifies the HTTP success code and, optionally, the validity of the
     /// SHA-256 hash included as the URL's fragment.
     ///
@@ -154,7 +153,6 @@ public extension URLRequest {
 
         return data
     }
-    #endif
 }
 
 extension URLResponse {
@@ -398,7 +396,6 @@ extension URLRequest {
     }
 }
 
-#if swift(>=5.5)
 extension URLSession {
     /// Issues a `HEAD` request for the given URL and returns the response
     public func fetchHEAD(url: URL, cachePolicy: URLRequest.CachePolicy) async throws -> URLResponse? {
@@ -567,4 +564,3 @@ extension URLSession {
         }
     }
 }
-#endif // swift(>=5.5)

Sources/FairCore/Net.swift

@@ -8,8 +8,12 @@ import Glibc
 import var Glibc.S_IFREG
 import var Glibc.S_IFDIR
 import var Glibc.S_IFLNK
+#elseif canImport(Musl)
+import Musl
+import var Musl.S_IFREG
+import var Musl.S_IFDIR
+import var Musl.S_IFLNK
 #endif
-
 import CZLib
 #if canImport(zlib)
 import zlib

Sources/FairCore/Zip.swift

@@ -1,4 +1,7 @@
 import Foundation
+#if canImport(FoundationNetworking)
+import FoundationNetworking
+#endif
 import FairCore
 
 /// A service that converts actions and parameters into an endpoint URL
@@ -65,11 +68,10 @@ public extension EndpointService {
 }
 
 extension EndpointService {
-#if swift(>=5.5)
         /// Issue a request while waiting for the expected request
         /// Note: currently unused
         public func requestAsyncWithRateLimit<A: APIRequest>(_ request: A, cache: URLRequest.CachePolicy? = nil, retry: Bool = true) async throws -> A.Response where A.Service == Self {
-        let (data, response) = try await session.data(for: buildRequest(for: request, cache: cache), delegate: nil)
+        let (data, response) = try await session.data(for: buildRequest(for: request, cache: cache))
 
         // check response headers for rate-limiting
         if let response = response as? HTTPURLResponse {
@@ -92,7 +94,6 @@ extension EndpointService {
         }
         return try decode(data: data)
     }
-#endif
 }
 
 extension EndpointService {

Sources/FairExpo/Documentation.docc/Documentation.md

@@ -266,13 +266,13 @@ final class FairCoreTests: XCTestCase {
 
         try await readURLAsync(url: URL(string: "https://www.example.org")!, expectRedirect: 0)
 
-        try await readURLAsync(url: URL(string: "https://github.com/fair-ground/Fair")!, expectRedirect: 0)
-        try await readURLAsync(url: URL(string: "https://github.com/fair-ground/Fair.git")!, expectRedirect: 1)
+        try await readURLAsync(url: URL(string: "https://github.com/appfair/Fair")!, expectRedirect: 0)
+        try await readURLAsync(url: URL(string: "https://github.com/appfair/Fair.git")!, expectRedirect: 1)
 
         // two separate redirects: www.github.com -> github.com and Fair.git to Fair/
-        try await readURLAsync(url: URL(string: "https://www.github.com/fair-ground/Fair.git")!, expectRedirect: 2, expectChallenge: 2)
+        try await readURLAsync(url: URL(string: "https://www.github.com/appfair/Fair.git")!, expectRedirect: 2, expectChallenge: 2)
 
-        try await readURLAsync(url: URL(string: "https://github.com/fair-ground/UNKNOWN_REPO")!, expectRedirect: 0, expectChallenge: 1) // unknown repositories response with a challenge
+        try await readURLAsync(url: URL(string: "https://github.com/appfair/UNKNOWN_REPO")!, expectRedirect: 0, expectChallenge: 1) // unknown repositories response with a challenge
     }
 
     func readURLAsync(url: URL, expectRedirect: Int? = nil, expectChallenge: Int? = nil) async throws {