G: shebang

1 files changed, 8 insertions, 18 deletions

diff --git a/tests/lexer.rs b/tests/lexer.rs
index 6c7531596..20840f456 100644
--- a/tests/lexer.rs
+++ b/tests/lexer.rs
@@ -2,30 +2,20 @@ extern crate file;
 extern crate libsyntax2;
 extern crate testutils;
 
-use std::path::{Path};
 use std::fmt::Write;
 
 use libsyntax2::{Token, tokenize};
-use testutils::{assert_equal_text, collect_tests};
+use testutils::dir_tests;
 
 #[test]
 fn lexer_tests() {
-    for test_case in collect_tests(&["lexer"]) {
-        lexer_test_case(&test_case);
-    }
-}
-
-fn lexer_test_case(path: &Path) {
-    let actual = {
-        let text = file::get_text(path).unwrap();
-        let tokens = tokenize(&text);
-        dump_tokens(&tokens, &text)
-    };
-    let path = path.with_extension("txt");
-    let expected = file::get_text(&path).unwrap();
-    let expected = expected.as_str();
-    let actual = actual.as_str();
-    assert_equal_text(expected, actual, &path)
+    dir_tests(
+        &["lexer"],
+        |text| {
+            let tokens = tokenize(text);
+            dump_tokens(&tokens, text)
+        }
+    )
 }
 
 fn dump_tokens(tokens: &[Token], text: &str) -> String {