Skip to content

Commit 2654ea2

Browse files
bwignally-p
bwignall
authored and
y-p
committed
CLN: test_timedeltas, specialize assert_
GH6175: replacing "assert_" with specialized form assertEqual.
1 parent 6f4c3cd commit 2654ea2

File tree

1 file changed

+67
-67
lines changed

1 file changed

+67
-67
lines changed

‎pandas/tseries/tests/test_timedeltas.py

+67-67
Original file line numberDiff line numberDiff line change
@@ -32,65 +32,65 @@ def setUp(self):
3232
def test_numeric_conversions(self):
3333
_skip_if_numpy_not_friendly()
3434

35-
self.assert_(ct(0) == np.timedelta64(0,'ns'))
36-
self.assert_(ct(10) == np.timedelta64(10,'ns'))
37-
self.assert_(ct(10,unit='ns') == np.timedelta64(10,'ns').astype('m8[ns]'))
35+
self.assertEqual(ct(0), np.timedelta64(0,'ns'))
36+
self.assertEqual(ct(10), np.timedelta64(10,'ns'))
37+
self.assertEqual(ct(10,unit='ns'), np.timedelta64(10,'ns').astype('m8[ns]'))
3838

39-
self.assert_(ct(10,unit='us') == np.timedelta64(10,'us').astype('m8[ns]'))
40-
self.assert_(ct(10,unit='ms') == np.timedelta64(10,'ms').astype('m8[ns]'))
41-
self.assert_(ct(10,unit='s') == np.timedelta64(10,'s').astype('m8[ns]'))
42-
self.assert_(ct(10,unit='d') == np.timedelta64(10,'D').astype('m8[ns]'))
39+
self.assertEqual(ct(10,unit='us'), np.timedelta64(10,'us').astype('m8[ns]'))
40+
self.assertEqual(ct(10,unit='ms'), np.timedelta64(10,'ms').astype('m8[ns]'))
41+
self.assertEqual(ct(10,unit='s'), np.timedelta64(10,'s').astype('m8[ns]'))
42+
self.assertEqual(ct(10,unit='d'), np.timedelta64(10,'D').astype('m8[ns]'))
4343

4444
def test_timedelta_conversions(self):
4545
_skip_if_numpy_not_friendly()
4646

47-
self.assert_(ct(timedelta(seconds=1)) == np.timedelta64(1,'s').astype('m8[ns]'))
48-
self.assert_(ct(timedelta(microseconds=1)) == np.timedelta64(1,'us').astype('m8[ns]'))
49-
self.assert_(ct(timedelta(days=1)) == np.timedelta64(1,'D').astype('m8[ns]'))
47+
self.assertEqual(ct(timedelta(seconds=1)), np.timedelta64(1,'s').astype('m8[ns]'))
48+
self.assertEqual(ct(timedelta(microseconds=1)), np.timedelta64(1,'us').astype('m8[ns]'))
49+
self.assertEqual(ct(timedelta(days=1)), np.timedelta64(1,'D').astype('m8[ns]'))
5050

5151
def test_short_format_converters(self):
5252
_skip_if_numpy_not_friendly()
5353

5454
def conv(v):
5555
return v.astype('m8[ns]')
5656

57-
self.assert_(ct('10') == np.timedelta64(10,'ns'))
58-
self.assert_(ct('10ns') == np.timedelta64(10,'ns'))
59-
self.assert_(ct('100') == np.timedelta64(100,'ns'))
60-
self.assert_(ct('100ns') == np.timedelta64(100,'ns'))
61-
62-
self.assert_(ct('1000') == np.timedelta64(1000,'ns'))
63-
self.assert_(ct('1000ns') == np.timedelta64(1000,'ns'))
64-
self.assert_(ct('1000NS') == np.timedelta64(1000,'ns'))
65-
66-
self.assert_(ct('10us') == np.timedelta64(10000,'ns'))
67-
self.assert_(ct('100us') == np.timedelta64(100000,'ns'))
68-
self.assert_(ct('1000us') == np.timedelta64(1000000,'ns'))
69-
self.assert_(ct('1000Us') == np.timedelta64(1000000,'ns'))
70-
self.assert_(ct('1000uS') == np.timedelta64(1000000,'ns'))
71-
72-
self.assert_(ct('1ms') == np.timedelta64(1000000,'ns'))
73-
self.assert_(ct('10ms') == np.timedelta64(10000000,'ns'))
74-
self.assert_(ct('100ms') == np.timedelta64(100000000,'ns'))
75-
self.assert_(ct('1000ms') == np.timedelta64(1000000000,'ns'))
76-
77-
self.assert_(ct('-1s') == -np.timedelta64(1000000000,'ns'))
78-
self.assert_(ct('1s') == np.timedelta64(1000000000,'ns'))
79-
self.assert_(ct('10s') == np.timedelta64(10000000000,'ns'))
80-
self.assert_(ct('100s') == np.timedelta64(100000000000,'ns'))
81-
self.assert_(ct('1000s') == np.timedelta64(1000000000000,'ns'))
82-
83-
self.assert_(ct('1d') == conv(np.timedelta64(1,'D')))
84-
self.assert_(ct('-1d') == -conv(np.timedelta64(1,'D')))
85-
self.assert_(ct('1D') == conv(np.timedelta64(1,'D')))
86-
self.assert_(ct('10D') == conv(np.timedelta64(10,'D')))
87-
self.assert_(ct('100D') == conv(np.timedelta64(100,'D')))
88-
self.assert_(ct('1000D') == conv(np.timedelta64(1000,'D')))
89-
self.assert_(ct('10000D') == conv(np.timedelta64(10000,'D')))
57+
self.assertEqual(ct('10'), np.timedelta64(10,'ns'))
58+
self.assertEqual(ct('10ns'), np.timedelta64(10,'ns'))
59+
self.assertEqual(ct('100'), np.timedelta64(100,'ns'))
60+
self.assertEqual(ct('100ns'), np.timedelta64(100,'ns'))
61+
62+
self.assertEqual(ct('1000'), np.timedelta64(1000,'ns'))
63+
self.assertEqual(ct('1000ns'), np.timedelta64(1000,'ns'))
64+
self.assertEqual(ct('1000NS'), np.timedelta64(1000,'ns'))
65+
66+
self.assertEqual(ct('10us'), np.timedelta64(10000,'ns'))
67+
self.assertEqual(ct('100us'), np.timedelta64(100000,'ns'))
68+
self.assertEqual(ct('1000us'), np.timedelta64(1000000,'ns'))
69+
self.assertEqual(ct('1000Us'), np.timedelta64(1000000,'ns'))
70+
self.assertEqual(ct('1000uS'), np.timedelta64(1000000,'ns'))
71+
72+
self.assertEqual(ct('1ms'), np.timedelta64(1000000,'ns'))
73+
self.assertEqual(ct('10ms'), np.timedelta64(10000000,'ns'))
74+
self.assertEqual(ct('100ms'), np.timedelta64(100000000,'ns'))
75+
self.assertEqual(ct('1000ms'), np.timedelta64(1000000000,'ns'))
76+
77+
self.assertEqual(ct('-1s'), -np.timedelta64(1000000000,'ns'))
78+
self.assertEqual(ct('1s'), np.timedelta64(1000000000,'ns'))
79+
self.assertEqual(ct('10s'), np.timedelta64(10000000000,'ns'))
80+
self.assertEqual(ct('100s'), np.timedelta64(100000000000,'ns'))
81+
self.assertEqual(ct('1000s'), np.timedelta64(1000000000000,'ns'))
82+
83+
self.assertEqual(ct('1d'), conv(np.timedelta64(1,'D')))
84+
self.assertEqual(ct('-1d'), -conv(np.timedelta64(1,'D')))
85+
self.assertEqual(ct('1D'), conv(np.timedelta64(1,'D')))
86+
self.assertEqual(ct('10D'), conv(np.timedelta64(10,'D')))
87+
self.assertEqual(ct('100D'), conv(np.timedelta64(100,'D')))
88+
self.assertEqual(ct('1000D'), conv(np.timedelta64(1000,'D')))
89+
self.assertEqual(ct('10000D'), conv(np.timedelta64(10000,'D')))
9090

9191
# space
92-
self.assert_(ct(' 10000D ') == conv(np.timedelta64(10000,'D')))
93-
self.assert_(ct(' - 10000D ') == -conv(np.timedelta64(10000,'D')))
92+
self.assertEqual(ct(' 10000D '), conv(np.timedelta64(10000,'D')))
93+
self.assertEqual(ct(' - 10000D '), -conv(np.timedelta64(10000,'D')))
9494

9595
# invalid
9696
self.assertRaises(ValueError, ct, '1foo')
@@ -103,27 +103,27 @@ def conv(v):
103103
return v.astype('m8[ns]')
104104
d1 = np.timedelta64(1,'D')
105105

106-
self.assert_(ct('1days') == conv(d1))
107-
self.assert_(ct('1days,') == conv(d1))
108-
self.assert_(ct('- 1days,') == -conv(d1))
106+
self.assertEqual(ct('1days'), conv(d1))
107+
self.assertEqual(ct('1days,'), conv(d1))
108+
self.assertEqual(ct('- 1days,'), -conv(d1))
109109

110-
self.assert_(ct('00:00:01') == conv(np.timedelta64(1,'s')))
111-
self.assert_(ct('06:00:01') == conv(np.timedelta64(6*3600+1,'s')))
112-
self.assert_(ct('06:00:01.0') == conv(np.timedelta64(6*3600+1,'s')))
113-
self.assert_(ct('06:00:01.01') == conv(np.timedelta64(1000*(6*3600+1)+10,'ms')))
110+
self.assertEqual(ct('00:00:01'), conv(np.timedelta64(1,'s')))
111+
self.assertEqual(ct('06:00:01'), conv(np.timedelta64(6*3600+1,'s')))
112+
self.assertEqual(ct('06:00:01.0'), conv(np.timedelta64(6*3600+1,'s')))
113+
self.assertEqual(ct('06:00:01.01'), conv(np.timedelta64(1000*(6*3600+1)+10,'ms')))
114114

115-
self.assert_(ct('- 1days, 00:00:01') == -conv(d1+np.timedelta64(1,'s')))
116-
self.assert_(ct('1days, 06:00:01') == conv(d1+np.timedelta64(6*3600+1,'s')))
117-
self.assert_(ct('1days, 06:00:01.01') == conv(d1+np.timedelta64(1000*(6*3600+1)+10,'ms')))
115+
self.assertEqual(ct('- 1days, 00:00:01'), -conv(d1+np.timedelta64(1,'s')))
116+
self.assertEqual(ct('1days, 06:00:01'), conv(d1+np.timedelta64(6*3600+1,'s')))
117+
self.assertEqual(ct('1days, 06:00:01.01'), conv(d1+np.timedelta64(1000*(6*3600+1)+10,'ms')))
118118

119119
# invalid
120120
self.assertRaises(ValueError, ct, '- 1days, 00')
121121

122122
def test_nat_converters(self):
123123
_skip_if_numpy_not_friendly()
124124

125-
self.assert_(to_timedelta('nat',box=False) == tslib.iNaT)
126-
self.assert_(to_timedelta('nan',box=False) == tslib.iNaT)
125+
self.assertEqual(to_timedelta('nat',box=False), tslib.iNaT)
126+
self.assertEqual(to_timedelta('nan',box=False), tslib.iNaT)
127127

128128
def test_to_timedelta(self):
129129
_skip_if_numpy_not_friendly()
@@ -132,12 +132,12 @@ def conv(v):
132132
return v.astype('m8[ns]')
133133
d1 = np.timedelta64(1,'D')
134134

135-
self.assert_(to_timedelta('1 days 06:05:01.00003',box=False) == conv(d1+np.timedelta64(6*3600+5*60+1,'s')+np.timedelta64(30,'us')))
136-
self.assert_(to_timedelta('15.5us',box=False) == conv(np.timedelta64(15500,'ns')))
135+
self.assertEqual(to_timedelta('1 days 06:05:01.00003',box=False), conv(d1+np.timedelta64(6*3600+5*60+1,'s')+np.timedelta64(30,'us')))
136+
self.assertEqual(to_timedelta('15.5us',box=False), conv(np.timedelta64(15500,'ns')))
137137

138138
# empty string
139139
result = to_timedelta('',box=False)
140-
self.assert_(result == tslib.iNaT)
140+
self.assertEqual(result, tslib.iNaT)
141141

142142
result = to_timedelta(['', ''])
143143
self.assert_(isnull(result).all())
@@ -150,7 +150,7 @@ def conv(v):
150150
# ints
151151
result = np.timedelta64(0,'ns')
152152
expected = to_timedelta(0,box=False)
153-
self.assert_(result == expected)
153+
self.assertEqual(result, expected)
154154

155155
# Series
156156
expected = Series([timedelta(days=1), timedelta(days=1, seconds=1)])
@@ -166,12 +166,12 @@ def conv(v):
166166
v = timedelta(seconds=1)
167167
result = to_timedelta(v,box=False)
168168
expected = np.timedelta64(timedelta(seconds=1))
169-
self.assert_(result == expected)
169+
self.assertEqual(result, expected)
170170

171171
v = np.timedelta64(timedelta(seconds=1))
172172
result = to_timedelta(v,box=False)
173173
expected = np.timedelta64(timedelta(seconds=1))
174-
self.assert_(result == expected)
174+
self.assertEqual(result, expected)
175175

176176
def test_to_timedelta_via_apply(self):
177177
_skip_if_numpy_not_friendly()
@@ -221,10 +221,10 @@ def test_to_timedelta_on_missing_values(self):
221221
assert_series_equal(actual, expected)
222222

223223
actual = pd.to_timedelta(np.nan)
224-
self.assert_(actual == timedelta_NaT)
224+
self.assertEqual(actual, timedelta_NaT)
225225

226226
actual = pd.to_timedelta(pd.NaT)
227-
self.assert_(actual == timedelta_NaT)
227+
self.assertEqual(actual, timedelta_NaT)
228228

229229
def test_timedelta_ops_with_missing_values(self):
230230
_skip_if_numpy_not_friendly()
@@ -242,9 +242,9 @@ def test_timedelta_ops_with_missing_values(self):
242242
NA = np.nan
243243

244244
actual = scalar1 + scalar1
245-
self.assert_(actual == scalar2)
245+
self.assertEqual(actual, scalar2)
246246
actual = scalar2 - scalar1
247-
self.assert_(actual == scalar1)
247+
self.assertEqual(actual, scalar1)
248248

249249
actual = s1 + s1
250250
assert_series_equal(actual, s2)

0 commit comments

Comments
 (0)