From 7fc72e8c28d4b2e247b678934ae5d3c914d44f07 Mon Sep 17 00:00:00 2001 From: Stephen Chung Date: Mon, 13 Feb 2023 08:59:58 +0800 Subject: [PATCH] Use ? in tests. --- tests/arrays.rs | 18 +++++++----------- tests/bool_op.rs | 28 ++++++++++++---------------- tests/closures.rs | 16 ++++++++-------- tests/comments.rs | 2 +- tests/compound_equality.rs | 10 +++++----- tests/float.rs | 4 +--- tests/get_set.rs | 8 +++----- tests/not.rs | 8 +++----- tests/unit.rs | 4 +--- 9 files changed, 41 insertions(+), 57 deletions(-) diff --git a/tests/arrays.rs b/tests/arrays.rs index a363873f..8820a54a 100644 --- a/tests/arrays.rs +++ b/tests/arrays.rs @@ -515,14 +515,12 @@ fn test_arrays_map_reduce() -> Result<(), Box> { 3 ); - engine - .eval::<()>( - " + engine.eval::<()>( + " let x = [1, 2, 3, 2, 1]; x.find(|v| v > 4) ", - ) - .unwrap(); + )?; assert_eq!( engine.eval::( @@ -534,14 +532,12 @@ fn test_arrays_map_reduce() -> Result<(), Box> { 2 ); - engine - .eval::<()>( - " + engine.eval::<()>( + " let x = [#{alice: 1}, #{bob: 2}, #{clara: 3}]; x.find_map(|v| v.dave) ", - ) - .unwrap(); + )?; Ok(()) } @@ -550,7 +546,7 @@ fn test_arrays_map_reduce() -> Result<(), Box> { fn test_arrays_elvis() -> Result<(), Box> { let engine = Engine::new(); - engine.eval::<()>("let x = (); x?[2]").unwrap(); + engine.eval::<()>("let x = (); x?[2]")?; engine.run("let x = (); x?[2] = 42")?; diff --git a/tests/bool_op.rs b/tests/bool_op.rs index 30a551cd..247fc33b 100644 --- a/tests/bool_op.rs +++ b/tests/bool_op.rs @@ -4,8 +4,8 @@ use rhai::{Engine, EvalAltResult}; fn test_bool_op1() -> Result<(), Box> { let engine = Engine::new(); - assert!(engine.eval::("true && (false || true)").unwrap()); - assert!(engine.eval::("true & (false | true)").unwrap()); + assert!(engine.eval::("true && (false || true)")?); + assert!(engine.eval::("true & (false | true)")?); Ok(()) } @@ -14,8 +14,8 @@ fn test_bool_op1() -> Result<(), Box> { fn test_bool_op2() -> Result<(), Box> { let engine = Engine::new(); - assert!(!engine.eval::("false && (false || true)").unwrap()); - assert!(!engine.eval::("false & (false | true)").unwrap()); + assert!(!engine.eval::("false && (false || true)")?); + assert!(!engine.eval::("false & (false | true)")?); Ok(()) } @@ -25,9 +25,9 @@ fn test_bool_op3() -> Result<(), Box> { let engine = Engine::new(); assert!(engine.eval::("true && (false || 123)").is_err()); - assert!(engine.eval::("true && (true || { throw })").unwrap()); + assert!(engine.eval::("true && (true || { throw })")?); assert!(engine.eval::("123 && (false || true)").is_err()); - assert!(!engine.eval::("false && (true || { throw })").unwrap()); + assert!(!engine.eval::("false && (true || { throw })")?); Ok(()) } @@ -36,23 +36,19 @@ fn test_bool_op3() -> Result<(), Box> { fn test_bool_op_short_circuit() -> Result<(), Box> { let engine = Engine::new(); - assert!(engine - .eval::( - " + assert!(engine.eval::( + " let x = true; x || { throw; }; " - ) - .unwrap()); + )?); - assert!(!engine - .eval::( - " + assert!(!engine.eval::( + " let x = false; x && { throw; }; " - ) - .unwrap()); + )?); Ok(()) } diff --git a/tests/closures.rs b/tests/closures.rs index d2576e80..0e934c30 100644 --- a/tests/closures.rs +++ b/tests/closures.rs @@ -369,9 +369,9 @@ fn test_closures_external() -> Result<(), Box> { let fn_ptr = engine.eval_ast::(&ast)?; - let f = move |x: INT| -> String { fn_ptr.call(&engine, &ast, (x,)).unwrap() }; + let f = move |x: INT| fn_ptr.call::(&engine, &ast, (x,)); - assert_eq!(f(42), "hello42"); + assert_eq!(f(42)?, "hello42"); Ok(()) } @@ -383,20 +383,20 @@ fn test_closures_callback() -> Result<(), Box> { type SingleNode = Rc; trait Node { - fn run(&self, x: INT) -> INT; + fn run(&self, x: INT) -> Result>; } struct PhaserNode { - func: Box INT>, + func: Box Result>>, } impl Node for PhaserNode { - fn run(&self, x: INT) -> INT { + fn run(&self, x: INT) -> Result> { (self.func)(x) } } - fn phaser(callback: impl Fn(INT) -> INT + 'static) -> impl Node { + fn phaser(callback: impl Fn(INT) -> Result> + 'static) -> impl Node { PhaserNode { func: Box::new(callback), } @@ -419,7 +419,7 @@ fn test_closures_callback() -> Result<(), Box> { let engine = engine2.clone(); let ast = ast2.clone(); - let callback = Box::new(move |x: INT| fp.call(&engine.borrow(), &ast, (x,)).unwrap()); + let callback = Box::new(move |x: INT| fp.call(&engine.borrow(), &ast, (x,))); Rc::new(phaser(callback)) as SingleNode }); @@ -428,7 +428,7 @@ fn test_closures_callback() -> Result<(), Box> { let cb = shared_engine.borrow().eval_ast::(&ast)?; - assert_eq!(cb.run(21), 42); + assert_eq!(cb.run(21)?, 42); Ok(()) } diff --git a/tests/comments.rs b/tests/comments.rs index 15f15afc..9d981c59 100644 --- a/tests/comments.rs +++ b/tests/comments.rs @@ -21,7 +21,7 @@ fn test_comments() -> Result<(), Box> { 42 ); - engine.run("/* Hello world */").unwrap(); + engine.run("/* Hello world */")?; Ok(()) } diff --git a/tests/compound_equality.rs b/tests/compound_equality.rs index e7de4cec..bd93f2cf 100644 --- a/tests/compound_equality.rs +++ b/tests/compound_equality.rs @@ -5,8 +5,8 @@ fn test_or_equals() -> Result<(), Box> { let engine = Engine::new(); assert_eq!(engine.eval::("let x = 16; x |= 74; x")?, 90); - assert!(engine.eval::("let x = true; x |= false; x").unwrap()); - assert!(engine.eval::("let x = false; x |= true; x").unwrap()); + assert!(engine.eval::("let x = true; x |= false; x")?); + assert!(engine.eval::("let x = false; x |= true; x")?); Ok(()) } @@ -16,9 +16,9 @@ fn test_and_equals() -> Result<(), Box> { let engine = Engine::new(); assert_eq!(engine.eval::("let x = 16; x &= 31; x")?, 16); - assert!(!engine.eval::("let x = true; x &= false; x").unwrap()); - assert!(!engine.eval::("let x = false; x &= true; x").unwrap()); - assert!(engine.eval::("let x = true; x &= true; x").unwrap()); + assert!(!engine.eval::("let x = true; x &= false; x")?); + assert!(!engine.eval::("let x = false; x &= true; x")?); + assert!(engine.eval::("let x = true; x &= true; x")?); Ok(()) } diff --git a/tests/float.rs b/tests/float.rs index b09740e6..a44243ed 100644 --- a/tests/float.rs +++ b/tests/float.rs @@ -9,9 +9,7 @@ fn test_float() -> Result<(), Box> { assert!(engine.eval::("let x = 0.0; let y = 1.0; x < y")?); assert!(!engine.eval::("let x = 0.0; let y = 1.0; x > y")?); - assert!(!engine - .eval::("let x = 0.; let y = 1.; x > y") - .unwrap()); + assert!(!engine.eval::("let x = 0.; let y = 1.; x > y")?); assert!((engine.eval::("let x = 9.9999; x")? - 9.9999 as FLOAT).abs() < EPSILON); Ok(()) diff --git a/tests/get_set.rs b/tests/get_set.rs index d5af9080..62e57805 100644 --- a/tests/get_set.rs +++ b/tests/get_set.rs @@ -399,11 +399,9 @@ fn test_get_set_indexer() -> Result<(), Box> { fn test_get_set_elvis() -> Result<(), Box> { let engine = Engine::new(); - engine.eval::<()>("let x = (); x?.foo.bar.baz").unwrap(); - engine.eval::<()>("let x = (); x?.foo(1,2,3)").unwrap(); - engine - .eval::<()>("let x = #{a:()}; x.a?.foo.bar.baz") - .unwrap(); + engine.eval::<()>("let x = (); x?.foo.bar.baz")?; + engine.eval::<()>("let x = (); x?.foo(1,2,3)")?; + engine.eval::<()>("let x = #{a:()}; x.a?.foo.bar.baz")?; assert_eq!(engine.eval::("let x = 'x'; x?.type_of()")?, "char"); Ok(()) diff --git a/tests/not.rs b/tests/not.rs index c9db6e2f..7440ec48 100644 --- a/tests/not.rs +++ b/tests/not.rs @@ -4,14 +4,12 @@ use rhai::{Engine, EvalAltResult}; fn test_not() -> Result<(), Box> { let engine = Engine::new(); - assert!(!engine - .eval::("let not_true = !true; not_true") - .unwrap()); + assert!(!engine.eval::("let not_true = !true; not_true")?); #[cfg(not(feature = "no_function"))] - assert!(engine.eval::("fn not(x) { !x } not(false)").unwrap()); + assert!(engine.eval::("fn not(x) { !x } not(false)")?); - assert!(engine.eval::("!!!!true").unwrap()); + assert!(engine.eval::("!!!!true")?); Ok(()) } diff --git a/tests/unit.rs b/tests/unit.rs index ed3d2847..d2abd3c2 100644 --- a/tests/unit.rs +++ b/tests/unit.rs @@ -10,9 +10,7 @@ fn test_unit() -> Result<(), Box> { #[test] fn test_unit_eq() -> Result<(), Box> { let engine = Engine::new(); - assert!(engine - .eval::("let x = (); let y = (); x == y") - .unwrap()); + assert!(engine.eval::("let x = (); let y = (); x == y")?); Ok(()) }