Mercurial > hg
changeset 41241:168041fa6d5f
rust: factorized testing Graphs
it will useful to use these outside of `ancestors`, too.
Differential Revision: https://phab.mercurial-scm.org/D5579
| author | Georges Racinet <georges.racinet@octobus.net> |
|---|---|
| date | Mon, 14 Jan 2019 20:42:25 +0100 |
| parents | ff333620a4cc |
| children | 47881d2a9d99 |
| files | rust/hg-core/src/ancestors.rs rust/hg-core/src/lib.rs rust/hg-core/src/testing.rs |
| diffstat | 3 files changed, 111 insertions(+), 58 deletions(-) [+] |
line wrap: on
line diff
--- a/rust/hg-core/src/ancestors.rs Sat Jan 12 16:57:04 2019 +0100 +++ b/rust/hg-core/src/ancestors.rs Mon Jan 14 20:42:25 2019 +0100 @@ -381,34 +381,9 @@ mod tests { use super::*; + use crate::testing::{SampleGraph, VecGraph}; use std::iter::FromIterator; - #[derive(Clone, Debug)] - struct Stub; - - /// This is the same as the dict from test-ancestors.py - impl Graph for Stub { - fn parents(&self, rev: Revision) -> Result<[Revision; 2], GraphError> { - match rev { - 0 => Ok([-1, -1]), - 1 => Ok([0, -1]), - 2 => Ok([1, -1]), - 3 => Ok([1, -1]), - 4 => Ok([2, -1]), - 5 => Ok([4, -1]), - 6 => Ok([4, -1]), - 7 => Ok([4, -1]), - 8 => Ok([-1, -1]), - 9 => Ok([6, 7]), - 10 => Ok([5, -1]), - 11 => Ok([3, 7]), - 12 => Ok([9, -1]), - 13 => Ok([8, -1]), - r => Err(GraphError::ParentOutOfRange(r)), - } - } - } - fn list_ancestors<G: Graph>( graph: G, initrevs: Vec<Revision>, @@ -425,25 +400,37 @@ /// Same tests as test-ancestor.py, without membership /// (see also test-ancestor.py.out) fn test_list_ancestor() { - assert_eq!(list_ancestors(Stub, vec![], 0, false), vec![]); + assert_eq!(list_ancestors(SampleGraph, vec![], 0, false), vec![]); assert_eq!( - list_ancestors(Stub, vec![11, 13], 0, false), + list_ancestors(SampleGraph, vec![11, 13], 0, false), vec![8, 7, 4, 3, 2, 1, 0] ); - assert_eq!(list_ancestors(Stub, vec![1, 3], 0, false), vec![1, 0]); assert_eq!( - list_ancestors(Stub, vec![11, 13], 0, true), + list_ancestors(SampleGraph, vec![1, 3], 0, false), + vec![1, 0] + ); + assert_eq!( + list_ancestors(SampleGraph, vec![11, 13], 0, true), vec![13, 11, 8, 7, 4, 3, 2, 1, 0] ); - assert_eq!(list_ancestors(Stub, vec![11, 13], 6, false), vec![8, 7]); assert_eq!( - list_ancestors(Stub, vec![11, 13], 6, true), + list_ancestors(SampleGraph, vec![11, 13], 6, false), + vec![8, 7] + ); + assert_eq!( + list_ancestors(SampleGraph, vec![11, 13], 6, true), vec![13, 11, 8, 7] ); - assert_eq!(list_ancestors(Stub, vec![11, 13], 11, true), vec![13, 11]); - assert_eq!(list_ancestors(Stub, vec![11, 13], 12, true), vec![13]); + assert_eq!( + list_ancestors(SampleGraph, vec![11, 13], 11, true), + vec![13, 11] + ); assert_eq!( - list_ancestors(Stub, vec![10, 1], 0, true), + list_ancestors(SampleGraph, vec![11, 13], 12, true), + vec![13] + ); + assert_eq!( + list_ancestors(SampleGraph, vec![10, 1], 0, true), vec![10, 5, 4, 2, 1, 0] ); } @@ -455,26 +442,26 @@ /// For instance, run tests/test-obsolete-checkheads.t fn test_nullrev_input() { let mut iter = - AncestorsIterator::new(Stub, vec![-1], 0, false).unwrap(); + AncestorsIterator::new(SampleGraph, vec![-1], 0, false).unwrap(); assert_eq!(iter.next(), None) } #[test] fn test_contains() { let mut lazy = - AncestorsIterator::new(Stub, vec![10, 1], 0, true).unwrap(); + AncestorsIterator::new(SampleGraph, vec![10, 1], 0, true).unwrap(); assert!(lazy.contains(1).unwrap()); assert!(!lazy.contains(3).unwrap()); let mut lazy = - AncestorsIterator::new(Stub, vec![0], 0, false).unwrap(); + AncestorsIterator::new(SampleGraph, vec![0], 0, false).unwrap(); assert!(!lazy.contains(NULL_REVISION).unwrap()); } #[test] fn test_peek() { let mut iter = - AncestorsIterator::new(Stub, vec![10], 0, true).unwrap(); + AncestorsIterator::new(SampleGraph, vec![10], 0, true).unwrap(); // peek() gives us the next value assert_eq!(iter.peek(), Some(10)); // but it's not been consumed @@ -490,16 +477,18 @@ #[test] fn test_empty() { let mut iter = - AncestorsIterator::new(Stub, vec![10], 0, true).unwrap(); + AncestorsIterator::new(SampleGraph, vec![10], 0, true).unwrap(); assert!(!iter.is_empty()); while iter.next().is_some() {} assert!(!iter.is_empty()); - let iter = AncestorsIterator::new(Stub, vec![], 0, true).unwrap(); + let iter = + AncestorsIterator::new(SampleGraph, vec![], 0, true).unwrap(); assert!(iter.is_empty()); // case where iter.seen == {NULL_REVISION} - let iter = AncestorsIterator::new(Stub, vec![0], 0, false).unwrap(); + let iter = + AncestorsIterator::new(SampleGraph, vec![0], 0, false).unwrap(); assert!(iter.is_empty()); } @@ -519,7 +508,7 @@ #[test] fn test_initrev_out_of_range() { // inclusive=false looks up initrev's parents right away - match AncestorsIterator::new(Stub, vec![25], 0, false) { + match AncestorsIterator::new(SampleGraph, vec![25], 0, false) { Ok(_) => panic!("Should have been ParentOutOfRange"), Err(e) => assert_eq!(e, GraphError::ParentOutOfRange(25)), } @@ -536,7 +525,7 @@ #[test] fn test_lazy_iter_contains() { let mut lazy = - LazyAncestors::new(Stub, vec![11, 13], 0, false).unwrap(); + LazyAncestors::new(SampleGraph, vec![11, 13], 0, false).unwrap(); let revs: Vec<Revision> = lazy.iter().map(|r| r.unwrap()).collect(); // compare with iterator tests on the same initial revisions @@ -551,7 +540,7 @@ #[test] fn test_lazy_contains_iter() { let mut lazy = - LazyAncestors::new(Stub, vec![11, 13], 0, false).unwrap(); // reminder: [8, 7, 4, 3, 2, 1, 0] + LazyAncestors::new(SampleGraph, vec![11, 13], 0, false).unwrap(); // reminder: [8, 7, 4, 3, 2, 1, 0] assert_eq!(lazy.contains(2), Ok(true)); assert_eq!(lazy.contains(6), Ok(false)); @@ -570,7 +559,7 @@ /// Test constructor, add/get bases fn test_missing_bases() { let mut missing_ancestors = - MissingAncestors::new(Stub, [5, 3, 1, 3].iter().cloned()); + MissingAncestors::new(SampleGraph, [5, 3, 1, 3].iter().cloned()); let mut as_vec: Vec<Revision> = missing_ancestors.get_bases().iter().cloned().collect(); as_vec.sort(); @@ -588,7 +577,7 @@ expected: &[Revision], ) { let mut missing_ancestors = - MissingAncestors::new(Stub, bases.iter().cloned()); + MissingAncestors::new(SampleGraph, bases.iter().cloned()); let mut revset: HashSet<Revision> = revs.iter().cloned().collect(); missing_ancestors .remove_ancestors_from(&mut revset) @@ -615,7 +604,7 @@ expected: &[Revision], ) { let mut missing_ancestors = - MissingAncestors::new(Stub, bases.iter().cloned()); + MissingAncestors::new(SampleGraph, bases.iter().cloned()); let missing = missing_ancestors .missing_ancestors(revs.iter().cloned()) .unwrap(); @@ -631,16 +620,6 @@ assert_missing_ancestors(&[7], &[9, 11], &[3, 6, 9, 11]); } - // A Graph represented by a vector whose indices are revisions - // and values are parents of the revisions - type VecGraph = Vec<[Revision; 2]>; - - impl Graph for VecGraph { - fn parents(&self, rev: Revision) -> Result<[Revision; 2], GraphError> { - Ok(self[rev as usize]) - } - } - /// An interesting case found by a random generator similar to /// the one in test-ancestor.py. An early version of Rust MissingAncestors /// failed this, yet none of the integration tests of the whole suite
--- a/rust/hg-core/src/lib.rs Sat Jan 12 16:57:04 2019 +0100 +++ b/rust/hg-core/src/lib.rs Mon Jan 14 20:42:25 2019 +0100 @@ -4,6 +4,8 @@ // GNU General Public License version 2 or any later version. mod ancestors; pub use ancestors::{AncestorsIterator, LazyAncestors, MissingAncestors}; +#[cfg(test)] +pub mod testing; /// Mercurial revision numbers ///
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/rust/hg-core/src/testing.rs Mon Jan 14 20:42:25 2019 +0100 @@ -0,0 +1,72 @@ +// testing.rs +// +// Copyright 2018 Georges Racinet <georges.racinet@octobus.net> +// +// This software may be used and distributed according to the terms of the +// GNU General Public License version 2 or any later version. + +use crate::{Graph, GraphError, Revision, NULL_REVISION}; + +/// A stub `Graph`, same as the one from `test-ancestor.py` +/// +/// o 13 +/// | +/// | o 12 +/// | | +/// | | o 11 +/// | | |\ +/// | | | | o 10 +/// | | | | | +/// | o---+ | 9 +/// | | | | | +/// o | | | | 8 +/// / / / / +/// | | o | 7 +/// | | | | +/// o---+ | 6 +/// / / / +/// | | o 5 +/// | |/ +/// | o 4 +/// | | +/// o | 3 +/// | | +/// | o 2 +/// |/ +/// o 1 +/// | +/// o 0 +#[derive(Clone, Debug)] +pub struct SampleGraph; + +impl Graph for SampleGraph { + fn parents(&self, rev: Revision) -> Result<[Revision; 2], GraphError> { + match rev { + 0 => Ok([NULL_REVISION, NULL_REVISION]), + 1 => Ok([0, NULL_REVISION]), + 2 => Ok([1, NULL_REVISION]), + 3 => Ok([1, NULL_REVISION]), + 4 => Ok([2, NULL_REVISION]), + 5 => Ok([4, NULL_REVISION]), + 6 => Ok([4, NULL_REVISION]), + 7 => Ok([4, NULL_REVISION]), + 8 => Ok([NULL_REVISION, NULL_REVISION]), + 9 => Ok([6, 7]), + 10 => Ok([5, NULL_REVISION]), + 11 => Ok([3, 7]), + 12 => Ok([9, NULL_REVISION]), + 13 => Ok([8, NULL_REVISION]), + r => Err(GraphError::ParentOutOfRange(r)), + } + } +} + +// A Graph represented by a vector whose indices are revisions +// and values are parents of the revisions +pub type VecGraph = Vec<[Revision; 2]>; + +impl Graph for VecGraph { + fn parents(&self, rev: Revision) -> Result<[Revision; 2], GraphError> { + Ok(self[rev as usize]) + } +}