fix some imports

Author: aaronsteers

airbyte_cdk/test/declarative/models/__init__.py

@@ -1,4 +1,4 @@
-from scenario import (
+from airbyte_cdk.test.declarative.models.scenario import (
     AcceptanceTestScenario,
 )
 

airbyte_cdk/test/declarative/test_suites/connector_base.py

@@ -9,7 +9,6 @@
 
 import pytest
 import yaml
-from airbyte_connector_tester.job_runner import run_test_job
 from pydantic import BaseModel
 
 from airbyte_cdk import Connector
@@ -21,10 +20,30 @@
 from airbyte_cdk.test.declarative.models import (
     AcceptanceTestScenario,
 )
+from airbyte_cdk.test.declarative.utils.job_runner import run_test_job
 
 ACCEPTANCE_TEST_CONFIG_PATH = Path("acceptance-test-config.yml")
 
 
+def _get_acceptance_tests(
+    category: str,
+    accept_test_config_path: Path = ACCEPTANCE_TEST_CONFIG_PATH,
+) -> list[AcceptanceTestScenario]:
+    all_tests_config = yaml.safe_load(accept_test_config_path.read_text())
+    if "acceptance_tests" not in all_tests_config:
+        raise ValueError(f"Acceptance tests config not found in {accept_test_config_path}")
+    if category not in all_tests_config["acceptance_tests"]:
+        return []
+    if "tests" not in all_tests_config["acceptance_tests"][category]:
+        raise ValueError(f"No tests found for category {category}")
+
+    return [
+        AcceptanceTestScenario.model_validate(test)
+        for test in all_tests_config["acceptance_tests"][category]["tests"]
+        if "iam_role" not in test["config_path"]
+    ]
+
+
 class ConnectorTestSuiteBase(abc.ABC):
     """Base class for connector test suites."""
 
@@ -49,27 +68,6 @@ def new_connector(self, **kwargs: dict[str, Any]) -> Connector:
         """
         return self.connector_factory()
 
-    # Internal Methods - We don't expect subclasses to override these
-
-    @classmethod
-    def _get_acceptance_tests(
-        category: str,
-        accept_test_config_path: Path = ACCEPTANCE_TEST_CONFIG_PATH,
-    ) -> list[AcceptanceTestScenario]:
-        all_tests_config = yaml.safe_load(accept_test_config_path.read_text())
-        if "acceptance_tests" not in all_tests_config:
-            raise ValueError(f"Acceptance tests config not found in {accept_test_config_path}")
-        if category not in all_tests_config["acceptance_tests"]:
-            return []
-        if "tests" not in all_tests_config["acceptance_tests"][category]:
-            raise ValueError(f"No tests found for category {category}")
-
-        return [
-            AcceptanceTestScenario.model_validate(test)
-            for test in all_tests_config["acceptance_tests"][category]["tests"]
-            if "iam_role" not in test["config_path"]
-        ]
-
     # Test Definitions
 
     @pytest.mark.parametrize(
@@ -89,7 +87,7 @@ def test_use_plugin_parametrized_test(
 
     @pytest.mark.parametrize(
         "instance",
-        self._get_acceptance_tests("connection"),
+        _get_acceptance_tests("connection"),
         ids=lambda instance: instance.instance_name,
     )
     def test_check(

airbyte_cdk/test/declarative/test_suites/destination_base.py

@@ -1,7 +1,7 @@
 # Copyright (c) 2024 Airbyte, Inc., all rights reserved.
 """Base class for destination test suites."""
 
-from airbyte_connector_tester.connector_tests import ConnectorTestSuiteBase
+from airbyte_cdk.test.declarative.test_suites.connector_base import ConnectorTestSuiteBase
 
 
 class DestinationTestSuiteBase(ConnectorTestSuiteBase):

airbyte_cdk/test/declarative/test_suites/source_base.py

@@ -5,12 +5,6 @@
 from pathlib import Path
 
 import pytest
-from airbyte_connector_tester.connector_tests import ConnectorTestSuiteBase
-from airbyte_connector_tester.instances import (
-    AcceptanceTestScenario,
-    get_acceptance_tests,
-)
-from airbyte_connector_tester.job_runner import run_test_job
 
 from airbyte_cdk.models import (
     AirbyteStream,
@@ -19,6 +13,9 @@
     DestinationSyncMode,
     SyncMode,
 )
+from airbyte_cdk.test.declarative.models import (
+    AcceptanceTestScenario,
+)
 
 
 class SourceTestSuiteBase(ConnectorTestSuiteBase):

airbyte_cdk/test/declarative/utils/job_runner.py

@@ -4,10 +4,12 @@
 from typing import Callable, Literal
 
 import orjson
-from airbyte_connector_tester.instances import AcceptanceTestScenario
 
 from airbyte_cdk import Connector
 from airbyte_cdk.test import entrypoint_wrapper
+from airbyte_cdk.test.declarative.models import (
+    AcceptanceTestScenario,
+)
 
 
 def run_test_job(

unit_tests/test/test_declarative_test_suites.py

@@ -0,0 +1,15 @@
+# Copyright (c) 2024 Airbyte, Inc., all rights reserved.
+"""Test declarative tests framework."""
+
+from airbyte_cdk.test.declarative import (
+    ConnectorTestSuiteBase,
+    DestinationTestSuiteBase,
+    SourceTestSuiteBase,
+)
+
+
+def test_declarative_test_suites():
+    """Test declarative tests framework."""
+    assert ConnectorTestSuiteBase()
+    assert DestinationTestSuiteBase()
+    assert SourceTestSuiteBase()