Use ? in tests.
This commit is contained in:
@@ -4,8 +4,8 @@ use rhai::{Engine, EvalAltResult};
|
||||
fn test_bool_op1() -> Result<(), Box<EvalAltResult>> {
|
||||
let engine = Engine::new();
|
||||
|
||||
assert!(engine.eval::<bool>("true && (false || true)").unwrap());
|
||||
assert!(engine.eval::<bool>("true & (false | true)").unwrap());
|
||||
assert!(engine.eval::<bool>("true && (false || true)")?);
|
||||
assert!(engine.eval::<bool>("true & (false | true)")?);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
@@ -14,8 +14,8 @@ fn test_bool_op1() -> Result<(), Box<EvalAltResult>> {
|
||||
fn test_bool_op2() -> Result<(), Box<EvalAltResult>> {
|
||||
let engine = Engine::new();
|
||||
|
||||
assert!(!engine.eval::<bool>("false && (false || true)").unwrap());
|
||||
assert!(!engine.eval::<bool>("false & (false | true)").unwrap());
|
||||
assert!(!engine.eval::<bool>("false && (false || true)")?);
|
||||
assert!(!engine.eval::<bool>("false & (false | true)")?);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
@@ -25,9 +25,9 @@ fn test_bool_op3() -> Result<(), Box<EvalAltResult>> {
|
||||
let engine = Engine::new();
|
||||
|
||||
assert!(engine.eval::<bool>("true && (false || 123)").is_err());
|
||||
assert!(engine.eval::<bool>("true && (true || { throw })").unwrap());
|
||||
assert!(engine.eval::<bool>("true && (true || { throw })")?);
|
||||
assert!(engine.eval::<bool>("123 && (false || true)").is_err());
|
||||
assert!(!engine.eval::<bool>("false && (true || { throw })").unwrap());
|
||||
assert!(!engine.eval::<bool>("false && (true || { throw })")?);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
@@ -36,23 +36,19 @@ fn test_bool_op3() -> Result<(), Box<EvalAltResult>> {
|
||||
fn test_bool_op_short_circuit() -> Result<(), Box<EvalAltResult>> {
|
||||
let engine = Engine::new();
|
||||
|
||||
assert!(engine
|
||||
.eval::<bool>(
|
||||
"
|
||||
assert!(engine.eval::<bool>(
|
||||
"
|
||||
let x = true;
|
||||
x || { throw; };
|
||||
"
|
||||
)
|
||||
.unwrap());
|
||||
)?);
|
||||
|
||||
assert!(!engine
|
||||
.eval::<bool>(
|
||||
"
|
||||
assert!(!engine.eval::<bool>(
|
||||
"
|
||||
let x = false;
|
||||
x && { throw; };
|
||||
"
|
||||
)
|
||||
.unwrap());
|
||||
)?);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
Reference in New Issue
Block a user