Skip to content

Commit a1f44d3

Browse files
Remove TestData from frame-tests test_replace.py
1 parent 14b8632 commit a1f44d3

File tree

1 file changed

+41
-42
lines changed

1 file changed

+41
-42
lines changed

pandas/tests/frame/test_replace.py

+41-42
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
import pandas as pd
1010
from pandas import DataFrame, Index, Series, Timestamp, date_range
11-
from pandas.tests.frame.common import TestData
1211
from pandas.util.testing import assert_frame_equal, assert_series_equal
1312

1413

@@ -22,27 +21,27 @@ def mix_abc() -> Dict[str, list]:
2221
return {"a": list(range(4)), "b": list("ab.."), "c": ["a", "b", np.nan, "d"]}
2322

2423

25-
class TestDataFrameReplace(TestData):
26-
def test_replace_inplace(self):
27-
self.tsframe["A"][:5] = np.nan
28-
self.tsframe["A"][-5:] = np.nan
24+
class TestDataFrameReplace:
25+
def test_replace_inplace(self, datetime_frame, float_string_frame):
26+
datetime_frame["A"][:5] = np.nan
27+
datetime_frame["A"][-5:] = np.nan
2928

30-
tsframe = self.tsframe.copy()
29+
tsframe = datetime_frame.copy()
3130
tsframe.replace(np.nan, 0, inplace=True)
32-
assert_frame_equal(tsframe, self.tsframe.fillna(0))
31+
assert_frame_equal(tsframe, datetime_frame.fillna(0))
3332

3433
# mixed type
35-
mf = self.mixed_frame
34+
mf = float_string_frame
3635
mf.iloc[5:20, mf.columns.get_loc("foo")] = np.nan
3736
mf.iloc[-10:, mf.columns.get_loc("A")] = np.nan
3837

39-
result = self.mixed_frame.replace(np.nan, 0)
40-
expected = self.mixed_frame.fillna(value=0)
38+
result = float_string_frame.replace(np.nan, 0)
39+
expected = float_string_frame.fillna(value=0)
4140
assert_frame_equal(result, expected)
4241

43-
tsframe = self.tsframe.copy()
42+
tsframe = datetime_frame.copy()
4443
tsframe.replace([np.nan], [0], inplace=True)
45-
assert_frame_equal(tsframe, self.tsframe.fillna(0))
44+
assert_frame_equal(tsframe, datetime_frame.fillna(0))
4645

4746
def test_regex_replace_scalar(self, mix_ab):
4847
obj = {"a": list("ab.."), "b": list("efgh")}
@@ -583,17 +582,17 @@ def test_replace_regex_metachar(self, metachar):
583582
expected = DataFrame({"a": ["paren", "else"]})
584583
assert_frame_equal(result, expected)
585584

586-
def test_replace(self):
587-
self.tsframe["A"][:5] = np.nan
588-
self.tsframe["A"][-5:] = np.nan
585+
def test_replace(self, datetime_frame):
586+
datetime_frame["A"][:5] = np.nan
587+
datetime_frame["A"][-5:] = np.nan
589588

590-
zero_filled = self.tsframe.replace(np.nan, -1e8)
591-
assert_frame_equal(zero_filled, self.tsframe.fillna(-1e8))
592-
assert_frame_equal(zero_filled.replace(-1e8, np.nan), self.tsframe)
589+
zero_filled = datetime_frame.replace(np.nan, -1e8)
590+
assert_frame_equal(zero_filled, datetime_frame.fillna(-1e8))
591+
assert_frame_equal(zero_filled.replace(-1e8, np.nan), datetime_frame)
593592

594-
self.tsframe["A"][:5] = np.nan
595-
self.tsframe["A"][-5:] = np.nan
596-
self.tsframe["B"][:5] = -1e8
593+
datetime_frame["A"][:5] = np.nan
594+
datetime_frame["A"][-5:] = np.nan
595+
datetime_frame["B"][:5] = -1e8
597596

598597
# empty
599598
df = DataFrame(index=["a", "b"])
@@ -684,20 +683,20 @@ def test_replace_convert(self):
684683
res = rep.dtypes
685684
assert_series_equal(expec, res)
686685

687-
def test_replace_mixed(self):
688-
mf = self.mixed_frame
686+
def test_replace_mixed(self, float_string_frame):
687+
mf = float_string_frame
689688
mf.iloc[5:20, mf.columns.get_loc("foo")] = np.nan
690689
mf.iloc[-10:, mf.columns.get_loc("A")] = np.nan
691690

692-
result = self.mixed_frame.replace(np.nan, -18)
693-
expected = self.mixed_frame.fillna(value=-18)
691+
result = float_string_frame.replace(np.nan, -18)
692+
expected = float_string_frame.fillna(value=-18)
694693
assert_frame_equal(result, expected)
695-
assert_frame_equal(result.replace(-18, np.nan), self.mixed_frame)
694+
assert_frame_equal(result.replace(-18, np.nan), float_string_frame)
696695

697-
result = self.mixed_frame.replace(np.nan, -1e8)
698-
expected = self.mixed_frame.fillna(value=-1e8)
696+
result = float_string_frame.replace(np.nan, -1e8)
697+
expected = float_string_frame.fillna(value=-1e8)
699698
assert_frame_equal(result, expected)
700-
assert_frame_equal(result.replace(-1e8, np.nan), self.mixed_frame)
699+
assert_frame_equal(result.replace(-1e8, np.nan), float_string_frame)
701700

702701
# int block upcasting
703702
df = DataFrame(
@@ -793,30 +792,30 @@ def test_replace_simple_nested_dict_with_nonexistent_value(self):
793792
result = df.replace({"col": {-1: "-", 1: "a", 4: "b"}})
794793
assert_frame_equal(expected, result)
795794

796-
def test_replace_value_is_none(self):
797-
orig_value = self.tsframe.iloc[0, 0]
798-
orig2 = self.tsframe.iloc[1, 0]
795+
def test_replace_value_is_none(self, datetime_frame):
796+
orig_value = datetime_frame.iloc[0, 0]
797+
orig2 = datetime_frame.iloc[1, 0]
799798

800-
self.tsframe.iloc[0, 0] = np.nan
801-
self.tsframe.iloc[1, 0] = 1
799+
datetime_frame.iloc[0, 0] = np.nan
800+
datetime_frame.iloc[1, 0] = 1
802801

803-
result = self.tsframe.replace(to_replace={np.nan: 0})
804-
expected = self.tsframe.T.replace(to_replace={np.nan: 0}).T
802+
result = datetime_frame.replace(to_replace={np.nan: 0})
803+
expected = datetime_frame.T.replace(to_replace={np.nan: 0}).T
805804
assert_frame_equal(result, expected)
806805

807-
result = self.tsframe.replace(to_replace={np.nan: 0, 1: -1e8})
808-
tsframe = self.tsframe.copy()
806+
result = datetime_frame.replace(to_replace={np.nan: 0, 1: -1e8})
807+
tsframe = datetime_frame.copy()
809808
tsframe.iloc[0, 0] = 0
810809
tsframe.iloc[1, 0] = -1e8
811810
expected = tsframe
812811
assert_frame_equal(expected, result)
813-
self.tsframe.iloc[0, 0] = orig_value
814-
self.tsframe.iloc[1, 0] = orig2
812+
datetime_frame.iloc[0, 0] = orig_value
813+
datetime_frame.iloc[1, 0] = orig2
815814

816-
def test_replace_for_new_dtypes(self):
815+
def test_replace_for_new_dtypes(self, datetime_frame):
817816

818817
# dtypes
819-
tsframe = self.tsframe.copy().astype(np.float32)
818+
tsframe = datetime_frame.copy().astype(np.float32)
820819
tsframe["A"][:5] = np.nan
821820
tsframe["A"][-5:] = np.nan
822821

0 commit comments

Comments
 (0)