From 24894aca3162d654ee051f591a920ef1525d821f Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Mon, 4 Nov 2019 22:12:49 +0300
Subject: Remove more duplication in test fixtures

---
 crates/ra_assists/src/doc_tests.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'crates/ra_assists/src/doc_tests.rs')

diff --git a/crates/ra_assists/src/doc_tests.rs b/crates/ra_assists/src/doc_tests.rs
index 6e1e3de84..43194037e 100644
--- a/crates/ra_assists/src/doc_tests.rs
+++ b/crates/ra_assists/src/doc_tests.rs
@@ -6,12 +6,12 @@
 mod generated;
 
 use hir::mock::MockDatabase;
-use ra_db::FileRange;
+use ra_db::{fixture::WithFixture, FileRange};
 use test_utils::{assert_eq_text, extract_range_or_offset};
 
 fn check(assist_id: &str, before: &str, after: &str) {
     let (selection, before) = extract_range_or_offset(before);
-    let (db, _source_root, file_id) = MockDatabase::with_single_file(&before);
+    let (db, file_id) = MockDatabase::with_single_file(&before);
     let frange = FileRange { file_id, range: selection.into() };
 
     let (_assist_id, action) = crate::assists(&db, frange)
-- 
cgit v1.2.3


From 74d827bb8001952f90c85fca3d064fe3096009bd Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Mon, 4 Nov 2019 22:21:15 +0300
Subject: Rename MockDatabase -> TestDB

Actually working rename is sooo useful!
---
 crates/ra_assists/src/doc_tests.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'crates/ra_assists/src/doc_tests.rs')

diff --git a/crates/ra_assists/src/doc_tests.rs b/crates/ra_assists/src/doc_tests.rs
index 43194037e..2500a5ab7 100644
--- a/crates/ra_assists/src/doc_tests.rs
+++ b/crates/ra_assists/src/doc_tests.rs
@@ -5,13 +5,13 @@
 
 mod generated;
 
-use hir::mock::MockDatabase;
+use hir::mock::TestDB;
 use ra_db::{fixture::WithFixture, FileRange};
 use test_utils::{assert_eq_text, extract_range_or_offset};
 
 fn check(assist_id: &str, before: &str, after: &str) {
     let (selection, before) = extract_range_or_offset(before);
-    let (db, file_id) = MockDatabase::with_single_file(&before);
+    let (db, file_id) = TestDB::with_single_file(&before);
     let frange = FileRange { file_id, range: selection.into() };
 
     let (_assist_id, action) = crate::assists(&db, frange)
-- 
cgit v1.2.3


From 42370610ce03c1bb5893d9e29c2c215482e8d8ca Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Mon, 4 Nov 2019 22:28:47 +0300
Subject: Restore assists tests

---
 crates/ra_assists/src/doc_tests.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'crates/ra_assists/src/doc_tests.rs')

diff --git a/crates/ra_assists/src/doc_tests.rs b/crates/ra_assists/src/doc_tests.rs
index 2500a5ab7..a8f8446cb 100644
--- a/crates/ra_assists/src/doc_tests.rs
+++ b/crates/ra_assists/src/doc_tests.rs
@@ -5,10 +5,11 @@
 
 mod generated;
 
-use hir::mock::TestDB;
 use ra_db::{fixture::WithFixture, FileRange};
 use test_utils::{assert_eq_text, extract_range_or_offset};
 
+use crate::test_db::TestDB;
+
 fn check(assist_id: &str, before: &str, after: &str) {
     let (selection, before) = extract_range_or_offset(before);
     let (db, file_id) = TestDB::with_single_file(&before);
-- 
cgit v1.2.3