From 0cc079f3e96968cdd88cb016ab34c22ed5f93dc6 Mon Sep 17 00:00:00 2001
From: Jonas Bushart <jonas@bushart.org>
Date: Sun, 3 Apr 2022 12:01:11 +0000
Subject: [PATCH] Merge test functions using the same coverage marks to avoid
 parallelism

---
 crates/ide_db/src/imports/insert_use/tests.rs | 162 +++++++++---------
 1 file changed, 84 insertions(+), 78 deletions(-)

diff --git a/crates/ide_db/src/imports/insert_use/tests.rs b/crates/ide_db/src/imports/insert_use/tests.rs
index 39d2b22ff0..2048b7baed 100644
--- a/crates/ide_db/src/imports/insert_use/tests.rs
+++ b/crates/ide_db/src/imports/insert_use/tests.rs
@@ -84,63 +84,6 @@ use external_crate2::bar::A;",
     );
 }
 
-#[test]
-fn insert_not_group_empty() {
-    cov_mark::check!(insert_empty_file);
-    check_with_config(
-        "use external_crate2::bar::A",
-        r"",
-        r"use external_crate2::bar::A;
-
-",
-        &InsertUseConfig {
-            granularity: ImportGranularity::Item,
-            enforce_granularity: true,
-            prefix_kind: PrefixKind::Plain,
-            group: false,
-            skip_glob_imports: true,
-        },
-    );
-}
-
-#[test]
-fn insert_not_group_empty_module() {
-    cov_mark::check!(insert_empty_module);
-    check_with_config(
-        "foo::bar",
-        r"mod x {$0}",
-        r"mod x {
-    use foo::bar;
-}",
-        &InsertUseConfig {
-            granularity: ImportGranularity::Item,
-            enforce_granularity: true,
-            prefix_kind: PrefixKind::Plain,
-            group: false,
-            skip_glob_imports: true,
-        },
-    );
-}
-
-#[test]
-fn insert_no_group_after_inner_attr() {
-    cov_mark::check!(insert_empty_inner_attr);
-    check_with_config(
-        "foo::bar",
-        r"#![allow(unused_imports)]",
-        r"#![allow(unused_imports)]
-
-use foo::bar;",
-        &InsertUseConfig {
-            granularity: ImportGranularity::Item,
-            enforce_granularity: true,
-            prefix_kind: PrefixKind::Plain,
-            group: false,
-            skip_glob_imports: true,
-        },
-    )
-}
-
 #[test]
 fn insert_existing() {
     check_crate("std::fs", "use std::fs;", "use std::fs;")
@@ -359,45 +302,108 @@ fn main() {}",
 
 #[test]
 fn insert_empty_file() {
-    cov_mark::check!(insert_empty_file);
-    // empty files will get two trailing newlines
-    // this is due to the test case insert_no_imports above
-    check_crate(
-        "foo::bar",
-        "",
-        r"use foo::bar;
+    {
+        // Default configuration
+        cov_mark::check!(insert_empty_file);
+        // empty files will get two trailing newlines
+        // this is due to the test case insert_no_imports above
+        check_crate(
+            "foo::bar",
+            "",
+            r"use foo::bar;
 
 ",
-    )
+        );
+    }
+    {
+        // "not group" configuration
+        cov_mark::check!(insert_empty_file);
+        check_with_config(
+            "use external_crate2::bar::A",
+            r"",
+            r"use external_crate2::bar::A;
+
+",
+            &InsertUseConfig {
+                granularity: ImportGranularity::Item,
+                enforce_granularity: true,
+                prefix_kind: PrefixKind::Plain,
+                group: false,
+                skip_glob_imports: true,
+            },
+        );
+    }
 }
 
 #[test]
 fn insert_empty_module() {
-    cov_mark::check!(insert_empty_module);
-    check(
-        "foo::bar",
-        r"
+    {
+        // Default configuration
+        cov_mark::check!(insert_empty_module);
+        check(
+            "foo::bar",
+            r"
 mod x {$0}
 ",
-        r"
+            r"
 mod x {
     use foo::bar;
 }
 ",
-        ImportGranularity::Item,
-    )
+            ImportGranularity::Item,
+        );
+    }
+    {
+        // "not group" configuration
+        cov_mark::check!(insert_empty_module);
+        check_with_config(
+            "foo::bar",
+            r"mod x {$0}",
+            r"mod x {
+    use foo::bar;
+}",
+            &InsertUseConfig {
+                granularity: ImportGranularity::Item,
+                enforce_granularity: true,
+                prefix_kind: PrefixKind::Plain,
+                group: false,
+                skip_glob_imports: true,
+            },
+        );
+    }
 }
 
 #[test]
 fn insert_after_inner_attr() {
-    cov_mark::check!(insert_empty_inner_attr);
-    check_crate(
-        "foo::bar",
-        r"#![allow(unused_imports)]",
-        r"#![allow(unused_imports)]
+    {
+        // Default configuration
+        cov_mark::check!(insert_empty_inner_attr);
+        check_crate(
+            "foo::bar",
+            r"#![allow(unused_imports)]",
+            r"#![allow(unused_imports)]
 
 use foo::bar;",
-    )
+        );
+    }
+    {
+        // "not group" configuration
+        cov_mark::check!(insert_empty_inner_attr);
+        check_with_config(
+            "foo::bar",
+            r"#![allow(unused_imports)]",
+            r"#![allow(unused_imports)]
+
+use foo::bar;",
+            &InsertUseConfig {
+                granularity: ImportGranularity::Item,
+                enforce_granularity: true,
+                prefix_kind: PrefixKind::Plain,
+                group: false,
+                skip_glob_imports: true,
+            },
+        );
+    }
 }
 
 #[test]