@@ -593,6 +593,17 @@ def _assert_equal(self, x, y, **kwargs):
593
593
def _assert_not_equal (self , a , b , ** kwargs ):
594
594
self .assertRaises (AssertionError , assert_frame_equal , a , b , ** kwargs )
595
595
self .assertRaises (AssertionError , assert_frame_equal , b , a , ** kwargs )
596
+
597
+ def test_equal_with_different_row_order (self ):
598
+ self ._assert_equal (pd .DataFrame ({'A' : [1 , 2 , 3 ], 'B' : [4 , 5 , 6 ]},
599
+ index = ['a' , 'b' , 'c' ]),
600
+ pd .DataFrame ({'A' : [3 , 2 , 1 ], 'B' : [6 , 5 , 4 ]},
601
+ index = ['c' , 'b' , 'a' ]),
602
+ check_like = True )
603
+
604
+ def test_not_equal_with_different_shape (self ):
605
+ self ._assert_not_equal (pd .DataFrame ({'A' : [1 , 2 , 3 ]}),
606
+ pd .DataFrame ({'A' : [1 , 2 , 3 , 4 ]}))
596
607
597
608
def test_index_dtype (self ):
598
609
df1 = DataFrame .from_records (
@@ -621,19 +632,9 @@ def test_frame_equal_message(self):
621
632
622
633
expected = """DataFrame are different
623
634
624
- DataFrame shape \\ (number of rows\\ ) are different
625
- \\ [left\\ ]: 3, RangeIndex\\ (start=0, stop=3, step=1\\ )
626
- \\ [right\\ ]: 4, RangeIndex\\ (start=0, stop=4, step=1\\ )"""
627
-
628
- with assertRaisesRegexp (AssertionError , expected ):
629
- assert_frame_equal (pd .DataFrame ({'A' : [1 , 2 , 3 ]}),
630
- pd .DataFrame ({'A' : [1 , 2 , 3 , 4 ]}))
631
-
632
- expected = """DataFrame are different
633
-
634
- DataFrame shape \\ (number of columns\\ ) are different
635
- \\ [left\\ ]: 2, Index\\ (\\ [u?'A', u?'B'\\ ], dtype='object'\\ )
636
- \\ [right\\ ]: 1, Index\\ (\\ [u?'A'\\ ], dtype='object'\\ )"""
635
+ DataFrame shape mismatch
636
+ \\ [left\\ ]: \\ (3, 2\\ )
637
+ \\ [right\\ ]: \\ (4, 1\\ )"""
637
638
638
639
with assertRaisesRegexp (AssertionError , expected ):
639
640
assert_frame_equal (pd .DataFrame ({'A' : [1 , 2 , 3 ], 'B' : [4 , 5 , 6 ]}),
0 commit comments