chore: update tests to followsuite with api changes

z3z1ma · Jul 27, 2024 · 1011bb7 · 1011bb7
1 parent a513438
commit 1011bb7
Show file tree

Hide file tree

Showing 17 changed files with 17 additions and 16 deletions.
diff --git a/tests/injector/__init__.py → tests/core/injector/__init__.py b/tests/injector/__init__.py → tests/core/injector/__init__.py
diff --git a/tests/injector/test_config.py → tests/core/injector/test_config.py b/tests/injector/test_config.py → tests/core/injector/test_config.py
@@ -3,7 +3,7 @@
 
 import pytest
 
-from cdf.injector import ConfigResolver
+from cdf.core.configuration import ConfigResolver
 
 
 def test_apply_converters():

diff --git a/tests/injector/test_registry.py → tests/core/injector/test_registry.py b/tests/injector/test_registry.py → tests/core/injector/test_registry.py
@@ -1,6 +1,6 @@
 import typing as t
 
-from cdf.injector import DependencyRegistry
+from cdf.core.injector import DependencyRegistry
 
 
 def test_registry():

diff --git a/tests/nextgen/test_workspace.py → tests/core/test_workspace.py b/tests/nextgen/test_workspace.py → tests/core/test_workspace.py
@@ -1,6 +1,7 @@
-import cdf.injector as injector
-import cdf.nextgen.model as model
-from cdf.nextgen.workspace import Workspace
+import cdf.core.component as cmp
+import cdf.core.configuration as conf
+import cdf.core.injector as injector
+from cdf.core.workspace import Workspace
 
 
 def test_workspace():
@@ -27,32 +28,32 @@ def test_resource():
             },
             *Workspace.configuration_sources,
         ],
-        service_definitons=[
-            model.Service(
+        service_definitions=[
+            cmp.Service(
                 "a",
                 injector.Dependency(1),
                 owner="Alex",
                 description="A secret number",
-                sla=model.ServiceLevelAgreement.CRITICAL,
+                sla=cmp.ServiceLevelAgreement.CRITICAL,
             ),
-            model.Service(
+            cmp.Service(
                 "b", injector.Dependency(lambda a: a + 1 * 5 / 10), owner="Alex"
             ),
-            model.Service(
+            cmp.Service(
                 "prod_bigquery", injector.Dependency("dwh-123"), owner="DataTeam"
             ),
-            model.Service(
+            cmp.Service(
                 "sfdc",
                 injector.Dependency(
-                    injector.map_config_section("sfdc")(
+                    conf.map_config_section("sfdc")(
                         lambda username: f"https://sfdc.com/{username}"
                     )
                 ),
                 owner="RevOps",
             ),
         ],
-        source_definitons=[
-            model.Source(
+        source_definitions=[
+            cmp.Source(
                 "source_a",
                 injector.Dependency(test_source),
                 owner="Alex",
@@ -61,7 +62,7 @@ def test_resource():
         ],
     )
 
-    @injector.map_config_values(secret_number="a.b.c")
+    @conf.map_config_values(secret_number="a.b.c")
     def c(secret_number: int, sfdc: str) -> int:
         print(f"SFDC: {sfdc=}")
         return secret_number * 10

diff --git a/tests/core/feature_flag/test_file.py → tests/integrations/feature_flag/test_file.py b/tests/core/feature_flag/test_file.py → tests/integrations/feature_flag/test_file.py
diff --git a/tests/core/feature_flag/test_harness.py → ...integrations/feature_flag/test_harness.py b/tests/core/feature_flag/test_harness.py → ...integrations/feature_flag/test_harness.py
diff --git a/tests/core/feature_flag/test_launchdarkly.py → ...rations/feature_flag/test_launchdarkly.py b/tests/core/feature_flag/test_launchdarkly.py → ...rations/feature_flag/test_launchdarkly.py
diff --git a/tests/core/specification/test_notebook.py → tests/legacy/specification/test_notebook.py b/tests/core/specification/test_notebook.py → tests/legacy/specification/test_notebook.py
diff --git a/tests/core/specification/test_pipeline.py → tests/legacy/specification/test_pipeline.py b/tests/core/specification/test_pipeline.py → tests/legacy/specification/test_pipeline.py
diff --git a/tests/core/specification/test_publisher.py → tests/legacy/specification/test_publisher.py b/tests/core/specification/test_publisher.py → tests/legacy/specification/test_publisher.py
diff --git a/tests/core/specification/test_script.py → tests/legacy/specification/test_script.py b/tests/core/specification/test_script.py → tests/legacy/specification/test_script.py
diff --git a/tests/core/specification/test_sink.py → tests/legacy/specification/test_sink.py b/tests/core/specification/test_sink.py → tests/legacy/specification/test_sink.py
diff --git a/tests/core/test_context.py → tests/legacy/test_context.py b/tests/core/test_context.py → tests/legacy/test_context.py
diff --git a/tests/core/test_filesystem.py → tests/legacy/test_filesystem.py b/tests/core/test_filesystem.py → tests/legacy/test_filesystem.py
diff --git a/tests/core/test_packaging.py → tests/legacy/test_packaging.py b/tests/core/test_packaging.py → tests/legacy/test_packaging.py
diff --git a/tests/core/test_project.py → tests/legacy/test_project.py b/tests/core/test_project.py → tests/legacy/test_project.py
@@ -5,7 +5,7 @@
 import dlt
 import pytest
 
-from cdf.core.project import Project, load_project
+from cdf.legacy.project import Project, load_project
 
 
 def test_load_project():

diff --git a/tests/core/utility/test_file_.py → tests/legacy/utility/test_file_.py b/tests/core/utility/test_file_.py → tests/legacy/utility/test_file_.py