From 215b7e02fe99957f975b3c1acdac6b7c2b0fc968 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 12 Oct 2020 00:39:52 +0100 Subject: [PATCH] more tests Signed-off-by: Ian Jackson --- zcoord/zcoord.rs | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/zcoord/zcoord.rs b/zcoord/zcoord.rs index e190a4c2..04996d99 100644 --- a/zcoord/zcoord.rs +++ b/zcoord/zcoord.rs @@ -738,18 +738,27 @@ mod test { #[test] fn range(){ - fn nxt(i: &mut RangeIterator, exp: &str) { - let got = i.next().unwrap(); - assert_eq!(got.to_string(), exp); - assert_eq!(got, bf(exp)); + struct It { + i: RangeIterator, + last: ZCoord, + } + impl It { + fn nxt(&mut self, exp: &str) { + let got = self.i.next().unwrap(); + assert_eq!(got.to_string(), exp); + assert_eq!(got, bf(exp)); + assert!(got > self.last); + self.last = got.clone(); + } } let x = bf("3333333333_vvvvvvvvv0").clone_mut(); let y = bf("3333333334_0000000040").clone_mut(); - let mut i = x.range_upto(&y, 4).unwrap(); - nxt(&mut i, "3333333334"); - nxt(&mut i, "3333333334_0000000010"); - nxt(&mut i, "3333333334_0000000020"); - nxt(&mut i, "3333333334_0000000030"); - assert_eq!(i.next(), None); + let i = x.range_upto(&y, 4).unwrap(); + let mut it = It { i, last: x.repack().unwrap() }; + it.nxt("3333333334"); + it.nxt("3333333334_0000000010"); + it.nxt("3333333334_0000000020"); + it.nxt("3333333334_0000000030"); + assert_eq!(it.i.next(), None); } } -- 2.30.2