Merge pull request #71 from juanibiapina/directory-structure

Use default rust directory structure for tests

src/lib.rs

@@ -47,9 +47,6 @@ mod engine;
 mod fn_register;
 mod parser;
 
-#[cfg(test)]
-mod tests;
-
 pub use any::Any;
 pub use engine::{Engine, EvalAltResult, Scope};
 pub use fn_register::RegisterFn;

src/tests/mod.rs

@@ -1,26 +0,0 @@
-mod arrays;
-mod binary_ops;
-mod bit_shift;
-mod bool_op;
-mod chars;
-mod comments;
-mod compound_equality;
-mod decrement;
-mod float;
-mod get_set;
-mod if_block;
-mod increment;
-mod internal_fn;
-mod looping;
-mod method_call;
-mod mismatched_op;
-mod not;
-mod number_literals;
-mod ops;
-mod power_of;
-mod string;
-mod unary_after_binary;
-mod unary_minus;
-mod unit;
-mod var_scope;
-mod while_loop;

tests/arrays.rs

@@ -1,5 +1,7 @@
-use engine::Engine;
-use fn_register::RegisterFn;
+extern crate rhai;
+
+use rhai::Engine;
+use rhai::RegisterFn;
 
 #[test]
 fn test_arrays() {
@@ -63,4 +65,4 @@ fn test_array_with_structs() {
     } else {
         assert!(false);
     }
-}
+}

tests/binary_ops.rs

@@ -1,4 +1,6 @@
-use engine::Engine;
+extern crate rhai;
+
+use rhai::Engine;
 
 #[test]
 fn test_binary_ops() {

tests/bit_shift.rs

@@ -1,4 +1,6 @@
-use engine::Engine;
+extern crate rhai;
+
+use rhai::Engine;
 
 #[test]
 fn test_left_shift() {

tests/bool_op.rs

@@ -1,4 +1,6 @@
-use engine::Engine;
+extern crate rhai;
+
+use rhai::Engine;
 
 #[test]
 fn test_bool_op1() {
@@ -20,4 +22,4 @@ fn test_bool_op2() {
     } else {
         assert!(false);
     }
-}
+}

tests/chars.rs

@@ -1,4 +1,6 @@
-use engine::Engine;
+extern crate rhai;
+
+use rhai::Engine;
 
 #[test]
 fn test_chars() {
@@ -20,4 +22,4 @@ fn test_chars() {
         Err(_) => (),
         _ => assert!(false),
     }
-}
+}

tests/comments.rs

@@ -1,4 +1,6 @@
-use engine::Engine;
+extern crate rhai;
+
+use rhai::Engine;
 
 #[test]
 fn test_comments() {

tests/compound_equality.rs

@@ -1,4 +1,6 @@
-use engine::Engine;
+extern crate rhai;
+
+use rhai::Engine;
 
 #[test]
 fn test_or_equals() {
@@ -116,4 +118,4 @@ fn test_modulo_equals() {
     } else {
         assert!(false);
     }
-}
+}

tests/decrement.rs

@@ -1,4 +1,6 @@
-use engine::Engine;
+extern crate rhai;
+
+use rhai::Engine;
 
 #[test]
 fn test_decrement() {

tests/float.rs

@@ -1,5 +1,7 @@
-use engine::Engine;
-use fn_register::RegisterFn;
+extern crate rhai;
+
+use rhai::Engine;
+use rhai::RegisterFn;
 
 #[test]
 fn test_float() {

tests/get_set.rs

@@ -1,5 +1,7 @@
-use engine::Engine;
-use fn_register::RegisterFn;
+extern crate rhai;
+
+use rhai::Engine;
+use rhai::RegisterFn;
 
 #[test]
 fn test_get_set() {

tests/if_block.rs

@@ -1,4 +1,6 @@
-use engine::Engine;
+extern crate rhai;
+
+use rhai::Engine;
 
 #[test]
 fn test_if() {

tests/increment.rs

@@ -1,4 +1,6 @@
-use engine::Engine;
+extern crate rhai;
+
+use rhai::Engine;
 
 #[test]
 fn test_increment() {

tests/internal_fn.rs

@@ -1,4 +1,6 @@
-use engine::Engine;
+extern crate rhai;
+
+use rhai::Engine;
 
 #[test]
 fn test_internal_fn() {

tests/looping.rs

@@ -1,4 +1,6 @@
-use engine::Engine;
+extern crate rhai;
+
+use rhai::Engine;
 
 #[test]
 fn test_loop() {

tests/method_call.rs

@@ -1,5 +1,7 @@
-use engine::Engine;
-use fn_register::RegisterFn;
+extern crate rhai;
+
+use rhai::Engine;
+use rhai::RegisterFn;
 
 #[test]
 fn test_method_call() {

tests/mismatched_op.rs

@@ -1,4 +1,6 @@
-use engine::{Engine, EvalAltResult};
+extern crate rhai;
+
+use rhai::{Engine, EvalAltResult};
 
 #[test]
 fn test_mismatched_op() {

tests/not.rs

@@ -1,4 +1,6 @@
-use engine::Engine;
+extern crate rhai;
+
+use rhai::Engine;
 
 #[test]
 fn test_not() {

tests/number_literals.rs

@@ -1,4 +1,6 @@
-use engine::Engine;
+extern crate rhai;
+
+use rhai::Engine;
 
 #[test]
 fn test_number_literal() {
@@ -60,4 +62,4 @@ fn test_binary_literal() {
     } else {
         assert!(false);
     }
-}
+}

tests/ops.rs

@@ -1,4 +1,6 @@
-use engine::Engine;
+extern crate rhai;
+
+use rhai::Engine;
 
 #[test]
 fn test_ops() {
@@ -26,4 +28,4 @@ fn test_op_prec() {
     } else {
         assert!(false);
     }
-}
+}

tests/power_of.rs

@@ -1,4 +1,6 @@
-use engine::Engine;
+extern crate rhai;
+
+use rhai::Engine;
 
 #[test]
 fn test_power_of() {

tests/string.rs

@@ -1,4 +1,6 @@
-use engine::Engine;
+extern crate rhai;
+
+use rhai::Engine;
 
 #[test]
 fn test_string() {

tests/unary_after_binary.rs

@@ -1,4 +1,6 @@
-use engine::Engine;
+extern crate rhai;
+
+use rhai::Engine;
 
 #[test]
 // TODO also add test case for unary after compound

tests/unary_minus.rs

@@ -1,4 +1,6 @@
-use engine::Engine;
+extern crate rhai;
+
+use rhai::Engine;
 
 #[test]
 fn test_unary_minus() {

tests/unit.rs

@@ -1,4 +1,6 @@
-use engine::Engine;
+extern crate rhai;
+
+use rhai::Engine;
 
 #[test]
 fn test_unit() {
@@ -31,4 +33,4 @@ fn test_unit_with_spaces() {
     } else {
         assert!(false);
     }
-}
+}

tests/var_scope.rs

@@ -1,4 +1,6 @@
-use engine::{Engine, Scope};
+extern crate rhai;
+
+use rhai::{Engine, Scope};
 
 #[test]
 fn test_var_scope() {

tests/while_loop.rs

@@ -1,4 +1,6 @@
-use engine::Engine;
+extern crate rhai;
+
+use rhai::Engine;
 
 #[test]
 fn test_while() {