3 files changed, 49 insertions, 79 deletions

diff --git a/crates/ra_analysis/src/hover.rs b/crates/ra_analysis/src/hover.rs
index 8217df305..2cf79eebf 100644
--- a/crates/ra_analysis/src/hover.rs
+++ b/crates/ra_analysis/src/hover.rs
@@ -167,7 +167,7 @@ impl NavigationTarget {
 #[cfg(test)]
 mod tests {
     use ra_syntax::TextRange;
-    use crate::mock_analysis::single_file_with_position;
+    use crate::mock_analysis::{single_file_with_position, single_file_with_range};
 
     #[test]
     fn hover_shows_type_of_an_expression() {
@@ -191,4 +191,52 @@ mod tests {
         let hover = analysis.hover(position).unwrap().unwrap();
         assert_eq!(hover.info, "i32");
     }
+
+    #[test]
+    fn test_type_of_for_function() {
+        let (analysis, range) = single_file_with_range(
+            "
+            pub fn foo() -> u32 { 1 };
+
+            fn main() {
+                let foo_test = <|>foo()<|>;
+            }
+            ",
+        );
+
+        let type_name = analysis.type_of(range).unwrap().unwrap();
+        assert_eq!("u32", &type_name);
+    }
+
+    // FIXME: improve type_of to make this work
+    #[test]
+    fn test_type_of_for_expr_1() {
+        let (analysis, range) = single_file_with_range(
+            "
+            fn main() {
+                let foo = <|>1 + foo_test<|>;
+            }
+            ",
+        );
+
+        let type_name = analysis.type_of(range).unwrap().unwrap();
+        assert_eq!("[unknown]", &type_name);
+    }
+
+    // FIXME: improve type_of to make this work
+    #[test]
+    fn test_type_of_for_expr_2() {
+        let (analysis, range) = single_file_with_range(
+            "
+            fn main() {
+                let foo: usize = 1;
+                let bar = <|>1 + foo_test<|>;
+            }
+            ",
+        );
+
+        let type_name = analysis.type_of(range).unwrap().unwrap();
+        assert_eq!("[unknown]", &type_name);
+    }
+
 }
diff --git a/crates/ra_analysis/tests/test/main.rs b/crates/ra_analysis/tests/test/main.rs
index e15035304..26da7c10c 100644
--- a/crates/ra_analysis/tests/test/main.rs
+++ b/crates/ra_analysis/tests/test/main.rs
@@ -1,5 +1,4 @@
 mod runnables;
-mod type_of;
 
 use ra_syntax::TextRange;
 use test_utils::{assert_eq_dbg, assert_eq_text};
diff --git a/crates/ra_analysis/tests/test/type_of.rs b/crates/ra_analysis/tests/test/type_of.rs
deleted file mode 100644
index 9d15b52a8..000000000
--- a/crates/ra_analysis/tests/test/type_of.rs
+++ /dev/null
@@ -1,77 +0,0 @@
-use ra_analysis::mock_analysis::single_file_with_range;
-
-#[test]
-fn test_type_of_for_function() {
-    let (analysis, range) = single_file_with_range(
-        "
-        pub fn foo() -> u32 { 1 };
-
-        fn main() {
-            let foo_test = <|>foo()<|>;
-        }
-        ",
-    );
-
-    let type_name = analysis.type_of(range).unwrap().unwrap();
-    assert_eq!("u32", &type_name);
-}
-
-// FIXME: improve type_of to make this work
-#[test]
-fn test_type_of_for_num() {
-    let (analysis, range) = single_file_with_range(
-        r#"
-        fn main() {
-            let foo_test = <|>"foo"<|>;
-        }
-        "#,
-    );
-
-    assert!(analysis.type_of(range).unwrap().is_none());
-}
-// FIXME: improve type_of to make this work
-#[test]
-fn test_type_of_for_binding() {
-    let (analysis, range) = single_file_with_range(
-        "
-        pub fn foo() -> u32 { 1 };
-
-        fn main() {
-            let <|>foo_test<|> = foo();
-        }
-        ",
-    );
-
-    assert!(analysis.type_of(range).unwrap().is_none());
-}
-
-// FIXME: improve type_of to make this work
-#[test]
-fn test_type_of_for_expr_1() {
-    let (analysis, range) = single_file_with_range(
-        "
-        fn main() {
-            let foo = <|>1 + foo_test<|>;
-        }
-        ",
-    );
-
-    let type_name = analysis.type_of(range).unwrap().unwrap();
-    assert_eq!("[unknown]", &type_name);
-}
-
-// FIXME: improve type_of to make this work
-#[test]
-fn test_type_of_for_expr_2() {
-    let (analysis, range) = single_file_with_range(
-        "
-        fn main() {
-            let foo: usize = 1;
-            let bar = <|>1 + foo_test<|>;
-        }
-        ",
-    );
-
-    let type_name = analysis.type_of(range).unwrap().unwrap();
-    assert_eq!("[unknown]", &type_name);
-}