4 files changed, 140 insertions, 131 deletions

diff --git a/crates/ra_ide_api/src/rename.rs b/crates/ra_ide_api/src/rename.rs
index 9ab6f2a77..53dc273c6 100644
--- a/crates/ra_ide_api/src/rename.rs
+++ b/crates/ra_ide_api/src/rename.rs
@@ -132,3 +132,139 @@ fn rename_reference(
         cursor_position: None,
     });
 }
+
+#[cfg(test)]
+mod tests {
+    use insta::assert_debug_snapshot_matches;
+    use test_utils::assert_eq_text;
+    use crate::{
+        mock_analysis::single_file_with_position,
+        mock_analysis::analysis_and_position,
+        FileId
+};
+
+    #[test]
+    fn test_rename_for_local() {
+        test_rename(
+            r#"
+    fn main() {
+        let mut i = 1;
+        let j = 1;
+        i = i<|> + j;
+
+        {
+            i = 0;
+        }
+
+        i = 5;
+    }"#,
+            "k",
+            r#"
+    fn main() {
+        let mut k = 1;
+        let j = 1;
+        k = k + j;
+
+        {
+            k = 0;
+        }
+
+        k = 5;
+    }"#,
+        );
+    }
+
+    #[test]
+    fn test_rename_for_param_inside() {
+        test_rename(
+            r#"
+    fn foo(i : u32) -> u32 {
+        i<|>
+    }"#,
+            "j",
+            r#"
+    fn foo(j : u32) -> u32 {
+        j
+    }"#,
+        );
+    }
+
+    #[test]
+    fn test_rename_refs_for_fn_param() {
+        test_rename(
+            r#"
+    fn foo(i<|> : u32) -> u32 {
+        i
+    }"#,
+            "new_name",
+            r#"
+    fn foo(new_name : u32) -> u32 {
+        new_name
+    }"#,
+        );
+    }
+
+    #[test]
+    fn test_rename_for_mut_param() {
+        test_rename(
+            r#"
+    fn foo(mut i<|> : u32) -> u32 {
+        i
+    }"#,
+            "new_name",
+            r#"
+    fn foo(mut new_name : u32) -> u32 {
+        new_name
+    }"#,
+        );
+    }
+
+    #[test]
+    fn test_rename_mod() {
+        let (analysis, position) = analysis_and_position(
+            "
+        //- /bar.rs
+        mod fo<|>o;
+        //- /bar/foo.rs
+        // emtpy
+    ",
+        );
+        let new_name = "foo2";
+        let source_change = analysis.rename(position, new_name).unwrap();
+        assert_debug_snapshot_matches!("rename_mod", &source_change);
+    }
+
+    #[test]
+    fn test_rename_mod_in_dir() {
+        let (analysis, position) = analysis_and_position(
+            "
+        //- /lib.rs
+        mod fo<|>o;
+        //- /foo/mod.rs
+        // emtpy
+    ",
+        );
+        let new_name = "foo2";
+        let source_change = analysis.rename(position, new_name).unwrap();
+        assert_debug_snapshot_matches!("rename_mod_in_dir", &source_change);
+    }
+
+    fn test_rename(text: &str, new_name: &str, expected: &str) {
+        let (analysis, position) = single_file_with_position(text);
+        let source_change = analysis.rename(position, new_name).unwrap();
+        let mut text_edit_bulder = ra_text_edit::TextEditBuilder::default();
+        let mut file_id: Option<FileId> = None;
+        if let Some(change) = source_change {
+            for edit in change.source_file_edits {
+                file_id = Some(edit.file_id);
+                for atom in edit.edit.as_atoms() {
+                    text_edit_bulder.replace(atom.delete, atom.insert.clone());
+                }
+            }
+        }
+        let result = text_edit_bulder
+            .finish()
+            .apply(&*analysis.file_text(file_id.unwrap()));
+        assert_eq_text!(expected, &*result);
+    }
+}
diff --git a/crates/ra_ide_api/tests/test/snapshots/test__rename_mod.snap b/crates/ra_ide_api/src/snapshots/tests__rename_mod.snap
index 54f622b95..dc97b3334 100644
--- a/crates/ra_ide_api/tests/test/snapshots/test__rename_mod.snap
+++ b/crates/ra_ide_api/src/snapshots/tests__rename_mod.snap
@@ -1,6 +1,6 @@
-Created: 2019-01-16T14:12:39.379431+00:00
+Created: 2019-01-18T08:26:43.427092+00:00
 Creator: [email protected]
-Source: crates/ra_ide_api/tests/test/main.rs
+Source: crates/ra_ide_api/src/rename.rs
 
 Some(
     SourceChange {
diff --git a/crates/ra_ide_api/tests/test/snapshots/test__rename_mod_in_dir.snap b/crates/ra_ide_api/src/snapshots/tests__rename_mod_in_dir.snap
index aac30e89f..7dcd65185 100644
--- a/crates/ra_ide_api/tests/test/snapshots/test__rename_mod_in_dir.snap
+++ b/crates/ra_ide_api/src/snapshots/tests__rename_mod_in_dir.snap
@@ -1,6 +1,6 @@
-Created: 2019-01-16T14:12:39.379358+00:00
+Created: 2019-01-18T08:26:43.427095+00:00
 Creator: [email protected]
-Source: crates/ra_ide_api/tests/test/main.rs
+Source: crates/ra_ide_api/src/rename.rs
 
 Some(
     SourceChange {
diff --git a/crates/ra_ide_api/tests/test/main.rs b/crates/ra_ide_api/tests/test/main.rs
index 2077a89ce..756075190 100644
--- a/crates/ra_ide_api/tests/test/main.rs
+++ b/crates/ra_ide_api/tests/test/main.rs
@@ -2,9 +2,7 @@ use ra_ide_api::{
     AnalysisChange,
     CrateGraph, FileId, mock_analysis::{MockAnalysis, single_file, single_file_with_position}, Query,
 };
-use ra_ide_api::mock_analysis::analysis_and_position;
 use ra_syntax::TextRange;
-use test_utils::assert_eq_text;
 use insta::assert_debug_snapshot_matches;
 
 #[test]
@@ -93,131 +91,6 @@ fn test_find_all_refs_for_fn_param() {
 }
 
 #[test]
-fn test_rename_for_local() {
-    test_rename(
-        r#"
-    fn main() {
-        let mut i = 1;
-        let j = 1;
-        i = i<|> + j;
-
-        {
-            i = 0;
-        }
-
-        i = 5;
-    }"#,
-        "k",
-        r#"
-    fn main() {
-        let mut k = 1;
-        let j = 1;
-        k = k + j;
-
-        {
-            k = 0;
-        }
-
-        k = 5;
-    }"#,
-    );
-}
-
-#[test]
-fn test_rename_for_param_inside() {
-    test_rename(
-        r#"
-    fn foo(i : u32) -> u32 {
-        i<|>
-    }"#,
-        "j",
-        r#"
-    fn foo(j : u32) -> u32 {
-        j
-    }"#,
-    );
-}
-
-#[test]
-fn test_rename_refs_for_fn_param() {
-    test_rename(
-        r#"
-    fn foo(i<|> : u32) -> u32 {
-        i
-    }"#,
-        "new_name",
-        r#"
-    fn foo(new_name : u32) -> u32 {
-        new_name
-    }"#,
-    );
-}
-
-#[test]
-fn test_rename_for_mut_param() {
-    test_rename(
-        r#"
-    fn foo(mut i<|> : u32) -> u32 {
-        i
-    }"#,
-        "new_name",
-        r#"
-    fn foo(mut new_name : u32) -> u32 {
-        new_name
-    }"#,
-    );
-}
-
-#[test]
-fn test_rename_mod() {
-    let (analysis, position) = analysis_and_position(
-        "
-        //- /bar.rs
-        mod fo<|>o;
-        //- /bar/foo.rs
-        // emtpy
-    ",
-    );
-    let new_name = "foo2";
-    let source_change = analysis.rename(position, new_name).unwrap();
-    assert_debug_snapshot_matches!("rename_mod", &source_change);
-}
-
-#[test]
-fn test_rename_mod_in_dir() {
-    let (analysis, position) = analysis_and_position(
-        "
-        //- /lib.rs
-        mod fo<|>o;
-        //- /foo/mod.rs
-        // emtpy
-    ",
-    );
-    let new_name = "foo2";
-    let source_change = analysis.rename(position, new_name).unwrap();
-    assert_debug_snapshot_matches!("rename_mod_in_dir", &source_change);
-}
-
-fn test_rename(text: &str, new_name: &str, expected: &str) {
-    let (analysis, position) = single_file_with_position(text);
-    let source_change = analysis.rename(position, new_name).unwrap();
-    let mut text_edit_bulder = ra_text_edit::TextEditBuilder::default();
-    let mut file_id: Option<FileId> = None;
-    if let Some(change) = source_change {
-        for edit in change.source_file_edits {
-            file_id = Some(edit.file_id);
-            for atom in edit.edit.as_atoms() {
-                text_edit_bulder.replace(atom.delete, atom.insert.clone());
-            }
-        }
-    }
-    let result = text_edit_bulder
-        .finish()
-        .apply(&*analysis.file_text(file_id.unwrap()));
-    assert_eq_text!(expected, &*result);
-}
-
-#[test]
 fn world_symbols_include_stuff_from_macros() {
     let (analysis, _) = single_file(
         "