itsscb/chrono
1
0
Fork 0
mirror of https://github.com/chronotope/chrono.git synced 2025-09-27 04:50:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tests: replace TimeDelta::minutes with try_minutes

Browse Source
This commit is contained in:
Paul Dicker 2024-02-21 07:48:38 +01:00 committed by Paul Dicker
parent 9fc931a394
commit f93508ffd9
5 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/datetime/tests.rs
View File

@ -1511,20 +1511,20 @@ fn test_datetime_sub_assign() {
let datetime = naivedatetime.and_utc();
let mut datetime_sub = datetime;
datetime_sub -= TimeDelta::minutes(90);
assert_eq!(datetime_sub, datetime - TimeDelta::minutes(90));
datetime_sub -= TimeDelta::try_minutes(90).unwrap();
assert_eq!(datetime_sub, datetime - TimeDelta::try_minutes(90).unwrap());
let timezone = FixedOffset::east_opt(60 * 60).unwrap();
let datetime = datetime.with_timezone(&timezone);
let datetime_sub = datetime_sub.with_timezone(&timezone);
assert_eq!(datetime_sub, datetime - TimeDelta::minutes(90));
assert_eq!(datetime_sub, datetime - TimeDelta::try_minutes(90).unwrap());
let timezone = FixedOffset::west_opt(2 * 60 * 60).unwrap();
let datetime = datetime.with_timezone(&timezone);
let datetime_sub = datetime_sub.with_timezone(&timezone);
assert_eq!(datetime_sub, datetime - TimeDelta::minutes(90));
assert_eq!(datetime_sub, datetime - TimeDelta::try_minutes(90).unwrap());
}
#[test]

4
src/naive/datetime/tests.rs
View File

@ -73,7 +73,7 @@ fn test_datetime_addassignment() {
let ymdhms =
|y, m, d, h, n, s| NaiveDate::from_ymd_opt(y, m, d).unwrap().and_hms_opt(h, n, s).unwrap();
let mut date = ymdhms(2016, 10, 1, 10, 10, 10);
date += TimeDelta::minutes(10_000_000);
date += TimeDelta::try_minutes(10_000_000).unwrap();
assert_eq!(date, ymdhms(2035, 10, 6, 20, 50, 10));
date += TimeDelta::try_days(10).unwrap();
assert_eq!(date, ymdhms(2035, 10, 16, 20, 50, 10));
@ -84,7 +84,7 @@ fn test_datetime_subassignment() {
let ymdhms =
|y, m, d, h, n, s| NaiveDate::from_ymd_opt(y, m, d).unwrap().and_hms_opt(h, n, s).unwrap();
let mut date = ymdhms(2016, 10, 1, 10, 10, 10);
date -= TimeDelta::minutes(10_000_000);
date -= TimeDelta::try_minutes(10_000_000).unwrap();
assert_eq!(date, ymdhms(1997, 9, 26, 23, 30, 10));
date -= TimeDelta::try_days(10).unwrap();
assert_eq!(date, ymdhms(1997, 9, 16, 23, 30, 10));

40
src/round.rs
View File

@ -478,7 +478,7 @@ mod tests {
)
.unwrap();
assert_eq!(
dt.duration_round(TimeDelta::minutes(5)).unwrap().to_string(),
dt.duration_round(TimeDelta::try_minutes(5).unwrap()).unwrap().to_string(),
"2012-12-12 18:25:00 UTC"
);
// round down
@ -491,16 +491,16 @@ mod tests {
)
.unwrap();
assert_eq!(
dt.duration_round(TimeDelta::minutes(5)).unwrap().to_string(),
dt.duration_round(TimeDelta::try_minutes(5).unwrap()).unwrap().to_string(),
"2012-12-12 18:20:00 UTC"
);
assert_eq!(
dt.duration_round(TimeDelta::minutes(10)).unwrap().to_string(),
dt.duration_round(TimeDelta::try_minutes(10).unwrap()).unwrap().to_string(),
"2012-12-12 18:20:00 UTC"
);
assert_eq!(
dt.duration_round(TimeDelta::minutes(30)).unwrap().to_string(),
dt.duration_round(TimeDelta::try_minutes(30).unwrap()).unwrap().to_string(),
"2012-12-12 18:30:00 UTC"
);
assert_eq!(
@ -570,7 +570,7 @@ mod tests {
.unwrap()
.naive_utc();
assert_eq!(
dt.duration_round(TimeDelta::minutes(5)).unwrap().to_string(),
dt.duration_round(TimeDelta::try_minutes(5).unwrap()).unwrap().to_string(),
"2012-12-12 18:25:00"
);
// round down
@ -584,16 +584,16 @@ mod tests {
.unwrap()
.naive_utc();
assert_eq!(
dt.duration_round(TimeDelta::minutes(5)).unwrap().to_string(),
dt.duration_round(TimeDelta::try_minutes(5).unwrap()).unwrap().to_string(),
"2012-12-12 18:20:00"
);
assert_eq!(
dt.duration_round(TimeDelta::minutes(10)).unwrap().to_string(),
dt.duration_round(TimeDelta::try_minutes(10).unwrap()).unwrap().to_string(),
"2012-12-12 18:20:00"
);
assert_eq!(
dt.duration_round(TimeDelta::minutes(30)).unwrap().to_string(),
dt.duration_round(TimeDelta::try_minutes(30).unwrap()).unwrap().to_string(),
"2012-12-12 18:30:00"
);
assert_eq!(
@ -610,7 +610,7 @@ mod tests {
fn test_duration_round_pre_epoch() {
let dt = Utc.with_ymd_and_hms(1969, 12, 12, 12, 12, 12).unwrap();
assert_eq!(
dt.duration_round(TimeDelta::minutes(10)).unwrap().to_string(),
dt.duration_round(TimeDelta::try_minutes(10).unwrap()).unwrap().to_string(),
"1969-12-12 12:10:00 UTC"
);
}
@ -641,7 +641,7 @@ mod tests {
)
.unwrap();
assert_eq!(
dt.duration_trunc(TimeDelta::minutes(5)).unwrap().to_string(),
dt.duration_trunc(TimeDelta::try_minutes(5).unwrap()).unwrap().to_string(),
"2012-12-12 18:20:00 UTC"
);
// would round down
@ -654,15 +654,15 @@ mod tests {
)
.unwrap();
assert_eq!(
dt.duration_trunc(TimeDelta::minutes(5)).unwrap().to_string(),
dt.duration_trunc(TimeDelta::try_minutes(5).unwrap()).unwrap().to_string(),
"2012-12-12 18:20:00 UTC"
);
assert_eq!(
dt.duration_trunc(TimeDelta::minutes(10)).unwrap().to_string(),
dt.duration_trunc(TimeDelta::try_minutes(10).unwrap()).unwrap().to_string(),
"2012-12-12 18:20:00 UTC"
);
assert_eq!(
dt.duration_trunc(TimeDelta::minutes(30)).unwrap().to_string(),
dt.duration_trunc(TimeDelta::try_minutes(30).unwrap()).unwrap().to_string(),
"2012-12-12 18:00:00 UTC"
);
assert_eq!(
@ -727,7 +727,7 @@ mod tests {
.unwrap()
.naive_utc();
assert_eq!(
dt.duration_trunc(TimeDelta::minutes(5)).unwrap().to_string(),
dt.duration_trunc(TimeDelta::try_minutes(5).unwrap()).unwrap().to_string(),
"2012-12-12 18:20:00"
);
// would round down
@ -741,15 +741,15 @@ mod tests {
.unwrap()
.naive_utc();
assert_eq!(
dt.duration_trunc(TimeDelta::minutes(5)).unwrap().to_string(),
dt.duration_trunc(TimeDelta::try_minutes(5).unwrap()).unwrap().to_string(),
"2012-12-12 18:20:00"
);
assert_eq!(
dt.duration_trunc(TimeDelta::minutes(10)).unwrap().to_string(),
dt.duration_trunc(TimeDelta::try_minutes(10).unwrap()).unwrap().to_string(),
"2012-12-12 18:20:00"
);
assert_eq!(
dt.duration_trunc(TimeDelta::minutes(30)).unwrap().to_string(),
dt.duration_trunc(TimeDelta::try_minutes(30).unwrap()).unwrap().to_string(),
"2012-12-12 18:00:00"
);
assert_eq!(
@ -766,7 +766,7 @@ mod tests {
fn test_duration_trunc_pre_epoch() {
let dt = Utc.with_ymd_and_hms(1969, 12, 12, 12, 12, 12).unwrap();
assert_eq!(
dt.duration_trunc(TimeDelta::minutes(10)).unwrap().to_string(),
dt.duration_trunc(TimeDelta::try_minutes(10).unwrap()).unwrap().to_string(),
"1969-12-12 12:10:00 UTC"
);
}
@ -788,7 +788,7 @@ mod tests {
#[test]
fn test_duration_trunc_close_to_epoch() {
let span = TimeDelta::minutes(15);
let span = TimeDelta::try_minutes(15).unwrap();
let dt = NaiveDate::from_ymd_opt(1970, 1, 1).unwrap().and_hms_opt(0, 0, 15).unwrap();
assert_eq!(dt.duration_trunc(span).unwrap().to_string(), "1970-01-01 00:00:00");
@ -799,7 +799,7 @@ mod tests {
#[test]
fn test_duration_round_close_to_epoch() {
let span = TimeDelta::minutes(15);
let span = TimeDelta::try_minutes(15).unwrap();
let dt = NaiveDate::from_ymd_opt(1970, 1, 1).unwrap().and_hms_opt(0, 0, 15).unwrap();
assert_eq!(dt.duration_round(span).unwrap().to_string(), "1970-01-01 00:00:00");

4
src/time_delta.rs
View File

@ -639,7 +639,7 @@ mod tests {
assert_eq!(-(days(3) + TimeDelta::seconds(70)), days(-4) + TimeDelta::seconds(86_400 - 70));
let mut d = TimeDelta::default();
d += TimeDelta::minutes(1);
d += TimeDelta::try_minutes(1).unwrap();
d -= TimeDelta::seconds(30);
assert_eq!(d, TimeDelta::seconds(30));
}
@ -1201,7 +1201,7 @@ mod tests {
const ONE_WEEK: TimeDelta = expect!(TimeDelta::try_weeks(1), "");
const ONE_DAY: TimeDelta = expect!(TimeDelta::try_days(1), "");
const ONE_HOUR: TimeDelta = expect!(TimeDelta::try_hours(1), "");
const ONE_MINUTE: TimeDelta = TimeDelta::minutes(1);
const ONE_MINUTE: TimeDelta = expect!(TimeDelta::try_minutes(1), "");
const ONE_SECOND: TimeDelta = TimeDelta::seconds(1);
const ONE_MILLI: TimeDelta = TimeDelta::milliseconds(1);
const ONE_MICRO: TimeDelta = TimeDelta::microseconds(1);

2
tests/wasm.rs
View File

@ -25,7 +25,7 @@ fn now() {
let actual = NaiveDateTime::parse_from_str(&now, "%s").unwrap().and_utc();
let diff = utc - actual;
assert!(
diff < chrono::TimeDelta::minutes(5),
diff < chrono::TimeDelta::try_minutes(5).unwrap(),
"expected {} - {} == {} < 5m (env var: {})",
utc,
actual,