Skip to content

Commit

Permalink
MAINT: Remove vestigial self.assert* (pandas-dev#16190)
Browse files Browse the repository at this point in the history
Remove all remaining self.assert*
method calls originating from unittest.
Any that are left are calls to methods
directly defined in the test class or
a higher derived pandas test class.
  • Loading branch information
gfyoung authored and pcluo committed May 22, 2017
1 parent 4fdb2cf commit 8b55ddf
Show file tree
Hide file tree
Showing 4 changed files with 71 additions and 85 deletions.
10 changes: 5 additions & 5 deletions pandas/tests/frame/test_repr_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -331,13 +331,13 @@ def test_info_memory_usage(self):
res = buf.getvalue().splitlines()
assert re.match(r"memory usage: [^+]+$", res[-1])

self.assertGreater(df_with_object_index.memory_usage(index=True,
deep=True).sum(),
df_with_object_index.memory_usage(index=True).sum())
assert (df_with_object_index.memory_usage(
index=True, deep=True).sum() > df_with_object_index.memory_usage(
index=True).sum())

df_object = pd.DataFrame({'a': ['a']})
self.assertGreater(df_object.memory_usage(deep=True).sum(),
df_object.memory_usage().sum())
assert (df_object.memory_usage(deep=True).sum() >
df_object.memory_usage().sum())

# Test a DataFrame with duplicate columns
dtypes = ['int64', 'int64', 'int64', 'float64']
Expand Down
4 changes: 2 additions & 2 deletions pandas/tests/io/formats/test_style.py
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ def test_bar_align_mid_pos_and_neg(self):
'#5fba7d 10.0%, #5fba7d 100.0%, '
'transparent 100.0%)']}

self.assertEqual(result, expected)
assert result == expected

def test_bar_align_mid_all_pos(self):
df = pd.DataFrame({'A': [10, 20, 50, 100]})
Expand All @@ -399,7 +399,7 @@ def test_bar_align_mid_all_pos(self):
'transparent 0%, transparent 0.0%, #5fba7d 0.0%, '
'#5fba7d 100.0%, transparent 100.0%)']}

self.assertEqual(result, expected)
assert result == expected

def test_bar_align_mid_all_neg(self):
df = pd.DataFrame({'A': [-100, -60, -30, -20]})
Expand Down
8 changes: 4 additions & 4 deletions pandas/tests/test_nanops.py
Original file line number Diff line number Diff line change
Expand Up @@ -914,11 +914,11 @@ def test_constant_series(self):
def test_all_finite(self):
alpha, beta = 0.3, 0.1
left_tailed = self.prng.beta(alpha, beta, size=100)
self.assertLess(nanops.nanskew(left_tailed), 0)
assert nanops.nanskew(left_tailed) < 0

alpha, beta = 0.1, 0.3
right_tailed = self.prng.beta(alpha, beta, size=100)
self.assertGreater(nanops.nanskew(right_tailed), 0)
assert nanops.nanskew(right_tailed) > 0

def test_ground_truth(self):
skew = nanops.nanskew(self.samples)
Expand Down Expand Up @@ -964,11 +964,11 @@ def test_constant_series(self):
def test_all_finite(self):
alpha, beta = 0.3, 0.1
left_tailed = self.prng.beta(alpha, beta, size=100)
self.assertLess(nanops.nankurt(left_tailed), 0)
assert nanops.nankurt(left_tailed) < 0

alpha, beta = 0.1, 0.3
right_tailed = self.prng.beta(alpha, beta, size=100)
self.assertGreater(nanops.nankurt(right_tailed), 0)
assert nanops.nankurt(right_tailed) > 0

def test_ground_truth(self):
kurt = nanops.nankurt(self.samples)
Expand Down
Loading

0 comments on commit 8b55ddf

Please sign in to comment.