|
20 | 20 | START, END = datetime(2009, 1, 1), datetime(2010, 1, 1) |
21 | 21 |
|
22 | 22 |
|
23 | | -def eq_gen_range(kwargs, expected): |
24 | | - rng = generate_range(**kwargs) |
25 | | - result = np.asarray(list(rng)) |
26 | | - expected = np.asarray(expected) |
27 | | - |
28 | | - tm.assert_numpy_array_equal(result, expected) |
29 | | - |
30 | | - |
31 | 23 | class TestDateRanges(TestData): |
32 | 24 |
|
33 | 25 | def test_date_range_gen_error(self): |
@@ -204,20 +196,23 @@ def test_generate_cday(self): |
204 | 196 | assert rng1 == rng2 |
205 | 197 |
|
206 | 198 | def test_1(self): |
207 | | - eq_gen_range(dict(start=datetime(2009, 3, 25), periods=2), |
208 | | - [datetime(2009, 3, 25), datetime(2009, 3, 26)]) |
| 199 | + rng = list(generate_range(start=datetime(2009, 3, 25), periods=2)) |
| 200 | + expected = [datetime(2009, 3, 25), datetime(2009, 3, 26)] |
| 201 | + assert rng == expected |
209 | 202 |
|
210 | 203 | def test_2(self): |
211 | | - eq_gen_range(dict(start=datetime(2008, 1, 1), |
212 | | - end=datetime(2008, 1, 3)), |
213 | | - [datetime(2008, 1, 1), |
214 | | - datetime(2008, 1, 2), |
215 | | - datetime(2008, 1, 3)]) |
| 204 | + rng = list(generate_range(start=datetime(2008, 1, 1), |
| 205 | + end=datetime(2008, 1, 3))) |
| 206 | + expected = [datetime(2008, 1, 1), |
| 207 | + datetime(2008, 1, 2), |
| 208 | + datetime(2008, 1, 3)] |
| 209 | + assert rng == expected |
216 | 210 |
|
217 | 211 | def test_3(self): |
218 | | - eq_gen_range(dict(start=datetime(2008, 1, 5), |
219 | | - end=datetime(2008, 1, 6)), |
220 | | - []) |
| 212 | + rng = list(generate_range(start=datetime(2008, 1, 5), |
| 213 | + end=datetime(2008, 1, 6))) |
| 214 | + expected = [] |
| 215 | + assert rng == expected |
221 | 216 |
|
222 | 217 | def test_precision_finer_than_offset(self): |
223 | 218 | # GH 9907 |
|
0 commit comments