Skip to content

Commit 87e634a

Browse files
alinaliBQalinaliBQ
committed
Use ASSERT instead of EXPECT gtest checks
1 parent 744d868 commit 87e634a

2 files changed

Lines changed: 39 additions & 39 deletions

File tree

‎cpp/src/arrow/flight/sql/odbc/odbc_api.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -861,7 +861,7 @@ SQLRETURN SQLBindCol(SQLHSTMT stmt, SQLUSMALLINT record_number, SQLSMALLINT c_ty
861861
using ODBC::ODBCDescriptor;
862862
using ODBC::ODBCStatement;
863863
return ODBCStatement::ExecuteWithDiagnostics(stmt, SQL_ERROR, [=]() {
864-
// GH-47021: implement driver to return indicator value when data pointer is null
864+
// GH-47021 TODO: implement driver to return indicator value when data pointer is null
865865
ODBCStatement* statement = reinterpret_cast<ODBCStatement*>(stmt);
866866
ODBCDescriptor* ard = statement->GetARD();
867867
ard->BindCol(record_number, c_type, data_ptr, buffer_length, indicator_ptr);

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

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -46,80 +46,80 @@ TYPED_TEST(StatementTest, TestSQLBindColDataQuery) {
4646
SQLLEN buf_len = 0;
4747
SQLLEN ind;
4848

49-
EXPECT_EQ(SQL_SUCCESS,
49+
ASSERT_EQ(SQL_SUCCESS,
5050
SQLBindCol(this->stmt, 1, SQL_C_STINYINT, &stiny_int_val_min, buf_len, &ind));
5151

52-
EXPECT_EQ(SQL_SUCCESS,
52+
ASSERT_EQ(SQL_SUCCESS,
5353
SQLBindCol(this->stmt, 2, SQL_C_STINYINT, &stiny_int_val_max, buf_len, &ind));
5454

5555
// Unsigned Tiny Int
5656
uint8_t utiny_int_val_min;
5757
uint8_t utiny_int_val_max;
5858

59-
EXPECT_EQ(SQL_SUCCESS,
59+
ASSERT_EQ(SQL_SUCCESS,
6060
SQLBindCol(this->stmt, 3, SQL_C_UTINYINT, &utiny_int_val_min, buf_len, &ind));
6161

62-
EXPECT_EQ(SQL_SUCCESS,
62+
ASSERT_EQ(SQL_SUCCESS,
6363
SQLBindCol(this->stmt, 4, SQL_C_UTINYINT, &utiny_int_val_max, buf_len, &ind));
6464

6565
// Signed Small Int
6666
int16_t ssmall_int_val_min;
6767
int16_t ssmall_int_val_max;
6868

69-
EXPECT_EQ(SQL_SUCCESS,
69+
ASSERT_EQ(SQL_SUCCESS,
7070
SQLBindCol(this->stmt, 5, SQL_C_SSHORT, &ssmall_int_val_min, buf_len, &ind));
7171

72-
EXPECT_EQ(SQL_SUCCESS,
72+
ASSERT_EQ(SQL_SUCCESS,
7373
SQLBindCol(this->stmt, 6, SQL_C_SSHORT, &ssmall_int_val_max, buf_len, &ind));
7474

7575
// Unsigned Small Int
7676
uint16_t usmall_int_val_min;
7777
uint16_t usmall_int_val_max;
7878

79-
EXPECT_EQ(SQL_SUCCESS,
79+
ASSERT_EQ(SQL_SUCCESS,
8080
SQLBindCol(this->stmt, 7, SQL_C_USHORT, &usmall_int_val_min, buf_len, &ind));
8181

82-
EXPECT_EQ(SQL_SUCCESS,
82+
ASSERT_EQ(SQL_SUCCESS,
8383
SQLBindCol(this->stmt, 8, SQL_C_USHORT, &usmall_int_val_max, buf_len, &ind));
8484

8585
// Signed Integer
8686
SQLINTEGER slong_val_min;
8787
SQLINTEGER slong_val_max;
8888

89-
EXPECT_EQ(SQL_SUCCESS,
89+
ASSERT_EQ(SQL_SUCCESS,
9090
SQLBindCol(this->stmt, 9, SQL_C_SLONG, &slong_val_min, buf_len, &ind));
9191

92-
EXPECT_EQ(SQL_SUCCESS,
92+
ASSERT_EQ(SQL_SUCCESS,
9393
SQLBindCol(this->stmt, 10, SQL_C_SLONG, &slong_val_max, buf_len, &ind));
9494

9595
// Unsigned Integer
9696
SQLUINTEGER ulong_val_min;
9797
SQLUINTEGER ulong_val_max;
9898

99-
EXPECT_EQ(SQL_SUCCESS,
99+
ASSERT_EQ(SQL_SUCCESS,
100100
SQLBindCol(this->stmt, 11, SQL_C_ULONG, &ulong_val_min, buf_len, &ind));
101101

102-
EXPECT_EQ(SQL_SUCCESS,
102+
ASSERT_EQ(SQL_SUCCESS,
103103
SQLBindCol(this->stmt, 12, SQL_C_ULONG, &ulong_val_max, buf_len, &ind));
104104

105105
// Signed Big Int
106106
SQLBIGINT sbig_int_val_min;
107107
SQLBIGINT sbig_int_val_max;
108108

109-
EXPECT_EQ(SQL_SUCCESS,
109+
ASSERT_EQ(SQL_SUCCESS,
110110
SQLBindCol(this->stmt, 13, SQL_C_SBIGINT, &sbig_int_val_min, buf_len, &ind));
111111

112-
EXPECT_EQ(SQL_SUCCESS,
112+
ASSERT_EQ(SQL_SUCCESS,
113113
SQLBindCol(this->stmt, 14, SQL_C_SBIGINT, &sbig_int_val_max, buf_len, &ind));
114114

115115
// Unsigned Big Int
116116
SQLUBIGINT ubig_int_val_min;
117117
SQLUBIGINT ubig_int_val_max;
118118

119-
EXPECT_EQ(SQL_SUCCESS,
119+
ASSERT_EQ(SQL_SUCCESS,
120120
SQLBindCol(this->stmt, 15, SQL_C_UBIGINT, &ubig_int_val_min, buf_len, &ind));
121121

122-
EXPECT_EQ(SQL_SUCCESS,
122+
ASSERT_EQ(SQL_SUCCESS,
123123
SQLBindCol(this->stmt, 16, SQL_C_UBIGINT, &ubig_int_val_max, buf_len, &ind));
124124

125125
// Decimal
@@ -128,76 +128,76 @@ TYPED_TEST(StatementTest, TestSQLBindColDataQuery) {
128128
memset(&decimal_val_neg, 0, sizeof(decimal_val_neg));
129129
memset(&decimal_val_pos, 0, sizeof(decimal_val_pos));
130130

131-
EXPECT_EQ(SQL_SUCCESS,
131+
ASSERT_EQ(SQL_SUCCESS,
132132
SQLBindCol(this->stmt, 17, SQL_C_NUMERIC, &decimal_val_neg, buf_len, &ind));
133133

134-
EXPECT_EQ(SQL_SUCCESS,
134+
ASSERT_EQ(SQL_SUCCESS,
135135
SQLBindCol(this->stmt, 18, SQL_C_NUMERIC, &decimal_val_pos, buf_len, &ind));
136136

137137
// Float
138138
float float_val_min;
139139
float float_val_max;
140140

141-
EXPECT_EQ(SQL_SUCCESS,
141+
ASSERT_EQ(SQL_SUCCESS,
142142
SQLBindCol(this->stmt, 19, SQL_C_FLOAT, &float_val_min, buf_len, &ind));
143143

144-
EXPECT_EQ(SQL_SUCCESS,
144+
ASSERT_EQ(SQL_SUCCESS,
145145
SQLBindCol(this->stmt, 20, SQL_C_FLOAT, &float_val_max, buf_len, &ind));
146146

147147
// Double
148148
SQLDOUBLE double_val_min;
149149
SQLDOUBLE double_val_max;
150150

151-
EXPECT_EQ(SQL_SUCCESS,
151+
ASSERT_EQ(SQL_SUCCESS,
152152
SQLBindCol(this->stmt, 21, SQL_C_DOUBLE, &double_val_min, buf_len, &ind));
153153

154-
EXPECT_EQ(SQL_SUCCESS,
154+
ASSERT_EQ(SQL_SUCCESS,
155155
SQLBindCol(this->stmt, 22, SQL_C_DOUBLE, &double_val_max, buf_len, &ind));
156156

157157
// Bit
158158
bool bit_val_false;
159159
bool bit_val_true;
160160

161-
EXPECT_EQ(SQL_SUCCESS,
161+
ASSERT_EQ(SQL_SUCCESS,
162162
SQLBindCol(this->stmt, 23, SQL_C_BIT, &bit_val_false, buf_len, &ind));
163163

164-
EXPECT_EQ(SQL_SUCCESS,
164+
ASSERT_EQ(SQL_SUCCESS,
165165
SQLBindCol(this->stmt, 24, SQL_C_BIT, &bit_val_true, buf_len, &ind));
166166

167167
// Characters
168168
SQLCHAR char_val[2];
169169
buf_len = sizeof(SQLCHAR) * 2;
170170

171-
EXPECT_EQ(SQL_SUCCESS,
171+
ASSERT_EQ(SQL_SUCCESS,
172172
SQLBindCol(this->stmt, 25, SQL_C_CHAR, &char_val, buf_len, &ind));
173173

174174
SQLWCHAR wchar_val[2];
175175
size_t wchar_size = arrow::flight::sql::odbc::GetSqlWCharSize();
176176
buf_len = wchar_size * 2;
177177

178-
EXPECT_EQ(SQL_SUCCESS,
178+
ASSERT_EQ(SQL_SUCCESS,
179179
SQLBindCol(this->stmt, 26, SQL_C_WCHAR, &wchar_val, buf_len, &ind));
180180

181181
SQLWCHAR wvarchar_val[3];
182182
buf_len = wchar_size * 3;
183183

184-
EXPECT_EQ(SQL_SUCCESS,
184+
ASSERT_EQ(SQL_SUCCESS,
185185
SQLBindCol(this->stmt, 27, SQL_C_WCHAR, &wvarchar_val, buf_len, &ind));
186186

187187
SQLCHAR varchar_val[4];
188188
buf_len = sizeof(SQLCHAR) * 4;
189189

190-
EXPECT_EQ(SQL_SUCCESS,
190+
ASSERT_EQ(SQL_SUCCESS,
191191
SQLBindCol(this->stmt, 28, SQL_C_CHAR, &varchar_val, buf_len, &ind));
192192

193193
// Date and Timestamp
194194
SQL_DATE_STRUCT date_val_min{}, date_val_max{};
195195
buf_len = 0;
196196

197-
EXPECT_EQ(SQL_SUCCESS,
197+
ASSERT_EQ(SQL_SUCCESS,
198198
SQLBindCol(this->stmt, 29, SQL_C_TYPE_DATE, &date_val_min, buf_len, &ind));
199199

200-
EXPECT_EQ(SQL_SUCCESS,
200+
ASSERT_EQ(SQL_SUCCESS,
201201
SQLBindCol(this->stmt, 30, SQL_C_TYPE_DATE, &date_val_max, buf_len, &ind));
202202

203203
SQL_TIMESTAMP_STRUCT timestamp_val_min{}, timestamp_val_max{};
@@ -322,10 +322,10 @@ TEST_F(StatementRemoteTest, TestSQLBindColTimeQuery) {
322322
SQLLEN buf_len = sizeof(time_var_min);
323323
SQLLEN ind;
324324

325-
EXPECT_EQ(SQL_SUCCESS,
325+
ASSERT_EQ(SQL_SUCCESS,
326326
SQLBindCol(this->stmt, 1, SQL_C_TYPE_TIME, &time_var_min, buf_len, &ind));
327327

328-
EXPECT_EQ(SQL_SUCCESS,
328+
ASSERT_EQ(SQL_SUCCESS,
329329
SQLBindCol(this->stmt, 2, SQL_C_TYPE_TIME, &time_var_max, buf_len, &ind));
330330

331331
std::wstring wsql =
@@ -510,7 +510,7 @@ TYPED_TEST(StatementTest, TestSQLBindColRowArraySize) {
510510
}
511511

512512
TYPED_TEST(StatementTest, DISABLED_TestSQLBindColIndicatorOnly) {
513-
// GH-47021: implement driver to return indicator value when data pointer is null
513+
// GH-47021 TODO: implement driver to return indicator value when data pointer is null
514514

515515
// Verify driver supports null data pointer with valid indicator pointer
516516

@@ -523,7 +523,7 @@ TYPED_TEST(StatementTest, DISABLED_TestSQLBindColIndicatorOnly) {
523523
// Characters
524524
SQLLEN buf_len = sizeof(SQLCHAR) * 2;
525525
SQLLEN char_val_ind;
526-
EXPECT_EQ(SQL_SUCCESS,
526+
ASSERT_EQ(SQL_SUCCESS,
527527
SQLBindCol(this->stmt, 25, SQL_C_CHAR, 0, buf_len, &char_val_ind));
528528

529529
// Execute query and fetch data once since there is only 1 row.
@@ -551,14 +551,14 @@ TYPED_TEST(StatementTest, TestSQLBindColIndicatorOnlySQLUnbind) {
551551
// Signed Tiny Int
552552
int8_t stiny_int_val;
553553
SQLLEN stiny_int_ind;
554-
EXPECT_EQ(SQL_SUCCESS,
554+
ASSERT_EQ(SQL_SUCCESS,
555555
SQLBindCol(this->stmt, 1, SQL_C_STINYINT, &stiny_int_val, 0, &stiny_int_ind));
556556

557557
// Characters
558558
SQLCHAR char_val[2];
559559
SQLLEN buf_len = sizeof(SQLCHAR) * 2;
560560
SQLLEN char_val_ind;
561-
EXPECT_EQ(SQL_SUCCESS,
561+
ASSERT_EQ(SQL_SUCCESS,
562562
SQLBindCol(this->stmt, 25, SQL_C_CHAR, &char_val, buf_len, &char_val_ind));
563563

564564
// Driver should still be able to execute queries after unbinding columns
@@ -573,8 +573,8 @@ TYPED_TEST(StatementTest, TestSQLBindColIndicatorOnlySQLUnbind) {
573573

574574
ASSERT_EQ(SQL_SUCCESS, SQLFetch(this->stmt));
575575

576-
// GH-47021: implement driver to return indicator value when data pointer is null and
577-
// uncomment the checks Verify values for indicator pointer Signed Tiny Int
576+
// GH-47021 TODO: implement driver to return indicator value when data pointer is null
577+
// and uncomment the checks Verify values for indicator pointer Signed Tiny Int
578578
// EXPECT_EQ(1, stiny_int_ind);
579579

580580
// Char array

0 commit comments

Comments
 (0)