1 files changed, 41 insertions, 20 deletions

diff --git a/src/eval/test.rs b/src/eval/test.rs
index 83749e0..c9e7630 100644
--- a/src/eval/test.rs
+++ b/src/eval/test.rs
@@ -1,32 +1,27 @@
 use super::*;
 use crate::ast::*;
-use std::io::Write;
 use expect_test::{expect, Expect};
 
-fn gen_test(file: &str, program: &str, expected: Expect) {
+fn gen_test(file: &str, program: &str, stdout: Expect, stderr: Expect) {
     let language = tree_sitter_python::language();
     let mut parser = tree_sitter::Parser::new();
     let _ = parser.set_language(&language);
     let tree = parser.parse(file, None).unwrap();
     let program = ast::Program::new().with_file(program).unwrap();
 
-    let mut output = Vec::new();
-    let result;
+    let mut out = Vec::new();
+    let mut err = Vec::new();
 
-    {
-        let mut ctx = Context::new(language)
-            .with_input(file.to_owned())
-            .with_tree(tree)
-            .with_program(program)
-            .with_output_stream(Box::new(&mut output) as Box<dyn io::Write>);
+    Context::new(language)
+        .with_input(file.to_owned())
+        .with_tree(tree)
+        .with_program(program)
+        .with_output_stream(Box::new(&mut out) as Box<dyn io::Write>)
+        .with_error_stream(Box::new(&mut err) as Box<dyn io::Write>)
+        .eval();
 
-        result = ctx.eval();
-    }
-
-    if let Err(e) = result {
-        writeln!(output, "{e:?}").unwrap();
-    }
-    expected.assert_eq(&String::from_utf8(output).unwrap())
+    stdout.assert_eq(&String::from_utf8(out).unwrap());
+    stderr.assert_eq(&String::from_utf8(err).unwrap());
 }
 
 #[test]
@@ -201,6 +196,7 @@ fn list_1() {
             }
             ",
         expect!["[5]"],
+        expect![],
     );
 }
 
@@ -214,6 +210,7 @@ fn list_2() {
             }
             ",
         expect!["3"],
+        expect![],
     );
 }
 
@@ -229,6 +226,7 @@ fn list_3() {
             }
             "#,
         expect!["true, false"],
+        expect![],
     );
 }
 
@@ -256,6 +254,7 @@ fn list_4() {
                 [5, 4]
                 [5]
             "#]],
+        expect![],
     );
 }
 
@@ -274,6 +273,7 @@ fn list_5() {
                 false
                 true
             "#]],
+        expect![],
     );
 }
 
@@ -291,6 +291,7 @@ fn string_1() {
             FOO
             foo
         "#]],
+        expect![],
     );
 }
 
@@ -320,6 +321,7 @@ fn string_2() {
             FOO is upper? true
             FOO is lower? false
         "#]],
+        expect![],
     );
 }
 
@@ -337,6 +339,7 @@ fn string_3() {
             a[3:5]: ` b`
             a[2:9]: `o bar b`
         "#]],
+        expect![],
     );
 }
 
@@ -349,9 +352,8 @@ fn string_4() {
                 println("a[9:20]: `", substr(a, 9, 20), "`");
             }
             "#,
-        expect![[r#"
-            a[9:20]: `InvalidStringSlice { length: 11, start: 9, end: 20 }
-        "#]],
+        expect!["a[9:20]: `"],
+        expect![],
     );
 }
 
@@ -367,5 +369,24 @@ fn node_1() {
             def foo(a, b): hello()
             foo
         "#]],
+        expect![],
+    );
+}
+
+#[test]
+fn analysis_1() {
+    gen_test(
+        "def foo(a, b): hello()",
+        r#"
+        enter (function) { }
+        enter ((function (name))) { }
+        enter ((function (name args))) { }
+        "#,
+        expect![],
+        expect![[r#"
+            [warning] the pattern `(function)` can be reduced to just `function`
+            [warning] the pattern `((function (name)))` can be reduced to just `(function name)`
+            [warning] the pattern `((function (name args)))` can be reduced to just `(function (name args))`
+        "#]],
     );
 }