strip down tests and move them to ruff_db

Author: ntBre

crates/ruff_db/src/diagnostic/render.rs

@@ -2587,7 +2587,7 @@ watermelon
         }
 
         /// Returns a builder for tersely constructing diagnostics.
-        fn builder(
+        pub(super) fn builder(
             &mut self,
             identifier: &'static str,
             severity: Severity,
@@ -2654,7 +2654,7 @@ watermelon
         ///
         /// See the docs on `TestEnvironment::span` for the meaning of
         /// `path`, `line_offset_start` and `line_offset_end`.
-        fn primary(
+        pub(super) fn primary(
             mut self,
             path: &str,
             line_offset_start: &str,
@@ -2694,7 +2694,7 @@ watermelon
         }
 
         /// Set the secondary code on the diagnostic.
-        fn secondary_code(mut self, secondary_code: &str) -> DiagnosticBuilder<'e> {
+        pub(super) fn secondary_code(mut self, secondary_code: &str) -> DiagnosticBuilder<'e> {
             self.diag
                 .set_secondary_code(SecondaryCode::new(secondary_code.to_string()));
             self

crates/ruff_db/src/diagnostic/render/full.rs

@@ -1,8 +1,8 @@
 #[cfg(test)]
 mod tests {
     use crate::diagnostic::{
-        DiagnosticFormat,
-        render::tests::{create_diagnostics, create_syntax_error_diagnostics},
+        DiagnosticFormat, Severity,
+        render::tests::{TestEnvironment, create_diagnostics, create_syntax_error_diagnostics},
     };
 
     #[test]
@@ -63,4 +63,92 @@ mod tests {
           |
         ");
     }
+
+    /// Check that the new `full` rendering code in `ruff_db` handles cases fixed by commit c9b99e4.
+    ///
+    /// For example, without the fix, we get diagnostics like this:
+    ///
+    /// ```
+    ///  0 │+error[no-indented-block]: Expected an indented block
+    ///  1 │+  --> E11.py:9:1
+    ///  2 │+   |
+    ///  3 │+ 7 | #: E112
+    ///  4 │+ 8 | if False:
+    ///  5 │+   |          ^
+    ///  6 │+ 9 | print()
+    ///  7 │+10 | #: E113
+    ///  8 │+11 | print()
+    ///  9 │+   |
+    ///  ```
+    ///
+    /// where the caret points to the end of the previous line instead of the start of the next.
+    #[test]
+    fn empty_span_after_line_terminator() {
+        let mut env = TestEnvironment::new();
+        env.add(
+            "example.py",
+            r#"
+if False:
+print()
+"#,
+        );
+        env.format(DiagnosticFormat::Full);
+
+        let diagnostic = env
+            .builder(
+                "no-indented-block",
+                Severity::Error,
+                "Expected an indented block",
+            )
+            .primary("example.py", "3:0", "3:0", "")
+            .secondary_code("E112")
+            .build();
+
+        insta::assert_snapshot!(env.render(&diagnostic), @r"
+        error[no-indented-block]: Expected an indented block
+         --> example.py:3:1
+          |
+        2 | if False:
+        3 | print()
+          | ^
+          |
+        ");
+    }
+
+    /// Check that the new `full` rendering code in `ruff_db` handles cases fixed by commit 2922490.
+    ///
+    /// For example, without the fix, we get diagnostics like this:
+    ///
+    /// ```
+    ///  55 | nested_fstrings = f'␈{f'^Z{f'␛'}'}'
+    ///     |                       ^ PLE2512
+    ///  ```
+    ///
+    /// where the caret points to the `f` in the f-string instead of the start of the invalid
+    /// character (`^Z`).
+    #[test]
+    fn unprintable_characters() {
+        let mut env = TestEnvironment::new();
+        env.add("example.py", "nested_fstrings = f'{f'{f''}'}'");
+        env.format(DiagnosticFormat::Full);
+
+        let diagnostic = env
+            .builder(
+                "invalid-character-sub",
+                Severity::Error,
+                r#"Invalid unescaped character SUB, use "\x1A" instead"#,
+            )
+            .primary("example.py", "1:24", "1:24", "")
+            .secondary_code("PLE2512")
+            .build();
+
+        insta::assert_snapshot!(env.render(&diagnostic), @r#"
+        error[invalid-character-sub]: Invalid unescaped character SUB, use "\x1A" instead
+         --> example.py:1:25
+          |
+        1 | nested_fstrings = f'␈{f'{f'␛'}'}'
+          |                         ^
+          |
+        "#);
+    }
 }

crates/ruff_linter/src/message/snapshots/ruff_linter__message__text__tests__empty_span_after_line_terminator.snap

@@ -447,59 +447,4 @@ mod tests {
 
         assert_snapshot!(content);
     }
-
-    /// Check that the new `full` rendering code in `ruff_db` handles cases fixed by commit c9b99e4.
-    ///
-    /// For example, without the fix, we get diagnostics like this:
-    ///
-    /// ```
-    ///  0 │+error[no-indented-block]: Expected an indented block
-    ///  1 │+  --> E11.py:9:1
-    ///  2 │+   |
-    ///  3 │+ 7 | #: E112
-    ///  4 │+ 8 | if False:
-    ///  5 │+   |          ^
-    ///  6 │+ 9 | print()
-    ///  7 │+10 | #: E113
-    ///  8 │+11 | print()
-    ///  9 │+   |
-    ///  ```
-    ///
-    /// where the caret points to the end of the previous line instead of the start of the next.
-    #[test]
-    fn empty_span_after_line_terminator() -> anyhow::Result<()> {
-        let path = Path::new("pycodestyle").join("E11.py");
-        let settings = LinterSettings::for_rule(Rule::NoIndentedBlock);
-        let diagnostics = test_path(path, &settings)?;
-        let config = DisplayDiagnosticConfig::default().format(DiagnosticFormat::Full);
-        let notebook_indexes = FxHashMap::default();
-        let context = EmitterContext::new(&notebook_indexes);
-        let value = DisplayDiagnostics::new(&context, &config, &diagnostics);
-        insta::assert_snapshot!(value.to_string());
-        Ok(())
-    }
-
-    /// Check that the new `full` rendering code in `ruff_db` handles cases fixed by commit 2922490.
-    ///
-    /// For example, without the fix, we get diagnostics like this:
-    ///
-    /// ```
-    ///  55 | nested_fstrings = f'␈{f'^Z{f'␛'}'}'
-    ///     |                       ^ PLE2512
-    ///  ```
-    ///
-    /// where the caret points to the `f` in the f-string instead of the start of the invalid
-    /// character (`^Z`).
-    #[test]
-    fn unprintable_characters() -> anyhow::Result<()> {
-        let path = Path::new("pylint").join("invalid_characters.py");
-        let settings = LinterSettings::for_rule(Rule::InvalidCharacterSub);
-        let diagnostics = test_path(path, &settings)?;
-        let config = DisplayDiagnosticConfig::default().format(DiagnosticFormat::Full);
-        let notebook_indexes = FxHashMap::default();
-        let context = EmitterContext::new(&notebook_indexes);
-        let value = DisplayDiagnostics::new(&context, &config, &diagnostics);
-        insta::assert_snapshot!(value.to_string());
-        Ok(())
-    }
 }