8
8
from pandas import DataFrame , Index , MultiIndex , Series , concat , merge
9
9
from pandas .tests .reshape .merge .test_merge import NGROUPS , N , get_test_data
10
10
import pandas .util .testing as tm
11
- from pandas .util .testing import assert_frame_equal
12
11
13
12
a_ = np .array
14
13
@@ -194,7 +193,7 @@ def test_join_on(self):
194
193
expected = DataFrame (
195
194
{"key" : ["a" , "a" , "b" , "b" , "c" ], "value" : [0 , 0 , 1 , 1 , 2 ]}
196
195
)
197
- assert_frame_equal (joined , expected )
196
+ tm . assert_frame_equal (joined , expected )
198
197
199
198
# Test when some are missing
200
199
df_a = DataFrame ([[1 ], [2 ], [3 ]], index = ["a" , "b" , "c" ], columns = ["one" ])
@@ -281,7 +280,7 @@ def test_join_on_pass_vector(self):
281
280
282
281
join_col = self .target .pop ("C" )
283
282
result = self .target .join (self .source , on = join_col )
284
- assert_frame_equal (result , expected )
283
+ tm . assert_frame_equal (result , expected )
285
284
286
285
def test_join_with_len0 (self ):
287
286
# nothing to merge
@@ -314,12 +313,12 @@ def test_join_on_singlekey_list(self):
314
313
joined = df .join (df2 , on = ["key" ])
315
314
expected = df .join (df2 , on = "key" )
316
315
317
- assert_frame_equal (joined , expected )
316
+ tm . assert_frame_equal (joined , expected )
318
317
319
318
def test_join_on_series (self ):
320
319
result = self .target .join (self .source ["MergedA" ], on = "C" )
321
320
expected = self .target .join (self .source [["MergedA" ]], on = "C" )
322
- assert_frame_equal (result , expected )
321
+ tm . assert_frame_equal (result , expected )
323
322
324
323
def test_join_on_series_buglet (self ):
325
324
# GH #638
@@ -341,11 +340,11 @@ def test_join_index_mixed(self, join_type):
341
340
342
341
joined = df1 .join (df2 , how = join_type )
343
342
expected = _join_by_hand (df1 , df2 , how = join_type )
344
- assert_frame_equal (joined , expected )
343
+ tm . assert_frame_equal (joined , expected )
345
344
346
345
joined = df2 .join (df1 , how = join_type )
347
346
expected = _join_by_hand (df2 , df1 , how = join_type )
348
- assert_frame_equal (joined , expected )
347
+ tm . assert_frame_equal (joined , expected )
349
348
350
349
def test_join_index_mixed_overlap (self ):
351
350
df1 = DataFrame (
@@ -377,7 +376,7 @@ def test_join_index_mixed_overlap(self):
377
376
df1 .columns = expected_columns [:4 ]
378
377
df2 .columns = expected_columns [4 :]
379
378
expected = _join_by_hand (df1 , df2 )
380
- assert_frame_equal (joined , expected )
379
+ tm . assert_frame_equal (joined , expected )
381
380
382
381
def test_join_empty_bug (self ):
383
382
# generated an exception in 0.4.3
@@ -416,7 +415,7 @@ def test_join_multiindex(self):
416
415
ex_index = Index (index1 .values ).union (Index (index2 .values ))
417
416
expected = df1 .reindex (ex_index ).join (df2 .reindex (ex_index ))
418
417
expected .index .names = index1 .names
419
- assert_frame_equal (joined , expected )
418
+ tm . assert_frame_equal (joined , expected )
420
419
assert joined .index .names == index1 .names
421
420
422
421
df1 = df1 .sort_index (level = 1 )
@@ -427,7 +426,7 @@ def test_join_multiindex(self):
427
426
expected = df1 .reindex (ex_index ).join (df2 .reindex (ex_index ))
428
427
expected .index .names = index1 .names
429
428
430
- assert_frame_equal (joined , expected )
429
+ tm . assert_frame_equal (joined , expected )
431
430
assert joined .index .names == index1 .names
432
431
433
432
def test_join_inner_multiindex (self ):
@@ -475,7 +474,7 @@ def test_join_inner_multiindex(self):
475
474
how = "inner" ,
476
475
sort = False ,
477
476
)
478
- assert_frame_equal (joined , expected2 .reindex_like (joined ))
477
+ tm . assert_frame_equal (joined , expected2 .reindex_like (joined ))
479
478
480
479
expected2 = merge (
481
480
to_join ,
@@ -490,7 +489,7 @@ def test_join_inner_multiindex(self):
490
489
expected .index = joined .index
491
490
492
491
assert joined .index .is_monotonic
493
- assert_frame_equal (joined , expected )
492
+ tm . assert_frame_equal (joined , expected )
494
493
495
494
# _assert_same_contents(expected, expected2.loc[:, expected.columns])
496
495
@@ -528,7 +527,7 @@ def test_join_float64_float32(self):
528
527
assert rs .dtypes ["md" ] == "float32"
529
528
530
529
xp = xpdf .merge (s , left_on = "a" , right_index = True )
531
- assert_frame_equal (rs , xp )
530
+ tm . assert_frame_equal (rs , xp )
532
531
533
532
def test_join_many_non_unique_index (self ):
534
533
df1 = DataFrame ({"a" : [1 , 1 ], "b" : [1 , 1 ], "c" : [10 , 20 ]})
@@ -547,7 +546,7 @@ def test_join_many_non_unique_index(self):
547
546
expected = expected [result .columns ]
548
547
expected ["a" ] = expected .a .astype ("int64" )
549
548
expected ["b" ] = expected .b .astype ("int64" )
550
- assert_frame_equal (result , expected )
549
+ tm . assert_frame_equal (result , expected )
551
550
552
551
df1 = DataFrame ({"a" : [1 , 1 , 1 ], "b" : [1 , 1 , 1 ], "c" : [10 , 20 , 30 ]})
553
552
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):
562
561
563
562
result = result .reset_index ()
564
563
565
- assert_frame_equal (result , expected .loc [:, result .columns ])
564
+ tm . assert_frame_equal (result , expected .loc [:, result .columns ])
566
565
567
566
# GH 11519
568
567
df = DataFrame (
@@ -580,9 +579,9 @@ def test_join_many_non_unique_index(self):
580
579
outer = df .join (s , how = "outer" )
581
580
left = df .join (s , how = "left" )
582
581
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 )
586
585
587
586
def test_join_sort (self ):
588
587
left = DataFrame ({"key" : ["foo" , "bar" , "baz" , "foo" ], "value" : [1 , 2 , 3 , 4 ]})
@@ -597,7 +596,7 @@ def test_join_sort(self):
597
596
},
598
597
index = [1 , 2 , 0 , 3 ],
599
598
)
600
- assert_frame_equal (joined , expected )
599
+ tm . assert_frame_equal (joined , expected )
601
600
602
601
# smoke test
603
602
joined = left .join (right , on = "key" , sort = False )
@@ -684,7 +683,7 @@ def test_join_many_mixed(self):
684
683
df3 = df .loc [:, ["key" ]]
685
684
686
685
result = df1 .join ([df2 , df3 ])
687
- assert_frame_equal (result , df )
686
+ tm . assert_frame_equal (result , df )
688
687
689
688
def test_join_dups (self ):
690
689
@@ -702,7 +701,7 @@ def test_join_dups(self):
702
701
expected = concat ([df , df ], axis = 1 )
703
702
result = df .join (df , rsuffix = "_2" )
704
703
result .columns = expected .columns
705
- assert_frame_equal (result , expected )
704
+ tm . assert_frame_equal (result , expected )
706
705
707
706
# GH 4975, invalid join on dups
708
707
w = DataFrame (np .random .randn (4 , 2 ), columns = ["x" , "y" ])
@@ -716,7 +715,7 @@ def test_join_dups(self):
716
715
dta = dta .merge (w , left_index = True , right_index = True )
717
716
expected = concat ([x , y , z , w ], axis = 1 )
718
717
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 )
720
719
721
720
def test_join_multi_to_multi (self , join_type ):
722
721
# GH 20475
@@ -736,7 +735,7 @@ def test_join_multi_to_multi(self, join_type):
736
735
.merge (right .reset_index (), on = ["abc" , "xy" ], how = join_type )
737
736
.set_index (["abc" , "xy" , "num" ])
738
737
)
739
- assert_frame_equal (expected , result )
738
+ tm . assert_frame_equal (expected , result )
740
739
741
740
msg = (
742
741
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):
769
768
result = df1 .join (df2 .set_index ("date" ), on = "date" )
770
769
expected = df1 .copy ()
771
770
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 )
773
772
774
773
775
774
def _check_join (left , right , result , join_col , how = "left" , lsuffix = "_x" , rsuffix = "_y" ):
0 commit comments