Skip to content

TST: Refactor test_maybe_match_name and test_hash_pandas_object #21600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 25, 2018
Merged

TST: Refactor test_maybe_match_name and test_hash_pandas_object #21600

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7cb4a13
refactor test_maybe_match_name
minggli Jun 22, 2018
8ec8d9b
minor styling
minggli Jun 22, 2018
7364e2b
test_hash_pandas_object
minggli Jun 22, 2018
2ddd15c
indentation
minggli Jun 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 10 additions & 26 deletions pandas/tests/test_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ def test_mut_exclusive():


def test_get_callable_name():
from functools import partial
getname = com._get_callable_name

def fn(x):
Expand Down Expand Up @@ -154,8 +153,7 @@ def test_random_state():

# Check with random state object
state2 = npr.RandomState(10)
assert (com._random_state(state2).uniform() ==
npr.RandomState(10).uniform())
assert com._random_state(state2).uniform() == npr.RandomState(10).uniform()

# check with no arg random state
assert com._random_state() is np.random
Expand All @@ -168,29 +166,15 @@ def test_random_state():
com._random_state(5.5)


def test_maybe_match_name():

matched = ops._maybe_match_name(
Series([1], name='x'), Series(
[2], name='x'))
assert (matched == 'x')

matched = ops._maybe_match_name(
Series([1], name='x'), Series(
[2], name='y'))
assert (matched is None)

matched = ops._maybe_match_name(Series([1]), Series([2], name='x'))
assert (matched is None)

matched = ops._maybe_match_name(Series([1], name='x'), Series([2]))
assert (matched is None)

matched = ops._maybe_match_name(Series([1], name='x'), [2])
assert (matched == 'x')

matched = ops._maybe_match_name([1], Series([2], name='y'))
assert (matched == 'y')
@pytest.mark.parametrize('left, right, expected', [
(Series([1], name='x'), Series([2], name='x'), 'x'),
(Series([1], name='x'), Series([2], name='y'), None),
(Series([1]), Series([2], name='x'), None),
(Series([1], name='x'), Series([2]), None),
(Series([1], name='x'), [2], 'x'),
([1], Series([2], name='y'), 'y')])
def test_maybe_match_name(left, right, expected):
assert ops._maybe_match_name(left, right) == expected


def test_dict_compat():
Expand Down