@@ -33,6 +33,12 @@ class ConnectionInfoMockTest : public FlightSQLODBCMockTestBase {};
3333using TestTypes = ::testing::Types<ConnectionInfoMockTest, FlightSQLODBCRemoteTestBase>;
3434TYPED_TEST_SUITE (ConnectionInfoTest, TestTypes);
3535
36+ template <typename T>
37+ class ConnectionInfoHandleTest : public T {};
38+ using TestTypesHandle = ::testing::Types<FlightSQLOdbcEnvConnHandleMockTestBase,
39+ FlightSQLOdbcEnvConnHandleRemoteTestBase>;
40+ TYPED_TEST_SUITE (ConnectionInfoHandleTest, TestTypesHandle);
41+
3642namespace {
3743// Helper Functions
3844
@@ -583,14 +589,19 @@ TYPED_TEST(ConnectionInfoTest, TestSQLGetInfoAlterTable) {
583589 EXPECT_EQ (static_cast <SQLUINTEGER>(0 ), value);
584590}
585591
586- #ifdef DISABLE_TEST
587- TYPED_TEST (ConnectionInfoTest, TestSQLGetInfoCatalogLocation) {
592+ TYPED_TEST (ConnectionInfoHandleTest, TestSQLGetInfoCatalogLocation) {
593+ // GH-49482 TODO: resolve inconsitent return value for SQL_CATALOG_LOCATION and change
594+ // test type to `ConnectionInfoTest`
595+ this ->ConnectWithString (this ->GetConnectionString ());
596+
588597 SQLUSMALLINT value;
589598 GetInfo (conn, SQL_CATALOG_LOCATION, &value);
590599
591600 EXPECT_EQ (static_cast <SQLUSMALLINT>(0 ), value);
601+
602+ EXPECT_EQ (SQL_SUCCESS, SQLDisconnect (conn))
603+ << GetOdbcErrorMessage (SQL_HANDLE_DBC, conn);
592604}
593- #endif
594605
595606TYPED_TEST (ConnectionInfoTest, TestSQLGetInfoCatalogName) {
596607 SQLWCHAR value[kOdbcBufferSize ] = L" " ;
@@ -711,21 +722,33 @@ TYPED_TEST(ConnectionInfoTest, TestSQLGetInfoDropDomain) {
711722 EXPECT_EQ (static_cast <SQLUINTEGER>(0 ), value);
712723}
713724
714- #ifdef DISABLE_TEST
715- TYPED_TEST (ConnectionInfoTest, TestSQLGetInfoDropSchema) {
725+ TYPED_TEST (ConnectionInfoHandleTest, TestSQLGetInfoDropSchema) {
726+ // GH-49482 TODO: resolve inconsitent return value for SQL_DROP_SCHEMA and change test
727+ // type to `ConnectionInfoTest`
728+ this ->ConnectWithString (this ->GetConnectionString ());
729+
716730 SQLUINTEGER value;
717731 GetInfo (conn, SQL_DROP_SCHEMA, &value);
718732
719733 EXPECT_EQ (static_cast <SQLUINTEGER>(0 ), value);
734+
735+ EXPECT_EQ (SQL_SUCCESS, SQLDisconnect (conn))
736+ << GetOdbcErrorMessage (SQL_HANDLE_DBC, conn);
720737}
721738
722- TYPED_TEST (ConnectionInfoTest, TestSQLGetInfoDropTable) {
739+ TYPED_TEST (ConnectionInfoHandleTest, TestSQLGetInfoDropTable) {
740+ // GH-49482 TODO: resolve inconsitent return value for SQL_DROP_TABLE and change test
741+ // type to `ConnectionInfoTest`
742+ this ->ConnectWithString (this ->GetConnectionString ());
743+
723744 SQLUINTEGER value;
724745 GetInfo (conn, SQL_DROP_TABLE, &value);
725746
726747 EXPECT_EQ (static_cast <SQLUINTEGER>(0 ), value);
748+
749+ EXPECT_EQ (SQL_SUCCESS, SQLDisconnect (conn))
750+ << GetOdbcErrorMessage (SQL_HANDLE_DBC, conn);
727751}
728- #endif
729752
730753TYPED_TEST (ConnectionInfoTest, TestSQLGetInfoDropTranslation) {
731754 SQLUINTEGER value;
0 commit comments