@@ -406,19 +406,15 @@ def test_mixed_groupings(normalize, expected_label, expected_values):
406
406
407
407
408
408
@pytest .mark .parametrize (
409
- "test, expected_names" ,
409
+ "test, columns, expected_names" ,
410
410
[
411
- ("repeat" , ["a" , None , "d" , "b" , "b" , "e" ]),
412
- ("level" , ["a" , None , "d" , "b" , "c" , "level_1" ]),
411
+ ("repeat" , list ( "abbde" ), ["a" , None , "d" , "b" , "b" , "e" ]),
412
+ ("level" , list ( "abcd" ) + [ "level_1" ], ["a" , None , "d" , "b" , "c" , "level_1" ]),
413
413
],
414
414
)
415
415
@pytest .mark .parametrize ("as_index" , [False , True ])
416
- def test_column_name_clashes (test , expected_names , as_index ):
417
- df = DataFrame ({"a" : [1 , 2 ], "b" : [3 , 4 ], "c" : [5 , 6 ], "d" : [7 , 8 ], "e" : [9 , 10 ]})
418
- if test == "repeat" :
419
- df .columns = list ("abbde" )
420
- else :
421
- df .columns = list ("abcd" ) + ["level_1" ]
416
+ def test_column_name_clashes (test , columns , expected_names , as_index ):
417
+ df = DataFrame ([[1 , 3 , 5 , 7 , 9 ], [2 , 4 , 6 , 8 , 10 ]], columns = columns )
422
418
423
419
if as_index :
424
420
result = df .groupby (["a" , [0 , 1 ], "d" ], as_index = as_index ).value_counts ()
0 commit comments