From fc46c12e3641c5dcd18f4b32f85b2d8f33000cf6 Mon Sep 17 00:00:00 2001
From: David Lattimore <dml@google.com>
Date: Sat, 27 Jun 2020 11:31:15 +1000
Subject: [PATCH] Fix test following change to fixture parsing
(d016cb486738c1ab2574a322924183fa8a870b06)
---
crates/ra_ssr/src/tests.rs | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/crates/ra_ssr/src/tests.rs b/crates/ra_ssr/src/tests.rs
index d7e6d817a0f..7a3141be8b9 100644
--- a/crates/ra_ssr/src/tests.rs
+++ b/crates/ra_ssr/src/tests.rs
@@ -209,6 +209,11 @@ fn assert_ssr_transform(rule: &str, input: &str, result: &str) {
assert_ssr_transforms(&[rule], input, result);
}
+fn normalize_code(code: &str) -> String {
+ let (db, file_id) = single_file(code);
+ db.file_text(file_id).to_string()
+}
+
fn assert_ssr_transforms(rules: &[&str], input: &str, result: &str) {
let (db, file_id) = single_file(input);
let mut match_finder = MatchFinder::new(&db);
@@ -217,8 +222,13 @@ fn assert_ssr_transforms(rules: &[&str], input: &str, result: &str) {
match_finder.add_rule(rule);
}
if let Some(edits) = match_finder.edits_for_file(file_id) {
- let mut after = input.to_string();
+ // Note, db.file_text is not necessarily the same as `input`, since fixture parsing alters
+ // stuff.
+ let mut after = db.file_text(file_id).to_string();
edits.apply(&mut after);
+ // Likewise, we need to make sure that whatever transformations fixture parsing applies,
+ // also get appplied to our expected result.
+ let result = normalize_code(result);
assert_eq!(after, result);
} else {
panic!("No edits were made");