Skip to content

Commit d5e95ce

Browse files
committed
Fix tests
1 parent 46450e2 commit d5e95ce

File tree

2 files changed

+17
-18
lines changed

2 files changed

+17
-18
lines changed

Sources/GRPCNIOTransportCore/TLSConfig.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ public enum TLSConfig: Sendable {
3030

3131
/// A description of where a certificate is coming from: either a byte array or a file.
3232
/// The serialization format is specified by ``TLSConfig/SerializationFormat``.
33-
public struct CertificateSource: Sendable {
34-
package enum Wrapped {
33+
public struct CertificateSource: Sendable, Equatable {
34+
package enum Wrapped: Equatable {
3535
case file(path: String, format: SerializationFormat)
3636
case bytes(bytes: [UInt8], format: SerializationFormat)
3737
}
@@ -90,8 +90,8 @@ public enum TLSConfig: Sendable {
9090
}
9191

9292
/// A description of where the trust roots are coming from: either a custom certificate chain, or the system default trust store.
93-
public struct TrustRootsSource: Sendable {
94-
package enum Wrapped {
93+
public struct TrustRootsSource: Sendable, Equatable {
94+
package enum Wrapped: Equatable {
9595
case certificates([CertificateSource])
9696
case systemDefault
9797
}
@@ -113,8 +113,8 @@ public enum TLSConfig: Sendable {
113113
}
114114

115115
/// How to verify certificates.
116-
public struct CertificateVerification: Sendable {
117-
package enum Wrapped {
116+
public struct CertificateVerification: Sendable, Equatable {
117+
package enum Wrapped: Equatable {
118118
case doNotVerify
119119
case fullVerification
120120
case noHostnameVerification

Tests/GRPCNIOTransportHTTP2Tests/HTTP2TransportNIOTransportServicesTests.swift

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -199,11 +199,8 @@ final class HTTP2TransportNIOTransportServicesTests: XCTestCase {
199199
}
200200

201201
func testServerConfig_Defaults() throws {
202-
try XCTSkipIf(true)
203-
204-
let identityProvider = Self.loadIdentity
205202
let grpcTLSConfig = HTTP2ServerTransport.TransportServices.Config.TLS.defaults(
206-
identityProvider: identityProvider
203+
identityProvider: Self.loadIdentity
207204
)
208205
let grpcConfig = HTTP2ServerTransport.TransportServices.Config.defaults(
209206
transportSecurity: .tls(grpcTLSConfig)
@@ -213,17 +210,15 @@ final class HTTP2TransportNIOTransportServicesTests: XCTestCase {
213210
XCTAssertEqual(grpcConfig.connection, HTTP2ServerTransport.Config.Connection.defaults)
214211
XCTAssertEqual(grpcConfig.http2, HTTP2ServerTransport.Config.HTTP2.defaults)
215212
XCTAssertEqual(grpcConfig.rpc, HTTP2ServerTransport.Config.RPC.defaults)
216-
XCTAssertEqual(try grpcTLSConfig.identityProvider(), try identityProvider())
213+
214+
XCTAssertNotNil(grpcTLSConfig.identityProvider)
215+
XCTAssertEqual(grpcTLSConfig.trustRoots, .systemDefault)
216+
XCTAssertEqual(grpcTLSConfig.clientCertificateVerification, .noVerification)
217217
XCTAssertEqual(grpcTLSConfig.requireALPN, false)
218218
}
219219

220220
func testClientConfig_Defaults() throws {
221-
try XCTSkipIf(true)
222-
223-
let identityProvider = Self.loadIdentity
224-
let grpcTLSConfig = HTTP2ClientTransport.TransportServices.Config.TLS(
225-
identityProvider: identityProvider
226-
)
221+
let grpcTLSConfig = HTTP2ClientTransport.TransportServices.Config.TLS.defaults()
227222
let grpcConfig = HTTP2ClientTransport.TransportServices.Config.defaults(
228223
transportSecurity: .tls(grpcTLSConfig)
229224
)
@@ -232,7 +227,11 @@ final class HTTP2TransportNIOTransportServicesTests: XCTestCase {
232227
XCTAssertEqual(grpcConfig.connection, HTTP2ClientTransport.Config.Connection.defaults)
233228
XCTAssertEqual(grpcConfig.http2, HTTP2ClientTransport.Config.HTTP2.defaults)
234229
XCTAssertEqual(grpcConfig.backoff, HTTP2ClientTransport.Config.Backoff.defaults)
235-
XCTAssertEqual(try grpcTLSConfig.identityProvider(), try identityProvider())
230+
231+
XCTAssertNil(grpcTLSConfig.identityProvider)
232+
XCTAssertNil(grpcTLSConfig.serverHostname)
233+
XCTAssertEqual(grpcTLSConfig.serverCertificateVerification, .fullVerification)
234+
XCTAssertEqual(grpcTLSConfig.trustRoots, .systemDefault)
236235
}
237236
}
238237
#endif

0 commit comments

Comments
 (0)