Converts tests to Swift Testing

Sources/GraphQL/Execution/Execute.swift

@@ -53,7 +53,7 @@ public final class ExecutionContext: @unchecked Sendable {
         }
         set {
             // Writes occur sequentially.
-            return errorsQueue.async(flags: .barrier) {
+            return errorsQueue.sync(flags: .barrier) {
                 self._errors = newValue
             }
         }

Sources/GraphQL/Type/Schema.swift

@@ -49,7 +49,7 @@ public final class GraphQLSchema: @unchecked Sendable {
         }
         set {
             // Writes occur sequentially.
-            return validationErrorQueue.async(flags: .barrier) {
+            return validationErrorQueue.sync(flags: .barrier) {
                 self._validationErrors = newValue
             }
         }
@@ -77,7 +77,7 @@ public final class GraphQLSchema: @unchecked Sendable {
         }
         set {
             // Writes occur sequentially.
-            return subTypeMapQueue.async(flags: .barrier) {
+            return subTypeMapQueue.sync(flags: .barrier) {
                 self._subTypeMap = newValue
             }
         }

Tests/GraphQLTests/ExecutionTests/OneOfTests.swift

@@ -1,10 +1,10 @@
 @testable import GraphQL
-import XCTest
+import Testing
 
-class OneOfTests: XCTestCase {
+@Suite struct OneOfTests {
     // MARK: OneOf Input Objects
 
-    func testAcceptsAGoodDefaultValue() async throws {
+    @Test func acceptsAGoodDefaultValue() async throws {
         let query = """
         query ($input: TestInputObject! = {a: "abc"}) {
           test(input: $input) {
@@ -17,9 +17,8 @@ class OneOfTests: XCTestCase {
             schema: getSchema(),
             request: query
         )
-        XCTAssertEqual(
-            result,
-            GraphQLResult(data: [
+        #expect(
+            result == GraphQLResult(data: [
                 "test": [
                     "a": "abc",
                     "b": .null,
@@ -28,7 +27,7 @@ class OneOfTests: XCTestCase {
         )
     }
 
-    func testRejectsABadDefaultValue() async throws {
+    @Test func rejectsABadDefaultValue() async throws {
         let query = """
         query ($input: TestInputObject! = {a: "abc", b: 123}) {
           test(input: $input) {
@@ -41,14 +40,14 @@ class OneOfTests: XCTestCase {
             schema: getSchema(),
             request: query
         )
-        XCTAssertEqual(result.errors.count, 1)
-        XCTAssertEqual(
-            result.errors[0].message,
-            "OneOf Input Object \"TestInputObject\" must specify exactly one key."
+        #expect(result.errors.count == 1)
+        #expect(
+            result.errors[0].message ==
+                "OneOf Input Object \"TestInputObject\" must specify exactly one key."
         )
     }
 
-    func testAcceptsAGoodVariable() async throws {
+    @Test func acceptsAGoodVariable() async throws {
         let query = """
         query ($input: TestInputObject!) {
           test(input: $input) {
@@ -62,9 +61,8 @@ class OneOfTests: XCTestCase {
             request: query,
             variableValues: ["input": ["a": "abc"]]
         )
-        XCTAssertEqual(
-            result,
-            GraphQLResult(data: [
+        #expect(
+            result == GraphQLResult(data: [
                 "test": [
                     "a": "abc",
                     "b": .null,
@@ -73,7 +71,7 @@ class OneOfTests: XCTestCase {
         )
     }
 
-    func testAcceptsAGoodVariableWithAnUndefinedKey() async throws {
+    @Test func acceptsAGoodVariableWithAnUndefinedKey() async throws {
         let query = """
         query ($input: TestInputObject!) {
           test(input: $input) {
@@ -87,9 +85,8 @@ class OneOfTests: XCTestCase {
             request: query,
             variableValues: ["input": ["a": "abc", "b": .undefined]]
         )
-        XCTAssertEqual(
-            result,
-            GraphQLResult(data: [
+        #expect(
+            result == GraphQLResult(data: [
                 "test": [
                     "a": "abc",
                     "b": .null,
@@ -98,7 +95,7 @@ class OneOfTests: XCTestCase {
         )
     }
 
-    func testRejectsAVariableWithMultipleNonNullKeys() async throws {
+    @Test func rejectsAVariableWithMultipleNonNullKeys() async throws {
         let query = """
         query ($input: TestInputObject!) {
           test(input: $input) {
@@ -112,17 +109,16 @@ class OneOfTests: XCTestCase {
             request: query,
             variableValues: ["input": ["a": "abc", "b": 123]]
         )
-        XCTAssertEqual(result.errors.count, 1)
-        XCTAssertEqual(
-            result.errors[0].message,
-            """
+        #expect(result.errors.count == 1)
+        #expect(
+            result.errors[0].message == """
             Variable "$input" got invalid value "{"a":"abc","b":123}".
             Exactly one key must be specified for OneOf type "TestInputObject".
             """
         )
     }
 
-    func testRejectsAVariableWithMultipleNullableKeys() async throws {
+    @Test func rejectsAVariableWithMultipleNullableKeys() async throws {
         let query = """
         query ($input: TestInputObject!) {
           test(input: $input) {
@@ -136,10 +132,9 @@ class OneOfTests: XCTestCase {
             request: query,
             variableValues: ["input": ["a": "abc", "b": .null]]
         )
-        XCTAssertEqual(result.errors.count, 1)
-        XCTAssertEqual(
-            result.errors[0].message,
-            """
+        #expect(result.errors.count == 1)
+        #expect(
+            result.errors[0].message == """
             Variable "$input" got invalid value "{"a":"abc","b":null}".
             Exactly one key must be specified for OneOf type "TestInputObject".
             """

Tests/GraphQLTests/FederationTests/FederationTests.swift

@@ -1,8 +1,8 @@
 @testable import GraphQL
-import XCTest
+import Testing
 
-final class FederationTests: XCTestCase {
-    func testFederationSampleSchema() throws {
+@Suite struct FederationTests {
+    @Test func federationSampleSchema() throws {
         // Confirm that the Apollo test schema can be parsed as expected https://github.com/apollographql/apollo-federation-subgraph-compatibility/blob/main/COMPATIBILITY.md
         let source =
             """
@@ -328,7 +328,7 @@ final class FederationTests: XCTestCase {
         let document = try parse(source: source)
         let printed = print(ast: document)
 
-        XCTAssertEqual(document, expected)
-        XCTAssertEqual(source, printed)
+        #expect(document == expected)
+        #expect(source == printed)
     }
 }

Tests/GraphQLTests/HelloWorldTests/HelloWorldTests.swift

@@ -1,7 +1,7 @@
 @testable import GraphQL
-import XCTest
+import Testing
 
-class HelloWorldTests: XCTestCase {
+@Suite struct HelloWorldTests {
     let schema = try! GraphQLSchema(
         query: GraphQLObjectType(
             name: "RootQueryType",
@@ -16,7 +16,7 @@ class HelloWorldTests: XCTestCase {
         )
     )
 
-    func testHello() async throws {
+    @Test func hello() async throws {
         let query = "{ hello }"
         let expected = GraphQLResult(data: ["hello": "world"])
 
@@ -25,10 +25,10 @@ class HelloWorldTests: XCTestCase {
             request: query
         )
 
-        XCTAssertEqual(result, expected)
+        #expect(result == expected)
     }
 
-    func testBoyhowdy() async throws {
+    @Test func boyhowdy() async throws {
         let query = "{ boyhowdy }"
 
         let expected = GraphQLResult(
@@ -45,10 +45,10 @@ class HelloWorldTests: XCTestCase {
             request: query
         )
 
-        XCTAssertEqual(result, expected)
+        #expect(result == expected)
     }
 
-    func testHelloAsync() async throws {
+    @Test func helloAsync() async throws {
         let query = "{ hello }"
         let expected = GraphQLResult(data: ["hello": "world"])
 
@@ -57,6 +57,6 @@ class HelloWorldTests: XCTestCase {
             request: query
         )
 
-        XCTAssertEqual(result, expected)
+        #expect(result == expected)
     }
 }