Skip to content

Commit bd257ae

Browse files
glbrnttglbrntt
authored
Update tests (#5)
Motivation: Some type names changed in grpc/grpc-swift#2076 and now our tests fail. Modifications: - Update tests Result: Tests pass
1 parent f89495e commit bd257ae

File tree

1 file changed

+32
-32
lines changed

1 file changed

+32
-32
lines changed

‎Tests/GRPCProtobufCodeGenTests/ProtobufCodeGeneratorTests.swift‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -92,20 +92,20 @@ final class ProtobufCodeGeneratorTests: XCTestCase {
9292
internal protocol Hello_World_Greeter_ClientProtocol: Sendable {
9393
/// Sends a greeting.
9494
func sayHello<R>(
95-
request: GRPCCore.ClientRequest.Single<Hello_World_HelloRequest>,
95+
request: GRPCCore.ClientRequest<Hello_World_HelloRequest>,
9696
serializer: some GRPCCore.MessageSerializer<Hello_World_HelloRequest>,
9797
deserializer: some GRPCCore.MessageDeserializer<Hello_World_HelloReply>,
9898
options: GRPCCore.CallOptions,
99-
_ body: @Sendable @escaping (GRPCCore.ClientResponse.Single<Hello_World_HelloReply>) async throws -> R
99+
_ body: @Sendable @escaping (GRPCCore.ClientResponse<Hello_World_HelloReply>) async throws -> R
100100
) async throws -> R where R: Sendable
101101
}
102102
103103
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
104104
extension Hello_World_Greeter.ClientProtocol {
105105
internal func sayHello<R>(
106-
request: GRPCCore.ClientRequest.Single<Hello_World_HelloRequest>,
106+
request: GRPCCore.ClientRequest<Hello_World_HelloRequest>,
107107
options: GRPCCore.CallOptions = .defaults,
108-
_ body: @Sendable @escaping (GRPCCore.ClientResponse.Single<Hello_World_HelloReply>) async throws -> R = {
108+
_ body: @Sendable @escaping (GRPCCore.ClientResponse<Hello_World_HelloReply>) async throws -> R = {
109109
try $0.message
110110
}
111111
) async throws -> R where R: Sendable {
@@ -126,11 +126,11 @@ final class ProtobufCodeGeneratorTests: XCTestCase {
126126
_ message: Hello_World_HelloRequest,
127127
metadata: GRPCCore.Metadata = [:],
128128
options: GRPCCore.CallOptions = .defaults,
129-
onResponse handleResponse: @Sendable @escaping (GRPCCore.ClientResponse.Single<Hello_World_HelloReply>) async throws -> Result = {
129+
onResponse handleResponse: @Sendable @escaping (GRPCCore.ClientResponse<Hello_World_HelloReply>) async throws -> Result = {
130130
try $0.message
131131
}
132132
) async throws -> Result where Result: Sendable {
133-
let request = GRPCCore.ClientRequest.Single<Hello_World_HelloRequest>(
133+
let request = GRPCCore.ClientRequest<Hello_World_HelloRequest>(
134134
message: message,
135135
metadata: metadata
136136
)
@@ -153,11 +153,11 @@ final class ProtobufCodeGeneratorTests: XCTestCase {
153153
154154
/// Sends a greeting.
155155
internal func sayHello<R>(
156-
request: GRPCCore.ClientRequest.Single<Hello_World_HelloRequest>,
156+
request: GRPCCore.ClientRequest<Hello_World_HelloRequest>,
157157
serializer: some GRPCCore.MessageSerializer<Hello_World_HelloRequest>,
158158
deserializer: some GRPCCore.MessageDeserializer<Hello_World_HelloReply>,
159159
options: GRPCCore.CallOptions = .defaults,
160-
_ body: @Sendable @escaping (GRPCCore.ClientResponse.Single<Hello_World_HelloReply>) async throws -> R = {
160+
_ body: @Sendable @escaping (GRPCCore.ClientResponse<Hello_World_HelloReply>) async throws -> R = {
161161
try $0.message
162162
}
163163
) async throws -> R where R: Sendable {
@@ -242,9 +242,9 @@ final class ProtobufCodeGeneratorTests: XCTestCase {
242242
public protocol Helloworld_Greeter_StreamingServiceProtocol: GRPCCore.RegistrableRPCService {
243243
/// Sends a greeting.
244244
func sayHello(
245-
request: GRPCCore.ServerRequest.Stream<Helloworld_HelloRequest>,
245+
request: GRPCCore.StreamingServerRequest<Helloworld_HelloRequest>,
246246
context: GRPCCore.ServerContext
247-
) async throws -> GRPCCore.ServerResponse.Stream<Helloworld_HelloReply>
247+
) async throws -> GRPCCore.StreamingServerResponse<Helloworld_HelloReply>
248248
}
249249
250250
/// Conformance to `GRPCCore.RegistrableRPCService`.
@@ -271,23 +271,23 @@ final class ProtobufCodeGeneratorTests: XCTestCase {
271271
public protocol Helloworld_Greeter_ServiceProtocol: Helloworld_Greeter.StreamingServiceProtocol {
272272
/// Sends a greeting.
273273
func sayHello(
274-
request: GRPCCore.ServerRequest.Single<Helloworld_HelloRequest>,
274+
request: GRPCCore.ServerRequest<Helloworld_HelloRequest>,
275275
context: GRPCCore.ServerContext
276-
) async throws -> GRPCCore.ServerResponse.Single<Helloworld_HelloReply>
276+
) async throws -> GRPCCore.ServerResponse<Helloworld_HelloReply>
277277
}
278278
279279
/// Partial conformance to `Helloworld_Greeter_StreamingServiceProtocol`.
280280
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
281281
extension Helloworld_Greeter.ServiceProtocol {
282282
public func sayHello(
283-
request: GRPCCore.ServerRequest.Stream<Helloworld_HelloRequest>,
283+
request: GRPCCore.StreamingServerRequest<Helloworld_HelloRequest>,
284284
context: GRPCCore.ServerContext
285-
) async throws -> GRPCCore.ServerResponse.Stream<Helloworld_HelloReply> {
285+
) async throws -> GRPCCore.StreamingServerResponse<Helloworld_HelloReply> {
286286
let response = try await self.sayHello(
287-
request: GRPCCore.ServerRequest.Single(stream: request),
287+
request: GRPCCore.ServerRequest(stream: request),
288288
context: context
289289
)
290-
return GRPCCore.ServerResponse.Stream(single: response)
290+
return GRPCCore.StreamingServerResponse(single: response)
291291
}
292292
}
293293
"""
@@ -365,9 +365,9 @@ final class ProtobufCodeGeneratorTests: XCTestCase {
365365
package protocol Greeter_StreamingServiceProtocol: GRPCCore.RegistrableRPCService {
366366
/// Sends a greeting.
367367
func sayHello(
368-
request: GRPCCore.ServerRequest.Stream<HelloRequest>,
368+
request: GRPCCore.StreamingServerRequest<HelloRequest>,
369369
context: GRPCCore.ServerContext
370-
) async throws -> GRPCCore.ServerResponse.Stream<HelloReply>
370+
) async throws -> GRPCCore.StreamingServerResponse<HelloReply>
371371
}
372372
373373
/// Conformance to `GRPCCore.RegistrableRPCService`.
@@ -394,23 +394,23 @@ final class ProtobufCodeGeneratorTests: XCTestCase {
394394
package protocol Greeter_ServiceProtocol: Greeter.StreamingServiceProtocol {
395395
/// Sends a greeting.
396396
func sayHello(
397-
request: GRPCCore.ServerRequest.Single<HelloRequest>,
397+
request: GRPCCore.ServerRequest<HelloRequest>,
398398
context: GRPCCore.ServerContext
399-
) async throws -> GRPCCore.ServerResponse.Single<HelloReply>
399+
) async throws -> GRPCCore.ServerResponse<HelloReply>
400400
}
401401
402402
/// Partial conformance to `Greeter_StreamingServiceProtocol`.
403403
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
404404
extension Greeter.ServiceProtocol {
405405
package func sayHello(
406-
request: GRPCCore.ServerRequest.Stream<HelloRequest>,
406+
request: GRPCCore.StreamingServerRequest<HelloRequest>,
407407
context: GRPCCore.ServerContext
408-
) async throws -> GRPCCore.ServerResponse.Stream<HelloReply> {
408+
) async throws -> GRPCCore.StreamingServerResponse<HelloReply> {
409409
let response = try await self.sayHello(
410-
request: GRPCCore.ServerRequest.Single(stream: request),
410+
request: GRPCCore.ServerRequest(stream: request),
411411
context: context
412412
)
413-
return GRPCCore.ServerResponse.Stream(single: response)
413+
return GRPCCore.StreamingServerResponse(single: response)
414414
}
415415
}
416416
@@ -419,20 +419,20 @@ final class ProtobufCodeGeneratorTests: XCTestCase {
419419
package protocol Greeter_ClientProtocol: Sendable {
420420
/// Sends a greeting.
421421
func sayHello<R>(
422-
request: GRPCCore.ClientRequest.Single<HelloRequest>,
422+
request: GRPCCore.ClientRequest<HelloRequest>,
423423
serializer: some GRPCCore.MessageSerializer<HelloRequest>,
424424
deserializer: some GRPCCore.MessageDeserializer<HelloReply>,
425425
options: GRPCCore.CallOptions,
426-
_ body: @Sendable @escaping (GRPCCore.ClientResponse.Single<HelloReply>) async throws -> R
426+
_ body: @Sendable @escaping (GRPCCore.ClientResponse<HelloReply>) async throws -> R
427427
) async throws -> R where R: Sendable
428428
}
429429
430430
@available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *)
431431
extension Greeter.ClientProtocol {
432432
package func sayHello<R>(
433-
request: GRPCCore.ClientRequest.Single<HelloRequest>,
433+
request: GRPCCore.ClientRequest<HelloRequest>,
434434
options: GRPCCore.CallOptions = .defaults,
435-
_ body: @Sendable @escaping (GRPCCore.ClientResponse.Single<HelloReply>) async throws -> R = {
435+
_ body: @Sendable @escaping (GRPCCore.ClientResponse<HelloReply>) async throws -> R = {
436436
try $0.message
437437
}
438438
) async throws -> R where R: Sendable {
@@ -453,11 +453,11 @@ final class ProtobufCodeGeneratorTests: XCTestCase {
453453
_ message: HelloRequest,
454454
metadata: GRPCCore.Metadata = [:],
455455
options: GRPCCore.CallOptions = .defaults,
456-
onResponse handleResponse: @Sendable @escaping (GRPCCore.ClientResponse.Single<HelloReply>) async throws -> Result = {
456+
onResponse handleResponse: @Sendable @escaping (GRPCCore.ClientResponse<HelloReply>) async throws -> Result = {
457457
try $0.message
458458
}
459459
) async throws -> Result where Result: Sendable {
460-
let request = GRPCCore.ClientRequest.Single<HelloRequest>(
460+
let request = GRPCCore.ClientRequest<HelloRequest>(
461461
message: message,
462462
metadata: metadata
463463
)
@@ -480,11 +480,11 @@ final class ProtobufCodeGeneratorTests: XCTestCase {
480480
481481
/// Sends a greeting.
482482
package func sayHello<R>(
483-
request: GRPCCore.ClientRequest.Single<HelloRequest>,
483+
request: GRPCCore.ClientRequest<HelloRequest>,
484484
serializer: some GRPCCore.MessageSerializer<HelloRequest>,
485485
deserializer: some GRPCCore.MessageDeserializer<HelloReply>,
486486
options: GRPCCore.CallOptions = .defaults,
487-
_ body: @Sendable @escaping (GRPCCore.ClientResponse.Single<HelloReply>) async throws -> R = {
487+
_ body: @Sendable @escaping (GRPCCore.ClientResponse<HelloReply>) async throws -> R = {
488488
try $0.message
489489
}
490490
) async throws -> R where R: Sendable {

0 commit comments

Comments
 (0)