Skip to content

Commit 415a748

Browse files
author
TrigonaMinima
committed
TST: Moving DatetimeIndex related tests from test_timeseries.py and flake8 fixes
1 parent c43c7de commit 415a748

File tree

9 files changed

+372
-365
lines changed

9 files changed

+372
-365
lines changed

pandas/tests/indexes/datetime/test_misc.py

-48
This file was deleted.

pandas/tests/indexes/datetime/test_datetime.py renamed to pandas/tests/indexes/datetimes/test_datetime.py

+2-32
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
from pandas.core.common import PerformanceWarning
1111
from pandas.compat.numpy import np_datetime64_compat
1212
from pandas import (notnull, DatetimeIndex, Int64Index, Index, date_range,
13-
bdate_range, Series, DataFrame, Timestamp, datetime, offsets, NaT,
14-
_np_version_under1p8)
13+
bdate_range, Series, DataFrame, Timestamp, datetime,
14+
offsets, NaT, _np_version_under1p8)
1515

1616
from pandas.util.testing import assert_series_equal, assert_almost_equal
1717

@@ -565,36 +565,6 @@ def test_time_overflow_for_32bit_machines(self):
565565
idx2 = pd.date_range(end='2000', periods=periods, freq='S')
566566
self.assertEqual(len(idx2), periods)
567567

568-
def test_intersection(self):
569-
first = self.index
570-
second = self.index[5:]
571-
intersect = first.intersection(second)
572-
self.assertTrue(tm.equalContents(intersect, second))
573-
574-
# GH 10149
575-
cases = [klass(second.values) for klass in [np.array, Series, list]]
576-
for case in cases:
577-
result = first.intersection(case)
578-
self.assertTrue(tm.equalContents(result, second))
579-
580-
third = Index(['a', 'b', 'c'])
581-
result = first.intersection(third)
582-
expected = pd.Index([], dtype=object)
583-
self.assert_index_equal(result, expected)
584-
585-
def test_union(self):
586-
first = self.index[:5]
587-
second = self.index[5:]
588-
everything = self.index
589-
union = first.union(second)
590-
self.assertTrue(tm.equalContents(union, everything))
591-
592-
# GH 10149
593-
cases = [klass(second.values) for klass in [np.array, Series, list]]
594-
for case in cases:
595-
result = first.union(case)
596-
self.assertTrue(tm.equalContents(result, everything))
597-
598568
def test_nat(self):
599569
self.assertIs(DatetimeIndex([np.nan])[0], pd.NaT)
600570

0 commit comments

Comments
 (0)