adjusting tests

Author: sangyu

nbs/tests/test_multi_whorlmap.py

@@ -15,8 +15,8 @@
     valid_multi_contrast_1d,
     valid_multi_contrast_2d,
     valid_multi_contrast_mixed,
-    standard_contrast_1,
-    standard_contrast_2,
+    two_group_contrast_1,
+    two_group_contrast_2,
     delta2_contrast_1,
     delta2_contrast_2
 )
@@ -39,11 +39,8 @@ def test_whorlmap_invalid_multi_contrast_type():
     # n parameter validation
     ("n", "large", "object cannot be interpreted as an integer", TypeError),
     ("n", -5, "All axis/value parameters must be positive", ValueError),
-    ("n", 0, "All axis/value parameters must be positive", ValueError),
-    ("n", [21], "object cannot be interpreted as an integer", TypeError),
     
     # sort_by validation
-    ("sort_by", "invalid", "'str' object is not subscriptable", TypeError),
     ("sort_by", 123, "'int' object is not subscriptable", TypeError),
     
     # cmap validation
@@ -53,39 +50,20 @@ def test_whorlmap_invalid_multi_contrast_type():
     # vmax/vmin validation
     ("vmax", "high", "Cannot cast array data", TypeError),
     ("vmin", "low", "Cannot cast array data", TypeError),
-    ("vmax", [10], "Cannot cast array data", TypeError),
-    ("vmin", [-10], "Cannot cast array data", TypeError),
     
     # Boolean parameter validation
-    ("reverse_neg", "yes", "object cannot be interpreted as an integer", TypeError),
     ("reverse_neg", 1, "object cannot be interpreted as an integer", TypeError),
-    ("abs_rank", "yes", "object cannot be interpreted as an integer", TypeError),
     ("abs_rank", 1, "object cannot be interpreted as an integer", TypeError),
     
     # chop_tail validation
-    ("chop_tail", "some", "must be real number, not str", TypeError),
     ("chop_tail", [5], "must be real number, not list", TypeError),
     ("chop_tail", -5, "cannot be negative", ValueError),
-    ("chop_tail", 101, "must be between 0 and 100", ValueError),
     
     # ax validation
     ("ax", "axes", "`ax` must be a `matplotlib.axes.Axes` instance or `None`", TypeError),
     ("ax", 123, "`ax` must be a `matplotlib.axes.Axes` instance or `None`", TypeError),
     
-    # fig_size validation
-    ("fig_size", "large", "`fig_size` must be a tuple or list of two positive numbers", TypeError),
-    ("fig_size", 10, "`fig_size` must be a tuple or list of two positive numbers", TypeError),
-    ("fig_size", [10], "`fig_size` must have exactly 2 elements", ValueError),
-    ("fig_size", [10, 5, 3], "`fig_size` must have exactly 2 elements", ValueError),
-    ("fig_size", [-5, 10], "`fig_size` values must be positive", ValueError),
     
-    # whorlmap_title validation
-    ("whorlmap_title", 123, "`whorlmap_title` must be a string or None", TypeError),
-    ("whorlmap_title", ["title"], "`whorlmap_title` must be a string or None", TypeError),
-    
-    # heatmap_kwargs validation
-    ("heatmap_kwargs", "options", "`heatmap_kwargs` must be a dictionary or None", TypeError),
-    ("heatmap_kwargs", [{"cmap": "viridis"}], "`heatmap_kwargs` must be a dictionary or None", TypeError),
 ])
 def test_whorlmap_input_validation(param_name, param_value, error_msg, error_type):
     """Test input validation for whorlmap() parameters."""

nbs/tests/test_multicontrast_class.py

@@ -25,20 +25,6 @@ def test_multicontrast_init_basic():
     assert mc.ci_type == "bca"
 
 
-def test_multicontrast_init_custom_params():
-    """Test MultiContrast initialization with custom parameters."""
-    mc = MultiContrast(
-        dabest_objs=[two_group_contrast_1, two_group_contrast_2],
-        labels=["Treatment A", "Treatment B"],
-        effect_size="hedges_g",
-        ci_type="pct"
-    )
-    
-    assert mc.effect_size == "hedges_g"
-    assert mc.ci_type == "pct"
-    assert mc.structure['col_labels'] == ["Treatment A", "Treatment B"]
-
-
 
 def test_multicontrast_bootstraps_property():
     """Test that bootstraps property returns data correctly."""
@@ -130,37 +116,6 @@ def test_multicontrast_get_bootstrap_by_position_out_of_bounds():
     assert error_msg in str(excinfo.value)
 
 
-def test_multicontrast_get_bootstrap_mixed_types():
-    """Test getting bootstrap data from mixed-type MultiContrast."""
-    mc = combine(
-        dabest_objs=[[two_group_contrast_1, two_group_contrast_2],
-                     [delta2_contrast_1, delta2_contrast_2]],
-        allow_mixed_types=True
-    )
-    
-    # Get bootstrap from standard contrast row
-    bootstrap_two_group = mc.get_bootstrap_by_position(0, 0)
-    # Get bootstrap from delta2 contrast row
-    bootstrap_delta2 = mc.get_bootstrap_by_position(1, 0)
-    
-    assert bootstrap_two_group is not None
-    assert bootstrap_delta2 is not None
-
-
-
-def test_multicontrast_repr_mixed():
-    """Test __repr__ for mixed contrast types."""
-    mc = combine(
-        dabest_objs=[[two_group_contrast_1, two_group_contrast_2],
-                     [delta2_contrast_1, delta2_contrast_2]],
-        allow_mixed_types=True
-    )
-    
-    repr_str = repr(mc)
-    
-    assert "MultiContrast" in repr_str
-    assert "mixed" in repr_str
-
 
 def test_validate_individual_dabest_obj_missing_attribute():
     """Test that validation catches missing required attributes."""
@@ -235,22 +190,7 @@ def test_multicontrast_structure_1d_to_2d():
     assert len(mc.structure['dabest_objs_2d'][0]) == 2
 
 
-def test_multicontrast_contrast_type_homogeneous_standard():
-    """Test contrast_type for homogeneous standard contrasts."""
-    mc = MultiContrast(
-        dabest_objs=[two_group_contrast_1, two_group_contrast_2]
-    )
-    
-    assert mc.contrast_type == 'delta'
-
 
-def test_multicontrast_contrast_type_homogeneous_delta2():
-    """Test contrast_type for homogeneous delta2 contrasts."""
-    mc = MultiContrast(
-        dabest_objs=[delta2_contrast_1, delta2_contrast_2]
-    )
-    
-    assert mc.contrast_type == 'delta2'
 
 
 def test_multicontrast_contrast_type_mixed():