GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-08-28 04:27:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ISO8601d: Added :dayName methods and tests

Browse source
This commit is contained in:
Paul Beckingham 2015-09-26 14:32:14 -04:00
parent 7164215146
commit f26cff9a4a
3 changed files with 45 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/ISO8601.cpp
View file

@ -850,6 +850,40 @@ std::string ISO8601d::monthName (int month)
return ucFirst (months[month - 1]); return ucFirst (months[month - 1]);
} }
////////////////////////////////////////////////////////////////////////////////
void ISO8601d::dayName (int dow, std::string& name)
{
static const char* days[7] =
{
STRING_DATE_SUNDAY,
STRING_DATE_MONDAY,
STRING_DATE_TUESDAY,
STRING_DATE_WEDNESDAY,
STRING_DATE_THURSDAY,
STRING_DATE_FRIDAY,
STRING_DATE_SATURDAY,
};
name = ucFirst (days[dow]);
}
////////////////////////////////////////////////////////////////////////////////
std::string ISO8601d::dayName (int dow)
{
static const char* days[7] =
{
STRING_DATE_SUNDAY,
STRING_DATE_MONDAY,
STRING_DATE_TUESDAY,
STRING_DATE_WEDNESDAY,
STRING_DATE_THURSDAY,
STRING_DATE_FRIDAY,
STRING_DATE_SATURDAY,
};
return ucFirst (days[dow]);
}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Static // Static
int ISO8601d::dayOfWeek (const std::string& input) int ISO8601d::dayOfWeek (const std::string& input)

2
src/ISO8601.h
View file

@ -48,6 +48,8 @@ public:
static int daysInMonth (int, int); static int daysInMonth (int, int);
static int daysInYear (int); static int daysInYear (int);
static std::string monthName (int); static std::string monthName (int);
static void dayName (int, std::string&);
static std::string dayName (int);
static int dayOfWeek (const std::string&); static int dayOfWeek (const std::string&);

10
test/iso8601d.t.cpp
View file

@ -71,7 +71,7 @@ void testParse (
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
int main (int argc, char** argv) int main (int argc, char** argv)
{ {
UnitTest t (808); UnitTest t (815);
ISO8601d iso; ISO8601d iso;
std::string::size_type start = 0; std::string::size_type start = 0;
@ -246,6 +246,14 @@ int main (int argc, char** argv)
t.is (ISO8601d::monthName (11), "November", "11 = November"); t.is (ISO8601d::monthName (11), "November", "11 = November");
t.is (ISO8601d::monthName (12), "December", "12 = December"); t.is (ISO8601d::monthName (12), "December", "12 = December");
t.is (ISO8601d::dayName (0), "Sunday", "0 == Sunday");
t.is (ISO8601d::dayName (1), "Monday", "1 == Monday");
t.is (ISO8601d::dayName (2), "Tuesday", "2 == Tuesday");
t.is (ISO8601d::dayName (3), "Wednesday", "3 == Wednesday");
t.is (ISO8601d::dayName (4), "Thursday", "4 == Thursday");
t.is (ISO8601d::dayName (5), "Friday", "5 == Friday");
t.is (ISO8601d::dayName (6), "Saturday", "6 == Saturday");
t.is (ISO8601d::dayOfWeek ("SUNDAY"), 0, "SUNDAY == 0"); t.is (ISO8601d::dayOfWeek ("SUNDAY"), 0, "SUNDAY == 0");
t.is (ISO8601d::dayOfWeek ("sunday"), 0, "sunday == 0"); t.is (ISO8601d::dayOfWeek ("sunday"), 0, "sunday == 0");
t.is (ISO8601d::dayOfWeek ("Sunday"), 0, "Sunday == 0"); t.is (ISO8601d::dayOfWeek ("Sunday"), 0, "Sunday == 0");