diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/parser.rs | 4 | ||||
-rw-r--r-- | tests/testutils/Cargo.toml | 1 | ||||
-rw-r--r-- | tests/testutils/src/lib.rs | 17 |
3 files changed, 11 insertions, 11 deletions
diff --git a/tests/parser.rs b/tests/parser.rs index eb955278e..770610974 100644 --- a/tests/parser.rs +++ b/tests/parser.rs | |||
@@ -2,13 +2,13 @@ extern crate libsyntax2; | |||
2 | extern crate testutils; | 2 | extern crate testutils; |
3 | 3 | ||
4 | use libsyntax2::parse; | 4 | use libsyntax2::parse; |
5 | use libsyntax2::utils::dump_tree_green; | 5 | use libsyntax2::utils::dump_tree; |
6 | use testutils::dir_tests; | 6 | use testutils::dir_tests; |
7 | 7 | ||
8 | #[test] | 8 | #[test] |
9 | fn parser_tests() { | 9 | fn parser_tests() { |
10 | dir_tests(&["parser/inline", "parser/ok", "parser/err"], |text| { | 10 | dir_tests(&["parser/inline", "parser/ok", "parser/err"], |text| { |
11 | let file = parse(text.to_string()); | 11 | let file = parse(text.to_string()); |
12 | dump_tree_green(&file) | 12 | dump_tree(&file) |
13 | }) | 13 | }) |
14 | } | 14 | } |
diff --git a/tests/testutils/Cargo.toml b/tests/testutils/Cargo.toml index 806c3de52..53b20f17b 100644 --- a/tests/testutils/Cargo.toml +++ b/tests/testutils/Cargo.toml | |||
@@ -4,5 +4,4 @@ version = "0.1.0" | |||
4 | authors = ["Aleksey Kladov <[email protected]>"] | 4 | authors = ["Aleksey Kladov <[email protected]>"] |
5 | 5 | ||
6 | [dependencies] | 6 | [dependencies] |
7 | file = "1.0" | ||
8 | difference = "2.0.0" | 7 | difference = "2.0.0" |
diff --git a/tests/testutils/src/lib.rs b/tests/testutils/src/lib.rs index 43b806541..7c481156f 100644 --- a/tests/testutils/src/lib.rs +++ b/tests/testutils/src/lib.rs | |||
@@ -1,8 +1,9 @@ | |||
1 | extern crate difference; | 1 | extern crate difference; |
2 | extern crate file; | ||
3 | 2 | ||
4 | use std::fs::read_dir; | 3 | use std::{ |
5 | use std::path::{Path, PathBuf}; | 4 | fs, |
5 | path::{Path, PathBuf} | ||
6 | }; | ||
6 | 7 | ||
7 | use difference::Changeset; | 8 | use difference::Changeset; |
8 | 9 | ||
@@ -18,7 +19,7 @@ use difference::Changeset; | |||
18 | /// | 19 | /// |
19 | /// so this should always be correct. | 20 | /// so this should always be correct. |
20 | fn read_text(path: &Path) -> String { | 21 | fn read_text(path: &Path) -> String { |
21 | file::get_text(path).unwrap().replace("\r\n", "\n") | 22 | fs::read_to_string(path).unwrap().replace("\r\n", "\n") |
22 | } | 23 | } |
23 | 24 | ||
24 | pub fn dir_tests<F>(paths: &[&str], f: F) | 25 | pub fn dir_tests<F>(paths: &[&str], f: F) |
@@ -33,7 +34,7 @@ where | |||
33 | println!("\nfile: {}", path.display()); | 34 | println!("\nfile: {}", path.display()); |
34 | println!("No .txt file with expected result, creating...\n"); | 35 | println!("No .txt file with expected result, creating...\n"); |
35 | println!("{}\n{}", input_code, parse_tree); | 36 | println!("{}\n{}", input_code, parse_tree); |
36 | file::put_text(&path, parse_tree).unwrap(); | 37 | fs::write(&path, parse_tree).unwrap(); |
37 | panic!("No expected result") | 38 | panic!("No expected result") |
38 | } | 39 | } |
39 | let expected = read_text(&path); | 40 | let expected = read_text(&path); |
@@ -61,7 +62,7 @@ fn collect_tests(paths: &[&str]) -> Vec<PathBuf> { | |||
61 | 62 | ||
62 | fn test_from_dir(dir: &Path) -> Vec<PathBuf> { | 63 | fn test_from_dir(dir: &Path) -> Vec<PathBuf> { |
63 | let mut acc = Vec::new(); | 64 | let mut acc = Vec::new(); |
64 | for file in read_dir(&dir).unwrap() { | 65 | for file in fs::read_dir(&dir).unwrap() { |
65 | let file = file.unwrap(); | 66 | let file = file.unwrap(); |
66 | let path = file.path(); | 67 | let path = file.path(); |
67 | if path.extension().unwrap_or_default() == "rs" { | 68 | if path.extension().unwrap_or_default() == "rs" { |
@@ -80,12 +81,12 @@ fn print_difference(expected: &str, actual: &str, path: &Path) { | |||
80 | if expected.trim() == actual.trim() { | 81 | if expected.trim() == actual.trim() { |
81 | println!("whitespace difference, rewriting"); | 82 | println!("whitespace difference, rewriting"); |
82 | println!("file: {}\n", path.display()); | 83 | println!("file: {}\n", path.display()); |
83 | file::put_text(path, actual).unwrap(); | 84 | fs::write(path, actual).unwrap(); |
84 | return; | 85 | return; |
85 | } | 86 | } |
86 | if REWRITE { | 87 | if REWRITE { |
87 | println!("rewriting {}", path.display()); | 88 | println!("rewriting {}", path.display()); |
88 | file::put_text(path, actual).unwrap(); | 89 | fs::write(path, actual).unwrap(); |
89 | return; | 90 | return; |
90 | } | 91 | } |
91 | let changeset = Changeset::new(actual, expected, "\n"); | 92 | let changeset = Changeset::new(actual, expected, "\n"); |