Skip to content

Commit 488e70d

Browse files
authored
Disable tests with DISABLED_
* Enable `TestSQLGetInfoDriverHdesc` We missed this test before, enabling the test now * Disable tests with `DISABLED_`
1 parent 2496650 commit 488e70d

File tree

4 files changed

+23
-24
lines changed

4 files changed

+23
-24
lines changed

cpp/src/arrow/flight/sql/odbc/tests/connection_info_test.cc

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -212,12 +212,21 @@ TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoDriverHdbc) {
212212

213213
// These information types are implemented by the Driver Manager alone.
214214
TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoDriverHdesc) {
215-
// TODO This is failing due to no descriptor being created
216-
// enable after SQL_HANDLE_DESC is supported
217-
GTEST_SKIP();
218215
this->Connect();
219216

220-
Validate(this->conn, SQL_DRIVER_HDESC, static_cast<SQLULEN>(0));
217+
SQLHDESC descriptor;
218+
219+
// Allocate a descriptor using alloc handle
220+
ASSERT_EQ(SQL_SUCCESS, SQLAllocHandle(SQL_HANDLE_DESC, this->conn, &descriptor));
221+
222+
// Value returned from driver manager is the desc address
223+
SQLHDESC local_desc = descriptor;
224+
SQLRETURN ret = SQLGetInfo(this->conn, SQL_HANDLE_DESC, &local_desc, 0, 0);
225+
EXPECT_EQ(SQL_SUCCESS, ret);
226+
EXPECT_GT(local_desc, static_cast<SQLHSTMT>(0));
227+
228+
// Free descriptor handle
229+
ASSERT_EQ(SQL_SUCCESS, SQLFreeHandle(SQL_HANDLE_DESC, descriptor));
221230

222231
this->Disconnect();
223232
}
@@ -389,9 +398,8 @@ TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoOdbcInterfaceConformance) {
389398

390399
// case SQL_ODBC_STANDARD_CLI_CONFORMANCE: - mentioned in SQLGetInfo spec with no
391400
// description and there is no constant for this.
392-
TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoOdbcStandardCliConformance) {
401+
TYPED_TEST(FlightSQLODBCTestBase, DISABLED_TestSQLGetInfoOdbcStandardCliConformance) {
393402
// Type commented out in odbc_connection.cc
394-
GTEST_SKIP();
395403
this->Connect();
396404

397405
// Type does not exist in sql.h
@@ -703,9 +711,8 @@ TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoAlterDomain) {
703711
this->Disconnect();
704712
}
705713

706-
TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoAlterSchema) {
714+
TYPED_TEST(FlightSQLODBCTestBase, DISABLED_TestSQLGetInfoAlterSchema) {
707715
// Type commented out in odbc_connection.cc
708-
GTEST_SKIP();
709716
this->Connect();
710717

711718
// Type does not exist in sql.h
@@ -722,9 +729,8 @@ TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoAlterTable) {
722729
this->Disconnect();
723730
}
724731

725-
TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetInfoAnsiSqlDatetimeLiterals) {
732+
TYPED_TEST(FlightSQLODBCTestBase, DISABLED_TestSQLGetInfoAnsiSqlDatetimeLiterals) {
726733
// Type commented out in odbc_connection.cc
727-
GTEST_SKIP();
728734
this->Connect();
729735

730736
// Type does not exist in sql.h

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -231,11 +231,9 @@ TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetEnvAttrOutputNTS) {
231231
this->Disconnect();
232232
}
233233

234-
TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetEnvAttrGetLength) {
234+
TYPED_TEST(FlightSQLODBCTestBase, DISABLED_TestSQLGetEnvAttrGetLength) {
235235
// Test is disabled because call to SQLGetEnvAttr is handled by the driver manager on
236236
// Windows. This test case can be potentially used on macOS/Linux
237-
GTEST_SKIP();
238-
239237
this->Connect();
240238

241239
SQLINTEGER length;
@@ -250,10 +248,9 @@ TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetEnvAttrGetLength) {
250248
this->Disconnect();
251249
}
252250

253-
TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetEnvAttrNullValuePointer) {
251+
TYPED_TEST(FlightSQLODBCTestBase, DISABLED_TestSQLGetEnvAttrNullValuePointer) {
254252
// Test is disabled because call to SQLGetEnvAttr is handled by the driver manager on
255253
// Windows. This test case can be potentially used on macOS/Linux
256-
GTEST_SKIP();
257254
this->Connect();
258255

259256
SQLRETURN return_get =

cpp/src/arrow/flight/sql/odbc/tests/errors_test.cc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,9 @@ TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetDiagFieldWForConnectFailure) {
133133
EXPECT_EQ(SQL_SUCCESS, ret);
134134
}
135135

136-
TYPED_TEST(FlightSQLODBCTestBase, TestSQLGetDiagFieldWForConnectFailureNTS) {
136+
TYPED_TEST(FlightSQLODBCTestBase, DISABLED_TestSQLGetDiagFieldWForConnectFailureNTS) {
137137
// Test is disabled because driver manager on Windows does not pass through SQL_NTS
138138
// This test case can be potentially used on macOS/Linux
139-
GTEST_SKIP();
140-
// ODBC Environment
141139
SQLHENV env;
142140
SQLHDBC conn;
143141

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1164,10 +1164,9 @@ TEST_F(FlightSQLODBCMockTestBase, TestSQLExecDirectVarbinaryTruncation) {
11641164
this->Disconnect();
11651165
}
11661166

1167-
TYPED_TEST(FlightSQLODBCTestBase, TestSQLExecDirectFloatTruncation) {
1167+
TYPED_TEST(FlightSQLODBCTestBase, DISABLED_TestSQLExecDirectFloatTruncation) {
11681168
// Test is disabled until float truncation is supported.
11691169
// GH-46985: return warning message instead of error on float truncation case
1170-
GTEST_SKIP();
11711170
this->Connect();
11721171

11731172
std::wstring wsql;
@@ -2064,9 +2063,9 @@ TYPED_TEST(FlightSQLODBCTestBase, TestSQLBindColRowArraySize) {
20642063
this->Disconnect();
20652064
}
20662065

2067-
TYPED_TEST(FlightSQLODBCTestBase, TestSQLBindColIndicatorOnly) {
2066+
TYPED_TEST(FlightSQLODBCTestBase, DISABLED_TestSQLBindColIndicatorOnly) {
20682067
// GH-47021: implement driver to return indicator value when data pointer is null
2069-
GTEST_SKIP();
2068+
20702069
// Verify driver supports null data pointer with valid indicator pointer
20712070
this->Connect();
20722071

@@ -2207,11 +2206,10 @@ TYPED_TEST(FlightSQLODBCTestBase, TestSQLExtendedFetchRowFetching) {
22072206
this->Disconnect();
22082207
}
22092208

2210-
TEST_F(FlightSQLODBCRemoteTestBase, TestSQLExtendedFetchQueryNullIndicator) {
2209+
TEST_F(FlightSQLODBCRemoteTestBase, DISABLED_TestSQLExtendedFetchQueryNullIndicator) {
22112210
// GH-47110: SQLExtendedFetch should return SQL_SUCCESS_WITH_INFO for 22002
22122211
// Limitation on mock test server prevents null from working properly, so use remote
22132212
// server instead. Mock server has type `DENSE_UNION` for null column data.
2214-
GTEST_SKIP();
22152213
this->Connect();
22162214

22172215
SQLINTEGER val;

0 commit comments

Comments
 (0)