[tidy first] Replace TestSelector with ResourceTypeSelector

core/dbt/task/build.py

@@ -11,7 +11,6 @@
 from dbt.graph import Graph, GraphQueue, ResourceTypeSelector
 from dbt.node_types import NodeType
 from dbt.task.base import BaseRunner, resource_types_from_args
-from dbt.task.test import TestSelector
 from dbt_common.events.functions import fire_event
 
 from .run import ModelRunner as run_model_runner
@@ -198,10 +197,11 @@ def get_node_selector(self, no_unit_tests=False) -> ResourceTypeSelector:
         resource_types = self.resource_types(no_unit_tests)
 
         if resource_types == [NodeType.Test]:
-            return TestSelector(
+            return ResourceTypeSelector(
                 graph=self.graph,
                 manifest=self.manifest,
                 previous_state=self.previous_state,
+                resource_types=resource_types,
             )
         return ResourceTypeSelector(
             graph=self.graph,

core/dbt/task/list.py

@@ -17,7 +17,6 @@
 from dbt.node_types import NodeType
 from dbt.task.base import resource_types_from_args
 from dbt.task.runnable import GraphRunnableTask
-from dbt.task.test import TestSelector
 from dbt_common.events.contextvars import task_contextvars
 from dbt_common.events.functions import fire_event, warn_or_error
 from dbt_common.events.types import PrintEvent
@@ -201,10 +200,11 @@ def get_node_selector(self):
         if self.manifest is None or self.graph is None:
             raise DbtInternalError("manifest and graph must be set to get perform node selection")
         if self.resource_types == [NodeType.Test]:
-            return TestSelector(
+            return ResourceTypeSelector(
                 graph=self.graph,
                 manifest=self.manifest,
                 previous_state=self.previous_state,
+                resource_types=self.resource_types,
             )
         else:
             return ResourceTypeSelector(

core/dbt/task/test.py

@@ -375,16 +375,6 @@ def _render_daff_diff(self, daff_diff: daff.TableDiff) -> str:
         return rendered
 
 
-class TestSelector(ResourceTypeSelector):
-    def __init__(self, graph, manifest, previous_state) -> None:
-        super().__init__(
-            graph=graph,
-            manifest=manifest,
-            previous_state=previous_state,
-            resource_types=[NodeType.Test, NodeType.Unit],
-        )
-
-
 class TestTask(RunTask):
     """
     Testing:
@@ -397,13 +387,14 @@ class TestTask(RunTask):
     def raise_on_first_error(self) -> bool:
         return False
 
-    def get_node_selector(self) -> TestSelector:
+    def get_node_selector(self) -> ResourceTypeSelector:
         if self.manifest is None or self.graph is None:
             raise DbtInternalError("manifest and graph must be set to get perform node selection")
-        return TestSelector(
+        return ResourceTypeSelector(
             graph=self.graph,
             manifest=self.manifest,
             previous_state=self.previous_state,
+            resource_types=[NodeType.Test, NodeType.Unit],
         )
 
     def get_runner_type(self, _) -> Optional[Type[BaseRunner]]: