Merge pull request #111 from elferherrera/unit-test

Example unit test

Cargo.lock

@@ -538,6 +538,7 @@ dependencies = [
  "lscolors",
  "nu-engine",
  "nu-json",
+ "nu-parser",
  "nu-path",
  "nu-protocol",
  "nu-table",

crates/nu-command/Cargo.toml

@@ -12,6 +12,7 @@ nu-path = { path = "../nu-path" }
 nu-protocol = { path = "../nu-protocol" }
 nu-table = { path = "../nu-table" }
 nu-term-grid = { path = "../nu-term-grid" }
+nu-parser = { path = "../nu-parser" }
 
 # Potential dependencies for extras
 glob = "0.3.0"

crates/nu-command/src/example_test.rs

@@ -0,0 +1,75 @@
+use std::{cell::RefCell, rc::Rc};
+
+use nu_engine::eval_block;
+use nu_parser::parse;
+use nu_protocol::{
+    engine::{Command, EngineState, EvaluationContext, StateWorkingSet},
+    Value,
+};
+
+use super::{From, Split};
+
+pub fn test_examples(cmd: impl Command + 'static) {
+    let examples = cmd.examples();
+    let engine_state = Rc::new(RefCell::new(EngineState::new()));
+
+    let delta = {
+        // Base functions that are needed for testing
+        // Try to keep this working set small to keep tests running as fast as possible
+        let engine_state = engine_state.borrow();
+        let mut working_set = StateWorkingSet::new(&*engine_state);
+        working_set.add_decl(Box::new(From));
+        working_set.add_decl(Box::new(Split));
+
+        // Adding the command that is being tested to the working set
+        working_set.add_decl(Box::new(cmd));
+
+        working_set.render()
+    };
+
+    EngineState::merge_delta(&mut *engine_state.borrow_mut(), delta);
+
+    for example in examples {
+        let start = std::time::Instant::now();
+
+        let (block, delta) = {
+            let engine_state = engine_state.borrow();
+            let mut working_set = StateWorkingSet::new(&*engine_state);
+            let (output, err) = parse(&mut working_set, None, example.example.as_bytes(), false);
+
+            if let Some(err) = err {
+                panic!("test parse error: {:?}", err)
+            }
+
+            (output, working_set.render())
+        };
+
+        EngineState::merge_delta(&mut *engine_state.borrow_mut(), delta);
+
+        let state = EvaluationContext {
+            engine_state: engine_state.clone(),
+            stack: nu_protocol::engine::Stack::new(),
+        };
+
+        match eval_block(&state, &block, Value::nothing()) {
+            Err(err) => panic!("test eval error: {:?}", err),
+            Ok(result) => {
+                println!("input: {}", example.example);
+                println!("result: {:?}", result);
+                println!("done: {:?}", start.elapsed());
+
+                // Note. Value implements PartialEq for Bool, Int, Float, String and Block
+                // If the command you are testing requires to compare another case, then
+                // you need to define its equality in the Value struct
+                if let Some(expected) = example.result {
+                    if result != expected {
+                        panic!(
+                            "the example result is different to expected value: {:?} != {:?}",
+                            result, expected
+                        )
+                    }
+                }
+            }
+        }
+    }
+}

crates/nu-command/src/filters/each.rs

@@ -1,7 +1,7 @@
 use nu_engine::eval_block;
 use nu_protocol::ast::Call;
 use nu_protocol::engine::{Command, EvaluationContext};
-use nu_protocol::{IntoValueStream, Signature, SyntaxShape, Value};
+use nu_protocol::{Example, IntoValueStream, Signature, Span, SyntaxShape, Value};
 
 pub struct Each;
 
@@ -24,6 +24,32 @@ impl Command for Each {
             .switch("numbered", "iterate with an index", Some('n'))
     }
 
+    fn examples(&self) -> Vec<Example> {
+        let stream_test_1 = vec![
+            Value::Int {
+                val: 2,
+                span: Span::unknown(),
+            },
+            Value::Int {
+                val: 4,
+                span: Span::unknown(),
+            },
+            Value::Int {
+                val: 6,
+                span: Span::unknown(),
+            },
+        ];
+
+        vec![Example {
+            example: "[1 2 3] | each { 2 * $it }",
+            description: "Multiplies elements in list",
+            result: Some(Value::Stream {
+                stream: stream_test_1.into_iter().into_value_stream(),
+                span: Span::unknown(),
+            }),
+        }]
+    }
+
     fn run(
         &self,
         context: &EvaluationContext,
@@ -225,3 +251,15 @@ impl Command for Each {
         }
     }
 }
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_examples() {
+        use crate::test_examples;
+
+        test_examples(Each {})
+    }
+}

crates/nu-command/src/filters/for_.rs

@@ -98,25 +98,32 @@ impl Command for For {
             Example {
                 description: "Echo the square of each integer",
                 example: "for x in [1 2 3] { $x * $x }",
-                result: Some(vec![
+                result: Some(Value::List {
+                    vals: vec![
                         Value::Int { val: 1, span },
                         Value::Int { val: 4, span },
                         Value::Int { val: 9, span },
-                ]),
+                    ],
+                    span: Span::unknown(),
+                }),
             },
             Example {
                 description: "Work with elements of a range",
                 example: "for $x in 1..3 { $x }",
-                result: Some(vec![
+                result: Some(Value::List {
+                    vals: vec![
                         Value::Int { val: 1, span },
                         Value::Int { val: 2, span },
                         Value::Int { val: 3, span },
-                ]),
+                    ],
+                    span: Span::unknown(),
+                }),
             },
             Example {
                 description: "Number each item and echo a message",
                 example: "for $it in ['bob' 'fred'] --numbered { $\"($it.index) is ($it.item)\" }",
-                result: Some(vec![
+                result: Some(Value::List {
+                    vals: vec![
                         Value::String {
                             val: "0 is bob".into(),
                             span,
@@ -125,7 +132,9 @@ impl Command for For {
                             val: "0 is fred".into(),
                             span,
                         },
-                ]),
+                    ],
+                    span: Span::unknown(),
+                }),
             },
         ]
     }

crates/nu-command/src/formats/from/json.rs

@@ -1,6 +1,6 @@
 use nu_protocol::ast::Call;
 use nu_protocol::engine::{Command, EvaluationContext};
-use nu_protocol::{IntoValueStream, ShellError, Signature, Span, Value};
+use nu_protocol::{Example, IntoValueStream, ShellError, Signature, Span, Value};
 
 pub struct FromJson;
 
@@ -21,6 +21,50 @@ impl Command for FromJson {
         )
     }
 
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                example: "'{ a:1 }' | from json",
+                description: "Converts json formatted string to table",
+                result: Some(Value::Record {
+                    cols: vec!["a".to_string()],
+                    vals: vec![Value::Int {
+                        val: 1,
+                        span: Span::unknown(),
+                    }],
+                    span: Span::unknown(),
+                }),
+            },
+            Example {
+                example: "'{ a:1, b: [1, 2] }' | from json",
+                description: "Converts json formatted string to table",
+                result: Some(Value::Record {
+                    cols: vec!["a".to_string(), "b".to_string()],
+                    vals: vec![
+                        Value::Int {
+                            val: 1,
+                            span: Span::unknown(),
+                        },
+                        Value::List {
+                            vals: vec![
+                                Value::Int {
+                                    val: 1,
+                                    span: Span::unknown(),
+                                },
+                                Value::Int {
+                                    val: 2,
+                                    span: Span::unknown(),
+                                },
+                            ],
+                            span: Span::unknown(),
+                        },
+                    ],
+                    span: Span::unknown(),
+                }),
+            },
+        ]
+    }
+
     fn run(
         &self,
         _context: &EvaluationContext,
@@ -109,3 +153,15 @@ fn convert_string_to_value(string_input: String, span: Span) -> Result<Value, Sh
         )),
     }
 }
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_examples() {
+        use crate::test_examples;
+
+        test_examples(FromJson {})
+    }
+}

crates/nu-command/src/lib.rs

@@ -1,6 +1,7 @@
 mod core_commands;
 mod default_context;
 mod env;
+mod example_test;
 mod experimental;
 mod filesystem;
 mod filters;
@@ -9,9 +10,10 @@ mod strings;
 mod system;
 mod viewers;
 
-pub use core_commands::*;
+pub(crate) use core_commands::*;
 pub use default_context::*;
 pub use env::*;
+pub use example_test::test_examples;
 pub use experimental::*;
 pub use filesystem::*;
 pub use filters::*;

crates/nu-command/src/strings/build_string.rs

@@ -1,7 +1,7 @@
 use nu_engine::eval_expression;
 use nu_protocol::ast::Call;
 use nu_protocol::engine::{Command, EvaluationContext};
-use nu_protocol::{ShellError, Signature, SyntaxShape, Value};
+use nu_protocol::{Example, ShellError, Signature, Span, SyntaxShape, Value};
 
 pub struct BuildString;
 
@@ -18,6 +18,27 @@ impl Command for BuildString {
         Signature::build("build-string").rest("rest", SyntaxShape::String, "list of string")
     }
 
+    fn examples(&self) -> Vec<Example> {
+        vec![
+            Example {
+                example: "build-string a b c",
+                description: "Builds a string from letters a b c",
+                result: Some(Value::String {
+                    val: "abc".to_string(),
+                    span: Span::unknown(),
+                }),
+            },
+            Example {
+                example: "build-string (1 + 2) = one ' ' plus ' ' two",
+                description: "Builds a string from letters a b c",
+                result: Some(Value::String {
+                    val: "3=one plus two".to_string(),
+                    span: Span::unknown(),
+                }),
+            },
+        ]
+    }
+
     fn run(
         &self,
         context: &EvaluationContext,
@@ -36,3 +57,15 @@ impl Command for BuildString {
         })
     }
 }
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_examples() {
+        use crate::test_examples;
+
+        test_examples(BuildString {})
+    }
+}

crates/nu-command/src/strings/split/chars.rs

@@ -19,20 +19,12 @@ impl Command for SubCommand {
         "splits a string's characters into separate rows"
     }
 
-    fn run(
-        &self,
-        _context: &EvaluationContext,
-        call: &Call,
-        input: Value,
-    ) -> Result<nu_protocol::Value, nu_protocol::ShellError> {
-        split_chars(call, input)
-    }
-
     fn examples(&self) -> Vec<Example> {
         vec![Example {
             description: "Split the string's characters into separate rows",
-            example: "echo 'hello' | split chars",
-            result: Some(vec![
+            example: "'hello' | split chars",
+            result: Some(Value::List {
+                vals: vec![
                     Value::String {
                         val: "h".into(),
                         span: Span::unknown(),
@@ -53,9 +45,20 @@ impl Command for SubCommand {
                         val: "o".into(),
                         span: Span::unknown(),
                     },
-            ]),
+                ],
+                span: Span::unknown(),
+            }),
         }]
     }
+
+    fn run(
+        &self,
+        _context: &EvaluationContext,
+        call: &Call,
+        input: Value,
+    ) -> Result<nu_protocol::Value, nu_protocol::ShellError> {
+        split_chars(call, input)
+    }
 }
 
 fn split_chars(call: &Call, input: Value) -> Result<nu_protocol::Value, nu_protocol::ShellError> {
@@ -86,15 +89,14 @@ fn split_chars_helper(v: &Value, name: Span) -> Vec<Value> {
     }
 }
 
-// #[cfg(test)]
-// mod tests {
-//     use super::ShellError;
-//     use super::SubCommand;
+#[cfg(test)]
+mod test {
+    use super::*;
 
-//     #[test]
-//     fn examples_work_as_expected() -> Result<(), ShellError> {
-//         use crate::examples::test as test_examples;
+    #[test]
+    fn test_examples() {
+        use crate::test_examples;
 
-//         test_examples(SubCommand {})
-//     }
-// }
+        test_examples(SubCommand {})
+    }
+}

crates/nu-protocol/src/example.rs

@@ -3,5 +3,5 @@ use crate::Value;
 pub struct Example {
     pub example: &'static str,
     pub description: &'static str,
-    pub result: Option<Vec<Value>>,
+    pub result: Option<Value>,
 }

crates/nu-protocol/src/value/mod.rs

@@ -441,6 +441,52 @@ impl PartialEq for Value {
             (Value::Float { val: lhs, .. }, Value::Float { val: rhs, .. }) => lhs == rhs,
             (Value::String { val: lhs, .. }, Value::String { val: rhs, .. }) => lhs == rhs,
             (Value::Block { val: b1, .. }, Value::Block { val: b2, .. }) => b1 == b2,
+            (Value::List { vals: vals_lhs, .. }, Value::List { vals: vals_rhs, .. }) => {
+                for (lhs, rhs) in vals_lhs.iter().zip(vals_rhs) {
+                    if lhs != rhs {
+                        return false;
+                    }
+                }
+
+                true
+            }
+            (
+                Value::Record {
+                    cols: cols_lhs,
+                    vals: vals_lhs,
+                    ..
+                },
+                Value::Record {
+                    cols: cols_rhs,
+                    vals: vals_rhs,
+                    ..
+                },
+            ) => {
+                if cols_lhs != cols_rhs {
+                    return false;
+                }
+
+                for (lhs, rhs) in vals_lhs.iter().zip(vals_rhs) {
+                    if lhs != rhs {
+                        return false;
+                    }
+                }
+
+                true
+            }
+            (
+                Value::Stream {
+                    stream: stream_lhs, ..
+                },
+                Value::Stream {
+                    stream: stream_rhs, ..
+                },
+            ) => {
+                let vals_lhs = stream_lhs.clone().collect_string();
+                let vals_rhs = stream_rhs.clone().collect_string();
+
+                vals_lhs == vals_rhs
+            }
             _ => false,
         }
     }

src/tests.rs

@@ -54,6 +54,14 @@ fn fail_test(input: &str, expected: &str) -> TestResult {
     Ok(())
 }
 
+fn not_found_msg() -> &'static str {
+    if cfg!(windows) {
+        "not recognized"
+    } else {
+        "not found"
+    }
+}
+
 #[test]
 fn add_simple() -> TestResult {
     run_test("3 + 4", "7")
@@ -393,7 +401,7 @@ fn module_import_uses_internal_command() -> TestResult {
 
 #[test]
 fn hides_def() -> TestResult {
-    fail_test(r#"def foo [] { "foo" }; hide foo; foo"#, "not found")
+    fail_test(r#"def foo [] { "foo" }; hide foo; foo"#, not_found_msg())
 }
 
 #[test]
@@ -406,7 +414,10 @@ fn hides_def_then_redefines() -> TestResult {
 
 #[test]
 fn hides_def_in_scope_1() -> TestResult {
-    fail_test(r#"def foo [] { "foo" }; do { hide foo; foo }"#, "not found")
+    fail_test(
+        r#"def foo [] { "foo" }; do { hide foo; foo }"#,
+        not_found_msg(),
+    )
 }
 
 #[test]
@@ -421,7 +432,7 @@ fn hides_def_in_scope_2() -> TestResult {
 fn hides_def_in_scope_3() -> TestResult {
     fail_test(
         r#"def foo [] { "foo" }; do { hide foo; def foo [] { "bar" }; hide foo; foo }"#,
-        "not found",
+        not_found_msg(),
     )
 }
 
@@ -429,7 +440,7 @@ fn hides_def_in_scope_3() -> TestResult {
 fn hides_def_in_scope_4() -> TestResult {
     fail_test(
         r#"def foo [] { "foo" }; do { def foo [] { "bar" }; hide foo; hide foo; foo }"#,
-        "not found",
+        not_found_msg(),
     )
 }
 
@@ -445,7 +456,7 @@ fn hide_twice_not_allowed() -> TestResult {
 fn hides_import_1() -> TestResult {
     fail_test(
         r#"module spam { export def foo [] { "foo" } }; use spam; hide spam.foo; foo"#,
-        "not found",
+        not_found_msg(),
     )
 }
 
@@ -453,7 +464,7 @@ fn hides_import_1() -> TestResult {
 fn hides_import_2() -> TestResult {
     fail_test(
         r#"module spam { export def foo [] { "foo" } }; use spam; hide spam.*; foo"#,
-        "not found",
+        not_found_msg(),
     )
 }
 
@@ -461,7 +472,7 @@ fn hides_import_2() -> TestResult {
 fn hides_import_3() -> TestResult {
     fail_test(
         r#"module spam { export def foo [] { "foo" } }; use spam; hide spam.[foo]; foo"#,
-        "not found",
+        not_found_msg(),
     )
 }
 
@@ -469,7 +480,7 @@ fn hides_import_3() -> TestResult {
 fn hides_import_4() -> TestResult {
     fail_test(
         r#"module spam { export def foo [] { "foo" } }; use spam.foo; hide foo; foo"#,
-        "not found",
+        not_found_msg(),
     )
 }
 
@@ -477,7 +488,7 @@ fn hides_import_4() -> TestResult {
 fn hides_import_5() -> TestResult {
     fail_test(
         r#"module spam { export def foo [] { "foo" } }; use spam.*; hide foo; foo"#,
-        "not found",
+        not_found_msg(),
     )
 }