Skip to content

Int weekday fix #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Alex9779 wants to merge 3 commits into from
Closed

Int weekday fix #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b76419
another test for international weekdays
Alex9779 Oct 9, 2014
9ba332e
fix for weekday calculation when first weekday is not 1=sunday (if se…
Alex9779 Oct 9, 2014
6c7b846
updated assert calls
Alex9779 Oct 9, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion MTDates/NSDate+MTDates.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,7 @@ - (NSInteger)mt_weekdayOfWeek
NSInteger weekdayOfWeek = [[NSDate mt_calendar] ordinalityOfUnit:NSCalendarUnitWeekday
inUnit:NSCalendarUnitWeekOfYear
forDate:self];
weekdayOfWeek += [[NSDate mt_calendar] firstWeekday] - 1;
[[NSDate sharedRecursiveLock] unlock];
return weekdayOfWeek;
}
Expand Down Expand Up @@ -693,7 +694,7 @@ - (NSDate *)mt_startOfCurrentWeek
{
[[NSDate sharedRecursiveLock] lock];
NSInteger weekday = [self mt_weekdayOfWeek];
NSDate *date = [self mt_dateDaysAfter:-(weekday - 1)];
NSDate *date = [self mt_dateDaysAfter:-(weekday - [[NSDate mt_calendar] firstWeekday])];
NSDate *startOfCurrentWeek = [NSDate mt_dateFromYear:[date mt_year]
month:[date mt_monthOfYear]
day:[date mt_dayOfMonth]
Expand Down
56 changes: 56 additions & 0 deletions MTDatesTests/MTDatesTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1065,6 +1065,62 @@ - (void)test_firstDayOfWeek
[NSDate mt_setFirstDayOfWeek:1];
}

- (void)test_firstDayOfWeek2
{
NSDate *date = [_formatter dateFromString:@"07/11/1986 09:23am"];

[NSDate mt_setFirstDayOfWeek:1];
XCTAssertEqualObjects([NSDate mt_dateFromYear:[date mt_year]
week:[date mt_weekOfYear]
weekday:[date mt_weekdayOfWeek]
hour:[date mt_hourOfDay]
minute:[date mt_minuteOfHour]], date);

[NSDate mt_setFirstDayOfWeek:2];
XCTAssertEqualObjects([NSDate mt_dateFromYear:[date mt_year]
week:[date mt_weekOfYear]
weekday:[date mt_weekdayOfWeek]
hour:[date mt_hourOfDay]
minute:[date mt_minuteOfHour]], date);

[NSDate mt_setFirstDayOfWeek:3];
XCTAssertEqualObjects([NSDate mt_dateFromYear:[date mt_year]
week:[date mt_weekOfYear]
weekday:[date mt_weekdayOfWeek]
hour:[date mt_hourOfDay]
minute:[date mt_minuteOfHour]], date);

[NSDate mt_setFirstDayOfWeek:4];
XCTAssertEqualObjects([NSDate mt_dateFromYear:[date mt_year]
week:[date mt_weekOfYear]
weekday:[date mt_weekdayOfWeek]
hour:[date mt_hourOfDay]
minute:[date mt_minuteOfHour]], date);

[NSDate mt_setFirstDayOfWeek:5];
XCTAssertEqualObjects([NSDate mt_dateFromYear:[date mt_year]
week:[date mt_weekOfYear]
weekday:[date mt_weekdayOfWeek]
hour:[date mt_hourOfDay]
minute:[date mt_minuteOfHour]], date);

[NSDate mt_setFirstDayOfWeek:6];
XCTAssertEqualObjects([NSDate mt_dateFromYear:[date mt_year]
week:[date mt_weekOfYear]
weekday:[date mt_weekdayOfWeek]
hour:[date mt_hourOfDay]
minute:[date mt_minuteOfHour]], date);

[NSDate mt_setFirstDayOfWeek:7];
XCTAssertEqualObjects([NSDate mt_dateFromYear:[date mt_year]
week:[date mt_weekOfYear]
weekday:[date mt_weekdayOfWeek]
hour:[date mt_hourOfDay]
minute:[date mt_minuteOfHour]], date);

[NSDate mt_setFirstDayOfWeek:1];
}

- (void)test_firstWeekOfYear
{
NSDate *date = nil;
Expand Down