Refactor tests.

tests/bool_op.rs

@@ -1,42 +1,39 @@
 use rhai::{Engine, EvalAltResult};
 
 #[test]
-fn test_bool_op1() {
+fn test_bool_op1() -> Result<(), EvalAltResult> {
     let mut engine = Engine::new();
 
-    assert_eq!(engine.eval::<bool>("true && (false || true)"), Ok(true));
-    assert_eq!(engine.eval::<bool>("true & (false | true)"), Ok(true));
+    assert_eq!(engine.eval::<bool>("true && (false || true)")?, true);
+    assert_eq!(engine.eval::<bool>("true & (false | true)")?, true);
+
+    Ok(())
 }
 
 #[test]
-fn test_bool_op2() {
+fn test_bool_op2() -> Result<(), EvalAltResult> {
     let mut engine = Engine::new();
 
-    assert_eq!(engine.eval::<bool>("false && (false || true)"), Ok(false));
-    assert_eq!(engine.eval::<bool>("false & (false | true)"), Ok(false));
+    assert_eq!(engine.eval::<bool>("false && (false || true)")?, false);
+    assert_eq!(engine.eval::<bool>("false & (false | true)")?, false);
+
+    Ok(())
 }
 
 #[test]
-fn test_bool_op3() {
+fn test_bool_op3() -> Result<(), EvalAltResult> {
     let mut engine = Engine::new();
 
-    assert_eq!(
-        engine.eval::<bool>("true && (false || 123)"),
-        Err(EvalAltResult::ErrorBooleanArgMismatch("OR".into()))
-    );
+    assert!(engine.eval::<bool>("true && (false || 123)").is_err());
+    assert_eq!(engine.eval::<bool>("true && (true || 123)")?, true);
+    assert!(engine.eval::<bool>("123 && (false || true)").is_err());
+    assert_eq!(engine.eval::<bool>("false && (true || 123)")?, false);
 
-    assert_eq!(engine.eval::<bool>("true && (true || 123)"), Ok(true));
-
-    assert_eq!(
-        engine.eval::<bool>("123 && (false || true)"),
-        Err(EvalAltResult::ErrorBooleanArgMismatch("AND".into()))
-    );
-
-    assert_eq!(engine.eval::<bool>("false && (true || 123)"), Ok(false));
+    Ok(())
 }
 
 #[test]
-fn test_bool_op_short_circuit() {
+fn test_bool_op_short_circuit() -> Result<(), EvalAltResult> {
     let mut engine = Engine::new();
 
     assert_eq!(
@@ -47,8 +44,8 @@ fn test_bool_op_short_circuit() {
 
             this() || that();
         "
-        ),
-        Ok(true)
+        )?,
+        true
     );
 
     assert_eq!(
@@ -59,9 +56,11 @@ fn test_bool_op_short_circuit() {
 
             this() && that();
         "
-        ),
-        Ok(false)
+        )?,
+        false
     );
+
+    Ok(())
 }
 
 #[test]
@@ -70,15 +69,17 @@ fn test_bool_op_no_short_circuit1() {
     let mut engine = Engine::new();
 
     assert_eq!(
-        engine.eval::<bool>(
-            r"
-            fn this() { false }
-            fn that() { 9/0 }
+        engine
+            .eval::<bool>(
+                r"
+                    fn this() { false }
+                    fn that() { 9/0 }
 
-            this() | that();
-        "
-        ),
-        Ok(false)
+                    this() | that();
+                "
+            )
+            .unwrap(),
+        false
     );
 }
 
@@ -88,14 +89,16 @@ fn test_bool_op_no_short_circuit2() {
     let mut engine = Engine::new();
 
     assert_eq!(
-        engine.eval::<bool>(
-            r"
-            fn this() { false }
-            fn that() { 9/0 }
+        engine
+            .eval::<bool>(
+                r"
+                    fn this() { false }
+                    fn that() { 9/0 }
 
-            this() & that();
-        "
-        ),
-        Ok(false)
+                    this() & that();
+                "
+            )
+            .unwrap(),
+        false
     );
 }