Fix calculation of 'end of previous work week' #73
Conversation
The calculation of the _end of previous work week_ (eopww) fails if the current day is a Saturday. The algorithm ([Datetime.cpp:2059](https://github.com/GothenburgBitFactory/libshared/blob/ee050a2cc68c46e8748113246b26feb0ad9f34c5/src/Datetime.cpp#L2059-L2063)) subtracts the current weekday (with Sunday = 0) plus one modulo 7 from the current day of month. When the current day is a Saturday, this results in a subtraction of 0, i.e. the current day remains unchanged, while it should be the previous Saturday. Dropping the modulo fixes the issue.
| @@ -52,7 +52,7 @@ void testInit (UnitTest& t, const std::string& value, Datetime& var) | |||
| //////////////////////////////////////////////////////////////////////////////// | |||
| int main (int, char**) | |||
| { | |||
| UnitTest t (164); | |||
There was a problem hiding this comment.
Hang on, this just changes the number of expected tests. Let's add a test case for this?
There was a problem hiding this comment.
The currently failing testcase is here:
t.ok (eopww < soww, "eopww < soww");
in dates.t.cpp. It only fails on a Saturday though...
There was a problem hiding this comment.
The change her only aligns the number of actually present testcases with the number of planned ones (i.e. the argument of the UnitTest constructor).
There was a problem hiding this comment.
Having a specific test case for "eopww should be before soww on Saturdays" would require the reference date (a.k.a. now) to be injectable into the Datetime parser, which would be preferable, but a bigger endeveaour... 🤔
There was a problem hiding this comment.
Ah, I see -- weird to have date-time tests depend on the actual date and time. Yeah, fuzzing that (or just replacing them with fake time and figuring out the right times to test all the corner cases) sounds like a good, but larger project.
lauft
changed the title
mainly those visible changes, and miscellaneous others see GothenburgBitFactory#3623 (weekstart) see GothenburgBitFactory#3651 (epoch limit defines) see GothenburgBitFactory/libshared#73 (eopww fix)
#3654) * libshared: bump for weekstart, epoch defines, eopww fix mainly those visible changes, and miscellaneous others see #3623 (weekstart) see #3651 (epoch limit defines) see GothenburgBitFactory/libshared#73 (eopww fix) * Initialize libshared's weekstart from user's rc.weekstart config This enables use of newer libshared code that can parse week numbers according to ISO8601 instead of existing code which is always using Sunday-based weeks. To get ISO behavior, set rc.weekstart=monday. Default is still Sunday / old algorithm, as before, since Sunday is in the hardcoded default rcfile. Weekstart does not yet fix week-relative shortcuts, which will still always use Monday. See #3623 for further details.
The calculation of the end of previous work week (eopww) fails if the current day is a Saturday.
The algorithm (Datetime.cpp:2059) subtracts the current weekday (with Sunday = 0) plus one modulo 7 from the current day of month.
When the current day is a Saturday, this results in a subtraction of 0, i.e. the current day remains unchanged, while it should be the previous Saturday.
Dropping the modulo fixes the issue.