Skip to content

Commit c6dfe24

Browse files
committed
Fix obj arguments in assertions
1 parent 0c24b20 commit c6dfe24

File tree

4 files changed

+10
-12
lines changed

4 files changed

+10
-12
lines changed

pandas/_testing/asserters.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ def _check_types(left, right, obj: str = "Index") -> None:
283283
right = cast(MultiIndex, right)
284284

285285
for level in range(left.nlevels):
286-
lobj = f"MultiIndex level [{level}]"
286+
lobj = f"{obj} level [{level}]"
287287
try:
288288
# try comparison on levels/codes to avoid densifying MultiIndex
289289
assert_index_equal(
@@ -314,7 +314,7 @@ def _check_types(left, right, obj: str = "Index") -> None:
314314
obj=lobj,
315315
)
316316
# get_level_values may change dtype
317-
_check_types(left.levels[level], right.levels[level], obj=obj)
317+
_check_types(left.levels[level], right.levels[level], obj=lobj)
318318

319319
# skip exact index checking when `check_categorical` is False
320320
elif check_exact and check_categorical:
@@ -527,7 +527,7 @@ def assert_interval_array_equal(
527527
kwargs["check_freq"] = False
528528

529529
assert_equal(left._left, right._left, obj=f"{obj}.left", **kwargs)
530-
assert_equal(left._right, right._right, obj=f"{obj}.left", **kwargs)
530+
assert_equal(left._right, right._right, obj=f"{obj}.right", **kwargs)
531531

532532
assert_attr_equal("closed", left, right, obj=obj)
533533

pandas/tests/util/test_assert_frame_equal.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ def test_frame_equal_shape_mismatch(df1, df2, frame_or_series):
7979
DataFrame.from_records(
8080
{"a": [1.0, 2.0], "b": [2.1, 1.5], "c": ["l1", "l2"]}, index=["a", "b"]
8181
),
82-
"MultiIndex level \\[0\\] are different",
82+
"DataFrame\\.index level \\[0\\] are different",
8383
),
8484
],
8585
)

pandas/tests/util/test_assert_index_equal.py

+5-7
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ def test_index_equal_levels_mismatch():
3232

3333

3434
def test_index_equal_values_mismatch(check_exact):
35-
msg = """MultiIndex level \\[1\\] are different
35+
msg = """Index level \\[1\\] are different
3636
37-
MultiIndex level \\[1\\] values are different \\(25\\.0 %\\)
37+
Index level \\[1\\] values are different \\(25\\.0 %\\)
3838
\\[left\\]: Index\\(\\[2, 2, 3, 4\\], dtype='int64'\\)
3939
\\[right\\]: Index\\(\\[1, 2, 3, 4\\], dtype='int64'\\)"""
4040

@@ -172,9 +172,9 @@ def test_index_equal_level_values_mismatch(check_exact, rtol):
172172
idx2 = MultiIndex.from_tuples([("A", 1), ("A", 2), ("B", 3), ("B", 4)])
173173
kwargs = {"check_exact": check_exact, "rtol": rtol}
174174

175-
msg = """MultiIndex level \\[1\\] are different
175+
msg = """Index level \\[1\\] are different
176176
177-
MultiIndex level \\[1\\] values are different \\(25\\.0 %\\)
177+
Index level \\[1\\] values are different \\(25\\.0 %\\)
178178
\\[left\\]: Index\\(\\[2, 2, 3, 4\\], dtype='int64'\\)
179179
\\[right\\]: Index\\(\\[1, 2, 3, 4\\], dtype='int64'\\)"""
180180

@@ -311,9 +311,7 @@ def test_assert_multi_index_dtype_check_categorical(check_categorical):
311311
idx1 = MultiIndex.from_arrays([Categorical(np.array([1, 2], dtype=np.uint64))])
312312
idx2 = MultiIndex.from_arrays([Categorical(np.array([1, 2], dtype=np.int64))])
313313
if check_categorical:
314-
with pytest.raises(
315-
AssertionError, match=r"^MultiIndex level \[0\] are different"
316-
):
314+
with pytest.raises(AssertionError, match=r"^Index level \[0\] are different"):
317315
tm.assert_index_equal(idx1, idx2, check_categorical=check_categorical)
318316
else:
319317
tm.assert_index_equal(idx1, idx2, check_categorical=check_categorical)

pandas/tests/util/test_assert_series_equal.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ def test_less_precise(data1, data2, any_float_dtype, decimals):
137137
DataFrame.from_records(
138138
{"a": [1.0, 2.0], "b": [2.1, 1.5], "c": ["l1", "l2"]}, index=["a", "b"]
139139
).c,
140-
"MultiIndex level \\[0\\] are different",
140+
"Series\\.index level \\[0\\] are different",
141141
),
142142
],
143143
)

0 commit comments

Comments
 (0)