|
27 | 27 | namespace arrow::flight::sql::odbc { |
28 | 28 |
|
29 | 29 | template <typename T> |
30 | | -class ConnectionInfoTest : public T { |
31 | | - public: |
32 | | - using List = std::list<T>; |
33 | | -}; |
| 30 | +class ConnectionInfoTest : public T {}; |
34 | 31 |
|
35 | 32 | class ConnectionInfoMockTest : public FlightSQLODBCMockTestBase {}; |
36 | 33 | using TestTypes = ::testing::Types<ConnectionInfoMockTest, FlightSQLODBCRemoteTestBase>; |
@@ -75,10 +72,10 @@ void Validate(SQLHDBC connection, SQLUSMALLINT info_type, SQLULEN expected_value |
75 | 72 | // Validate wchar string SQLWCHAR return value |
76 | 73 | void Validate(SQLHDBC connection, SQLUSMALLINT info_type, |
77 | 74 | const SQLWCHAR* expected_value) { |
78 | | - SQLWCHAR info_value[ODBC_BUFFER_SIZE] = L""; |
| 75 | + SQLWCHAR info_value[kOdbcBufferSize] = L""; |
79 | 76 | SQLSMALLINT message_length; |
80 | 77 |
|
81 | | - ASSERT_EQ(SQL_SUCCESS, SQLGetInfo(connection, info_type, info_value, ODBC_BUFFER_SIZE, |
| 78 | + ASSERT_EQ(SQL_SUCCESS, SQLGetInfo(connection, info_type, info_value, kOdbcBufferSize, |
82 | 79 | &message_length)); |
83 | 80 |
|
84 | 81 | EXPECT_EQ(*expected_value, *info_value); |
@@ -111,11 +108,11 @@ void ValidateGreaterThan(SQLHDBC connection, SQLUSMALLINT info_type, |
111 | 108 | // Validate wchar string SQLWCHAR return value is not empty |
112 | 109 | void ValidateNotEmptySQLWCHAR(SQLHDBC connection, SQLUSMALLINT info_type, |
113 | 110 | bool allow_truncation) { |
114 | | - SQLWCHAR info_value[ODBC_BUFFER_SIZE] = L""; |
| 111 | + SQLWCHAR info_value[kOdbcBufferSize] = L""; |
115 | 112 | SQLSMALLINT message_length; |
116 | 113 |
|
117 | 114 | SQLRETURN ret = |
118 | | - SQLGetInfo(connection, info_type, info_value, ODBC_BUFFER_SIZE, &message_length); |
| 115 | + SQLGetInfo(connection, info_type, info_value, kOdbcBufferSize, &message_length); |
119 | 116 | if (allow_truncation && ret == SQL_SUCCESS_WITH_INFO) { |
120 | 117 | ASSERT_EQ(SQL_SUCCESS_WITH_INFO, ret); |
121 | 118 | } else { |
|
0 commit comments