test: Updates tests for required sendability conformance

NeedleInAJayStack · NeedleInAJayStack · commit a36186cbbcc0 · 2025-08-10T23:41:50.000-06:00
diff --git a/Tests/GraphitiTests/HelloWorldTests/HelloWorldAsyncTests.swift b/Tests/GraphitiTests/HelloWorldTests/HelloWorldAsyncTests.swift
@@ -19,23 +19,23 @@ extension HelloResolver {
     func subscribeUser(
         context _: HelloContext,
         arguments _: NoArguments
-    ) -> AsyncThrowingStream<User, Error> {
-        pubsub.subscribe()
+    ) async -> AsyncThrowingStream<User, Error> {
+        await pubsub.subscribe()
     }
 
     func futureSubscribeUser(
         context _: HelloContext,
         arguments _: NoArguments
-    ) -> AsyncThrowingStream<User, Error> {
-        pubsub.subscribe()
+    ) async -> AsyncThrowingStream<User, Error> {
+        await pubsub.subscribe()
     }
 
     func asyncSubscribeUser(
         context _: HelloContext,
         arguments _: NoArguments
     ) async -> AsyncThrowingStream<User, Error> {
         return await Task {
-            pubsub.subscribe()
+            await pubsub.subscribe()
         }.value
     }
 }
@@ -168,7 +168,7 @@ class HelloWorldAsyncTests: XCTestCase {
         ).get()
         var iterator = subscription.makeAsyncIterator()
 
-        pubsub.publish(event: User(id: "124", name: "Jerry", friends: nil))
+        await pubsub.publish(event: User(id: "124", name: "Jerry", friends: nil))
 
         let result = try await iterator.next()
         XCTAssertEqual(
@@ -201,7 +201,7 @@ class HelloWorldAsyncTests: XCTestCase {
         ).get()
         var iterator = subscription.makeAsyncIterator()
 
-        pubsub.publish(event: User(id: "124", name: "Jerry", friends: nil))
+        await pubsub.publish(event: User(id: "124", name: "Jerry", friends: nil))
 
         let result = try await iterator.next()
         XCTAssertEqual(
@@ -234,7 +234,7 @@ class HelloWorldAsyncTests: XCTestCase {
         ).get()
         var iterator = subscription.makeAsyncIterator()
 
-        pubsub.publish(event: User(id: "124", name: "Jerry", friends: nil))
+        await pubsub.publish(event: User(id: "124", name: "Jerry", friends: nil))
 
         let result = try await iterator.next()
         XCTAssertEqual(
@@ -265,7 +265,7 @@ class HelloWorldAsyncTests: XCTestCase {
         ).get()
         var iterator = subscription.makeAsyncIterator()
 
-        pubsub.publish(event: User(id: "124", name: "Jerry", friends: nil))
+        await pubsub.publish(event: User(id: "124", name: "Jerry", friends: nil))
 
         let result = try await iterator.next()
         XCTAssertEqual(
@@ -282,7 +282,7 @@ class HelloWorldAsyncTests: XCTestCase {
 
 /// A very simple publish/subscriber used for testing
 @available(macOS 12, iOS 15, watchOS 8, tvOS 15, *)
-class SimplePubSub<T> {
+actor SimplePubSub<T: Sendable>: Sendable {
     private var subscribers: [Subscriber<T>]
 
     init() {
@@ -316,7 +316,7 @@ class SimplePubSub<T> {
     }
 }
 
-struct Subscriber<T> {
+struct Subscriber<T: Sendable> {
     let callback: (T) -> Void
     let cancel: () -> Void
 }
diff --git a/Tests/GraphitiTests/HelloWorldTests/HelloWorldTests.swift b/Tests/GraphitiTests/HelloWorldTests/HelloWorldTests.swift
@@ -56,7 +56,7 @@ struct UserEvent {
     let user: User
 }
 
-final class HelloContext {
+final class HelloContext: Sendable {
     func hello() -> String {
         "world"
     }
diff --git a/Tests/GraphitiTests/ScalarTests.swift b/Tests/GraphitiTests/ScalarTests.swift
@@ -656,7 +656,7 @@ class ScalarTests: XCTestCase {
     }
 }
 
-private class TestAPI<Resolver, ContextType>: API {
+private class TestAPI<Resolver: Sendable, ContextType: Sendable>: API {
     public let resolver: Resolver
     public let schema: Schema<Resolver, ContextType>
 
diff --git a/Tests/GraphitiTests/SchemaTests.swift b/Tests/GraphitiTests/SchemaTests.swift
@@ -158,7 +158,7 @@ class SchemaTests: XCTestCase {
     }
 }
 
-private class TestAPI<Resolver, ContextType>: API {
+private class TestAPI<Resolver: Sendable, ContextType: Sendable>: API {
     public let resolver: Resolver
     public let schema: Schema<Resolver, ContextType>
 
diff --git a/Tests/GraphitiTests/StarWarsAPI/StarWarsContext.swift b/Tests/GraphitiTests/StarWarsAPI/StarWarsContext.swift
@@ -5,8 +5,8 @@
  * fetching this data from a backend service rather than from hardcoded
  * values in a more complex demo.
  */
-public final class StarWarsContext {
-    private static var tatooine = Planet(
+public final class StarWarsContext: Sendable {
+    private static let tatooine = Planet(
         id: "10001",
         name: "Tatooine",
         diameter: 10465,
@@ -15,7 +15,7 @@ public final class StarWarsContext {
         residents: []
     )
 
-    private static var alderaan = Planet(
+    private static let alderaan = Planet(
         id: "10002",
         name: "Alderaan",
         diameter: 12500,
@@ -24,76 +24,76 @@ public final class StarWarsContext {
         residents: []
     )
 
-    private static var planetData: [String: Planet] = [
+    private static let planetData: [String: Planet] = [
         "10001": tatooine,
         "10002": alderaan,
     ]
 
-    private static var luke = Human(
+    private static let luke = Human(
         id: "1000",
         name: "Luke Skywalker",
         friends: ["1002", "1003", "2000", "2001"],
         appearsIn: [.newHope, .empire, .jedi],
         homePlanet: tatooine
     )
 
-    private static var vader = Human(
+    private static let vader = Human(
         id: "1001",
         name: "Darth Vader",
         friends: ["1004"],
         appearsIn: [.newHope, .empire, .jedi],
         homePlanet: tatooine
     )
 
-    private static var han = Human(
+    private static let han = Human(
         id: "1002",
         name: "Han Solo",
         friends: ["1000", "1003", "2001"],
         appearsIn: [.newHope, .empire, .jedi],
         homePlanet: alderaan
     )
 
-    private static var leia = Human(
+    private static let leia = Human(
         id: "1003",
         name: "Leia Organa",
         friends: ["1000", "1002", "2000", "2001"],
         appearsIn: [.newHope, .empire, .jedi],
         homePlanet: alderaan
     )
 
-    private static var tarkin = Human(
+    private static let tarkin = Human(
         id: "1004",
         name: "Wilhuff Tarkin",
         friends: ["1001"],
         appearsIn: [.newHope],
         homePlanet: alderaan
     )
 
-    private static var humanData: [String: Human] = [
+    private static let humanData: [String: Human] = [
         "1000": luke,
         "1001": vader,
         "1002": han,
         "1003": leia,
         "1004": tarkin,
     ]
 
-    private static var c3po = Droid(
+    private static let c3po = Droid(
         id: "2000",
         name: "C-3PO",
         friends: ["1000", "1002", "1003", "2001"],
         appearsIn: [.newHope, .empire, .jedi],
         primaryFunction: "Protocol"
     )
 
-    private static var r2d2 = Droid(
+    private static let r2d2 = Droid(
         id: "2001",
         name: "R2-D2",
         friends: ["1000", "1002", "1003"],
         appearsIn: [.newHope, .empire, .jedi],
         primaryFunction: "Astromech"
     )
 
-    private static var droidData: [String: Droid] = [
+    private static let droidData: [String: Droid] = [
         "2000": c3po,
         "2001": r2d2,
     ]
diff --git a/Tests/GraphitiTests/StarWarsAPI/StarWarsEntities.swift b/Tests/GraphitiTests/StarWarsAPI/StarWarsEntities.swift
@@ -1,17 +1,17 @@
-public enum Episode: String, CaseIterable, Codable {
+public enum Episode: String, CaseIterable, Codable, Sendable {
     case newHope = "NEWHOPE"
     case empire = "EMPIRE"
     case jedi = "JEDI"
 }
 
-public protocol Character {
+public protocol Character: Sendable {
     var id: String { get }
     var name: String { get }
     var friends: [String] { get }
     var appearsIn: [Episode] { get }
 }
 
-public protocol SearchResult {}
+public protocol SearchResult: Sendable {}
 
 public struct Planet: SearchResult {
     public let id: String
diff --git a/Tests/GraphitiTests/StarWarsAPI/StarWarsResolver.swift b/Tests/GraphitiTests/StarWarsAPI/StarWarsResolver.swift
@@ -30,34 +30,34 @@ public extension Droid {
     }
 }
 
-public struct StarWarsResolver {
+public struct StarWarsResolver: Sendable {
     public init() {}
 
-    public struct HeroArguments: Codable {
+    public struct HeroArguments: Codable, Sendable {
         public let episode: Episode?
     }
 
     public func hero(context: StarWarsContext, arguments: HeroArguments) -> Character {
         context.getHero(of: arguments.episode)
     }
 
-    public struct HumanArguments: Codable {
+    public struct HumanArguments: Codable, Sendable {
         public let id: String
     }
 
     public func human(context: StarWarsContext, arguments: HumanArguments) -> Human? {
         context.getHuman(id: arguments.id)
     }
 
-    public struct DroidArguments: Codable {
+    public struct DroidArguments: Codable, Sendable {
         public let id: String
     }
 
     public func droid(context: StarWarsContext, arguments: DroidArguments) -> Droid? {
         context.getDroid(id: arguments.id)
     }
 
-    public struct SearchArguments: Codable {
+    public struct SearchArguments: Codable, Sendable {
         public let query: String
     }
 
diff --git a/Tests/GraphitiTests/ValidationRulesTests.swift b/Tests/GraphitiTests/ValidationRulesTests.swift
@@ -44,7 +44,7 @@ class ValidationRulesTests: XCTestCase {
     }
 }
 
-private class TestAPI<Resolver, ContextType>: API {
+private class TestAPI<Resolver: Sendable, ContextType: Sendable>: API {
     public let resolver: Resolver
     public let schema: Schema<Resolver, ContextType>
 

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ struct UserEvent {`
`56`	`56`	`let user: User`
`57`	`57`	`}`
`58`	`58`
`59`		`-final class HelloContext {`
	`59`	`+final class HelloContext: Sendable {`
`60`	`60`	`func hello() -> String {`
`61`	`61`	`"world"`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -656,7 +656,7 @@ class ScalarTests: XCTestCase {`
`656`	`656`	`}`
`657`	`657`	`}`
`658`	`658`
`659`		`-private class TestAPI<Resolver, ContextType>: API {`
	`659`	`+private class TestAPI<Resolver: Sendable, ContextType: Sendable>: API {`
`660`	`660`	`public let resolver: Resolver`
`661`	`661`	`public let schema: Schema<Resolver, ContextType>`
`662`	`662`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ class SchemaTests: XCTestCase {`
`158`	`158`	`}`
`159`	`159`	`}`
`160`	`160`
`161`		`-private class TestAPI<Resolver, ContextType>: API {`
	`161`	`+private class TestAPI<Resolver: Sendable, ContextType: Sendable>: API {`
`162`	`162`	`public let resolver: Resolver`
`163`	`163`	`public let schema: Schema<Resolver, ContextType>`
`164`	`164`
Original file line number	Diff line number	Diff line change
`@@ -30,34 +30,34 @@ public extension Droid {`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`
`33`		`-public struct StarWarsResolver {`
	`33`	`+public struct StarWarsResolver: Sendable {`
`34`	`34`	`public init() {}`
`35`	`35`
`36`		`- public struct HeroArguments: Codable {`
	`36`	`+ public struct HeroArguments: Codable, Sendable {`
`37`	`37`	`public let episode: Episode?`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`public func hero(context: StarWarsContext, arguments: HeroArguments) -> Character {`
`41`	`41`	`context.getHero(of: arguments.episode)`
`42`	`42`	`}`
`43`	`43`
`44`		`- public struct HumanArguments: Codable {`
	`44`	`+ public struct HumanArguments: Codable, Sendable {`
`45`	`45`	`public let id: String`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`public func human(context: StarWarsContext, arguments: HumanArguments) -> Human? {`
`49`	`49`	`context.getHuman(id: arguments.id)`
`50`	`50`	`}`
`51`	`51`
`52`		`- public struct DroidArguments: Codable {`
	`52`	`+ public struct DroidArguments: Codable, Sendable {`
`53`	`53`	`public let id: String`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`public func droid(context: StarWarsContext, arguments: DroidArguments) -> Droid? {`
`57`	`57`	`context.getDroid(id: arguments.id)`
`58`	`58`	`}`
`59`	`59`
`60`		`- public struct SearchArguments: Codable {`
	`60`	`+ public struct SearchArguments: Codable, Sendable {`
`61`	`61`	`public let query: String`
`62`	`62`	`}`
`63`	`63`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ class ValidationRulesTests: XCTestCase {`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`
`47`		`-private class TestAPI<Resolver, ContextType>: API {`
	`47`	`+private class TestAPI<Resolver: Sendable, ContextType: Sendable>: API {`
`48`	`48`	`public let resolver: Resolver`
`49`	`49`	`public let schema: Schema<Resolver, ContextType>`
`50`	`50`