xeos
/
chrono
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added more tests for non-four-digit years and fixed edge cases.

This commit is contained in:
Kang Seonghoon 2015-02-18 00:00:30 +09:00
parent 0399ba1849
commit ca865e3c24
3 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/format/mod.rs
View File

@ -290,8 +290,8 @@ pub fn format<'a, I>(w: &mut fmt::Formatter, date: Option<&NaiveDate>, time: Opt
// non-four-digit years require an explicit sign as per ISO 8601 // non-four-digit years require an explicit sign as per ISO 8601
match pad { match pad {
Pad::None => try!(write!(w, "{:+}", v)), Pad::None => try!(write!(w, "{:+}", v)),
Pad::Zero => try!(write!(w, "{:+01$}", v, width)), Pad::Zero => try!(write!(w, "{:+01$}", v, width + 1)),
Pad::Space => try!(write!(w, "{:+1$}", v, width)), Pad::Space => try!(write!(w, "{:+1$}", v, width + 1)),
} }
} else { } else {
match pad { match pad {

12
src/format/strftime.rs
View File

@ -160,9 +160,9 @@ impl<'a> Iterator for StrftimeItems<'a> {
'C' => Some(num0!(YearDiv100)), 'C' => Some(num0!(YearDiv100)),
'D' => Some(recons![num0!(Month), lit!("/"), num0!(Day), lit!("/"), 'D' => Some(recons![num0!(Month), lit!("/"), num0!(Day), lit!("/"),
num0!(YearMod100)]), num0!(YearMod100)]),
'F' => Some(recons![num!(Year), lit!("-"), num0!(Month), lit!("-"), 'F' => Some(recons![num0!(Year), lit!("-"), num0!(Month), lit!("-"),
num0!(Day)]), num0!(Day)]),
'G' => Some(num!(IsoYear)), 'G' => Some(num0!(IsoYear)),
'H' => Some(num0!(Hour)), 'H' => Some(num0!(Hour)),
'I' => Some(num0!(Hour12)), 'I' => Some(num0!(Hour12)),
'M' => Some(num0!(Minute)), 'M' => Some(num0!(Minute)),
@ -176,14 +176,14 @@ impl<'a> Iterator for StrftimeItems<'a> {
'W' => Some(num0!(WeekFromMon)), 'W' => Some(num0!(WeekFromMon)),
'X' => Some(recons![num0!(Hour), lit!(":"), num0!(Minute), lit!(":"), 'X' => Some(recons![num0!(Hour), lit!(":"), num0!(Minute), lit!(":"),
num0!(Second)]), num0!(Second)]),
'Y' => Some(num!(Year)), 'Y' => Some(num0!(Year)),
'Z' => Some(fix!(TimezoneName)), 'Z' => Some(fix!(TimezoneName)),
'a' => Some(fix!(ShortWeekdayName)), 'a' => Some(fix!(ShortWeekdayName)),
'b' => Some(fix!(ShortMonthName)), 'b' => Some(fix!(ShortMonthName)),
'c' => Some(recons![fix!(ShortWeekdayName), sp!(" "), fix!(ShortMonthName), 'c' => Some(recons![fix!(ShortWeekdayName), sp!(" "), fix!(ShortMonthName),
sp!(" "), nums!(Day), sp!(" "), num0!(Hour), lit!(":"), sp!(" "), nums!(Day), sp!(" "), num0!(Hour), lit!(":"),
num0!(Minute), lit!(":"), num0!(Second), sp!(" "), num0!(Minute), lit!(":"), num0!(Second), sp!(" "),
num!(Year)]), num0!(Year)]),
'd' => Some(num0!(Day)), 'd' => Some(num0!(Day)),
'e' => Some(nums!(Day)), 'e' => Some(nums!(Day)),
'f' => Some(num0!(Nanosecond)), 'f' => Some(num0!(Nanosecond)),
@ -201,7 +201,7 @@ impl<'a> Iterator for StrftimeItems<'a> {
't' => Some(sp!("\t")), 't' => Some(sp!("\t")),
'u' => Some(num!(WeekdayFromMon)), 'u' => Some(num!(WeekdayFromMon)),
'v' => Some(recons![nums!(Day), lit!("-"), fix!(ShortMonthName), lit!("-"), 'v' => Some(recons![nums!(Day), lit!("-"), fix!(ShortMonthName), lit!("-"),
num!(Year)]), num0!(Year)]),
'w' => Some(num!(NumDaysFromSun)), 'w' => Some(num!(NumDaysFromSun)),
'x' => Some(recons![num0!(Month), lit!("/"), num0!(Day), lit!("/"), 'x' => Some(recons![num0!(Month), lit!("/"), num0!(Day), lit!("/"),
num0!(YearMod100)]), num0!(YearMod100)]),
@ -255,7 +255,7 @@ fn test_strftime_items() {
assert_eq!(parse_and_collect("100%%"), [lit!("100"), lit!("%")]); assert_eq!(parse_and_collect("100%%"), [lit!("100"), lit!("%")]);
assert_eq!(parse_and_collect("100%% ok"), [lit!("100"), lit!("%"), sp!(" "), lit!("ok")]); assert_eq!(parse_and_collect("100%% ok"), [lit!("100"), lit!("%"), sp!(" "), lit!("ok")]);
assert_eq!(parse_and_collect("%%PDF-1.0"), [lit!("%"), lit!("PDF-1.0")]); assert_eq!(parse_and_collect("%%PDF-1.0"), [lit!("%"), lit!("PDF-1.0")]);
assert_eq!(parse_and_collect("%Y-%m-%d"), [num!(Year), lit!("-"), num0!(Month), lit!("-"), assert_eq!(parse_and_collect("%Y-%m-%d"), [num0!(Year), lit!("-"), num0!(Month), lit!("-"),
num0!(Day)]); num0!(Day)]);
assert_eq!(parse_and_collect("[%F]"), parse_and_collect("[%Y-%m-%d]")); assert_eq!(parse_and_collect("[%F]"), parse_and_collect("[%Y-%m-%d]"));
assert_eq!(parse_and_collect("%m %d"), [num0!(Month), sp!(" "), num0!(Day)]); assert_eq!(parse_and_collect("%m %d"), [num0!(Month), sp!(" "), num0!(Day)]);

13
src/naive/date.rs
View File

@ -873,6 +873,19 @@ mod tests {
assert_eq!(d.format("%v").to_string(), " 4-Mar-2012"); assert_eq!(d.format("%v").to_string(), " 4-Mar-2012");
assert_eq!(d.format("%t%n%%%n%t").to_string(), "\t\n%\n\t"); assert_eq!(d.format("%t%n%%%n%t").to_string(), "\t\n%\n\t");
// non-four-digit years
assert_eq!(NaiveDate::from_ymd(12345, 1, 1).format("%Y").to_string(), "+12345");
assert_eq!(NaiveDate::from_ymd(1234, 1, 1).format("%Y").to_string(), "1234");
assert_eq!(NaiveDate::from_ymd(123, 1, 1).format("%Y").to_string(), "0123");
assert_eq!(NaiveDate::from_ymd(12, 1, 1).format("%Y").to_string(), "0012");
assert_eq!(NaiveDate::from_ymd(1, 1, 1).format("%Y").to_string(), "0001");
assert_eq!(NaiveDate::from_ymd(0, 1, 1).format("%Y").to_string(), "0000");
assert_eq!(NaiveDate::from_ymd(-1, 1, 1).format("%Y").to_string(), "-0001");
assert_eq!(NaiveDate::from_ymd(-12, 1, 1).format("%Y").to_string(), "-0012");
assert_eq!(NaiveDate::from_ymd(-123, 1, 1).format("%Y").to_string(), "-0123");
assert_eq!(NaiveDate::from_ymd(-1234, 1, 1).format("%Y").to_string(), "-1234");
assert_eq!(NaiveDate::from_ymd(-12345, 1, 1).format("%Y").to_string(), "-12345");
// corner cases // corner cases
assert_eq!(NaiveDate::from_ymd(2007, 12, 31).format("%G,%g,%U,%W,%V").to_string(), assert_eq!(NaiveDate::from_ymd(2007, 12, 31).format("%G,%g,%U,%W,%V").to_string(),
"2008,08,53,53,01"); "2008,08,53,53,01");