Skip to content

Commit cf2b60d

Browse files
committed
Try fixing tests
1 parent 386ac4a commit cf2b60d

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

Tests/PackageCollectionsSigningTests/KeyTests+RSA.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ class RSAKeyTests: XCTestCase {
2727
}
2828

2929
func testPublicKeyFromPEM() throws {
30-
XCTAssertNoThrow(try RSAPublicKey(pem: rsaPublicKey.bytes))
30+
XCTAssertNoThrow(try RSAPublicKey(pem: rsaPublicKey.data))
3131
}
3232

3333
func testPrivateKeyFromPEM() throws {
34-
XCTAssertNoThrow(try RSAPrivateKey(pem: rsaPrivateKey.bytes))
34+
XCTAssertNoThrow(try RSAPrivateKey(pem: rsaPrivateKey.data))
3535
}
3636
}

Tests/PackageCollectionsSigningTests/SigningTests+RSAKey.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@ import XCTest
1515

1616
class RSAKeySigningTests: XCTestCase {
1717
func test_signAndValidate_happyCase() throws {
18-
let privateKey = try RSAPrivateKey(pem: rsaPrivateKey.bytes)
19-
let publicKey = try RSAPublicKey(pem: rsaPublicKey.bytes)
18+
let privateKey = try RSAPrivateKey(pem: rsaPrivateKey.data)
19+
let publicKey = try RSAPublicKey(pem: rsaPublicKey.data)
2020

2121
let message = try JSONEncoder().encode(["foo": "bar"])
2222
let signature = try privateKey.sign(message: message)
2323
XCTAssertTrue(try publicKey.isValidSignature(signature, for: message))
2424
}
2525

2626
func test_signAndValidate_mismatch() throws {
27-
let privateKey = try RSAPrivateKey(pem: rsaPrivateKey.bytes)
28-
let publicKey = try RSAPublicKey(pem: rsaPublicKey.bytes)
27+
let privateKey = try RSAPrivateKey(pem: rsaPrivateKey.data)
28+
let publicKey = try RSAPublicKey(pem: rsaPublicKey.data)
2929

3030
let jsonEncoder = JSONEncoder()
3131
let message = try jsonEncoder.encode(["foo": "bar"])

Tests/PackageCollectionsSigningTests/Utilities.swift

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
See http://swift.org/CONTRIBUTORS.txt for Swift project authors
99
*/
1010

11+
import struct Foundation.Data
12+
13+
@testable import PackageCollectionsSigning
14+
1115
let ecPrivateKey = """
1216
-----BEGIN EC PRIVATE KEY-----
1317
MHcCAQEEIMFnwA1gjIFnFZim4B2QvoXJIG2L4B8nH1BBZFlotA24oAoGCCqGSM49
@@ -69,4 +73,8 @@ extension String {
6973
var bytes: [UInt8] {
7074
[UInt8](self.utf8)
7175
}
76+
77+
var data: Data {
78+
self.data(using: .utf8)!.copyBytes()
79+
}
7280
}

0 commit comments

Comments
 (0)