Skip to content

Commit 0236d75

Browse files
sinhrksjreback
sinhrks
authored and
jreback
committed
TST: Fix unused tests in tseries/test_base.py
Author: sinhrks <sinhrks@gmail.com> Closes #13996 from sinhrks/period_base_test and squashes the following commits: 869ef66 [sinhrks] TST: Fix unused tests in tseries/test_base.py
1 parent 22ef6f0 commit 0236d75

File tree

1 file changed

+59
-59
lines changed

1 file changed

+59
-59
lines changed

‎pandas/tseries/tests/test_base.py‎

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ def test_resolution(self):
355355
['day', 'day', 'day', 'day', 'hour',
356356
'minute', 'second', 'millisecond',
357357
'microsecond']):
358-
for tz in [None, 'Asia/Tokyo', 'US/Eastern']:
358+
for tz in self.tz:
359359
idx = pd.date_range(start='2013-04-01', periods=30, freq=freq,
360360
tz=tz)
361361
self.assertEqual(idx.resolution, expected)
@@ -508,7 +508,7 @@ def test_comp_nat(self):
508508

509509
def test_value_counts_unique(self):
510510
# GH 7735
511-
for tz in [None, 'UTC', 'Asia/Tokyo', 'US/Eastern']:
511+
for tz in self.tz:
512512
idx = pd.date_range('2011-01-01 09:00', freq='H', periods=10)
513513
# create repeated values, 'n'th element is repeated by n+1 times
514514
idx = DatetimeIndex(np.repeat(idx.values, range(1, len(idx) + 1)),
@@ -590,49 +590,50 @@ def test_order(self):
590590
self.assertEqual(ordered.freq.n, -1)
591591

592592
# without freq
593-
idx1 = DatetimeIndex(['2011-01-01', '2011-01-03', '2011-01-05',
594-
'2011-01-02', '2011-01-01'], name='idx1')
595-
exp1 = DatetimeIndex(['2011-01-01', '2011-01-01', '2011-01-02',
596-
'2011-01-03', '2011-01-05'], name='idx1')
597-
598-
idx2 = DatetimeIndex(['2011-01-01', '2011-01-03', '2011-01-05',
599-
'2011-01-02', '2011-01-01'],
600-
tz='Asia/Tokyo', name='idx2')
601-
602-
# TODO(wesm): unused?
603-
604-
# exp2 = DatetimeIndex(['2011-01-01', '2011-01-01', '2011-01-02',
605-
# '2011-01-03', '2011-01-05'],
606-
# tz='Asia/Tokyo', name='idx2')
607-
608-
# idx3 = DatetimeIndex([pd.NaT, '2011-01-03', '2011-01-05',
609-
# '2011-01-02', pd.NaT], name='idx3')
610-
# exp3 = DatetimeIndex([pd.NaT, pd.NaT, '2011-01-02', '2011-01-03',
611-
# '2011-01-05'], name='idx3')
612-
613-
for idx, expected in [(idx1, exp1), (idx1, exp1), (idx1, exp1)]:
614-
ordered = idx.sort_values()
615-
self.assert_index_equal(ordered, expected)
616-
self.assertIsNone(ordered.freq)
617-
618-
ordered = idx.sort_values(ascending=False)
619-
self.assert_index_equal(ordered, expected[::-1])
620-
self.assertIsNone(ordered.freq)
621-
622-
ordered, indexer = idx.sort_values(return_indexer=True)
623-
self.assert_index_equal(ordered, expected)
624-
625-
exp = np.array([0, 4, 3, 1, 2])
626-
self.assert_numpy_array_equal(indexer, exp, check_dtype=False)
627-
self.assertIsNone(ordered.freq)
628-
629-
ordered, indexer = idx.sort_values(return_indexer=True,
630-
ascending=False)
631-
self.assert_index_equal(ordered, expected[::-1])
632-
633-
exp = np.array([2, 1, 3, 4, 0])
634-
self.assert_numpy_array_equal(indexer, exp, check_dtype=False)
635-
self.assertIsNone(ordered.freq)
593+
for tz in self.tz:
594+
idx1 = DatetimeIndex(['2011-01-01', '2011-01-03', '2011-01-05',
595+
'2011-01-02', '2011-01-01'],
596+
tz=tz, name='idx1')
597+
exp1 = DatetimeIndex(['2011-01-01', '2011-01-01', '2011-01-02',
598+
'2011-01-03', '2011-01-05'],
599+
tz=tz, name='idx1')
600+
601+
idx2 = DatetimeIndex(['2011-01-01', '2011-01-03', '2011-01-05',
602+
'2011-01-02', '2011-01-01'],
603+
tz=tz, name='idx2')
604+
605+
exp2 = DatetimeIndex(['2011-01-01', '2011-01-01', '2011-01-02',
606+
'2011-01-03', '2011-01-05'],
607+
tz=tz, name='idx2')
608+
609+
idx3 = DatetimeIndex([pd.NaT, '2011-01-03', '2011-01-05',
610+
'2011-01-02', pd.NaT], tz=tz, name='idx3')
611+
exp3 = DatetimeIndex([pd.NaT, pd.NaT, '2011-01-02', '2011-01-03',
612+
'2011-01-05'], tz=tz, name='idx3')
613+
614+
for idx, expected in [(idx1, exp1), (idx2, exp2), (idx3, exp3)]:
615+
ordered = idx.sort_values()
616+
self.assert_index_equal(ordered, expected)
617+
self.assertIsNone(ordered.freq)
618+
619+
ordered = idx.sort_values(ascending=False)
620+
self.assert_index_equal(ordered, expected[::-1])
621+
self.assertIsNone(ordered.freq)
622+
623+
ordered, indexer = idx.sort_values(return_indexer=True)
624+
self.assert_index_equal(ordered, expected)
625+
626+
exp = np.array([0, 4, 3, 1, 2])
627+
self.assert_numpy_array_equal(indexer, exp, check_dtype=False)
628+
self.assertIsNone(ordered.freq)
629+
630+
ordered, indexer = idx.sort_values(return_indexer=True,
631+
ascending=False)
632+
self.assert_index_equal(ordered, expected[::-1])
633+
634+
exp = np.array([2, 1, 3, 4, 0])
635+
self.assert_numpy_array_equal(indexer, exp, check_dtype=False)
636+
self.assertIsNone(ordered.freq)
636637

637638
def test_getitem(self):
638639
idx1 = pd.date_range('2011-01-01', '2011-01-31', freq='D', name='idx')
@@ -782,7 +783,7 @@ def test_nat_new(self):
782783

783784
def test_shift(self):
784785
# GH 9903
785-
for tz in [None, 'US/Eastern', 'Asia/Tokyo']:
786+
for tz in self.tz:
786787
idx = pd.DatetimeIndex([], name='xxx', tz=tz)
787788
tm.assert_index_equal(idx.shift(0, freq='H'), idx)
788789
tm.assert_index_equal(idx.shift(3, freq='H'), idx)
@@ -2400,20 +2401,19 @@ def test_order(self):
24002401
exp1 = PeriodIndex(['2011-01-01', '2011-01-01', '2011-01-02',
24012402
'2011-01-03', '2011-01-05'], freq='D', name='idx1')
24022403

2403-
# TODO(wesm): unused?
2404-
# idx2 = PeriodIndex(['2011-01-01', '2011-01-03', '2011-01-05',
2405-
# '2011-01-02', '2011-01-01'],
2406-
# freq='D', name='idx2')
2407-
# exp2 = PeriodIndex(['2011-01-01', '2011-01-01', '2011-01-02',
2408-
# '2011-01-03', '2011-01-05'],
2409-
# freq='D', name='idx2')
2410-
2411-
# idx3 = PeriodIndex([pd.NaT, '2011-01-03', '2011-01-05',
2412-
# '2011-01-02', pd.NaT], freq='D', name='idx3')
2413-
# exp3 = PeriodIndex([pd.NaT, pd.NaT, '2011-01-02', '2011-01-03',
2414-
# '2011-01-05'], freq='D', name='idx3')
2404+
idx2 = PeriodIndex(['2011-01-01', '2011-01-03', '2011-01-05',
2405+
'2011-01-02', '2011-01-01'],
2406+
freq='D', name='idx2')
2407+
exp2 = PeriodIndex(['2011-01-01', '2011-01-01', '2011-01-02',
2408+
'2011-01-03', '2011-01-05'],
2409+
freq='D', name='idx2')
24152410

2416-
for idx, expected in [(idx1, exp1), (idx1, exp1), (idx1, exp1)]:
2411+
idx3 = PeriodIndex([pd.NaT, '2011-01-03', '2011-01-05',
2412+
'2011-01-02', pd.NaT], freq='D', name='idx3')
2413+
exp3 = PeriodIndex([pd.NaT, pd.NaT, '2011-01-02', '2011-01-03',
2414+
'2011-01-05'], freq='D', name='idx3')
2415+
2416+
for idx, expected in [(idx1, exp1), (idx2, exp2), (idx3, exp3)]:
24172417
ordered = idx.sort_values()
24182418
self.assert_index_equal(ordered, expected)
24192419
self.assertEqual(ordered.freq, 'D')

0 commit comments

Comments
 (0)