Skip to content

Commit 4792dec

Browse files
committed
Restructure test_smallest_difference() and shorten variable names
2 parents e999ab2 + ce7864f commit 4792dec

File tree

1 file changed

+45
-48
lines changed

1 file changed

+45
-48
lines changed

tests/test_tools.py

Lines changed: 45 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -6,46 +6,43 @@
66
class TestTools:
77

88
def test_smallest_difference(self):
9-
parameters = {'data_frame': pd.DataFrame(data={'v_wind':
10-
[4.0, 5.0, 6.0]},
11-
index=[100, 150, 200]),
12-
'comp_value': 100,
13-
'column_name': 'v_wind'}
14-
parameters_pd_series = {'data_frame': pd.DataFrame(data={'v_wind': [
9+
data_frame = pd.DataFrame(data={'v_wind': [4.0, 5.0, 6.0]},
10+
index=[100, 150, 200])
11+
data_frame_series = pd.DataFrame(data={'v_wind': [
1512
pd.Series(data=[4.0, 5.0, 6.0]),
1613
pd.Series(data=[8.0, 10.0, 14.0]),
17-
pd.Series(data=[16.0, 20.0, 28.0])]}, index=[100, 150, 200]),
18-
'comp_value': 100,
19-
'column_name': 'v_wind'}
14+
pd.Series(data=[16.0, 20.0, 28.0])]}, index=[100, 150, 200])
15+
parameters = {'comp_value': 100,
16+
'column_name': 'v_wind'}
2017
# TODO: test v_wind as np.array
2118

2219
# comparative value is an index of data frame
23-
expected_output = (100, 4.0)
24-
assert smallest_difference(**parameters) == expected_output
25-
expected_series = pd.Series(data=[4.0, 5.0, 6.0])
26-
assert_series_equal(smallest_difference(**parameters_pd_series)[1],
27-
expected_series)
20+
exp_output = (100, 4.0)
21+
assert smallest_difference(data_frame, **parameters) == exp_output
22+
exp_series = pd.Series(data=[4.0, 5.0, 6.0])
23+
assert_series_equal(smallest_difference(data_frame_series,
24+
**parameters)[1], exp_series)
2825
# comparative value between indices of data frame
29-
expected_output = (150, 5.0)
30-
parameters['comp_value'], parameters_pd_series['comp_value'] = 175, 175
31-
assert smallest_difference(**parameters) == expected_output
32-
expected_series = pd.Series(data=[8.0, 10.0, 14.0])
33-
assert_series_equal(smallest_difference(**parameters_pd_series)[1],
34-
expected_series)
26+
exp_output = (150, 5.0)
27+
parameters['comp_value'] = 175
28+
assert smallest_difference(data_frame, **parameters) == exp_output
29+
exp_series = pd.Series(data=[8.0, 10.0, 14.0])
30+
assert_series_equal(smallest_difference(data_frame_series,
31+
**parameters)[1], exp_series)
3532
# comparative value > indices of data frame
36-
expected_output = (200, 6.0)
37-
parameters['comp_value'], parameters_pd_series['comp_value'] = 250, 250
38-
assert smallest_difference(**parameters) == expected_output
39-
expected_series = pd.Series(data=[16.0, 20.0, 28.0])
40-
assert_series_equal(smallest_difference(**parameters_pd_series)[1],
41-
expected_series)
33+
exp_output = (200, 6.0)
34+
parameters['comp_value'] = 250
35+
assert smallest_difference(data_frame, **parameters) == exp_output
36+
exp_series = pd.Series(data=[16.0, 20.0, 28.0])
37+
assert_series_equal(smallest_difference(data_frame_series,
38+
**parameters)[1], exp_series)
4239
# comparative value < indices of data frame
43-
expected_output = (100, 4.0)
44-
parameters['comp_value'], parameters_pd_series['comp_value'] = 90, 90
45-
assert smallest_difference(**parameters) == expected_output
46-
expected_series = pd.Series(data=[4.0, 5.0, 6.0])
47-
assert_series_equal(smallest_difference(**parameters_pd_series)[1],
48-
expected_series)
40+
exp_output = (100, 4.0)
41+
parameters['comp_value'] = 90
42+
assert smallest_difference(data_frame, **parameters) == exp_output
43+
exp_series = pd.Series(data=[4.0, 5.0, 6.0])
44+
assert_series_equal(smallest_difference(data_frame_series,
45+
**parameters)[1], exp_series)
4946

5047
def test_linear_extra_interpolation(self):
5148
weather = pd.DataFrame(data={'v_wind': [4.0, 5.0, 6.0]},
@@ -57,33 +54,33 @@ def test_linear_extra_interpolation(self):
5754
# TODO: test v_wind as np.array
5855

5956
# Entries in column v_wind are float
60-
expected_output = 4.0
57+
exp_output = 4.0
6158
assert (linear_extra_interpolation(weather, 100, 'v_wind') ==
62-
expected_output)
63-
expected_output = 5.5
59+
exp_output)
60+
exp_output = 5.5
6461
assert (linear_extra_interpolation(weather, 175, 'v_wind') ==
65-
expected_output)
66-
expected_output = 7.0
62+
exp_output)
63+
exp_output = 7.0
6764
assert (linear_extra_interpolation(weather, 250, 'v_wind') ==
68-
expected_output)
69-
expected_output = 3.0
65+
exp_output)
66+
exp_output = 3.0
7067
assert (linear_extra_interpolation(weather, 50, 'v_wind') ==
71-
expected_output)
68+
exp_output)
7269

7370
# Entries in column v_wind are pd.Series
74-
expected_output = pd.Series(data=[4.0, 5.0, 6.0])
71+
exp_output = pd.Series(data=[4.0, 5.0, 6.0])
7572
assert_series_equal(linear_extra_interpolation(weather_pd_series,
7673
100, 'v_wind'),
77-
expected_output)
78-
expected_output = pd.Series(data=[12.0, 15.0, 21.0])
74+
exp_output)
75+
exp_output = pd.Series(data=[12.0, 15.0, 21.0])
7976
assert_series_equal(linear_extra_interpolation(weather_pd_series,
8077
175, 'v_wind'),
81-
expected_output)
82-
expected_output = pd.Series(data=[24.0, 30.0, 42.0])
78+
exp_output)
79+
exp_output = pd.Series(data=[24.0, 30.0, 42.0])
8380
assert_series_equal(linear_extra_interpolation(weather_pd_series,
8481
250, 'v_wind'),
85-
expected_output)
86-
expected_output = pd.Series(data=[2.0, 2.5, 2.0]) # TODO: Check this test
82+
exp_output)
83+
exp_output = pd.Series(data=[2.0, 2.5, 2.0]) # TODO: Check this test
8784
assert_series_equal(linear_extra_interpolation(weather_pd_series,
8885
75, 'v_wind'),
89-
expected_output)
86+
exp_output)

0 commit comments

Comments
 (0)