From bff5333d67a5df6195d08e9da93433ed0a01e517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= Date: Thu, 12 Dec 2024 06:28:19 +0100 Subject: [PATCH] chore: simplify testing panics --- mssql/mssql_test.go | 21 +++++++++------------ postgres/postgres_test.go | 13 +++++-------- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/mssql/mssql_test.go b/mssql/mssql_test.go index 4c9f1cee..f2928d9f 100644 --- a/mssql/mssql_test.go +++ b/mssql/mssql_test.go @@ -231,18 +231,15 @@ func Test_MSSQL_Non_UTF8(t *testing.T) { } func Test_SslRequiredMode(t *testing.T) { - defer func() { - if recover() == nil { - require.Equalf(t, true, nil, "Connection was established with a `require`") - } - }() - _ = New(Config{ - Database: "fiber", - Username: "username", - Password: "password", - Reset: true, - SslMode: "require", - }) + require.Panics(t, func() { + _ = New(Config{ + Database: "fiber", + Username: "username", + Password: "password", + Reset: true, + SslMode: "require", + }) + }, "Expected panic when connecting to MSSQL with SSL mode set to require") } func Test_MSSQL_Close(t *testing.T) { diff --git a/postgres/postgres_test.go b/postgres/postgres_test.go index 5add856d..2e9ff846 100644 --- a/postgres/postgres_test.go +++ b/postgres/postgres_test.go @@ -236,14 +236,11 @@ func Test_Postgres_Non_UTF8(t *testing.T) { } func Test_SslRequiredMode(t *testing.T) { - defer func() { - if recover() == nil { - require.Equalf(t, true, nil, "Connection was established with a `require`") - } - }() - _ = New(Config{ - Reset: true, - }) + require.Panics(t, func() { + _ = New(Config{ + Reset: true, + }) + }, "Expected panic when connecting to Postgres with SSL mode set to require") } func Test_Postgres_Conn(t *testing.T) {