Skip to content

Commit d93c0ac

Browse files
committed
changed a few test setup
1 parent db80abf commit d93c0ac

File tree

1 file changed

+11
-27
lines changed

1 file changed

+11
-27
lines changed

pandas/tests/reshape/merge/test_merge_anti.py

Lines changed: 11 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ class Test_AntiJoin:
1414
@pytest.mark.parametrize(
1515
"how, exp_index, exp_values",
1616
[
17-
("anti_left", ["c"], [3, 30, np.nan, np.nan]),
18-
("anti_right", ["d"], [np.nan, np.nan, 4, 40]),
17+
("anti_left", ["c"], [[3, 30, np.nan, np.nan]]),
18+
("anti_right", ["d"], [[np.nan, np.nan, 4, 40]]),
1919
(
2020
"anti_full",
2121
["c", "d"],
@@ -33,60 +33,44 @@ def test_basic_anti_index(self, how, exp_index, exp_values):
3333
tm.assert_frame_equal(result, expected)
3434

3535
@pytest.mark.parametrize(
36-
"on, how, expected",
36+
"on, how, data",
3737
[
3838
(
3939
["C"],
4040
"anti_left",
41-
DataFrame(
42-
{"A": [1, 2], "C": [5, 6], "B": [np.nan, np.nan]}, index=[0, 1]
43-
),
41+
[[1, 5, np.nan], [2, 6, np.nan]],
4442
),
4543
(
4644
["C"],
4745
"anti_right",
48-
DataFrame(
49-
{"A": [np.nan, np.nan], "C": [8, 9], "B": [2, 4]}, index=[0, 1]
50-
),
46+
[[np.nan, 8, 2], [np.nan, 9, 4]],
5147
),
5248
(
5349
["C"],
5450
"anti_full",
55-
DataFrame(
56-
{
57-
"A": [1, 2, np.nan, np.nan],
58-
"C": [5, 6, 8, 9],
59-
"B": [np.nan, np.nan, 2, 4],
60-
},
61-
index=[0, 1, 2, 3],
62-
),
51+
[[1, 5, np.nan], [2, 6, np.nan], [np.nan, 8, 2], [np.nan, 9, 4]],
6352
),
6453
(
6554
None,
6655
"anti_left",
67-
DataFrame({"A": [1, 2], "C": [5, 6], "B": [np.nan, np.nan]}),
56+
[[1, 5, np.nan], [2, 6, np.nan]],
6857
),
6958
(
7059
None,
7160
"anti_right",
72-
DataFrame({"A": [np.nan, np.nan], "C": [8, 9], "B": [2, 4]}),
61+
[[np.nan, 8, 2], [np.nan, 9, 4]],
7362
),
7463
(
7564
None,
7665
"anti_full",
77-
DataFrame(
78-
{
79-
"A": [1, 2, np.nan, np.nan],
80-
"C": [5, 6, 8, 9],
81-
"B": [np.nan, np.nan, 2, 4],
82-
},
83-
),
66+
[[1, 5, np.nan], [2, 6, np.nan], [np.nan, 8, 2], [np.nan, 9, 4]],
8467
),
8568
],
8669
)
87-
def test_basic_anti_on(self, on, how, expected):
70+
def test_basic_anti_on(self, on, how, data):
8871
left = DataFrame({"A": [1, 2, 3], "C": [5, 6, 7]}, index=["a", "b", "c"])
8972
right = DataFrame({"B": [1, 2, 4], "C": [7, 8, 9]}, index=["a", "b", "d"])
73+
expected = DataFrame(data, columns=["A", "C", "B"])
9074
result = merge(left, right, how=how, on=on)
9175
tm.assert_frame_equal(result, expected)
9276

0 commit comments

Comments
 (0)