chore: address comments and fix unit tests

Author: karenc-bq

tests/integration/host/build.gradle.kts

@@ -68,8 +68,8 @@ tasks.register<Test>("test-python-3.11-mysql") {
     filter.includeTestsMatching("integration.host.TestRunner.runTests")
     doFirst {
         systemProperty("exclude-performance", "true")
-        systemProperty("exclude-python-312", "true")
-        systemProperty("exclude-python-313", "true")
+        systemProperty("exclude-python-3-12", "true")
+        systemProperty("exclude-python-3-13", "true")
         systemProperty("exclude-multi-az-cluster", "true")
         systemProperty("exclude-multi-az-instance", "true")
         systemProperty("exclude-bg", "true")
@@ -85,8 +85,8 @@ tasks.register<Test>("test-python-3.11-pg") {
     filter.includeTestsMatching("integration.host.TestRunner.runTests")
     doFirst {
         systemProperty("exclude-performance", "true")
-        systemProperty("exclude-python-312", "true")
-        systemProperty("exclude-python-313", "true")
+        systemProperty("exclude-python-3-12", "true")
+        systemProperty("exclude-python-3-13", "true")
         systemProperty("exclude-multi-az-cluster", "true")
         systemProperty("exclude-multi-az-instance", "true")
         systemProperty("exclude-bg", "true")
@@ -102,8 +102,8 @@ tasks.register<Test>("test-python-3.12-mysql") {
     filter.includeTestsMatching("integration.host.TestRunner.runTests")
     doFirst {
         systemProperty("exclude-performance", "true")
-        systemProperty("exclude-python-311", "true")
-        systemProperty("exclude-python-313", "true")
+        systemProperty("exclude-python-3-11", "true")
+        systemProperty("exclude-python-3-13", "true")
         systemProperty("exclude-multi-az-cluster", "true")
         systemProperty("exclude-multi-az-instance", "true")
         systemProperty("exclude-traces-telemetry", "true")
@@ -119,8 +119,8 @@ tasks.register<Test>("test-python-3.12-pg") {
     filter.includeTestsMatching("integration.host.TestRunner.runTests")
     doFirst {
         systemProperty("exclude-performance", "true")
-        systemProperty("exclude-python-311", "true")
-        systemProperty("exclude-python-313", "true")
+        systemProperty("exclude-python-3-11", "true")
+        systemProperty("exclude-python-3-13", "true")
         systemProperty("exclude-multi-az-cluster", "true")
         systemProperty("exclude-multi-az-instance", "true")
         systemProperty("exclude-bg", "true")
@@ -136,8 +136,8 @@ tasks.register<Test>("test-python-3.13-mysql") {
     filter.includeTestsMatching("integration.host.TestRunner.runTests")
     doFirst {
         systemProperty("exclude-performance", "true")
-        systemProperty("exclude-python-311", "true")
-        systemProperty("exclude-python-312", "true")
+        systemProperty("exclude-python-3-11", "true")
+        systemProperty("exclude-python-3-12", "true")
         systemProperty("exclude-multi-az-cluster", "true")
         systemProperty("exclude-multi-az-instance", "true")
         systemProperty("exclude-bg", "true")
@@ -153,8 +153,8 @@ tasks.register<Test>("test-python-3.13-pg") {
     filter.includeTestsMatching("integration.host.TestRunner.runTests")
     doFirst {
         systemProperty("exclude-performance", "true")
-        systemProperty("exclude-python-311", "true")
-        systemProperty("exclude-python-312", "true")
+        systemProperty("exclude-python-3-11", "true")
+        systemProperty("exclude-python-3-12", "true")
         systemProperty("exclude-multi-az-cluster", "true")
         systemProperty("exclude-multi-az-instance", "true")
         systemProperty("exclude-bg", "true")

tests/integration/host/src/test/java/integration/host/TestEnvironmentConfiguration.java

@@ -70,11 +70,11 @@ public class TestEnvironmentConfiguration {
       Boolean.parseBoolean(System.getProperty("test-bg-only", "false"));
 
   public boolean excludePython311 =
-      Boolean.parseBoolean(System.getProperty("exclude-python-311", "false"));
+      Boolean.parseBoolean(System.getProperty("exclude-python-3-11", "false"));
   public boolean excludePython312 =
-      Boolean.parseBoolean(System.getProperty("exclude-python-312", "false"));
+      Boolean.parseBoolean(System.getProperty("exclude-python-3-12", "false"));
   public boolean excludePython313 =
-      Boolean.parseBoolean(System.getProperty("exclude-python-313", "false"));
+      Boolean.parseBoolean(System.getProperty("exclude-python-3-13", "false"));
 
   public String testFilter = System.getenv("FILTER");
 

tests/unit/test_connection_provider.py

@@ -18,6 +18,8 @@
 from aws_advanced_python_wrapper.connection_provider import (
     ConnectionProviderManager, DriverConnectionProvider)
 from aws_advanced_python_wrapper.hostinfo import HostInfo, HostRole
+from aws_advanced_python_wrapper.sql_alchemy_connection_provider import \
+    SqlAlchemyPooledConnectionProvider
 from aws_advanced_python_wrapper.utils.properties import Properties
 
 
@@ -28,36 +30,12 @@ def connection_mock(mocker):
 
 @pytest.fixture
 def default_provider_mock(mocker):
-    return mocker.MagicMock()
+    return mocker.MagicMock(spec=DriverConnectionProvider)
 
 
 @pytest.fixture
 def set_provider_mock(mocker):
-    # In Python 3.12+, isinstance checks with Protocols are stricter
-    # Create a real instance that implements the protocol, then wrap release_resources
-    # with a mock to allow method call tracking
-    class MockConnectionProviderWithRelease:
-        """Mock connection provider that implements CanReleaseResources protocol."""
-        def accepts_host_info(self, host_info, props):
-            return True
-        
-        def accepts_strategy(self, role, strategy):
-            return True
-        
-        def get_host_info_by_strategy(self, hosts, role, strategy, props):
-            return hosts[0] if hosts else None
-        
-        def connect(self, target_func, driver_dialect, database_dialect, host_info, props):
-            return None
-        
-        def release_resources(self):
-            pass
-    
-    # Create a real instance
-    provider = MockConnectionProviderWithRelease()
-    # Replace release_resources with a MagicMock so we can assert it was called
-    provider.release_resources = mocker.MagicMock()
-    return provider
+    return mocker.MagicMock(spec=SqlAlchemyPooledConnectionProvider)
 
 
 @pytest.fixture
@@ -196,8 +174,7 @@ def test_manager_get_host_info_by_strategy(connection_mock, default_provider_moc
     assert host_info.host == "other"
 
 
-def test_release_resources(connection_mock, default_provider_mock, set_provider_mock):
-    connection_provider_manager = ConnectionProviderManager(default_provider_mock)
+def test_release_resources(connection_mock, set_provider_mock):
     ConnectionProviderManager.set_connection_provider(set_provider_mock)
     ConnectionProviderManager.release_resources()
 

tests/unit/test_mysql_driver_dialect.py

@@ -14,24 +14,15 @@
 
 import psycopg
 import pytest
+from mysql.connector import MySQLConnection
+from mysql.connector.cursor import MySQLCursor
 
 from aws_advanced_python_wrapper.errors import AwsWrapperError
 from aws_advanced_python_wrapper.hostinfo import HostInfo
 from aws_advanced_python_wrapper.mysql_driver_dialect import MySQLDriverDialect
 from aws_advanced_python_wrapper.utils.properties import (Properties,
                                                           WrapperProperties)
 
-try:
-    from mysql.connector import CMySQLConnection
-    from mysql.connector.cursor_cext import CMySQLCursor
-except ImportError:
-    # CMySQLConnection not available (e.g., Python 3.13 with mysql-connector-python 9.0.0)
-    # Skip all tests in this module if C extension is not available
-    pytest.skip(
-        "CMySQLConnection not available (C extension not supported on this Python version)",
-        allow_module_level=True
-    )
-
 
 @pytest.fixture
 def dialect():
@@ -40,7 +31,7 @@ def dialect():
 
 @pytest.fixture
 def mock_conn(mocker):
-    return mocker.MagicMock(spec=CMySQLConnection)
+    return mocker.MagicMock(spec=MySQLConnection)
 
 
 @pytest.fixture
@@ -93,7 +84,7 @@ def test_autocommit(dialect, mock_conn, mock_invalid_conn):
 
 def test_transfer_session_state(dialect, mocker, mock_conn):
     mock_conn.autocommit = False
-    new_conn = mocker.MagicMock(spec=CMySQLConnection)
+    new_conn = mocker.MagicMock(spec=MySQLConnection)
 
     new_conn.autocommit = True
     dialect.transfer_session_state(mock_conn, new_conn)
@@ -104,8 +95,8 @@ def test_transfer_session_state(dialect, mocker, mock_conn):
 def test_get_connection_from_obj(dialect, mocker, mock_conn, mock_invalid_conn):
     assert dialect.get_connection_from_obj(mock_conn) == mock_conn
 
-    mock_cursor = mocker.MagicMock(spec=CMySQLCursor)
-    mock_cursor._cnx = mock_conn
+    mock_cursor = mocker.MagicMock(spec=MySQLCursor)
+    mock_cursor._connection = mock_conn
     assert dialect.get_connection_from_obj(mock_cursor) == mock_conn
 
     assert dialect.get_connection_from_obj(mock_invalid_conn) is None

tests/unit/test_pg_driver_dialect.py

@@ -14,6 +14,7 @@
 
 import psycopg
 import pytest
+from mysql.connector import MySQLConnection
 from sqlalchemy import PoolProxiedConnection
 
 from aws_advanced_python_wrapper.errors import AwsWrapperError
@@ -22,14 +23,6 @@
 from aws_advanced_python_wrapper.utils.properties import (Properties,
                                                           WrapperProperties)
 
-try:
-    from mysql.connector import CMySQLConnection
-    HAS_C_MYSQL_CONNECTION = True
-except ImportError:
-    # CMySQLConnection not available (e.g., Python 3.13 with mysql-connector-python 9.0.0)
-    HAS_C_MYSQL_CONNECTION = False
-    CMySQLConnection = None
-
 
 @pytest.fixture
 def mock_conn(mocker):
@@ -47,12 +40,7 @@ def mock_pool_conn(mocker, mock_conn):
 
 @pytest.fixture
 def mock_invalid_conn(mocker):
-    if HAS_C_MYSQL_CONNECTION:
-        return mocker.MagicMock(spec=CMySQLConnection)
-    else:
-        # Use a different invalid connection type when CMySQLConnection is not available
-        # This simulates an invalid connection type for error testing
-        return mocker.MagicMock(spec=object)
+    return mocker.MagicMock(spec=MySQLConnection)
 
 
 @pytest.fixture