test(BA-5824): remove trivial test_types.py and consolidate with parametrize

- Remove tests/unit/manager/data/metric/test_types.py entirely
- Consolidate metric type classification tests into single parametrized test
- Merge rate/diff query preset tests into parametrized test
- Merge diff/rate live stat filter tests into parametrized test

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: seedspirit

tests/unit/manager/clients/prometheus/test_fixed_query_builder.py

@@ -25,28 +25,34 @@ class TestGetContainerMetricType:
     def builder(self) -> FixedQueryBuilder:
         return FixedQueryBuilder("1m")
 
-    def test_gauge_for_unknown_metric(self, builder: FixedQueryBuilder) -> None:
-        label = ContainerMetricOptionalLabel(value_type=ValueType.CURRENT)
-        assert builder.get_container_metric_type("mem", label) == MetricType.GAUGE
-
-    def test_gauge_for_capacity_value_type(self, builder: FixedQueryBuilder) -> None:
-        """cpu_util with CAPACITY value_type should be GAUGE, not DIFF."""
-        label = ContainerMetricOptionalLabel(value_type=ValueType.CAPACITY)
-        assert builder.get_container_metric_type("cpu_util", label) == MetricType.GAUGE
-
-    @pytest.mark.parametrize("metric_name", ["net_rx", "net_tx"])
-    def test_rate_for_network_metrics(self, builder: FixedQueryBuilder, metric_name: str) -> None:
-        label = ContainerMetricOptionalLabel(value_type=ValueType.CURRENT)
-        assert builder.get_container_metric_type(metric_name, label) == MetricType.RATE
-
-    def test_rate_takes_precedence_over_value_type(self, builder: FixedQueryBuilder) -> None:
-        """net_rx is RATE regardless of value_type."""
-        label = ContainerMetricOptionalLabel(value_type=ValueType.CAPACITY)
-        assert builder.get_container_metric_type("net_rx", label) == MetricType.RATE
-
-    def test_diff_for_cpu_util_with_current(self, builder: FixedQueryBuilder) -> None:
-        label = ContainerMetricOptionalLabel(value_type=ValueType.CURRENT)
-        assert builder.get_container_metric_type("cpu_util", label) == MetricType.DIFF
+    @pytest.mark.parametrize(
+        ("metric_name", "value_type", "expected"),
+        [
+            ("mem", ValueType.CURRENT, MetricType.GAUGE),
+            ("cpu_util", ValueType.CAPACITY, MetricType.GAUGE),
+            ("net_rx", ValueType.CURRENT, MetricType.RATE),
+            ("net_tx", ValueType.CURRENT, MetricType.RATE),
+            ("net_rx", ValueType.CAPACITY, MetricType.RATE),
+            ("cpu_util", ValueType.CURRENT, MetricType.DIFF),
+        ],
+        ids=[
+            "gauge-unknown-metric",
+            "gauge-capacity-overrides-diff",
+            "rate-net_rx",
+            "rate-net_tx",
+            "rate-precedence-over-value_type",
+            "diff-cpu_util-current",
+        ],
+    )
+    def test_metric_type_classification(
+        self,
+        builder: FixedQueryBuilder,
+        metric_name: str,
+        value_type: ValueType,
+        expected: MetricType,
+    ) -> None:
+        label = ContainerMetricOptionalLabel(value_type=value_type)
+        assert builder.get_container_metric_type(metric_name, label) == expected
 
 
 class TestGetContainerMetricQuery:
@@ -61,26 +67,18 @@ def test_gauge_query_preset(self, builder: FixedQueryBuilder) -> None:
 
         assert isinstance(result, MetricPreset)
         assert result.window == "5m"
-        assert "container_metric_name" in result.labels
         assert result.labels["container_metric_name"] == LabelMatcher.exact("mem")
         assert result.labels["value_type"] == LabelMatcher.exact("current")
         assert "value_type" in result.group_by
 
-    def test_rate_query_preset(self, builder: FixedQueryBuilder) -> None:
+    @pytest.mark.parametrize("metric_name", ["net_rx", "cpu_util"])
+    def test_rate_based_query_uses_rate_function(
+        self, builder: FixedQueryBuilder, metric_name: str
+    ) -> None:
         label = ContainerMetricOptionalLabel(value_type=ValueType.CURRENT)
 
-        result = builder.get_container_metric_query("net_rx", label)
+        rendered = builder.get_container_metric_query(metric_name, label).render()
 
-        rendered = result.render()
-        assert "rate(" in rendered
-        assert "[5m]" in rendered
-
-    def test_diff_query_preset(self, builder: FixedQueryBuilder) -> None:
-        label = ContainerMetricOptionalLabel(value_type=ValueType.CURRENT)
-
-        result = builder.get_container_metric_query("cpu_util", label)
-
-        rendered = result.render()
         assert "rate(" in rendered
         assert "[5m]" in rendered
 
@@ -93,7 +91,6 @@ def test_query_with_optional_labels(self, builder: FixedQueryBuilder) -> None:
 
         result = builder.get_container_metric_query("mem", label)
 
-        assert "kernel_id" in result.labels
         assert result.labels["kernel_id"] == LabelMatcher.exact(str(kid))
         assert "kernel_id" in result.group_by
 
@@ -106,38 +103,31 @@ def test_kernel_id_regex_filter(self) -> None:
 
         result = builder.get_container_live_stat_queries([kid1, kid2])
 
-        gauge_labels = result.gauge.labels
-        assert "kernel_id" in gauge_labels
-        matcher = gauge_labels["kernel_id"]
+        matcher = result.gauge.labels["kernel_id"]
         assert matcher.operator == LabelOperator.REGEX
         assert str(kid1) in matcher.value
         assert str(kid2) in matcher.value
 
-    def test_diff_filters_by_metric_name_and_value_type(self) -> None:
-        builder = FixedQueryBuilder("1m")
-        kid = KernelId(UUID("aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"))
-
-        result = builder.get_container_live_stat_queries([kid])
-
-        diff_labels = result.diff.labels
-        assert "container_metric_name" in diff_labels
-        assert diff_labels["container_metric_name"].operator == LabelOperator.REGEX
-        assert "cpu_util" in diff_labels["container_metric_name"].value
-        assert "value_type" in diff_labels
-        assert diff_labels["value_type"] == LabelMatcher.exact("current")
-
-    def test_rate_filters_by_metric_name_and_value_type(self) -> None:
+    @pytest.mark.parametrize(
+        ("preset_attr", "expected_metrics"),
+        [
+            ("diff", ["cpu_util"]),
+            ("rate", ["net_rx", "net_tx"]),
+        ],
+    )
+    def test_preset_filters_by_metric_name_and_value_type(
+        self, preset_attr: str, expected_metrics: list[str]
+    ) -> None:
         builder = FixedQueryBuilder("1m")
         kid = KernelId(UUID("aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"))
 
         result = builder.get_container_live_stat_queries([kid])
+        labels = getattr(result, preset_attr).labels
 
-        rate_labels = result.rate.labels
-        assert "container_metric_name" in rate_labels
-        assert "net_rx" in rate_labels["container_metric_name"].value
-        assert "net_tx" in rate_labels["container_metric_name"].value
-        assert "value_type" in rate_labels
-        assert rate_labels["value_type"] == LabelMatcher.exact("current")
+        assert labels["container_metric_name"].operator == LabelOperator.REGEX
+        for metric in expected_metrics:
+            assert metric in labels["container_metric_name"].value
+        assert labels["value_type"] == LabelMatcher.exact("current")
 
     def test_gauge_has_no_metric_name_filter(self) -> None:
         builder = FixedQueryBuilder("1m")