@@ -8796,24 +8796,37 @@ def test_sort_index(self):
87968796 expected = frame .ix [frame .index [indexer ]]
87978797 assert_frame_equal (sorted_df , expected )
87988798
8799+ sorted_df = frame .sort (columns = 'A' , ascending = False )
8800+ assert_frame_equal (sorted_df , expected )
8801+
8802+ # GH4839
8803+ sorted_df = frame .sort (columns = ['A' ], ascending = [False ])
8804+ assert_frame_equal (sorted_df , expected )
8805+
87998806 # check for now
88008807 sorted_df = frame .sort (columns = 'A' )
8808+ assert_frame_equal (sorted_df , expected [::- 1 ])
88018809 expected = frame .sort_index (by = 'A' )
88028810 assert_frame_equal (sorted_df , expected )
88038811
8804- sorted_df = frame .sort (columns = 'A' , ascending = False )
8805- expected = frame .sort_index (by = 'A' , ascending = False )
8806- assert_frame_equal (sorted_df , expected )
88078812
88088813 sorted_df = frame .sort (columns = ['A' , 'B' ], ascending = False )
88098814 expected = frame .sort_index (by = ['A' , 'B' ], ascending = False )
88108815 assert_frame_equal (sorted_df , expected )
88118816
8817+ sorted_df = frame .sort (columns = ['A' , 'B' ])
8818+ assert_frame_equal (sorted_df , expected [::- 1 ])
8819+
88128820 self .assertRaises (ValueError , frame .sort_index , axis = 2 , inplace = True )
8821+
88138822 msg = 'When sorting by column, axis must be 0'
88148823 with assertRaisesRegexp (ValueError , msg ):
88158824 frame .sort_index (by = 'A' , axis = 1 )
88168825
8826+ msg = r'Length of ascending \(5\) != length of by \(2\)'
8827+ with assertRaisesRegexp (ValueError , msg ):
8828+ frame .sort_index (by = ['A' , 'B' ], axis = 0 , ascending = [True ] * 5 )
8829+
88178830 def test_sort_index_multicolumn (self ):
88188831 import random
88198832 A = np .arange (5 ).repeat (20 )
0 commit comments