convert test config to data_test config

core/dbt/cli/params.py

@@ -393,7 +393,8 @@
             "source",
             "analysis",
             "model",
-            "test",
+            "test",  # TODO should we preserve but deprecate this?
+            "data_test",
             "exposure",
             "snapshot",
             "seed",

core/dbt/compilation.py

@@ -48,7 +48,7 @@
 def print_compile_stats(stats):
     names = {
         NodeType.Model: "model",
-        NodeType.Test: "test",
+        NodeType.Test: "data test",
         NodeType.Unit: "unit test",
         NodeType.Snapshot: "snapshot",
         NodeType.Analysis: "analysis",

core/dbt/config/project.py

@@ -431,7 +431,7 @@ def create_project(self, rendered: RenderComponents) -> "Project":
         seeds: Dict[str, Any]
         snapshots: Dict[str, Any]
         sources: Dict[str, Any]
-        tests: Dict[str, Any]
+        data_tests: Dict[str, Any]
         unit_tests: Dict[str, Any]
         metrics: Dict[str, Any]
         semantic_models: Dict[str, Any]
@@ -445,7 +445,9 @@ def create_project(self, rendered: RenderComponents) -> "Project":
         seeds = cfg.seeds
         snapshots = cfg.snapshots
         sources = cfg.sources
-        tests = cfg.tests
+        # the `tests` config is deprecated but still allowed. Copy it into
+        # `data_tests` to simplify logic throughout the rest of the system.
+        data_tests = cfg.data_tests if "data-tests" in rendered.project_dict else cfg.tests
         unit_tests = cfg.unit_tests
         metrics = cfg.metrics
         semantic_models = cfg.semantic_models
@@ -506,7 +508,7 @@ def create_project(self, rendered: RenderComponents) -> "Project":
             selectors=selectors,
             query_comment=query_comment,
             sources=sources,
-            tests=tests,
+            data_tests=data_tests,
             unit_tests=unit_tests,
             metrics=metrics,
             semantic_models=semantic_models,
@@ -617,7 +619,7 @@ class Project:
     seeds: Dict[str, Any]
     snapshots: Dict[str, Any]
     sources: Dict[str, Any]
-    tests: Dict[str, Any]
+    data_tests: Dict[str, Any]
     unit_tests: Dict[str, Any]
     metrics: Dict[str, Any]
     semantic_models: Dict[str, Any]
@@ -703,7 +705,7 @@ def to_project_config(self, with_packages=False):
                 "seeds": self.seeds,
                 "snapshots": self.snapshots,
                 "sources": self.sources,
-                "tests": self.tests,
+                "data-tests": self.data_tests,
                 "unit-tests": self.unit_tests,
                 "metrics": self.metrics,
                 "semantic-models": self.semantic_models,

core/dbt/config/renderer.py

@@ -162,7 +162,7 @@ def should_render_keypath(self, keypath: Keypath) -> bool:
         if first == "vars":
             return False
 
-        if first in {"seeds", "models", "snapshots", "tests"}:
+        if first in {"seeds", "models", "snapshots", "tests", "data-tests"}:
             keypath_parts = {(k.lstrip("+ ") if isinstance(k, str) else k) for k in keypath}
             # model-level hooks
             late_rendered_hooks = {"pre-hook", "post-hook", "pre_hook", "post_hook"}

core/dbt/config/runtime.py

@@ -165,7 +165,7 @@ def from_parts(
             selectors=project.selectors,
             query_comment=project.query_comment,
             sources=project.sources,
-            tests=project.tests,
+            data_tests=project.data_tests,
             unit_tests=project.unit_tests,
             metrics=project.metrics,
             semantic_models=project.semantic_models,
@@ -324,7 +324,7 @@ def get_resource_config_paths(self) -> Dict[str, PathSet]:
             "seeds": self._get_config_paths(self.seeds),
             "snapshots": self._get_config_paths(self.snapshots),
             "sources": self._get_config_paths(self.sources),
-            "tests": self._get_config_paths(self.tests),
+            "data_tests": self._get_config_paths(self.data_tests),
             "unit_tests": self._get_config_paths(self.unit_tests),
             "metrics": self._get_config_paths(self.metrics),
             "semantic_models": self._get_config_paths(self.semantic_models),

core/dbt/context/context_config.py

@@ -42,7 +42,7 @@ def get_config_dict(self, resource_type: NodeType) -> Dict[str, Any]:
         elif resource_type == NodeType.Source:
             model_configs = unrendered.get("sources")
         elif resource_type == NodeType.Test:
-            model_configs = unrendered.get("tests")
+            model_configs = unrendered.get("data_tests")
         elif resource_type == NodeType.Metric:
             model_configs = unrendered.get("metrics")
         elif resource_type == NodeType.SemanticModel:
@@ -73,7 +73,7 @@ def get_config_dict(self, resource_type: NodeType) -> Dict[str, Any]:
         elif resource_type == NodeType.Source:
             model_configs = self.project.sources
         elif resource_type == NodeType.Test:
-            model_configs = self.project.tests
+            model_configs = self.project.data_tests
         elif resource_type == NodeType.Metric:
             model_configs = self.project.metrics
         elif resource_type == NodeType.SemanticModel:

core/dbt/contracts/files.py

@@ -221,7 +221,7 @@ def remote(cls, contents: str, project_name: str, language: str) -> "SourceFile"
 class SchemaSourceFile(BaseSourceFile):
     dfy: Dict[str, Any] = field(default_factory=dict)
     # these are in the manifest.nodes dictionary
-    tests: Dict[str, Any] = field(default_factory=dict)
+    data_tests: Dict[str, Any] = field(default_factory=dict)
     sources: List[str] = field(default_factory=list)
     exposures: List[str] = field(default_factory=list)
     metrics: List[str] = field(default_factory=list)
@@ -273,31 +273,31 @@ def append_patch(self, yaml_key, unique_id):
     def add_test(self, node_unique_id, test_from):
         name = test_from["name"]
         key = test_from["key"]
-        if key not in self.tests:
-            self.tests[key] = {}
-        if name not in self.tests[key]:
-            self.tests[key][name] = []
-        self.tests[key][name].append(node_unique_id)
+        if key not in self.data_tests:
+            self.data_tests[key] = {}
+        if name not in self.data_tests[key]:
+            self.data_tests[key][name] = []
+        self.data_tests[key][name].append(node_unique_id)
 
-    # this is only used in unit tests
+    # this is only used in tests/unit
     def remove_tests(self, yaml_key, name):
-        if yaml_key in self.tests:
-            if name in self.tests[yaml_key]:
-                del self.tests[yaml_key][name]
+        if yaml_key in self.data_tests:
+            if name in self.data_tests[yaml_key]:
+                del self.data_tests[yaml_key][name]
 
-    # this is only used in tests (unit + functional)
+    # this is only used in the tests directory (unit + functional)
     def get_tests(self, yaml_key, name):
-        if yaml_key in self.tests:
-            if name in self.tests[yaml_key]:
-                return self.tests[yaml_key][name]
+        if yaml_key in self.data_tests:
+            if name in self.data_tests[yaml_key]:
+                return self.data_tests[yaml_key][name]
         return []
 
     def get_key_and_name_for_test(self, test_unique_id):
         yaml_key = None
         block_name = None
-        for key in self.tests.keys():
-            for name in self.tests[key]:
-                for unique_id in self.tests[key][name]:
+        for key in self.data_tests.keys():
+            for name in self.data_tests[key]:
+                for unique_id in self.data_tests[key][name]:
                     if unique_id == test_unique_id:
                         yaml_key = key
                         block_name = name
@@ -306,9 +306,9 @@ def get_key_and_name_for_test(self, test_unique_id):
 
     def get_all_test_ids(self):
         test_ids = []
-        for key in self.tests.keys():
-            for name in self.tests[key]:
-                test_ids.extend(self.tests[key][name])
+        for key in self.data_tests.keys():
+            for name in self.data_tests[key]:
+                test_ids.extend(self.data_tests[key][name])
         return test_ids
 
     def add_env_var(self, var, yaml_key, name):

core/dbt/contracts/graph/nodes.py

@@ -400,7 +400,7 @@ def _deserialize(cls, dct: Dict[str, int]):
             return RPCNode.from_dict(dct)
         elif resource_type == "sql":
             return SqlNode.from_dict(dct)
-        elif resource_type == "test":
+        elif resource_type == "data_test" or resource_type == "test":
             if "test_metadata" in dct:
                 return GenericTestNode.from_dict(dct)
             else:
@@ -1251,20 +1251,20 @@ def columns(self) -> Sequence[UnparsedColumn]:
         return [] if self.table.columns is None else self.table.columns
 
     def get_tests(self) -> Iterator[Tuple[Dict[str, Any], Optional[UnparsedColumn]]]:
-        for test in self.tests:
-            yield normalize_test(test), None
+        for data_test in self.data_tests:
+            yield normalize_test(data_test), None
 
         for column in self.columns:
-            if column.tests is not None:
-                for test in column.tests:
-                    yield normalize_test(test), column
+            if column.data_tests is not None:
+                for data_test in column.data_tests:
+                    yield normalize_test(data_test), column
 
     @property
-    def tests(self) -> List[TestDef]:
-        if self.table.tests is None:
+    def data_tests(self) -> List[TestDef]:
+        if self.table.data_tests is None:
             return []
         else:
-            return self.table.tests
+            return self.table.data_tests
 
 
 @dataclass

core/dbt/contracts/graph/unparsed.py

@@ -98,7 +98,7 @@ class HasColumnProps(AdditionalPropertiesMixin, ExtensibleDbtClassMixin, Replace
 
 @dataclass
 class HasColumnAndTestProps(HasColumnProps):
-    tests: List[TestDef] = field(default_factory=list)
+    data_tests: List[TestDef] = field(default_factory=list)
 
 
 @dataclass
@@ -145,7 +145,7 @@ class UnparsedVersion(dbtClassMixin):
     config: Dict[str, Any] = field(default_factory=dict)
     constraints: List[Dict[str, Any]] = field(default_factory=list)
     docs: Docs = field(default_factory=Docs)
-    tests: Optional[List[TestDef]] = None
+    data_tests: Optional[List[TestDef]] = None
     columns: Sequence[Union[dbt.helper_types.IncludeExclude, UnparsedColumn]] = field(
         default_factory=list
     )
@@ -248,7 +248,11 @@ def get_tests_for_version(self, version: NodeVersion) -> List[TestDef]:
                 f"get_tests_for_version called for version '{version}' not in version map"
             )
         unparsed_version = self._version_map[version]
-        return unparsed_version.tests if unparsed_version.tests is not None else self.tests
+        return (
+            unparsed_version.data_tests
+            if unparsed_version.data_tests is not None
+            else self.data_tests
+        )
 
 
 @dataclass
@@ -401,7 +405,7 @@ class SourceTablePatch(dbtClassMixin):
     freshness: Optional[FreshnessThreshold] = field(default_factory=FreshnessThreshold)
     external: Optional[ExternalTable] = None
     tags: Optional[List[str]] = None
-    tests: Optional[List[TestDef]] = None
+    data_tests: Optional[List[TestDef]] = None
     columns: Optional[Sequence[UnparsedColumn]] = None
 
     def to_patch_dict(self) -> Dict[str, Any]:

core/dbt/contracts/project.py

@@ -1,3 +1,4 @@
+from dbt import deprecations
 from dbt.contracts.util import Replaceable, Mergeable, list_str, Identifier
 from dbt.contracts.connection import QueryComment, UserConfigContract
 from dbt.helper_types import NoValue
@@ -190,7 +191,7 @@ class Project(dbtClassMixin, Replaceable):
     source_paths: Optional[List[str]] = None
     model_paths: Optional[List[str]] = None
     macro_paths: Optional[List[str]] = None
-    data_paths: Optional[List[str]] = None
+    data_paths: Optional[List[str]] = None  # deprecated
     seed_paths: Optional[List[str]] = None
     test_paths: Optional[List[str]] = None
     analysis_paths: Optional[List[str]] = None
@@ -212,7 +213,8 @@ class Project(dbtClassMixin, Replaceable):
     snapshots: Dict[str, Any] = field(default_factory=dict)
     analyses: Dict[str, Any] = field(default_factory=dict)
     sources: Dict[str, Any] = field(default_factory=dict)
-    tests: Dict[str, Any] = field(default_factory=dict)
+    tests: Dict[str, Any] = field(default_factory=dict)  # deprecated
+    data_tests: Dict[str, Any] = field(default_factory=dict)
     unit_tests: Dict[str, Any] = field(default_factory=dict)
     metrics: Dict[str, Any] = field(default_factory=dict)
     semantic_models: Dict[str, Any] = field(default_factory=dict)
@@ -257,6 +259,7 @@ class Config(dbtMashConfig):
             "saved_queries": "saved-queries",
             "dbt_cloud": "dbt-cloud",
             "unit_tests": "unit-tests",
+            "data_tests": "data-tests",
         }
 
     @classmethod
@@ -278,6 +281,14 @@ def validate(cls, data):
             raise ValidationError(
                 f"Invalid dbt_cloud config. Expected a 'dict' but got '{type(data['dbt_cloud'])}'"
             )
+        if data.get("tests", None) and data.get("data_tests", None):
+            raise ValidationError(
+                "Invalid project config: cannot have both 'tests' and 'data_tests' defined"
+            )
+        if "tests" in data:
+            deprecations.warn(
+                "project-test-config", deprecated_path="tests", exp_path="data-tests"
+            )
 
 
 @dataclass

core/dbt/deprecations.py

@@ -51,6 +51,8 @@ class PackageInstallPathDeprecation(DBTDeprecation):
     _event = "PackageInstallPathDeprecation"
 
 
+# deprecations with a pattern of `project-config-*` for the name are not hardcoded
+# they are called programatically via the pattern below
 class ConfigSourcePathDeprecation(DBTDeprecation):
     _name = "project-config-source-paths"
     _event = "ConfigSourcePathDeprecation"
@@ -61,6 +63,16 @@ class ConfigDataPathDeprecation(DBTDeprecation):
     _event = "ConfigDataPathDeprecation"
 
 
+class ConfigLogPathDeprecation(DBTDeprecation):
+    _name = "project-config-log-path"
+    _event = "ConfigLogPathDeprecation"
+
+
+class ConfigTargetPathDeprecation(DBTDeprecation):
+    _name = "project-config-target-path"
+    _event = "ConfigTargetPathDeprecation"
+
+
 def renamed_method(old_name: str, new_name: str):
     class AdapterDeprecationWarning(DBTDeprecation):
         _name = "adapter:{}".format(old_name)
@@ -71,31 +83,26 @@ class AdapterDeprecationWarning(DBTDeprecation):
     deprecations[dep.name] = dep
 
 
-class MetricAttributesRenamed(DBTDeprecation):
-    _name = "metric-attr-renamed"
-    _event = "MetricAttributesRenamed"
+# class MetricAttributesRenamed(DBTDeprecation):
+#     _name = "metric-attr-renamed"
+#     _event = "MetricAttributesRenamed"
 
 
 class ExposureNameDeprecation(DBTDeprecation):
     _name = "exposure-name"
     _event = "ExposureNameDeprecation"
 
 
-class ConfigLogPathDeprecation(DBTDeprecation):
-    _name = "project-config-log-path"
-    _event = "ConfigLogPathDeprecation"
-
-
-class ConfigTargetPathDeprecation(DBTDeprecation):
-    _name = "project-config-target-path"
-    _event = "ConfigTargetPathDeprecation"
-
-
 class CollectFreshnessReturnSignature(DBTDeprecation):
     _name = "collect-freshness-return-signature"
     _event = "CollectFreshnessReturnSignature"
 
 
+class TestsConfigDeprecation(DBTDeprecation):
+    _name = "project-test-config"
+    _event = "TestsConfigDeprecation"
+
+
 def renamed_env_var(old_name: str, new_name: str):
     class EnvironmentVariableRenamed(DBTDeprecation):
         _name = f"environment-variable-renamed:{old_name}"
@@ -129,10 +136,11 @@ def warn(name, *args, **kwargs):
     PackageInstallPathDeprecation(),
     ConfigSourcePathDeprecation(),
     ConfigDataPathDeprecation(),
-    MetricAttributesRenamed(),
+    # MetricAttributesRenamed(),
     ExposureNameDeprecation(),
     ConfigLogPathDeprecation(),
     ConfigTargetPathDeprecation(),
+    TestsConfigDeprecation(),
     CollectFreshnessReturnSignature(),
 ]