Skip to content

Commit b85a985

Browse files
split some tests that were testing behviour of string and datetime series simultaniously
1 parent 3f2be37 commit b85a985

File tree

1 file changed

+20
-15
lines changed

1 file changed

+20
-15
lines changed

pandas/tests/series/test_api.py

+20-15
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,14 @@ def test_getitem_preserve_name(self, datetime_series):
108108
result = datetime_series[5:10]
109109
assert result.name == datetime_series.name
110110

111-
def test_pickle(self, datetime_series, string_series):
112-
unp_series = self._pickle_roundtrip(string_series)
111+
def test_pickle_datetimes(self, datetime_series):
113112
unp_ts = self._pickle_roundtrip(datetime_series)
114-
assert_series_equal(unp_series, string_series)
115113
assert_series_equal(unp_ts, datetime_series)
116114

115+
def test_pickle_strings(self, string_series):
116+
unp_series = self._pickle_roundtrip(string_series)
117+
assert_series_equal(unp_series, string_series)
118+
117119
def _pickle_roundtrip(self, obj):
118120

119121
with ensure_clean() as path:
@@ -308,13 +310,14 @@ def test_not_hashable(self):
308310
def test_contains(self, datetime_series):
309311
tm.assert_contains_all(datetime_series.index, datetime_series)
310312

311-
def test_iter(self, datetime_series, string_series):
312-
for i, val in enumerate(string_series):
313-
assert val == string_series[i]
314-
313+
def test_iter_datetimes(self, datetime_series):
315314
for i, val in enumerate(datetime_series):
316315
assert val == datetime_series[i]
317316

317+
def test_iter_strings(self, string_series):
318+
for i, val in enumerate(string_series):
319+
assert val == string_series[i]
320+
318321
def test_keys(self, datetime_series):
319322
# HACK: By doing this in two stages, we avoid 2to3 wrapping the call
320323
# to .keys() in a list()
@@ -326,23 +329,25 @@ def test_values(self, datetime_series):
326329
datetime_series.values, datetime_series, check_dtype=False
327330
)
328331

329-
def test_iteritems(self, datetime_series, string_series):
330-
for idx, val in string_series.iteritems():
331-
assert val == string_series[idx]
332-
332+
def test_iteritems_datetimes(self, datetime_series):
333333
for idx, val in datetime_series.iteritems():
334334
assert val == datetime_series[idx]
335335

336+
def test_iteritems_strings(self, string_series):
337+
for idx, val in string_series.iteritems():
338+
assert val == string_series[idx]
339+
336340
# assert is lazy (genrators don't define reverse, lists do)
337341
assert not hasattr(string_series.iteritems(), "reverse")
338342

339-
def test_items(self, datetime_series, string_series):
340-
for idx, val in string_series.items():
341-
assert val == string_series[idx]
342-
343+
def test_items_datetimes(self, datetime_series):
343344
for idx, val in datetime_series.items():
344345
assert val == datetime_series[idx]
345346

347+
def test_items_strings(self, string_series):
348+
for idx, val in string_series.items():
349+
assert val == string_series[idx]
350+
346351
# assert is lazy (genrators don't define reverse, lists do)
347352
assert not hasattr(string_series.items(), "reverse")
348353

0 commit comments

Comments
 (0)