Skip to content

Commit 869ef66

Browse files
sinhrkssinhrks
committed
TST: Fix unused tests in tseries/test_base.py
1 parent 29d9e24 commit 869ef66

File tree

1 file changed

+59
-59
lines changed

1 file changed

+59
-59
lines changed

‎pandas/tseries/tests/test_base.py

+59-59
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ def test_resolution(self):
335335
['day', 'day', 'day', 'day', 'hour',
336336
'minute', 'second', 'millisecond',
337337
'microsecond']):
338-
for tz in [None, 'Asia/Tokyo', 'US/Eastern']:
338+
for tz in self.tz:
339339
idx = pd.date_range(start='2013-04-01', periods=30, freq=freq,
340340
tz=tz)
341341
self.assertEqual(idx.resolution, expected)
@@ -488,7 +488,7 @@ def test_comp_nat(self):
488488

489489
def test_value_counts_unique(self):
490490
# GH 7735
491-
for tz in [None, 'UTC', 'Asia/Tokyo', 'US/Eastern']:
491+
for tz in self.tz:
492492
idx = pd.date_range('2011-01-01 09:00', freq='H', periods=10)
493493
# create repeated values, 'n'th element is repeated by n+1 times
494494
idx = DatetimeIndex(np.repeat(idx.values, range(1, len(idx) + 1)),
@@ -570,49 +570,50 @@ def test_order(self):
570570
self.assertEqual(ordered.freq.n, -1)
571571

572572
# without freq
573-
idx1 = DatetimeIndex(['2011-01-01', '2011-01-03', '2011-01-05',
574-
'2011-01-02', '2011-01-01'], name='idx1')
575-
exp1 = DatetimeIndex(['2011-01-01', '2011-01-01', '2011-01-02',
576-
'2011-01-03', '2011-01-05'], name='idx1')
577-
578-
idx2 = DatetimeIndex(['2011-01-01', '2011-01-03', '2011-01-05',
579-
'2011-01-02', '2011-01-01'],
580-
tz='Asia/Tokyo', name='idx2')
581-
582-
# TODO(wesm): unused?
583-
584-
# exp2 = DatetimeIndex(['2011-01-01', '2011-01-01', '2011-01-02',
585-
# '2011-01-03', '2011-01-05'],
586-
# tz='Asia/Tokyo', name='idx2')
587-
588-
# idx3 = DatetimeIndex([pd.NaT, '2011-01-03', '2011-01-05',
589-
# '2011-01-02', pd.NaT], name='idx3')
590-
# exp3 = DatetimeIndex([pd.NaT, pd.NaT, '2011-01-02', '2011-01-03',
591-
# '2011-01-05'], name='idx3')
592-
593-
for idx, expected in [(idx1, exp1), (idx1, exp1), (idx1, exp1)]:
594-
ordered = idx.sort_values()
595-
self.assert_index_equal(ordered, expected)
596-
self.assertIsNone(ordered.freq)
597-
598-
ordered = idx.sort_values(ascending=False)
599-
self.assert_index_equal(ordered, expected[::-1])
600-
self.assertIsNone(ordered.freq)
601-
602-
ordered, indexer = idx.sort_values(return_indexer=True)
603-
self.assert_index_equal(ordered, expected)
604-
605-
exp = np.array([0, 4, 3, 1, 2])
606-
self.assert_numpy_array_equal(indexer, exp, check_dtype=False)
607-
self.assertIsNone(ordered.freq)
608-
609-
ordered, indexer = idx.sort_values(return_indexer=True,
610-
ascending=False)
611-
self.assert_index_equal(ordered, expected[::-1])
612-
613-
exp = np.array([2, 1, 3, 4, 0])
614-
self.assert_numpy_array_equal(indexer, exp, check_dtype=False)
615-
self.assertIsNone(ordered.freq)
573+
for tz in self.tz:
574+
idx1 = DatetimeIndex(['2011-01-01', '2011-01-03', '2011-01-05',
575+
'2011-01-02', '2011-01-01'],
576+
tz=tz, name='idx1')
577+
exp1 = DatetimeIndex(['2011-01-01', '2011-01-01', '2011-01-02',
578+
'2011-01-03', '2011-01-05'],
579+
tz=tz, name='idx1')
580+
581+
idx2 = DatetimeIndex(['2011-01-01', '2011-01-03', '2011-01-05',
582+
'2011-01-02', '2011-01-01'],
583+
tz=tz, name='idx2')
584+
585+
exp2 = DatetimeIndex(['2011-01-01', '2011-01-01', '2011-01-02',
586+
'2011-01-03', '2011-01-05'],
587+
tz=tz, name='idx2')
588+
589+
idx3 = DatetimeIndex([pd.NaT, '2011-01-03', '2011-01-05',
590+
'2011-01-02', pd.NaT], tz=tz, name='idx3')
591+
exp3 = DatetimeIndex([pd.NaT, pd.NaT, '2011-01-02', '2011-01-03',
592+
'2011-01-05'], tz=tz, name='idx3')
593+
594+
for idx, expected in [(idx1, exp1), (idx2, exp2), (idx3, exp3)]:
595+
ordered = idx.sort_values()
596+
self.assert_index_equal(ordered, expected)
597+
self.assertIsNone(ordered.freq)
598+
599+
ordered = idx.sort_values(ascending=False)
600+
self.assert_index_equal(ordered, expected[::-1])
601+
self.assertIsNone(ordered.freq)
602+
603+
ordered, indexer = idx.sort_values(return_indexer=True)
604+
self.assert_index_equal(ordered, expected)
605+
606+
exp = np.array([0, 4, 3, 1, 2])
607+
self.assert_numpy_array_equal(indexer, exp, check_dtype=False)
608+
self.assertIsNone(ordered.freq)
609+
610+
ordered, indexer = idx.sort_values(return_indexer=True,
611+
ascending=False)
612+
self.assert_index_equal(ordered, expected[::-1])
613+
614+
exp = np.array([2, 1, 3, 4, 0])
615+
self.assert_numpy_array_equal(indexer, exp, check_dtype=False)
616+
self.assertIsNone(ordered.freq)
616617

617618
def test_getitem(self):
618619
idx1 = pd.date_range('2011-01-01', '2011-01-31', freq='D', name='idx')
@@ -762,7 +763,7 @@ def test_nat_new(self):
762763

763764
def test_shift(self):
764765
# GH 9903
765-
for tz in [None, 'US/Eastern', 'Asia/Tokyo']:
766+
for tz in self.tz:
766767
idx = pd.DatetimeIndex([], name='xxx', tz=tz)
767768
tm.assert_index_equal(idx.shift(0, freq='H'), idx)
768769
tm.assert_index_equal(idx.shift(3, freq='H'), idx)
@@ -2365,20 +2366,19 @@ def test_order(self):
23652366
exp1 = PeriodIndex(['2011-01-01', '2011-01-01', '2011-01-02',
23662367
'2011-01-03', '2011-01-05'], freq='D', name='idx1')
23672368

2368-
# TODO(wesm): unused?
2369-
# idx2 = PeriodIndex(['2011-01-01', '2011-01-03', '2011-01-05',
2370-
# '2011-01-02', '2011-01-01'],
2371-
# freq='D', name='idx2')
2372-
# exp2 = PeriodIndex(['2011-01-01', '2011-01-01', '2011-01-02',
2373-
# '2011-01-03', '2011-01-05'],
2374-
# freq='D', name='idx2')
2375-
2376-
# idx3 = PeriodIndex([pd.NaT, '2011-01-03', '2011-01-05',
2377-
# '2011-01-02', pd.NaT], freq='D', name='idx3')
2378-
# exp3 = PeriodIndex([pd.NaT, pd.NaT, '2011-01-02', '2011-01-03',
2379-
# '2011-01-05'], freq='D', name='idx3')
2369+
idx2 = PeriodIndex(['2011-01-01', '2011-01-03', '2011-01-05',
2370+
'2011-01-02', '2011-01-01'],
2371+
freq='D', name='idx2')
2372+
exp2 = PeriodIndex(['2011-01-01', '2011-01-01', '2011-01-02',
2373+
'2011-01-03', '2011-01-05'],
2374+
freq='D', name='idx2')
23802375

2381-
for idx, expected in [(idx1, exp1), (idx1, exp1), (idx1, exp1)]:
2376+
idx3 = PeriodIndex([pd.NaT, '2011-01-03', '2011-01-05',
2377+
'2011-01-02', pd.NaT], freq='D', name='idx3')
2378+
exp3 = PeriodIndex([pd.NaT, pd.NaT, '2011-01-02', '2011-01-03',
2379+
'2011-01-05'], freq='D', name='idx3')
2380+
2381+
for idx, expected in [(idx1, exp1), (idx2, exp2), (idx3, exp3)]:
23822382
ordered = idx.sort_values()
23832383
self.assert_index_equal(ordered, expected)
23842384
self.assertEqual(ordered.freq, 'D')

0 commit comments

Comments
 (0)