Work on code review comments

- rebased onto master

Author: alinaliBQ

cpp/src/arrow/flight/sql/odbc/tests/CMakeLists.txt

@@ -34,6 +34,7 @@ add_arrow_test(flight_sql_odbc_test
                SOURCES
                odbc_test_suite.cc
                odbc_test_suite.h
+               errors_test.cc
                connection_test.cc
                # Enable Protobuf cleanup after test execution
                # GH-46889: move protobuf_test_util to a more common location

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

@@ -27,27 +27,20 @@
 namespace arrow::flight::sql::odbc {
 
 template <typename T>
-class ErrorsTest : public T {
- public:
-  using List = std::list<T>;
-};
+class ErrorsTest : public T {};
 
 using TestTypes =
     ::testing::Types<FlightSQLODBCMockTestBase, FlightSQLODBCRemoteTestBase>;
 TYPED_TEST_SUITE(ErrorsTest, TestTypes);
 
 template <typename T>
-class ErrorsOdbcV2Test : public T {
- public:
-  using List = std::list<T>;
-};
+class ErrorsOdbcV2Test : public T {};
 
 using TestTypesOdbcV2 =
     ::testing::Types<FlightSQLOdbcV2MockTestBase, FlightSQLOdbcV2RemoteTestBase>;
 TYPED_TEST_SUITE(ErrorsOdbcV2Test, TestTypesOdbcV2);
 
 TYPED_TEST(ErrorsTest, TestSQLGetDiagFieldWForConnectFailure) {
-  //  ODBC Environment
   SQLHENV env;
   SQLHDBC conn;
 
@@ -67,14 +60,14 @@ TYPED_TEST(ErrorsTest, TestSQLGetDiagFieldWForConnectFailure) {
                        arrow::util::UTF8ToWideString(connect_str));
   std::vector<SQLWCHAR> connect_str0(wconnect_str.begin(), wconnect_str.end());
 
-  SQLWCHAR out_str[ODBC_BUFFER_SIZE];
+  SQLWCHAR out_str[kOdbcBufferSize];
   SQLSMALLINT out_str_len;
 
   // Connecting to ODBC server.
   ASSERT_EQ(SQL_ERROR,
             SQLDriverConnect(conn, NULL, &connect_str0[0],
                              static_cast<SQLSMALLINT>(connect_str0.size()), out_str,
-                             ODBC_BUFFER_SIZE, &out_str_len, SQL_DRIVER_NOPROMPT));
+                             kOdbcBufferSize, &out_str_len, SQL_DRIVER_NOPROMPT));
 
   // Retrieve all supported header level and record level data
   SQLSMALLINT HEADER_LEVEL = 0;
@@ -91,20 +84,20 @@ TYPED_TEST(ErrorsTest, TestSQLGetDiagFieldWForConnectFailure) {
   EXPECT_EQ(1, diag_number);
 
   // SQL_DIAG_SERVER_NAME
-  SQLWCHAR server_name[ODBC_BUFFER_SIZE];
+  SQLWCHAR server_name[kOdbcBufferSize];
   SQLSMALLINT server_name_length;
 
   EXPECT_EQ(SQL_SUCCESS,
             SQLGetDiagField(SQL_HANDLE_DBC, conn, RECORD_1, SQL_DIAG_SERVER_NAME,
-                            server_name, ODBC_BUFFER_SIZE, &server_name_length));
+                            server_name, kOdbcBufferSize, &server_name_length));
 
   // SQL_DIAG_MESSAGE_TEXT
-  SQLWCHAR message_text[ODBC_BUFFER_SIZE];
+  SQLWCHAR message_text[kOdbcBufferSize];
   SQLSMALLINT message_text_length;
 
   EXPECT_EQ(SQL_SUCCESS,
             SQLGetDiagField(SQL_HANDLE_DBC, conn, RECORD_1, SQL_DIAG_MESSAGE_TEXT,
-                            message_text, ODBC_BUFFER_SIZE, &message_text_length));
+                            message_text, kOdbcBufferSize, &message_text_length));
 
   EXPECT_GT(message_text_length, 100);
 
@@ -159,23 +152,23 @@ TYPED_TEST(ErrorsTest, DISABLED_TestSQLGetDiagFieldWForConnectFailureNTS) {
                        arrow::util::UTF8ToWideString(connect_str));
   std::vector<SQLWCHAR> connect_str0(wconnect_str.begin(), wconnect_str.end());
 
-  SQLWCHAR out_str[ODBC_BUFFER_SIZE];
+  SQLWCHAR out_str[kOdbcBufferSize];
   SQLSMALLINT out_str_len;
 
   // Connecting to ODBC server.
   ASSERT_EQ(SQL_ERROR,
             SQLDriverConnect(conn, NULL, &connect_str0[0],
                              static_cast<SQLSMALLINT>(connect_str0.size()), out_str,
-                             ODBC_BUFFER_SIZE, &out_str_len, SQL_DRIVER_NOPROMPT));
+                             kOdbcBufferSize, &out_str_len, SQL_DRIVER_NOPROMPT));
 
   // Retrieve all supported header level and record level data
   SQLSMALLINT RECORD_1 = 1;
 
   // SQL_DIAG_MESSAGE_TEXT SQL_NTS
-  SQLWCHAR message_text[ODBC_BUFFER_SIZE];
+  SQLWCHAR message_text[kOdbcBufferSize];
   SQLSMALLINT message_text_length;
 
-  message_text[ODBC_BUFFER_SIZE - 1] = '\0';
+  message_text[kOdbcBufferSize - 1] = '\0';
 
   ASSERT_EQ(SQL_SUCCESS,
             SQLGetDiagField(SQL_HANDLE_DBC, conn, RECORD_1, SQL_DIAG_MESSAGE_TEXT,
@@ -214,20 +207,20 @@ TYPED_TEST(ErrorsTest, TestSQLGetDiagFieldWForDescriptorFailureFromDriverManager
   EXPECT_EQ(1, diag_number);
 
   // SQL_DIAG_SERVER_NAME
-  SQLWCHAR server_name[ODBC_BUFFER_SIZE];
+  SQLWCHAR server_name[kOdbcBufferSize];
   SQLSMALLINT server_name_length;
 
   EXPECT_EQ(SQL_SUCCESS,
             SQLGetDiagField(SQL_HANDLE_DESC, descriptor, RECORD_1, SQL_DIAG_SERVER_NAME,
-                            server_name, ODBC_BUFFER_SIZE, &server_name_length));
+                            server_name, kOdbcBufferSize, &server_name_length));
 
   // SQL_DIAG_MESSAGE_TEXT
-  SQLWCHAR message_text[ODBC_BUFFER_SIZE];
+  SQLWCHAR message_text[kOdbcBufferSize];
   SQLSMALLINT message_text_length;
 
   EXPECT_EQ(SQL_SUCCESS,
             SQLGetDiagField(SQL_HANDLE_DESC, descriptor, RECORD_1, SQL_DIAG_MESSAGE_TEXT,
-                            message_text, ODBC_BUFFER_SIZE, &message_text_length));
+                            message_text, kOdbcBufferSize, &message_text_length));
 
   EXPECT_GT(message_text_length, 100);
 
@@ -267,12 +260,12 @@ TYPED_TEST(ErrorsTest, TestSQLGetDiagRecForDescriptorFailureFromDriverManager) {
 
   SQLWCHAR sql_state[6];
   SQLINTEGER native_error;
-  SQLWCHAR message[ODBC_BUFFER_SIZE];
+  SQLWCHAR message[kOdbcBufferSize];
   SQLSMALLINT message_length;
 
   ASSERT_EQ(SQL_SUCCESS,
             SQLGetDiagRec(SQL_HANDLE_DESC, descriptor, 1, sql_state, &native_error,
-                          message, ODBC_BUFFER_SIZE, &message_length));
+                          message, kOdbcBufferSize, &message_length));
 
   EXPECT_GT(message_length, 60);
 
@@ -308,21 +301,21 @@ TYPED_TEST(ErrorsTest, TestSQLGetDiagRecForConnectFailure) {
                        arrow::util::UTF8ToWideString(connect_str));
   std::vector<SQLWCHAR> connect_str0(wconnect_str.begin(), wconnect_str.end());
 
-  SQLWCHAR out_str[ODBC_BUFFER_SIZE];
+  SQLWCHAR out_str[kOdbcBufferSize];
   SQLSMALLINT out_str_len;
 
   // Connecting to ODBC server.
   ASSERT_EQ(SQL_ERROR,
             SQLDriverConnect(conn, NULL, &connect_str0[0],
                              static_cast<SQLSMALLINT>(connect_str0.size()), out_str,
-                             ODBC_BUFFER_SIZE, &out_str_len, SQL_DRIVER_NOPROMPT));
+                             kOdbcBufferSize, &out_str_len, SQL_DRIVER_NOPROMPT));
 
   SQLWCHAR sql_state[6];
   SQLINTEGER native_error;
-  SQLWCHAR message[ODBC_BUFFER_SIZE];
+  SQLWCHAR message[kOdbcBufferSize];
   SQLSMALLINT message_length;
   ASSERT_EQ(SQL_SUCCESS, SQLGetDiagRec(SQL_HANDLE_DBC, conn, 1, sql_state, &native_error,
-                                       message, ODBC_BUFFER_SIZE, &message_length));
+                                       message, kOdbcBufferSize, &message_length));
 
   EXPECT_GT(message_length, 120);
 
@@ -344,13 +337,13 @@ TYPED_TEST(ErrorsTest, TestSQLGetDiagRecInputData) {
 
   SQLWCHAR sql_state[6];
   SQLINTEGER native_error;
-  SQLWCHAR message[ODBC_BUFFER_SIZE];
+  SQLWCHAR message[kOdbcBufferSize];
   SQLSMALLINT message_length;
 
   // Pass invalid record number
   EXPECT_EQ(SQL_ERROR,
             SQLGetDiagRec(SQL_HANDLE_DBC, this->conn, 0, sql_state, &native_error,
-                          message, ODBC_BUFFER_SIZE, &message_length));
+                          message, kOdbcBufferSize, &message_length));
 
   // Pass valid record number with null inputs
   EXPECT_EQ(SQL_NO_DATA, SQLGetDiagRec(SQL_HANDLE_DBC, this->conn, 1, 0, 0, 0, 0, 0));