From 309716cffe93d065bcad0344b0f332425576c1e5 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Mon, 25 Mar 2019 14:28:04 +0300
Subject: move tests to where they belong

---
 crates/ra_hir/src/nameres/tests.rs                 |  1 +
 crates/ra_ide_api/src/diagnostics.rs               | 31 ++++++++++++++++++++++
 crates/ra_ide_api/tests/test/main.rs               | 16 -----------
 .../test__unresolved_module_diagnostic.snap        | 28 -------------------
 4 files changed, 32 insertions(+), 44 deletions(-)
 delete mode 100644 crates/ra_ide_api/tests/test/snapshots/test__unresolved_module_diagnostic.snap

(limited to 'crates')

diff --git a/crates/ra_hir/src/nameres/tests.rs b/crates/ra_hir/src/nameres/tests.rs
index 277b0757c..572bd1bf7 100644
--- a/crates/ra_hir/src/nameres/tests.rs
+++ b/crates/ra_hir/src/nameres/tests.rs
@@ -560,6 +560,7 @@ fn unresolved_module_diagnostics() {
         //- /lib.rs
         mod foo;
         mod bar;
+        mod baz {}
         //- /foo.rs
         ",
     )
diff --git a/crates/ra_ide_api/src/diagnostics.rs b/crates/ra_ide_api/src/diagnostics.rs
index 841103322..5a78e94d8 100644
--- a/crates/ra_ide_api/src/diagnostics.rs
+++ b/crates/ra_ide_api/src/diagnostics.rs
@@ -152,6 +152,9 @@ fn check_struct_shorthand_initialization(
 #[cfg(test)]
 mod tests {
     use test_utils::assert_eq_text;
+    use insta::assert_debug_snapshot_matches;
+
+    use crate::mock_analysis::single_file;
 
     use super::*;
 
@@ -180,6 +183,34 @@ mod tests {
         assert_eq_text!(after, &actual);
     }
 
+    #[test]
+    fn test_unresolved_module_diagnostic() {
+        let (analysis, file_id) = single_file("mod foo;");
+        let diagnostics = analysis.diagnostics(file_id).unwrap();
+        assert_debug_snapshot_matches!(diagnostics, @r####"[
+    Diagnostic {
+        message: "unresolved module",
+        range: [0; 8),
+        fix: Some(
+            SourceChange {
+                label: "create module",
+                source_file_edits: [],
+                file_system_edits: [
+                    CreateFile {
+                        source_root: SourceRootId(
+                            0
+                        ),
+                        path: "foo.rs"
+                    }
+                ],
+                cursor_position: None
+            }
+        ),
+        severity: Error
+    }
+]"####);
+    }
+
     #[test]
     fn test_check_unnecessary_braces_in_use_statement() {
         check_not_applicable(
diff --git a/crates/ra_ide_api/tests/test/main.rs b/crates/ra_ide_api/tests/test/main.rs
index 0f0766f62..d4ff21c09 100644
--- a/crates/ra_ide_api/tests/test/main.rs
+++ b/crates/ra_ide_api/tests/test/main.rs
@@ -1,4 +1,3 @@
-use insta::assert_debug_snapshot_matches;
 use ra_ide_api::{
     mock_analysis::{single_file, single_file_with_position, single_file_with_range, MockAnalysis},
     AnalysisChange, CrateGraph, Edition::Edition2018, Query, NavigationTarget,
@@ -6,21 +5,6 @@ use ra_ide_api::{
 };
 use ra_syntax::SmolStr;
 
-#[test]
-fn test_unresolved_module_diagnostic() {
-    let (analysis, file_id) = single_file("mod foo;");
-    let diagnostics = analysis.diagnostics(file_id).unwrap();
-    assert_debug_snapshot_matches!("unresolved_module_diagnostic", &diagnostics);
-}
-
-// FIXME: move this test to hir
-#[test]
-fn test_unresolved_module_diagnostic_no_diag_for_inline_mode() {
-    let (analysis, file_id) = single_file("mod foo {}");
-    let diagnostics = analysis.diagnostics(file_id).unwrap();
-    assert!(diagnostics.is_empty());
-}
-
 #[test]
 fn test_resolve_crate_root() {
     let mock = MockAnalysis::with_files(
diff --git a/crates/ra_ide_api/tests/test/snapshots/test__unresolved_module_diagnostic.snap b/crates/ra_ide_api/tests/test/snapshots/test__unresolved_module_diagnostic.snap
deleted file mode 100644
index 5bb953892..000000000
--- a/crates/ra_ide_api/tests/test/snapshots/test__unresolved_module_diagnostic.snap
+++ /dev/null
@@ -1,28 +0,0 @@
----
-created: "2019-01-22T14:45:01.486985900+00:00"
-creator: insta@0.4.0
-expression: "&diagnostics"
-source: "crates\\ra_ide_api\\tests\\test\\main.rs"
----
-[
-    Diagnostic {
-        message: "unresolved module",
-        range: [0; 8),
-        fix: Some(
-            SourceChange {
-                label: "create module",
-                source_file_edits: [],
-                file_system_edits: [
-                    CreateFile {
-                        source_root: SourceRootId(
-                            0
-                        ),
-                        path: "foo.rs"
-                    }
-                ],
-                cursor_position: None
-            }
-        ),
-        severity: Error
-    }
-]
-- 
cgit v1.2.3