Address more comments

Author: justing-bq

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

@@ -37,9 +37,9 @@ TYPED_TEST_SUITE(ConnectionTest, TestTypes);
 template <typename T>
 class ConnectionHandleTest : public T {};
 
-class ConnectionRemoteTest : public FlightSQLOdbcHandleRemoteTestBase {};
-using TestTypesHandle =
-    ::testing::Types<FlightSQLOdbcHandleMockTestBase, FlightSQLOdbcHandleRemoteTestBase>;
+class ConnectionRemoteTest : public FlightSQLOdbcEnvConnHandleRemoteTestBase {};
+using TestTypesHandle = ::testing::Types<FlightSQLOdbcEnvConnHandleMockTestBase,
+                                         FlightSQLOdbcEnvConnHandleRemoteTestBase>;
 TYPED_TEST_SUITE(ConnectionHandleTest, TestTypesHandle);
 
 TEST(ODBCHandles, TestSQLAllocAndFreeEnv) {

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

@@ -61,8 +61,7 @@ void ODBCRemoteTestBase::ConnectWithString(std::string connect_str) {
                              kOdbcBufferSize, &out_str_len, SQL_DRIVER_NOPROMPT))
       << GetOdbcErrorMessage(SQL_HANDLE_DBC, conn);
 
-  // GH-47710: TODO Allocate a statement using alloc handle
-  // ASSERT_EQ(SQL_SUCCESS, SQLAllocHandle(SQL_HANDLE_STMT, conn, &stmt));
+  ASSERT_EQ(SQL_SUCCESS, SQLAllocHandle(SQL_HANDLE_STMT, conn, &stmt));
 }
 
 void ODBCRemoteTestBase::Disconnect() {
@@ -182,21 +181,14 @@ void FlightSQLOdbcV2RemoteTestBase::SetUp() {
   connected_ = true;
 }
 
-void FlightSQLOdbcHandleRemoteTestBase::SetUp() {
-  ODBCRemoteTestBase::SetUp();
-  if (skipping_test_) {
-    return;
-  }
+void FlightSQLOdbcEnvConnHandleRemoteTestBase::SetUp() { AllocEnvConnHandles(); }
 
-  this->AllocEnvConnHandles();
-  allocated_ = true;
-}
+void FlightSQLOdbcEnvConnHandleRemoteTestBase::TearDown() {
+  // Free connection handle
+  EXPECT_EQ(SQL_SUCCESS, SQLFreeHandle(SQL_HANDLE_DBC, conn));
 
-void FlightSQLOdbcHandleRemoteTestBase::TearDown() {
-  if (allocated_) {
-    this->FreeEnvConnHandles();
-    allocated_ = false;
-  }
+  // Free environment handle
+  EXPECT_EQ(SQL_SUCCESS, SQLFreeHandle(SQL_HANDLE_ENV, env));
 }
 
 std::string FindTokenInCallHeaders(const CallHeaders& incoming_headers) {
@@ -392,14 +384,19 @@ void FlightSQLOdbcV2MockTestBase::SetUp() {
   connected_ = true;
 }
 
-void FlightSQLOdbcHandleMockTestBase::SetUp() {
+void FlightSQLOdbcEnvConnHandleMockTestBase::SetUp() {
   ODBCMockTestBase::SetUp();
-  this->AllocEnvConnHandles();
+  AllocEnvConnHandles();
 }
 
-void FlightSQLOdbcHandleMockTestBase::TearDown() {
-  this->FreeEnvConnHandles();
-  ODBCMockTestBase::TearDown();
+void FlightSQLOdbcEnvConnHandleMockTestBase::TearDown() {
+  // Free connection handle
+  EXPECT_EQ(SQL_SUCCESS, SQLFreeHandle(SQL_HANDLE_DBC, conn));
+
+  // Free environment handle
+  EXPECT_EQ(SQL_SUCCESS, SQLFreeHandle(SQL_HANDLE_ENV, env));
+
+  ASSERT_OK(server_->Shutdown());
 }
 
 bool CompareConnPropertyMap(Connection::ConnPropertyMap map1,

cpp/src/arrow/flight/sql/odbc/tests/odbc_test_suite.h

@@ -105,7 +105,7 @@ class FlightSQLOdbcV2RemoteTestBase : public FlightSQLODBCRemoteTestBase {
   void SetUp() override;
 };
 
-class FlightSQLOdbcHandleRemoteTestBase : public FlightSQLODBCRemoteTestBase {
+class FlightSQLOdbcEnvConnHandleRemoteTestBase : public FlightSQLODBCRemoteTestBase {
  protected:
   void SetUp() override;
   void TearDown() override;
@@ -197,7 +197,7 @@ class FlightSQLOdbcV2MockTestBase : public FlightSQLODBCMockTestBase {
   void SetUp() override;
 };
 
-class FlightSQLOdbcHandleMockTestBase : public FlightSQLODBCMockTestBase {
+class FlightSQLOdbcEnvConnHandleMockTestBase : public FlightSQLODBCMockTestBase {
  protected:
   void SetUp() override;
   void TearDown() override;