From dbe3f98e5040b3b507a030aad8444e138d3a721c Mon Sep 17 00:00:00 2001 From: Chris Mikkelson Date: Wed, 24 Jul 2024 13:22:46 -0500 Subject: [PATCH] Flesh out 'generic merger' test --- src/entry.rs | 2 +- src/source.rs | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/entry.rs b/src/entry.rs index 4e88f5a..5a4cf4a 100644 --- a/src/entry.rs +++ b/src/entry.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -#[derive(Debug, Clone)] +#[derive(Debug, Clone, PartialEq, Eq)] pub struct Entry { pub key: Arc>, pub value: Arc>, diff --git a/src/source.rs b/src/source.rs index 6836b93..0c76f64 100644 --- a/src/source.rs +++ b/src/source.rs @@ -285,9 +285,11 @@ pub mod test { use crate::merger::Merger; let ts = test_source(); let mut v = Vec::::new(); - let s = GenericSource::from(&ts); - v.push(s); + v.push(GenericSource::from(&ts)); + v.push(GenericSource::from(&ts)); + let mut refv = Vec::::from_iter((&ts).iter().chain((&ts).iter())); + refv.sort_by(|a, b| a.key.as_ref().cmp(b.key.as_ref())); let gs = Merger::from(v); - gs.iter(); + assert_eq!(Vec::from_iter(gs.iter()), refv); } } -- 2.50.1