Skip to content

Commit cefac6c

Browse files
justing-bqjusting-bq
authored
Rework assertions in connection_test
1 parent 9ee66dc commit cefac6c

File tree

1 file changed

+33
-32
lines changed

1 file changed

+33
-32
lines changed

‎cpp/src/arrow/flight/sql/odbc/tests/connection_test.cc‎

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include <sqltypes.h>
2525
#include <sqlucode.h>
2626

27+
#include "gmock/gmock.h"
2728
#include "gtest/gtest.h"
2829

2930
namespace arrow::flight::sql::odbc {
@@ -35,7 +36,7 @@ TEST(SQLAllocHandle, TestSQLAllocHandleEnv) {
3536
// Allocate an environment handle
3637
SQLAllocHandle(SQL_HANDLE_ENV, SQL_NULL_HANDLE, &env);
3738

38-
EXPECT_TRUE(env != NULL);
39+
EXPECT_THAT(env, ::testing::NotNull());
3940
}
4041

4142
TEST(SQLAllocEnv, TestSQLAllocEnv) {
@@ -45,7 +46,7 @@ TEST(SQLAllocEnv, TestSQLAllocEnv) {
4546
// Allocate an environment handle
4647
SQLRETURN return_value = SQLAllocEnv(&env);
4748

48-
EXPECT_TRUE(return_value == SQL_SUCCESS);
49+
EXPECT_EQ(SQL_SUCCESS, return_value);
4950
}
5051

5152
TEST(SQLAllocHandle, TestSQLAllocHandleConnect) {
@@ -56,12 +57,12 @@ TEST(SQLAllocHandle, TestSQLAllocHandleConnect) {
5657
// Allocate an environment handle
5758
SQLRETURN return_value = SQLAllocEnv(&env);
5859

59-
EXPECT_TRUE(return_value == SQL_SUCCESS);
60+
EXPECT_EQ(SQL_SUCCESS, return_value);
6061

6162
// Allocate a connection using alloc handle
6263
SQLRETURN return_alloc_handle = SQLAllocHandle(SQL_HANDLE_DBC, env, &conn);
6364

64-
EXPECT_TRUE(return_alloc_handle == SQL_SUCCESS);
65+
EXPECT_EQ(SQL_SUCCESS, return_alloc_handle);
6566
}
6667

6768
TEST(SQLAllocConnect, TestSQLAllocHandleConnect) {
@@ -72,12 +73,12 @@ TEST(SQLAllocConnect, TestSQLAllocHandleConnect) {
7273
// Allocate an environment handle
7374
SQLRETURN return_value = SQLAllocEnv(&env);
7475

75-
EXPECT_TRUE(return_value == SQL_SUCCESS);
76+
EXPECT_EQ(SQL_SUCCESS, return_value);
7677

7778
// Allocate a connection using alloc handle
7879
SQLRETURN return_alloc_connect = SQLAllocConnect(env, &conn);
7980

80-
EXPECT_TRUE(return_alloc_connect == SQL_SUCCESS);
81+
EXPECT_EQ(SQL_SUCCESS, return_alloc_connect);
8182
}
8283

8384
TEST(SQLFreeHandle, TestSQLFreeHandleEnv) {
@@ -90,7 +91,7 @@ TEST(SQLFreeHandle, TestSQLFreeHandleEnv) {
9091
// Free an environment handle
9192
SQLRETURN return_value = SQLFreeHandle(SQL_HANDLE_ENV, env);
9293

93-
EXPECT_TRUE(return_value == SQL_SUCCESS);
94+
EXPECT_EQ(SQL_SUCCESS, return_value);
9495
}
9596

9697
TEST(SQLFreeEnv, TestSQLFreeEnv) {
@@ -103,7 +104,7 @@ TEST(SQLFreeEnv, TestSQLFreeEnv) {
103104
// Free an environment handle
104105
SQLRETURN return_value = SQLFreeEnv(env);
105106

106-
EXPECT_TRUE(return_value == SQL_SUCCESS);
107+
EXPECT_EQ(SQL_SUCCESS, return_value);
107108
}
108109

109110
TEST(SQLFreeHandle, TestSQLFreeHandleConnect) {
@@ -114,17 +115,17 @@ TEST(SQLFreeHandle, TestSQLFreeHandleConnect) {
114115
// Allocate an environment handle
115116
SQLRETURN return_value = SQLAllocEnv(&env);
116117

117-
EXPECT_TRUE(return_value == SQL_SUCCESS);
118+
EXPECT_EQ(SQL_SUCCESS, return_value);
118119

119120
// Allocate a connection using alloc handle
120121
SQLRETURN return_alloc_handle = SQLAllocHandle(SQL_HANDLE_DBC, env, &conn);
121122

122-
EXPECT_TRUE(return_alloc_handle == SQL_SUCCESS);
123+
EXPECT_EQ(SQL_SUCCESS, return_alloc_handle);
123124

124125
// Free the created connection using free handle
125126
SQLRETURN return_free_handle = SQLFreeHandle(SQL_HANDLE_DBC, conn);
126127

127-
EXPECT_TRUE(return_free_handle == SQL_SUCCESS);
128+
EXPECT_EQ(SQL_SUCCESS, return_free_handle);
128129
}
129130

130131
TYPED_TEST(FlightSQLODBCTestBase, TestFreeNullHandles) {
@@ -153,17 +154,17 @@ TEST(SQLFreeConnect, TestSQLFreeConnect) {
153154
// Allocate an environment handle
154155
SQLRETURN return_env = SQLAllocEnv(&env);
155156

156-
EXPECT_TRUE(return_env == SQL_SUCCESS);
157+
EXPECT_EQ(SQL_SUCCESS, return_env);
157158

158159
// Allocate a connection using alloc handle
159160
SQLRETURN return_alloc_handle = SQLAllocHandle(SQL_HANDLE_DBC, env, &conn);
160161

161-
EXPECT_TRUE(return_alloc_handle == SQL_SUCCESS);
162+
EXPECT_EQ(SQL_SUCCESS, return_alloc_handle);
162163

163164
// Free the created connection using free connect
164165
SQLRETURN return_free_connect = SQLFreeConnect(conn);
165166

166-
EXPECT_TRUE(return_free_connect == SQL_SUCCESS);
167+
EXPECT_EQ(SQL_SUCCESS, return_free_connect);
167168
}
168169

169170
TEST(SQLGetEnvAttr, TestSQLGetEnvAttrODBCVersion) {
@@ -175,11 +176,11 @@ TEST(SQLGetEnvAttr, TestSQLGetEnvAttrODBCVersion) {
175176
// Allocate an environment handle
176177
SQLRETURN return_env = SQLAllocEnv(&env);
177178

178-
EXPECT_TRUE(return_env == SQL_SUCCESS);
179+
EXPECT_EQ(SQL_SUCCESS, return_env);
179180

180181
SQLRETURN return_get = SQLGetEnvAttr(env, SQL_ATTR_ODBC_VERSION, &version, 0, 0);
181182

182-
EXPECT_TRUE(return_get == SQL_SUCCESS);
183+
EXPECT_EQ(SQL_SUCCESS, return_get);
183184

184185
EXPECT_EQ(version, SQL_OV_ODBC2);
185186
}
@@ -191,13 +192,13 @@ TEST(SQLSetEnvAttr, TestSQLSetEnvAttrODBCVersionValid) {
191192
// Allocate an environment handle
192193
SQLRETURN return_env = SQLAllocEnv(&env);
193194

194-
EXPECT_TRUE(return_env == SQL_SUCCESS);
195+
EXPECT_EQ(SQL_SUCCESS, return_env);
195196

196197
// Attempt to set to unsupported version
197198
SQLRETURN return_set =
198199
SQLSetEnvAttr(env, SQL_ATTR_ODBC_VERSION, reinterpret_cast<void*>(SQL_OV_ODBC2), 0);
199200

200-
EXPECT_TRUE(return_set == SQL_SUCCESS);
201+
EXPECT_EQ(SQL_SUCCESS, return_set);
201202
}
202203

203204
TEST(SQLSetEnvAttr, TestSQLSetEnvAttrODBCVersionInvalid) {
@@ -207,13 +208,13 @@ TEST(SQLSetEnvAttr, TestSQLSetEnvAttrODBCVersionInvalid) {
207208
// Allocate an environment handle
208209
SQLRETURN return_env = SQLAllocEnv(&env);
209210

210-
EXPECT_TRUE(return_env == SQL_SUCCESS);
211+
EXPECT_EQ(SQL_SUCCESS, return_env);
211212

212213
// Attempt to set to unsupported version
213214
SQLRETURN return_set =
214215
SQLSetEnvAttr(env, SQL_ATTR_ODBC_VERSION, reinterpret_cast<void*>(1), 0);
215216

216-
EXPECT_TRUE(return_set == SQL_ERROR);
217+
EXPECT_EQ(SQL_ERROR, return_set);
217218
}
218219

219220
TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetEnvAttrOutputNTS) {
@@ -223,7 +224,7 @@ TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetEnvAttrOutputNTS) {
223224

224225
SQLRETURN return_get = SQLGetEnvAttr(this->env, SQL_ATTR_OUTPUT_NTS, &output_nts, 0, 0);
225226

226-
EXPECT_TRUE(return_get == SQL_SUCCESS);
227+
EXPECT_EQ(SQL_SUCCESS, return_get);
227228

228229
EXPECT_EQ(output_nts, SQL_TRUE);
229230

@@ -242,7 +243,7 @@ TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetEnvAttrGetLength) {
242243
SQLRETURN return_get =
243244
SQLGetEnvAttr(this->env, SQL_ATTR_ODBC_VERSION, nullptr, 0, &length);
244245

245-
EXPECT_TRUE(return_get == SQL_SUCCESS);
246+
EXPECT_EQ(SQL_SUCCESS, return_get);
246247

247248
EXPECT_EQ(length, sizeof(SQLINTEGER));
248249

@@ -258,7 +259,7 @@ TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetEnvAttrNullValuePointer) {
258259
SQLRETURN return_get =
259260
SQLGetEnvAttr(this->env, SQL_ATTR_ODBC_VERSION, nullptr, 0, nullptr);
260261

261-
EXPECT_TRUE(return_get == SQL_ERROR);
262+
EXPECT_EQ(SQL_ERROR, return_get);
262263

263264
this->Disconnect();
264265
}
@@ -270,13 +271,13 @@ TEST(SQLSetEnvAttr, TestSQLSetEnvAttrOutputNTSValid) {
270271
// Allocate an environment handle
271272
SQLRETURN return_env = SQLAllocEnv(&env);
272273

273-
EXPECT_TRUE(return_env == SQL_SUCCESS);
274+
EXPECT_EQ(SQL_SUCCESS, return_env);
274275

275276
// Attempt to set to output nts to supported version
276277
SQLRETURN return_set =
277278
SQLSetEnvAttr(env, SQL_ATTR_OUTPUT_NTS, reinterpret_cast<void*>(SQL_TRUE), 0);
278279

279-
EXPECT_TRUE(return_set == SQL_SUCCESS);
280+
EXPECT_EQ(SQL_SUCCESS, return_set);
280281
}
281282

282283
TEST(SQLSetEnvAttr, TestSQLSetEnvAttrOutputNTSInvalid) {
@@ -286,13 +287,13 @@ TEST(SQLSetEnvAttr, TestSQLSetEnvAttrOutputNTSInvalid) {
286287
// Allocate an environment handle
287288
SQLRETURN return_env = SQLAllocEnv(&env);
288289

289-
EXPECT_TRUE(return_env == SQL_SUCCESS);
290+
EXPECT_EQ(SQL_SUCCESS, return_env);
290291

291292
// Attempt to set to output nts to unsupported false
292293
SQLRETURN return_set =
293294
SQLSetEnvAttr(env, SQL_ATTR_OUTPUT_NTS, reinterpret_cast<void*>(SQL_FALSE), 0);
294295

295-
EXPECT_TRUE(return_set == SQL_ERROR);
296+
EXPECT_EQ(SQL_ERROR, return_set);
296297
}
297298

298299
TEST(SQLSetEnvAttr, TestSQLSetEnvAttrNullValuePointer) {
@@ -302,12 +303,12 @@ TEST(SQLSetEnvAttr, TestSQLSetEnvAttrNullValuePointer) {
302303
// Allocate an environment handle
303304
SQLRETURN return_env = SQLAllocEnv(&env);
304305

305-
EXPECT_TRUE(return_env == SQL_SUCCESS);
306+
EXPECT_EQ(SQL_SUCCESS, return_env);
306307

307308
// Attempt to set using bad data pointer
308309
SQLRETURN return_set = SQLSetEnvAttr(env, SQL_ATTR_ODBC_VERSION, nullptr, 0);
309310

310-
EXPECT_TRUE(return_set == SQL_ERROR);
311+
EXPECT_EQ(SQL_ERROR, return_set);
311312
}
312313

313314
TYPED_TEST(FlightSQLODBCTestBase, TestSQLDriverConnect) {
@@ -649,7 +650,7 @@ TEST_F(FlightSQLODBCRemoteTestBase, TestSQLConnectInvalidUid) {
649650

650651
// UID specified in DSN will take precedence,
651652
// so connection still fails despite passing valid uid in SQLConnect call
652-
EXPECT_TRUE(ret == SQL_ERROR);
653+
EXPECT_EQ(SQL_ERROR, ret);
653654

654655
VerifyOdbcErrorState(SQL_HANDLE_DBC, conn, error_state_28000);
655656

@@ -775,7 +776,7 @@ TEST_F(FlightSQLODBCRemoteTestBase, TestSQLDriverConnectInvalidUid) {
775776
static_cast<SQLSMALLINT>(connect_str0.size()), out_str,
776777
ODBC_BUFFER_SIZE, &out_str_len, SQL_DRIVER_NOPROMPT);
777778

778-
EXPECT_TRUE(ret == SQL_ERROR);
779+
EXPECT_EQ(SQL_ERROR, ret);
779780

780781
VerifyOdbcErrorState(SQL_HANDLE_DBC, conn, error_state_28000);
781782

@@ -815,7 +816,7 @@ TEST(SQLDisconnect, TestSQLDisconnectWithoutConnection) {
815816
// Attempt to disconnect without a connection, expect to fail
816817
ret = SQLDisconnect(conn);
817818

818-
EXPECT_TRUE(ret == SQL_ERROR);
819+
EXPECT_EQ(SQL_ERROR, ret);
819820

820821
// Expect ODBC driver manager to return error state
821822
VerifyOdbcErrorState(SQL_HANDLE_DBC, conn, error_state_08003);

0 commit comments

Comments
 (0)