Skip to content

Commit

Permalink
TST: move grouping test to correct location
Browse files Browse the repository at this point in the history
  • Loading branch information
jreback authored and No-Stream committed Nov 28, 2017
1 parent c4d438f commit 4b4500e
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 26 deletions.
26 changes: 1 addition & 25 deletions pandas/tests/groupby/test_groupby.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from pandas.errors import UnsupportedFunctionCall, PerformanceWarning
from pandas.util.testing import (assert_frame_equal, assert_index_equal,
assert_series_equal, assert_almost_equal)
from pandas.compat import (range, long, lrange, StringIO, lmap, lzip, map, zip,
from pandas.compat import (range, lrange, StringIO, lmap, lzip, map, zip,
builtins, OrderedDict)
from pandas import compat
from collections import defaultdict
Expand Down Expand Up @@ -2051,30 +2051,6 @@ def afunc(data):

assert_frame_equal(closure_bad, closure_good)

def test_multiindex_columns_empty_level(self):
l = [['count', 'values'], ['to filter', '']]
midx = MultiIndex.from_tuples(l)

df = DataFrame([[long(1), 'A']], columns=midx)

grouped = df.groupby('to filter').groups
assert grouped['A'] == [0]

grouped = df.groupby([('to filter', '')]).groups
assert grouped['A'] == [0]

df = DataFrame([[long(1), 'A'], [long(2), 'B']], columns=midx)

expected = df.groupby('to filter').groups
result = df.groupby([('to filter', '')]).groups
assert result == expected

df = DataFrame([[long(1), 'A'], [long(2), 'A']], columns=midx)

expected = df.groupby('to filter').groups
result = df.groupby([('to filter', '')]).groups
tm.assert_dict_equal(result, expected)

def test_cython_median(self):
df = DataFrame(np.random.randn(1000))
df.values[::2] = np.nan
Expand Down
26 changes: 25 additions & 1 deletion pandas/tests/groupby/test_grouping.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Index, MultiIndex, DataFrame, Series)
from pandas.util.testing import (assert_panel_equal, assert_frame_equal,
assert_series_equal, assert_almost_equal)
from pandas.compat import lrange
from pandas.compat import lrange, long

from pandas import compat
import numpy as np
Expand Down Expand Up @@ -356,6 +356,30 @@ def test_multifunc_select_col_integer_cols(self):
# it works!
df.groupby(1, as_index=False)[2].agg({'Q': np.mean})

def test_multiindex_columns_empty_level(self):
lst = [['count', 'values'], ['to filter', '']]
midx = MultiIndex.from_tuples(lst)

df = DataFrame([[long(1), 'A']], columns=midx)

grouped = df.groupby('to filter').groups
assert grouped['A'] == [0]

grouped = df.groupby([('to filter', '')]).groups
assert grouped['A'] == [0]

df = DataFrame([[long(1), 'A'], [long(2), 'B']], columns=midx)

expected = df.groupby('to filter').groups
result = df.groupby([('to filter', '')]).groups
assert result == expected

df = DataFrame([[long(1), 'A'], [long(2), 'A']], columns=midx)

expected = df.groupby('to filter').groups
result = df.groupby([('to filter', '')]).groups
tm.assert_dict_equal(result, expected)

def test_groupby_multiindex_tuple(self):
# GH 17979
df = pd.DataFrame([[1, 2, 3, 4], [3, 4, 5, 6], [1, 4, 2, 3]],
Expand Down

0 comments on commit 4b4500e

Please sign in to comment.