bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

std: Tweak tests of std::time

Browse source 
Typical algebra currently doesn't work on the types in std::time currently (see
[this comment][comment]), so tweak the tests to account for this property.

[comment]: https://github.com/rust-lang/rust/issues/29866#issuecomment-159093809

Closes #29970
This commit is contained in:
Alex Crichton 2015-11-23 14:51:45 -08:00
parent e24fffef8a
commit 27ee3fea7a
1 changed files with 24 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/libstd/time/mod.rs
View file

@ -231,6 +231,16 @@ impl fmt::Display for SystemTimeError {
mod tests { mod tests {
use super::{Instant, SystemTime, Duration, UNIX_EPOCH}; use super::{Instant, SystemTime, Duration, UNIX_EPOCH};
macro_rules! assert_almost_eq {
($a:expr, $b:expr) => ({
let (a, b) = ($a, $b);
if a != b {
let (a, b) = if a > b {(a, b)} else {(b, a)};
assert!(a - Duration::new(0, 1) <= b);
}
})
}
#[test] #[test]
fn instant_monotonic() { fn instant_monotonic() {
let a = Instant::now(); let a = Instant::now();
@ -249,11 +259,11 @@ mod tests {
let a = Instant::now(); let a = Instant::now();
let b = Instant::now(); let b = Instant::now();
let dur = b.duration_from_earlier(a); let dur = b.duration_from_earlier(a);
assert_eq!(b - dur, a); assert_almost_eq!(b - dur, a);
assert_eq!(a + dur, b); assert_almost_eq!(a + dur, b);
let second = Duration::new(1, 0); let second = Duration::new(1, 0);
assert_eq!(a - second + second, a); assert_almost_eq!(a - second + second, a);
} }
#[test] #[test]
@ -269,31 +279,31 @@ mod tests {
let b = SystemTime::now(); let b = SystemTime::now();
match b.duration_from_earlier(a) { match b.duration_from_earlier(a) {
Ok(dur) if dur == Duration::new(0, 0) => { Ok(dur) if dur == Duration::new(0, 0) => {
assert_eq!(a, b); assert_almost_eq!(a, b);
} }
Ok(dur) => { Ok(dur) => {
assert!(b > a); assert!(b > a);
assert_eq!(b - dur, a); assert_almost_eq!(b - dur, a);
assert_eq!(a + dur, b); assert_almost_eq!(a + dur, b);
} }
Err(dur) => { Err(dur) => {
let dur = dur.duration(); let dur = dur.duration();
assert!(a > b); assert!(a > b);
assert_eq!(b + dur, a); assert_almost_eq!(b + dur, a);
assert_eq!(b - dur, a); assert_almost_eq!(b - dur, a);
} }
} }
let second = Duration::new(1, 0); let second = Duration::new(1, 0);
assert_eq!(a.duration_from_earlier(a - second).unwrap(), second); assert_almost_eq!(a.duration_from_earlier(a - second).unwrap(), second);
assert_eq!(a.duration_from_earlier(a + second).unwrap_err().duration(), assert_almost_eq!(a.duration_from_earlier(a + second).unwrap_err()
second); .duration(), second);
assert_eq!(a - second + second, a); assert_almost_eq!(a - second + second, a);
let eighty_years = second * 60 * 60 * 24 * 365 * 80; let eighty_years = second * 60 * 60 * 24 * 365 * 80;
assert_eq!(a - eighty_years + eighty_years, a); assert_almost_eq!(a - eighty_years + eighty_years, a);
assert_eq!(a - (eighty_years * 10) + (eighty_years * 10), a); assert_almost_eq!(a - (eighty_years * 10) + (eighty_years * 10), a);
} }
#[test] #[test]