Skip to content

Commit d553ab3

Browse files
Anjali2019jreback
authored andcommitted
TST: Fixturize series/test_combine_concat.py (#22964)
1 parent 4c78b97 commit d553ab3

File tree

1 file changed

+12
-13
lines changed

1 file changed

+12
-13
lines changed

pandas/tests/series/test_combine_concat.py

+12-13
Original file line numberDiff line numberDiff line change
@@ -15,29 +15,28 @@
1515
from pandas.util.testing import assert_series_equal
1616
import pandas.util.testing as tm
1717

18-
from .common import TestData
1918

19+
class TestSeriesCombine():
2020

21-
class TestSeriesCombine(TestData):
22-
23-
def test_append(self):
24-
appendedSeries = self.series.append(self.objSeries)
21+
def test_append(self, datetime_series, string_series, object_series):
22+
appendedSeries = string_series.append(object_series)
2523
for idx, value in compat.iteritems(appendedSeries):
26-
if idx in self.series.index:
27-
assert value == self.series[idx]
28-
elif idx in self.objSeries.index:
29-
assert value == self.objSeries[idx]
24+
if idx in string_series.index:
25+
assert value == string_series[idx]
26+
elif idx in object_series.index:
27+
assert value == object_series[idx]
3028
else:
3129
raise AssertionError("orphaned index!")
3230

33-
pytest.raises(ValueError, self.ts.append, self.ts,
31+
pytest.raises(ValueError, datetime_series.append, datetime_series,
3432
verify_integrity=True)
3533

36-
def test_append_many(self):
37-
pieces = [self.ts[:5], self.ts[5:10], self.ts[10:]]
34+
def test_append_many(self, datetime_series):
35+
pieces = [datetime_series[:5], datetime_series[5:10],
36+
datetime_series[10:]]
3837

3938
result = pieces[0].append(pieces[1:])
40-
assert_series_equal(result, self.ts)
39+
assert_series_equal(result, datetime_series)
4140

4241
def test_append_duplicates(self):
4342
# GH 13677

0 commit comments

Comments
 (0)