Convert GoogleTests to swift testing

Author: mattmassicotte

Tests/OAuthenticatorTests/GoogleTests.swift

@@ -1,38 +1,36 @@
-import XCTest
-#if canImport(FoundationNetworking)
-import FoundationNetworking
-#endif
+import Foundation
+import Testing
 
 @testable import OAuthenticator
 
-final class GoogleTests: XCTestCase {
+struct GoogleTests {
+	@Test
     func testOAuthResponseDecode() throws {
         let content = """
 {"access_token": "abc", "expires_in": 3, "refresh_token": "def", "scope": "https://gmail.scope", "token_type": "bearer"}
 """
-        let data = try XCTUnwrap(content.data(using: .utf8))
+		let data = try #require(content.data(using: .utf8))
         let response = try JSONDecoder().decode(GoogleAPI.OAuthResponse.self, from: data)
 
-        XCTAssertEqual(response.accessToken, "abc")
-        
+		#expect(response.accessToken == "abc")
+
         let login = response.login
-        XCTAssertEqual(login.accessToken.value, "abc")
-        
+		#expect(login.accessToken.value == "abc")
+
         // Sleep until access token expires
         sleep(5)
-        XCTAssert(!login.accessToken.valid)
+		#expect(!login.accessToken.valid)
     }
 
     func testSuppliedParameters() async throws {
         let googleParameters = GoogleAPI.GoogleAPIParameters(includeGrantedScopes: true, loginHint: "john@doe.com")
 
-        XCTAssertNotNil(googleParameters.loginHint)
-        XCTAssertTrue(googleParameters.includeGrantedScopes)
-        
-        let callback = URL(string: "callback://google_api")
-        XCTAssertNotNil(callback)
-        
-        let creds = AppCredentials(clientId: "client_id", clientPassword: "client_pwd", scopes: ["scope1", "scope2"], callbackURL: callback!)
+		#expect(googleParameters.loginHint != nil)
+		#expect(googleParameters.includeGrantedScopes)
+
+		let callback = try #require(URL(string: "callback://google_api"))
+
+        let creds = AppCredentials(clientId: "client_id", clientPassword: "client_pwd", scopes: ["scope1", "scope2"], callbackURL: callback)
         let tokenHandling = GoogleAPI.googleAPITokenHandling(with: googleParameters)
         let config = Authenticator.Configuration(
             appCredentials: creds,
@@ -52,27 +50,24 @@ final class GoogleTests: XCTestCase {
         let googleURLProvider = try await config.tokenHandling.authorizationURLProvider(params)
 
         let urlComponent = URLComponents(url: googleURLProvider, resolvingAgainstBaseURL: true)
-        XCTAssertNotNil(urlComponent)
-        XCTAssertEqual(urlComponent!.scheme, GoogleAPI.scheme)
-        
+		#expect(urlComponent?.scheme == GoogleAPI.scheme)
+
         // Validate query items inclusion and value
-        XCTAssertNotNil(urlComponent!.queryItems)
-        XCTAssertTrue(urlComponent!.queryItems!.contains(where: { $0.name == GoogleAPI.includeGrantedScopeKey }))
-        XCTAssertTrue(urlComponent!.queryItems!.contains(where: { $0.name == GoogleAPI.loginHint }))
-        XCTAssertTrue(urlComponent!.queryItems!.contains(where: { $0.value == String(true) }))
-        XCTAssertTrue(urlComponent!.queryItems!.contains(where: { $0.value == "john@doe.com" }))
+		#expect(urlComponent!.queryItems!.contains(where: { $0.name == GoogleAPI.includeGrantedScopeKey }))
+		#expect(urlComponent!.queryItems!.contains(where: { $0.name == GoogleAPI.loginHint }))
+		#expect(urlComponent!.queryItems!.contains(where: { $0.value == String(true) }))
+		#expect(urlComponent!.queryItems!.contains(where: { $0.value == "john@doe.com" }))
     }
 
     func testDefaultParameters() async throws {
         let googleParameters = GoogleAPI.GoogleAPIParameters()
 
-        XCTAssertNil(googleParameters.loginHint)
-        XCTAssertTrue(googleParameters.includeGrantedScopes)
-        
-        let callback = URL(string: "callback://google_api")
-        XCTAssertNotNil(callback)
+		#expect(googleParameters.loginHint == nil)
+		#expect(googleParameters.includeGrantedScopes)
+
+		let callback = try #require(URL(string: "callback://google_api"))
 
-        let creds = AppCredentials(clientId: "client_id", clientPassword: "client_pwd", scopes: ["scope1", "scope2"], callbackURL: callback!)
+        let creds = AppCredentials(clientId: "client_id", clientPassword: "client_pwd", scopes: ["scope1", "scope2"], callbackURL: callback)
         let tokenHandling = GoogleAPI.googleAPITokenHandling(with: googleParameters)
         let config = Authenticator.Configuration(
             appCredentials: creds,
@@ -92,14 +87,11 @@ final class GoogleTests: XCTestCase {
         let googleURLProvider = try await config.tokenHandling.authorizationURLProvider(params)
 
         let urlComponent = URLComponents(url: googleURLProvider, resolvingAgainstBaseURL: true)
-        XCTAssertNotNil(urlComponent)
-        XCTAssertEqual(urlComponent!.scheme, GoogleAPI.scheme)
+		#expect(urlComponent?.scheme == GoogleAPI.scheme)
 
         // Validate query items inclusion and value
-        XCTAssertNotNil(urlComponent!.queryItems)
-        XCTAssertTrue(urlComponent!.queryItems!.contains(where: { $0.name == GoogleAPI.includeGrantedScopeKey }))
-        XCTAssertFalse(urlComponent!.queryItems!.contains(where: { $0.name == GoogleAPI.loginHint }))
-        XCTAssertTrue(urlComponent!.queryItems!.contains(where: { $0.value == String(true) }))
+		#expect(urlComponent!.queryItems!.contains(where: { $0.name == GoogleAPI.includeGrantedScopeKey }))
+		#expect(urlComponent!.queryItems!.contains(where: { $0.name == GoogleAPI.loginHint }) == false)
+		#expect(urlComponent!.queryItems!.contains(where: { $0.value == String(true) }))
     }
-
 }