diff --git a/src/tests/postprocessor.rs b/src/tests/postprocessor.rs index 2cdff2c9..ca437a54 100644 --- a/src/tests/postprocessor.rs +++ b/src/tests/postprocessor.rs @@ -4,27 +4,18 @@ use crate::tests::eval_bash; use super::compile_code; #[test] -fn default_ok() { - let default = PostProcessor::get_default(); - +fn test_each_installed_postprocessor() { let hello = "echo \"Hello world!\""; let hello = compile_code(hello); - let mut unavailable = vec![]; - - for processor in &default { - if ! processor.is_available() { - unavailable.push(processor.name.clone()); + let processors = PostProcessor::get_default(); + for processor in processors { + if processor.is_available() { + let res = processor.execute(hello.clone()); + assert!(res.is_ok(), "Postprocessor {} couldn't process hello world", processor.name); + let res = res.unwrap(); + let (stdout, _) = eval_bash(res); + assert_eq!(stdout, "Hello world!"); } } - - assert!(unavailable.is_empty(), "These commands have to be in $PATH for this test to pass: {}", unavailable.join(", ")); - - for processor in default { - let res = processor.execute(hello.clone()); - assert!(res.is_ok(), "Postprocessor {} couldn't process hello world", processor.name); - let res = res.unwrap(); - let (stdout, _) = eval_bash(res); - assert_eq!(stdout, "Hello world!"); - } } diff --git a/src/tests/validity/import_existing_file.ab b/src/tests/validity/import_existing_file.ab index b7c5c612..ef7f6da3 100644 --- a/src/tests/validity/import_existing_file.ab +++ b/src/tests/validity/import_existing_file.ab @@ -1,2 +1,3 @@ -import * from "test_files/str/trim.ab" -echo trim(" Succeeded ") +import * from "src/tests/validity/test_files/str/trim.ab" + +echo trim(" Succeeded ") diff --git a/src/tests/validity/import_existing_nested_file.ab b/src/tests/validity/import_existing_nested_file.ab index 0cec520a..e5c41861 100644 --- a/src/tests/validity/import_existing_nested_file.ab +++ b/src/tests/validity/import_existing_nested_file.ab @@ -1,4 +1,4 @@ -import * from "test_files/is_even.ab" +import * from "src/tests/validity/test_files/is_even.ab" // Output // even diff --git a/src/tests/validity/import_transitive_file.ab b/src/tests/validity/import_transitive_file.ab new file mode 100644 index 00000000..80efddbe --- /dev/null +++ b/src/tests/validity/import_transitive_file.ab @@ -0,0 +1,3 @@ +import * from "src/tests/validity/test_files/is_even.ab" + +echo trim(" Succeeded ") diff --git a/src/tests/validity/public_import.ab b/src/tests/validity/public_import.ab deleted file mode 100644 index 486b0e44..00000000 --- a/src/tests/validity/public_import.ab +++ /dev/null @@ -1,2 +0,0 @@ -import * from "test_files/is_even.ab" -echo trim(" Succeeded ") diff --git a/test_files/is_even.ab b/src/tests/validity/test_files/is_even.ab similarity index 100% rename from test_files/is_even.ab rename to src/tests/validity/test_files/is_even.ab diff --git a/test_files/str/trim.ab b/src/tests/validity/test_files/str/trim.ab similarity index 100% rename from test_files/str/trim.ab rename to src/tests/validity/test_files/str/trim.ab