Fix tests.
This commit is contained in:
parent
1073a7bd54
commit
7afcad24d6
@ -64,10 +64,11 @@ fn one_fn_and_const_module_test() -> Result<(), Box<EvalAltResult>> {
|
|||||||
|
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
engine.eval::<FLOAT>(
|
engine.eval::<FLOAT>(
|
||||||
r#"
|
"
|
||||||
let m = Math::Advanced::MYSTIC_NUMBER;
|
let m = Math::Advanced::MYSTIC_NUMBER;
|
||||||
let x = Math::Advanced::euclidean_distance(0.0, 1.0, 0.0, m);
|
let x = Math::Advanced::euclidean_distance(0.0, 1.0, 0.0, m);
|
||||||
x"#
|
x
|
||||||
|
"
|
||||||
)?,
|
)?,
|
||||||
41.0
|
41.0
|
||||||
);
|
);
|
||||||
@ -146,12 +147,13 @@ fn mut_opaque_ref_test() -> Result<(), Box<EvalAltResult>> {
|
|||||||
assert_eq!(
|
assert_eq!(
|
||||||
engine.eval::<bool>(
|
engine.eval::<bool>(
|
||||||
r#"
|
r#"
|
||||||
let success = "it worked";
|
let success = "it worked";
|
||||||
let message1 = Host::Msg::new_message(true, success);
|
let message1 = Host::Msg::new_message(true, success);
|
||||||
let ok1 = Host::Msg::write_out_message(message1);
|
let ok1 = Host::Msg::write_out_message(message1);
|
||||||
let message2 = Host::Msg::new_os_message(true, 0);
|
let message2 = Host::Msg::new_os_message(true, 0);
|
||||||
let ok2 = Host::Msg::write_out_message(message2);
|
let ok2 = Host::Msg::write_out_message(message2);
|
||||||
ok1 && ok2"#
|
ok1 && ok2
|
||||||
|
"#
|
||||||
)?,
|
)?,
|
||||||
true
|
true
|
||||||
);
|
);
|
||||||
@ -184,13 +186,13 @@ fn duplicate_fn_rename_test() -> Result<(), Box<EvalAltResult>> {
|
|||||||
engine.register_static_module("Math::Advanced", m.into());
|
engine.register_static_module("Math::Advanced", m.into());
|
||||||
|
|
||||||
let output_array = engine.eval::<Array>(
|
let output_array = engine.eval::<Array>(
|
||||||
r#"
|
"
|
||||||
let fx = get_mystic_number();
|
let fx = get_mystic_number();
|
||||||
let fy = Math::Advanced::add(fx, 1.0);
|
let fy = Math::Advanced::add(fx, 1.0);
|
||||||
let ix = 42;
|
let ix = 42;
|
||||||
let iy = Math::Advanced::add(ix, 1);
|
let iy = Math::Advanced::add(ix, 1);
|
||||||
[fy, iy]
|
[fy, iy]
|
||||||
"#,
|
",
|
||||||
)?;
|
)?;
|
||||||
assert_eq!(&output_array[0].as_float().unwrap(), &43.0);
|
assert_eq!(&output_array[0].as_float().unwrap(), &43.0);
|
||||||
assert_eq!(&output_array[1].as_int().unwrap(), &43);
|
assert_eq!(&output_array[1].as_int().unwrap(), &43);
|
||||||
@ -235,21 +237,21 @@ fn multiple_fn_rename_test() -> Result<(), Box<EvalAltResult>> {
|
|||||||
engine.register_global_module(m.into());
|
engine.register_global_module(m.into());
|
||||||
|
|
||||||
let output_array = engine.eval::<Array>(
|
let output_array = engine.eval::<Array>(
|
||||||
r#"
|
"
|
||||||
let fx = get_mystic_number();
|
let fx = get_mystic_number();
|
||||||
let fy1 = add(fx, 1.0);
|
let fy1 = add(fx, 1.0);
|
||||||
let fy2 = add_together(fx, 1.0);
|
let fy2 = add_together(fx, 1.0);
|
||||||
let fy3 = fx + 1.0;
|
let fy3 = fx + 1.0;
|
||||||
let p1 = fx.prop;
|
let p1 = fx.prop;
|
||||||
let p2 = prop(fx);
|
let p2 = prop(fx);
|
||||||
let idx1 = fx[1];
|
let idx1 = fx[1];
|
||||||
let idx2 = idx(fx, 1);
|
let idx2 = idx(fx, 1);
|
||||||
let ix = 42;
|
let ix = 42;
|
||||||
let iy1 = add(ix, 1);
|
let iy1 = add(ix, 1);
|
||||||
let iy2 = add_together(ix, 1);
|
let iy2 = add_together(ix, 1);
|
||||||
let iy3 = ix + 1;
|
let iy3 = ix + 1;
|
||||||
[fy1, fy2, fy3, iy1, iy2, iy3, p1, p2, idx1, idx2]
|
[fy1, fy2, fy3, iy1, iy2, iy3, p1, p2, idx1, idx2]
|
||||||
"#,
|
",
|
||||||
)?;
|
)?;
|
||||||
assert_eq!(&output_array[0].as_float().unwrap(), &44.0);
|
assert_eq!(&output_array[0].as_float().unwrap(), &44.0);
|
||||||
assert_eq!(&output_array[1].as_float().unwrap(), &44.0);
|
assert_eq!(&output_array[1].as_float().unwrap(), &44.0);
|
||||||
@ -307,15 +309,15 @@ fn export_by_prefix_test() -> Result<(), Box<EvalAltResult>> {
|
|||||||
engine.register_static_module("Math::Advanced", m.into());
|
engine.register_static_module("Math::Advanced", m.into());
|
||||||
|
|
||||||
let output_array = engine.eval::<Array>(
|
let output_array = engine.eval::<Array>(
|
||||||
r#"
|
"
|
||||||
let ex = 41.0;
|
let ex = 41.0;
|
||||||
let fx = Math::Advanced::foo_add_f(ex, 1.0);
|
let fx = Math::Advanced::foo_add_f(ex, 1.0);
|
||||||
let gx = Math::Advanced::foo_m(41.0, 1.0);
|
let gx = Math::Advanced::foo_m(41.0, 1.0);
|
||||||
let ei = 41;
|
let ei = 41;
|
||||||
let fi = Math::Advanced::bar_add_i(ei, 1);
|
let fi = Math::Advanced::bar_add_i(ei, 1);
|
||||||
let gi = Math::Advanced::foo_n(41, 1);
|
let gi = Math::Advanced::foo_n(41, 1);
|
||||||
[fx, gx, fi, gi]
|
[fx, gx, fi, gi]
|
||||||
"#,
|
",
|
||||||
)?;
|
)?;
|
||||||
assert_eq!(&output_array[0].as_float().unwrap(), &42.0);
|
assert_eq!(&output_array[0].as_float().unwrap(), &42.0);
|
||||||
assert_eq!(&output_array[1].as_float().unwrap(), &42.0);
|
assert_eq!(&output_array[1].as_float().unwrap(), &42.0);
|
||||||
@ -329,8 +331,7 @@ fn export_by_prefix_test() -> Result<(), Box<EvalAltResult>> {
|
|||||||
fx
|
fx
|
||||||
").unwrap_err(),
|
").unwrap_err(),
|
||||||
EvalAltResult::ErrorFunctionNotFound(s, p)
|
EvalAltResult::ErrorFunctionNotFound(s, p)
|
||||||
if s == "Math::Advanced::foo_add_float2 (f64, f64)"
|
if s == "Math::Advanced::foo_add_float2 (f64, f64)"));
|
||||||
&& p == rhai::Position::new(3, 34)));
|
|
||||||
|
|
||||||
assert!(matches!(*engine.eval::<FLOAT>(
|
assert!(matches!(*engine.eval::<FLOAT>(
|
||||||
"
|
"
|
||||||
@ -339,8 +340,7 @@ fn export_by_prefix_test() -> Result<(), Box<EvalAltResult>> {
|
|||||||
fx
|
fx
|
||||||
").unwrap_err(),
|
").unwrap_err(),
|
||||||
EvalAltResult::ErrorFunctionNotFound(s, p)
|
EvalAltResult::ErrorFunctionNotFound(s, p)
|
||||||
if s == "Math::Advanced::bar_m (f64, f64)"
|
if s == "Math::Advanced::bar_m (f64, f64)"));
|
||||||
&& p == rhai::Position::new(3, 34)));
|
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
@ -389,15 +389,15 @@ fn export_all_test() -> Result<(), Box<EvalAltResult>> {
|
|||||||
engine.register_static_module("Math::Advanced", m.into());
|
engine.register_static_module("Math::Advanced", m.into());
|
||||||
|
|
||||||
let output_array = engine.eval::<Array>(
|
let output_array = engine.eval::<Array>(
|
||||||
r#"
|
"
|
||||||
let ex = 41.0;
|
let ex = 41.0;
|
||||||
let fx = Math::Advanced::foo_add_f(ex, 1.0);
|
let fx = Math::Advanced::foo_add_f(ex, 1.0);
|
||||||
let gx = Math::Advanced::foo_m(41.0, 1.0);
|
let gx = Math::Advanced::foo_m(41.0, 1.0);
|
||||||
let ei = 41;
|
let ei = 41;
|
||||||
let fi = Math::Advanced::foo_add_i(ei, 1);
|
let fi = Math::Advanced::foo_add_i(ei, 1);
|
||||||
let gi = Math::Advanced::foo_n(41, 1);
|
let gi = Math::Advanced::foo_n(41, 1);
|
||||||
[fx, gx, fi, gi]
|
[fx, gx, fi, gi]
|
||||||
"#,
|
",
|
||||||
)?;
|
)?;
|
||||||
assert_eq!(&output_array[0].as_float().unwrap(), &42.0);
|
assert_eq!(&output_array[0].as_float().unwrap(), &42.0);
|
||||||
assert_eq!(&output_array[1].as_float().unwrap(), &42.0);
|
assert_eq!(&output_array[1].as_float().unwrap(), &42.0);
|
||||||
@ -411,8 +411,7 @@ fn export_all_test() -> Result<(), Box<EvalAltResult>> {
|
|||||||
fx
|
fx
|
||||||
").unwrap_err(),
|
").unwrap_err(),
|
||||||
EvalAltResult::ErrorFunctionNotFound(s, p)
|
EvalAltResult::ErrorFunctionNotFound(s, p)
|
||||||
if s == "Math::Advanced::foo_p (i64, i64)"
|
if s == "Math::Advanced::foo_p (i64, i64)"));
|
||||||
&& p == rhai::Position::new(3, 34)));
|
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
@ -52,7 +52,12 @@ fn one_fn_sub_module_nested_attr_test() -> Result<(), Box<EvalAltResult>> {
|
|||||||
engine.register_static_module("Math::Advanced", m.into());
|
engine.register_static_module("Math::Advanced", m.into());
|
||||||
|
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
engine.eval::<FLOAT>(r#"let m = Math::Advanced::constants::get_mystic_number(); m"#)?,
|
engine.eval::<FLOAT>(
|
||||||
|
"
|
||||||
|
let m = Math::Advanced::constants::get_mystic_number();
|
||||||
|
m
|
||||||
|
"
|
||||||
|
)?,
|
||||||
42.0
|
42.0
|
||||||
);
|
);
|
||||||
Ok(())
|
Ok(())
|
||||||
@ -121,21 +126,21 @@ fn export_nested_by_prefix_test() -> Result<(), Box<EvalAltResult>> {
|
|||||||
engine.register_static_module("Math::Advanced", m.into());
|
engine.register_static_module("Math::Advanced", m.into());
|
||||||
|
|
||||||
let output_array = engine.eval::<Array>(
|
let output_array = engine.eval::<Array>(
|
||||||
r#"
|
"
|
||||||
let ex = 41.0;
|
let ex = 41.0;
|
||||||
let fx = Math::Advanced::foo_first_adders::add_float(ex, 1.0);
|
let fx = Math::Advanced::foo_first_adders::add_float(ex, 1.0);
|
||||||
|
|
||||||
let ei = 41;
|
let ei = 41;
|
||||||
let fi = Math::Advanced::foo_first_adders::add_int(ei, 1);
|
let fi = Math::Advanced::foo_first_adders::add_int(ei, 1);
|
||||||
|
|
||||||
let gx = 41.0;
|
let gx = 41.0;
|
||||||
let hx = Math::Advanced::foo_second_adders::add_float(gx, 1.0);
|
let hx = Math::Advanced::foo_second_adders::add_float(gx, 1.0);
|
||||||
|
|
||||||
let gi = 41;
|
let gi = 41;
|
||||||
let hi = Math::Advanced::foo_second_adders::add_int(gi, 1);
|
let hi = Math::Advanced::foo_second_adders::add_int(gi, 1);
|
||||||
|
|
||||||
[fx, hx, fi, hi]
|
[fx, hx, fi, hi]
|
||||||
"#,
|
",
|
||||||
)?;
|
)?;
|
||||||
assert_eq!(&output_array[0].as_float().unwrap(), &42.0);
|
assert_eq!(&output_array[0].as_float().unwrap(), &42.0);
|
||||||
assert_eq!(&output_array[1].as_float().unwrap(), &42.0);
|
assert_eq!(&output_array[1].as_float().unwrap(), &42.0);
|
||||||
@ -149,8 +154,7 @@ fn export_nested_by_prefix_test() -> Result<(), Box<EvalAltResult>> {
|
|||||||
fx
|
fx
|
||||||
").unwrap_err(),
|
").unwrap_err(),
|
||||||
EvalAltResult::ErrorFunctionNotFound(s, p)
|
EvalAltResult::ErrorFunctionNotFound(s, p)
|
||||||
if s == "Math::Advanced::foo_third_adders::add_float (f64, f64)"
|
if s == "Math::Advanced::foo_third_adders::add_float (f64, f64)"));
|
||||||
&& p == rhai::Position::new(3, 52)));
|
|
||||||
|
|
||||||
assert!(matches!(*engine.eval::<FLOAT>(
|
assert!(matches!(*engine.eval::<FLOAT>(
|
||||||
"
|
"
|
||||||
@ -159,8 +163,7 @@ fn export_nested_by_prefix_test() -> Result<(), Box<EvalAltResult>> {
|
|||||||
fx
|
fx
|
||||||
").unwrap_err(),
|
").unwrap_err(),
|
||||||
EvalAltResult::ErrorFunctionNotFound(s, p)
|
EvalAltResult::ErrorFunctionNotFound(s, p)
|
||||||
if s == "Math::Advanced::foo_third_adders::add_int (i64, i64)"
|
if s == "Math::Advanced::foo_third_adders::add_int (i64, i64)"));
|
||||||
&& p == rhai::Position::new(3, 52)));
|
|
||||||
|
|
||||||
assert!(matches!(*engine.eval::<FLOAT>(
|
assert!(matches!(*engine.eval::<FLOAT>(
|
||||||
"
|
"
|
||||||
@ -169,8 +172,7 @@ fn export_nested_by_prefix_test() -> Result<(), Box<EvalAltResult>> {
|
|||||||
fx
|
fx
|
||||||
").unwrap_err(),
|
").unwrap_err(),
|
||||||
EvalAltResult::ErrorFunctionNotFound(s, p)
|
EvalAltResult::ErrorFunctionNotFound(s, p)
|
||||||
if s == "Math::Advanced::bar_fourth_adders::add_int (i64, i64)"
|
if s == "Math::Advanced::bar_fourth_adders::add_int (i64, i64)"));
|
||||||
&& p == rhai::Position::new(3, 53)));
|
|
||||||
|
|
||||||
assert!(matches!(*engine.eval::<FLOAT>(
|
assert!(matches!(*engine.eval::<FLOAT>(
|
||||||
"
|
"
|
||||||
@ -179,8 +181,7 @@ fn export_nested_by_prefix_test() -> Result<(), Box<EvalAltResult>> {
|
|||||||
fx
|
fx
|
||||||
").unwrap_err(),
|
").unwrap_err(),
|
||||||
EvalAltResult::ErrorFunctionNotFound(s, p)
|
EvalAltResult::ErrorFunctionNotFound(s, p)
|
||||||
if s == "Math::Advanced::bar_fourth_adders::add_float (f64, f64)"
|
if s == "Math::Advanced::bar_fourth_adders::add_float (f64, f64)"));
|
||||||
&& p == rhai::Position::new(3, 53)));
|
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user