adrian/schematics
1
0
Fork 0
Code Issues Pull requests Releases Activity

Correctly run tuples

Browse source
This commit is contained in:
Adrian Heine 2020-05-03 12:06:12 +02:00
parent 59253eadb1
commit 0a4019ea19
1 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/setup.rs
View file

@ -128,7 +128,9 @@ macro_rules! runnable_for_tuple {
#[allow(unused)]
fn run<_R: SymbolRunner>(&self, runner: &_R, force: bool) -> Result<bool, Box<dyn Error>> {
let ($($name,)*) = self;
Ok($(runner.run_symbol($name, force)? || )* false)
let mut result = false;
$(result = runner.run_symbol($name, force)? || result;)*
Ok(result)
}
}
);
@ -342,4 +344,23 @@ mod test {
setup.add(TestResource("A", "B")).unwrap();
assert_eq!(*count.borrow(), 0);
}
#[test]
fn correctly_handles_symbol_tuples() {
let (count, setup) = get_setup();
setup.run_symbol((TestSymbol { reached: false }, TestSymbol { reached: false }), false).unwrap();
assert_eq!(*count.borrow(), 2);
let (count, setup) = get_setup();
setup.run_symbol((TestSymbol { reached: true }, TestSymbol { reached: false }), false).unwrap();
assert_eq!(*count.borrow(), 1);
let (count, setup) = get_setup();
setup.run_symbol((TestSymbol { reached: false }, TestSymbol { reached: true }), false).unwrap();
assert_eq!(*count.borrow(), 1);
let (count, setup) = get_setup();
setup.run_symbol((TestSymbol { reached: true }, TestSymbol { reached: true }), true).unwrap();
assert_eq!(*count.borrow(), 2);
}
}