@@ -14,8 +14,8 @@ class Test_AntiJoin:
14
14
@pytest .mark .parametrize (
15
15
"how, exp_index, exp_values" ,
16
16
[
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 ] ]),
19
19
(
20
20
"anti_full" ,
21
21
["c" , "d" ],
@@ -33,60 +33,44 @@ def test_basic_anti_index(self, how, exp_index, exp_values):
33
33
tm .assert_frame_equal (result , expected )
34
34
35
35
@pytest .mark .parametrize (
36
- "on, how, expected " ,
36
+ "on, how, data " ,
37
37
[
38
38
(
39
39
["C" ],
40
40
"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 ]],
44
42
),
45
43
(
46
44
["C" ],
47
45
"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 ]],
51
47
),
52
48
(
53
49
["C" ],
54
50
"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 ]],
63
52
),
64
53
(
65
54
None ,
66
55
"anti_left" ,
67
- DataFrame ({ "A" : [ 1 , 2 ], "C" : [ 5 , 6 ], "B" : [ np .nan , np . nan ]}) ,
56
+ [[ 1 , 5 , np . nan ], [ 2 , 6 , np .nan ]] ,
68
57
),
69
58
(
70
59
None ,
71
60
"anti_right" ,
72
- DataFrame ({ "A" : [ np .nan , np . nan ], "C" : [ 8 , 9 ], "B" : [ 2 , 4 ]}) ,
61
+ [[ np .nan , 8 , 2 ], [ np . nan , 9 , 4 ]] ,
73
62
),
74
63
(
75
64
None ,
76
65
"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 ]],
84
67
),
85
68
],
86
69
)
87
- def test_basic_anti_on (self , on , how , expected ):
70
+ def test_basic_anti_on (self , on , how , data ):
88
71
left = DataFrame ({"A" : [1 , 2 , 3 ], "C" : [5 , 6 , 7 ]}, index = ["a" , "b" , "c" ])
89
72
right = DataFrame ({"B" : [1 , 2 , 4 ], "C" : [7 , 8 , 9 ]}, index = ["a" , "b" , "d" ])
73
+ expected = DataFrame (data , columns = ["A" , "C" , "B" ])
90
74
result = merge (left , right , how = how , on = on )
91
75
tm .assert_frame_equal (result , expected )
92
76
0 commit comments