Skip to content

Commit 3830928

Browse files
authored
Make PostgresNIO.testJSONBSerialize non throwing (#140)
1 parent 7c52814 commit 3830928

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

Tests/PostgresNIOTests/PostgresNIOTests.swift

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -555,27 +555,33 @@ final class PostgresNIOTests: XCTestCase {
555555
XCTAssertEqual(rows[0].column("bytes")?.bytes, [1, 2, 3])
556556
}
557557

558-
func testJSONBSerialize() throws {
558+
func testJSONBSerialize() {
559559
struct Object: Codable {
560560
let foo: Int
561561
let bar: Int
562562
}
563563

564-
let conn = try PostgresConnection.test(on: eventLoop).wait()
565-
defer { try! conn.close().wait() }
564+
var conn: PostgresConnection?
565+
XCTAssertNoThrow(conn = try PostgresConnection.test(on: eventLoop).wait())
566+
defer { XCTAssertNoThrow(try conn?.close().wait()) }
566567
do {
567-
let postgresData = try PostgresData(jsonb: Object(foo: 1, bar: 2))
568-
let rows = try conn.query("select $1::jsonb as jsonb", [postgresData]).wait()
568+
var postgresData: PostgresData?
569+
XCTAssertNoThrow(postgresData = try PostgresData(jsonb: Object(foo: 1, bar: 2)))
570+
var rows: PostgresQueryResult?
571+
XCTAssertNoThrow(rows = try conn?.query("select $1::jsonb as jsonb", [XCTUnwrap(postgresData)]).wait())
569572

570-
let object = try rows[0].column("jsonb")?.jsonb(as: Object.self)
573+
var object: Object?
574+
XCTAssertNoThrow(object = try rows?.first?.column("jsonb")?.jsonb(as: Object.self))
571575
XCTAssertEqual(object?.foo, 1)
572576
XCTAssertEqual(object?.bar, 2)
573577
}
574578

575579
do {
576-
let rows = try conn.query("select jsonb_build_object('foo',1,'bar',2) as jsonb").wait()
580+
var rows: PostgresQueryResult?
581+
XCTAssertNoThrow(rows = try conn?.query("select jsonb_build_object('foo',1,'bar',2) as jsonb").wait())
577582

578-
let object = try rows[0].column("jsonb")?.jsonb(as: Object.self)
583+
var object: Object?
584+
XCTAssertNoThrow(object = try rows?.first?.column("jsonb")?.jsonb(as: Object.self))
579585
XCTAssertEqual(object?.foo, 1)
580586
XCTAssertEqual(object?.bar, 2)
581587
}

0 commit comments

Comments
 (0)