Fine tune some tests.

This commit is contained in:
Stephen Chung 2020-03-12 12:35:30 +08:00
parent 0d1a240292
commit 4662b9bd0c
2 changed files with 19 additions and 19 deletions

View File

@ -62,12 +62,10 @@ fn test_bool_op_short_circuit() -> Result<(), EvalAltResult> {
} }
#[test] #[test]
#[should_panic]
fn test_bool_op_no_short_circuit1() { fn test_bool_op_no_short_circuit1() {
let mut engine = Engine::new(); let mut engine = Engine::new();
assert_eq!( assert!(engine
engine
.eval::<bool>( .eval::<bool>(
r" r"
let this = true; let this = true;
@ -75,18 +73,14 @@ fn test_bool_op_no_short_circuit1() {
this | { throw; } this | { throw; }
" "
) )
.unwrap(), .is_err());
false
);
} }
#[test] #[test]
#[should_panic]
fn test_bool_op_no_short_circuit2() { fn test_bool_op_no_short_circuit2() {
let mut engine = Engine::new(); let mut engine = Engine::new();
assert_eq!( assert!(engine
engine
.eval::<bool>( .eval::<bool>(
r" r"
let this = false; let this = false;
@ -94,7 +88,5 @@ fn test_bool_op_no_short_circuit2() {
this & { throw; } this & { throw; }
" "
) )
.unwrap(), .is_err());
false
);
} }

View File

@ -42,7 +42,15 @@ fn test_scope_eval() -> Result<(), EvalAltResult> {
println!("result: {}", result); // should print 966 println!("result: {}", result); // should print 966
// Variable y is changed in the script // Variable y is changed in the script
assert_eq!(scope.get_value::<INT>("y").unwrap(), 1); assert_eq!(
scope
.get_value::<INT>("y")
.ok_or(EvalAltResult::ErrorRuntime(
"variable y not found".into(),
Default::default()
))?,
1
);
Ok(()) Ok(())
} }