@@ -143,40 +143,42 @@ def test_mix_datetime_types(self, coll_vdirs):
143143 utils .BERLIN .localize (dt .datetime (2015 , 6 , 2 , 16 , 0 ))
144144
145145
146- def test_start_end ():
147- with freeze_time ('2016-04-10' ):
148- start = dt .datetime (2016 , 4 , 10 , 0 , 0 )
149- end = dt .datetime (2016 , 4 , 11 , 0 , 0 )
150- assert (start , end ) == start_end_from_daterange (('today' ,), locale = utils .LOCALE_BERLIN )
151-
152-
153- def test_start_end_default_delta ():
154- with freeze_time ('2016-04-10' ):
155- start = dt .datetime (2016 , 4 , 10 , 0 , 0 )
156- end = dt .datetime (2016 , 4 , 11 , 0 , 0 )
157- assert (start , end ) == start_end_from_daterange (('today' ,), utils .LOCALE_BERLIN )
158-
159-
160- def test_start_end_delta ():
161- with freeze_time ('2016-04-10' ):
162- start = dt .datetime (2016 , 4 , 10 , 0 , 0 )
163- end = dt .datetime (2016 , 4 , 12 , 0 , 0 )
164- assert (start , end ) == start_end_from_daterange (('today' , '2d' ), utils .LOCALE_BERLIN )
165-
166-
167- def test_start_end_empty ():
168- with freeze_time ('2016-04-10' ):
169- start = dt .datetime (2016 , 4 , 10 , 0 , 0 )
170- end = dt .datetime (2016 , 4 , 11 , 0 , 0 )
171- assert (start , end ) == start_end_from_daterange ([], utils .LOCALE_BERLIN )
172-
173-
174- def test_start_end_empty_default ():
175- with freeze_time ('2016-04-10' ):
176- start = dt .datetime (2016 , 4 , 10 , 0 , 0 )
177- end = dt .datetime (2016 , 4 , 13 , 0 , 0 )
178- assert (start , end ) == start_end_from_daterange (
179- [], utils .LOCALE_BERLIN ,
180- default_timedelta_date = dt .timedelta (days = 3 ),
181- default_timedelta_datetime = dt .timedelta (hours = 1 ),
182- )
146+ class TestStartEndFromDaterange :
147+ def test_start_end (self ):
148+ with freeze_time ('2016-04-10' ):
149+ start = dt .datetime (2016 , 4 , 10 , 0 , 0 )
150+ end = dt .datetime (2016 , 4 , 11 , 0 , 0 )
151+ assert (start , end ) == start_end_from_daterange (('today' ,), locale = utils .LOCALE_BERLIN )
152+
153+
154+ def test_start_end_default_delta (self ):
155+ with freeze_time ('2016-04-10' ):
156+ start = dt .datetime (2016 , 4 , 10 , 0 , 0 )
157+ end = dt .datetime (2016 , 4 , 11 , 0 , 0 )
158+ assert (start , end ) == start_end_from_daterange (('today' ,), utils .LOCALE_BERLIN )
159+
160+
161+ def test_start_end_delta (self ):
162+ with freeze_time ('2016-04-10' ):
163+ start = dt .datetime (2016 , 4 , 10 , 0 , 0 )
164+ end = dt .datetime (2016 , 4 , 12 , 0 , 0 )
165+ assert (start , end ) == start_end_from_daterange (('today' , '2d' ), utils .LOCALE_BERLIN )
166+
167+
168+ def test_start_end_empty (self ):
169+ with freeze_time ('2016-04-10' ):
170+ start = dt .datetime (2016 , 4 , 10 , 0 , 0 )
171+ end = dt .datetime (2016 , 4 , 11 , 0 , 0 )
172+ assert (start , end ) == start_end_from_daterange ([], utils .LOCALE_BERLIN )
173+
174+
175+ def test_start_end_empty_default (self ):
176+ with freeze_time ('2016-04-10' ):
177+ start = dt .datetime (2016 , 4 , 10 , 0 , 0 )
178+ end = dt .datetime (2016 , 4 , 13 , 0 , 0 )
179+ assert (start , end ) == start_end_from_daterange (
180+ [], utils .LOCALE_BERLIN ,
181+ default_timedelta_date = dt .timedelta (days = 3 ),
182+ default_timedelta_datetime = dt .timedelta (hours = 1 ),
183+ )
184+
0 commit comments