Skip to content

Commit ce3d7e0

Browse files
SaturnFromTitangfyoung
authored andcommitted
Fixed test util imports in pandas/tests/reshape/ (#29285)
xref: #29272
1 parent 00cb06c commit ce3d7e0

File tree

7 files changed

+234
-238
lines changed

7 files changed

+234
-238
lines changed

pandas/tests/reshape/merge/test_join.py

+23-24
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
from pandas import DataFrame, Index, MultiIndex, Series, concat, merge
99
from pandas.tests.reshape.merge.test_merge import NGROUPS, N, get_test_data
1010
import pandas.util.testing as tm
11-
from pandas.util.testing import assert_frame_equal
1211

1312
a_ = np.array
1413

@@ -194,7 +193,7 @@ def test_join_on(self):
194193
expected = DataFrame(
195194
{"key": ["a", "a", "b", "b", "c"], "value": [0, 0, 1, 1, 2]}
196195
)
197-
assert_frame_equal(joined, expected)
196+
tm.assert_frame_equal(joined, expected)
198197

199198
# Test when some are missing
200199
df_a = DataFrame([[1], [2], [3]], index=["a", "b", "c"], columns=["one"])
@@ -281,7 +280,7 @@ def test_join_on_pass_vector(self):
281280

282281
join_col = self.target.pop("C")
283282
result = self.target.join(self.source, on=join_col)
284-
assert_frame_equal(result, expected)
283+
tm.assert_frame_equal(result, expected)
285284

286285
def test_join_with_len0(self):
287286
# nothing to merge
@@ -314,12 +313,12 @@ def test_join_on_singlekey_list(self):
314313
joined = df.join(df2, on=["key"])
315314
expected = df.join(df2, on="key")
316315

317-
assert_frame_equal(joined, expected)
316+
tm.assert_frame_equal(joined, expected)
318317

319318
def test_join_on_series(self):
320319
result = self.target.join(self.source["MergedA"], on="C")
321320
expected = self.target.join(self.source[["MergedA"]], on="C")
322-
assert_frame_equal(result, expected)
321+
tm.assert_frame_equal(result, expected)
323322

324323
def test_join_on_series_buglet(self):
325324
# GH #638
@@ -341,11 +340,11 @@ def test_join_index_mixed(self, join_type):
341340

342341
joined = df1.join(df2, how=join_type)
343342
expected = _join_by_hand(df1, df2, how=join_type)
344-
assert_frame_equal(joined, expected)
343+
tm.assert_frame_equal(joined, expected)
345344

346345
joined = df2.join(df1, how=join_type)
347346
expected = _join_by_hand(df2, df1, how=join_type)
348-
assert_frame_equal(joined, expected)
347+
tm.assert_frame_equal(joined, expected)
349348

350349
def test_join_index_mixed_overlap(self):
351350
df1 = DataFrame(
@@ -377,7 +376,7 @@ def test_join_index_mixed_overlap(self):
377376
df1.columns = expected_columns[:4]
378377
df2.columns = expected_columns[4:]
379378
expected = _join_by_hand(df1, df2)
380-
assert_frame_equal(joined, expected)
379+
tm.assert_frame_equal(joined, expected)
381380

382381
def test_join_empty_bug(self):
383382
# generated an exception in 0.4.3
@@ -416,7 +415,7 @@ def test_join_multiindex(self):
416415
ex_index = Index(index1.values).union(Index(index2.values))
417416
expected = df1.reindex(ex_index).join(df2.reindex(ex_index))
418417
expected.index.names = index1.names
419-
assert_frame_equal(joined, expected)
418+
tm.assert_frame_equal(joined, expected)
420419
assert joined.index.names == index1.names
421420

422421
df1 = df1.sort_index(level=1)
@@ -427,7 +426,7 @@ def test_join_multiindex(self):
427426
expected = df1.reindex(ex_index).join(df2.reindex(ex_index))
428427
expected.index.names = index1.names
429428

430-
assert_frame_equal(joined, expected)
429+
tm.assert_frame_equal(joined, expected)
431430
assert joined.index.names == index1.names
432431

433432
def test_join_inner_multiindex(self):
@@ -475,7 +474,7 @@ def test_join_inner_multiindex(self):
475474
how="inner",
476475
sort=False,
477476
)
478-
assert_frame_equal(joined, expected2.reindex_like(joined))
477+
tm.assert_frame_equal(joined, expected2.reindex_like(joined))
479478

480479
expected2 = merge(
481480
to_join,
@@ -490,7 +489,7 @@ def test_join_inner_multiindex(self):
490489
expected.index = joined.index
491490

492491
assert joined.index.is_monotonic
493-
assert_frame_equal(joined, expected)
492+
tm.assert_frame_equal(joined, expected)
494493

495494
# _assert_same_contents(expected, expected2.loc[:, expected.columns])
496495

@@ -528,7 +527,7 @@ def test_join_float64_float32(self):
528527
assert rs.dtypes["md"] == "float32"
529528

530529
xp = xpdf.merge(s, left_on="a", right_index=True)
531-
assert_frame_equal(rs, xp)
530+
tm.assert_frame_equal(rs, xp)
532531

533532
def test_join_many_non_unique_index(self):
534533
df1 = DataFrame({"a": [1, 1], "b": [1, 1], "c": [10, 20]})
@@ -547,7 +546,7 @@ def test_join_many_non_unique_index(self):
547546
expected = expected[result.columns]
548547
expected["a"] = expected.a.astype("int64")
549548
expected["b"] = expected.b.astype("int64")
550-
assert_frame_equal(result, expected)
549+
tm.assert_frame_equal(result, expected)
551550

552551
df1 = DataFrame({"a": [1, 1, 1], "b": [1, 1, 1], "c": [10, 20, 30]})
553552
df2 = DataFrame({"a": [1, 1, 1], "b": [1, 1, 2], "d": [100, 200, 300]})
@@ -562,7 +561,7 @@ def test_join_many_non_unique_index(self):
562561

563562
result = result.reset_index()
564563

565-
assert_frame_equal(result, expected.loc[:, result.columns])
564+
tm.assert_frame_equal(result, expected.loc[:, result.columns])
566565

567566
# GH 11519
568567
df = DataFrame(
@@ -580,9 +579,9 @@ def test_join_many_non_unique_index(self):
580579
outer = df.join(s, how="outer")
581580
left = df.join(s, how="left")
582581
right = df.join(s, how="right")
583-
assert_frame_equal(inner, outer)
584-
assert_frame_equal(inner, left)
585-
assert_frame_equal(inner, right)
582+
tm.assert_frame_equal(inner, outer)
583+
tm.assert_frame_equal(inner, left)
584+
tm.assert_frame_equal(inner, right)
586585

587586
def test_join_sort(self):
588587
left = DataFrame({"key": ["foo", "bar", "baz", "foo"], "value": [1, 2, 3, 4]})
@@ -597,7 +596,7 @@ def test_join_sort(self):
597596
},
598597
index=[1, 2, 0, 3],
599598
)
600-
assert_frame_equal(joined, expected)
599+
tm.assert_frame_equal(joined, expected)
601600

602601
# smoke test
603602
joined = left.join(right, on="key", sort=False)
@@ -684,7 +683,7 @@ def test_join_many_mixed(self):
684683
df3 = df.loc[:, ["key"]]
685684

686685
result = df1.join([df2, df3])
687-
assert_frame_equal(result, df)
686+
tm.assert_frame_equal(result, df)
688687

689688
def test_join_dups(self):
690689

@@ -702,7 +701,7 @@ def test_join_dups(self):
702701
expected = concat([df, df], axis=1)
703702
result = df.join(df, rsuffix="_2")
704703
result.columns = expected.columns
705-
assert_frame_equal(result, expected)
704+
tm.assert_frame_equal(result, expected)
706705

707706
# GH 4975, invalid join on dups
708707
w = DataFrame(np.random.randn(4, 2), columns=["x", "y"])
@@ -716,7 +715,7 @@ def test_join_dups(self):
716715
dta = dta.merge(w, left_index=True, right_index=True)
717716
expected = concat([x, y, z, w], axis=1)
718717
expected.columns = ["x_x", "y_x", "x_y", "y_y", "x_x", "y_x", "x_y", "y_y"]
719-
assert_frame_equal(dta, expected)
718+
tm.assert_frame_equal(dta, expected)
720719

721720
def test_join_multi_to_multi(self, join_type):
722721
# GH 20475
@@ -736,7 +735,7 @@ def test_join_multi_to_multi(self, join_type):
736735
.merge(right.reset_index(), on=["abc", "xy"], how=join_type)
737736
.set_index(["abc", "xy", "num"])
738737
)
739-
assert_frame_equal(expected, result)
738+
tm.assert_frame_equal(expected, result)
740739

741740
msg = (
742741
r"len\(left_on\) must equal the number of levels in the index" ' of "right"'
@@ -769,7 +768,7 @@ def test_join_on_tz_aware_datetimeindex(self):
769768
result = df1.join(df2.set_index("date"), on="date")
770769
expected = df1.copy()
771770
expected["vals_2"] = pd.Series([np.nan] * 2 + list("tuv"), dtype=object)
772-
assert_frame_equal(result, expected)
771+
tm.assert_frame_equal(result, expected)
773772

774773

775774
def _check_join(left, right, result, join_col, how="left", lsuffix="_x", rsuffix="_y"):

0 commit comments

Comments
 (0)