Add tests

astral-sh · Mar 22, 2024 · c62cd04 · c62cd04
1 parent 97f48be
commit c62cd04
Show file tree

Hide file tree

Showing 12 changed files with 192 additions and 11 deletions.
diff --git a/crates/ruff/tests/snapshots/show_settings__display_default_settings.snap b/crates/ruff/tests/snapshots/show_settings__display_default_settings.snap
@@ -231,11 +231,7 @@ linter.flake8_bandit.check_typed_exception = false
 linter.flake8_bugbear.extend_immutable_calls = []
 linter.flake8_builtins.builtins_ignorelist = []
 linter.flake8_comprehensions.allow_dict_calls_with_keyword_arguments = false
-<<<<<<< HEAD:crates/ruff_cli/tests/snapshots/show_settings__display_default_settings.snap
-linter.flake8_copyright.notice_rgx = (?i)Copyright\s+(\(C\)\s+)?\d{4}([-,]\d{4})*
-=======
-linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}(-\d{4})*
->>>>>>> main:crates/ruff/tests/snapshots/show_settings__display_default_settings.snap
+linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|,\s)\d{4})*
 linter.flake8_copyright.author = none
 linter.flake8_copyright.min_file_size = 0
 linter.flake8_errmsg.max_string_length = 0

diff --git a/crates/ruff_linter/src/rules/flake8_copyright/mod.rs b/crates/ruff_linter/src/rules/flake8_copyright/mod.rs
@@ -71,6 +71,20 @@ import os
             r"
 # Copyright (C) 2021-2023
 
+import os
+"
+            .trim(),
+            &settings::LinterSettings::for_rules(vec![Rule::MissingCopyrightNotice]),
+        );
+        assert_messages!(diagnostics);
+    }
+
+    #[test]
+    fn notice_with_comma() {
+        let diagnostics = test_snippet(
+            r"
+# Copyright (C) 2021, 2022
+
 import os
 "
             .trim(),
@@ -85,6 +99,126 @@ import os
             r"
 # Copyright (C) 2023 Ruff
 
+import os
+"
+            .trim(),
+            &settings::LinterSettings {
+                flake8_copyright: super::settings::Settings {
+                    author: Some("Ruff".to_string()),
+                    ..super::settings::Settings::default()
+                },
+                ..settings::LinterSettings::for_rules(vec![Rule::MissingCopyrightNotice])
+            },
+        );
+        assert_messages!(diagnostics);
+    }
+
+    #[test]
+    fn valid_author_with_dash() {
+        let diagnostics = test_snippet(
+            r"
+# Copyright (C) 2022-2023 Ruff
+
+import os
+"
+            .trim(),
+            &settings::LinterSettings {
+                flake8_copyright: super::settings::Settings {
+                    author: Some("Ruff".to_string()),
+                    ..super::settings::Settings::default()
+                },
+                ..settings::LinterSettings::for_rules(vec![Rule::MissingCopyrightNotice])
+            },
+        );
+        assert_messages!(diagnostics);
+    }
+
+    #[test]
+    fn valid_author_with_dash_invalid_space() {
+        let diagnostics = test_snippet(
+            r"
+# Copyright (C) 2022- 2023 Ruff
+
+import os
+"
+            .trim(),
+            &settings::LinterSettings {
+                flake8_copyright: super::settings::Settings {
+                    author: Some("Ruff".to_string()),
+                    ..super::settings::Settings::default()
+                },
+                ..settings::LinterSettings::for_rules(vec![Rule::MissingCopyrightNotice])
+            },
+        );
+        assert_messages!(diagnostics);
+    }
+
+    #[test]
+    fn valid_author_with_dash_invalid_spaces() {
+        let diagnostics = test_snippet(
+            r"
+# Copyright (C) 2022 - 2023 Ruff
+
+import os
+"
+            .trim(),
+            &settings::LinterSettings {
+                flake8_copyright: super::settings::Settings {
+                    author: Some("Ruff".to_string()),
+                    ..super::settings::Settings::default()
+                },
+                ..settings::LinterSettings::for_rules(vec![Rule::MissingCopyrightNotice])
+            },
+        );
+        assert_messages!(diagnostics);
+    }
+
+    #[test]
+    fn valid_author_with_comma_invalid_no_space() {
+        let diagnostics = test_snippet(
+            r"
+# Copyright (C) 2022,2023 Ruff
+
+import os
+"
+            .trim(),
+            &settings::LinterSettings {
+                flake8_copyright: super::settings::Settings {
+                    author: Some("Ruff".to_string()),
+                    ..super::settings::Settings::default()
+                },
+                ..settings::LinterSettings::for_rules(vec![Rule::MissingCopyrightNotice])
+            },
+        );
+        assert_messages!(diagnostics);
+    }
+
+    #[test]
+    fn valid_author_with_comma_invalid_spaces() {
+        let diagnostics = test_snippet(
+            r"
+# Copyright (C) 2022 , 2023 Ruff
+
+import os
+"
+            .trim(),
+            &settings::LinterSettings {
+                flake8_copyright: super::settings::Settings {
+                    author: Some("Ruff".to_string()),
+                    ..super::settings::Settings::default()
+                },
+                ..settings::LinterSettings::for_rules(vec![Rule::MissingCopyrightNotice])
+            },
+        );
+        assert_messages!(diagnostics);
+    }
+
+    #[test]
+    fn valid_author_with_comma_valid_space() {
+        let diagnostics = test_snippet(
+            r"
+# Copyright (C) 2022, 2023 Ruff
+
 import os
 "
             .trim(),

diff --git a/crates/ruff_linter/src/rules/flake8_copyright/settings.rs b/crates/ruff_linter/src/rules/flake8_copyright/settings.rs
@@ -15,8 +15,7 @@ pub struct Settings {
 }
 
 pub static COPYRIGHT: Lazy<Regex> =
-    // Lazy::new(|| Regex::new(r"(?i)Copyright\s+(\(C\)\s+)?\d{4}([-,]\d{4})*").unwrap());
-    Lazy::new(|| Regex::new(r"(?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}(-\d{4})*").unwrap());
+    Lazy::new(|| Regex::new(r"(?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|,\s)\d{4})*").unwrap());
 
 impl Default for Settings {
     fn default() -> Self {

diff --git a/...8_copyright/snapshots/ruff_linter__rules__flake8_copyright__tests__notice_with_comma.snap b/...8_copyright/snapshots/ruff_linter__rules__flake8_copyright__tests__notice_with_comma.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff_linter/src/rules/flake8_copyright/mod.rs
+---
+
diff --git a/...uff_linter__rules__flake8_copyright__tests__valid_author_with_comma_invalid_no_space.snap b/...uff_linter__rules__flake8_copyright__tests__valid_author_with_comma_invalid_no_space.snap
@@ -0,0 +1,10 @@
+---
+source: crates/ruff_linter/src/rules/flake8_copyright/mod.rs
+---
+<filename>:1:1: CPY001 Missing copyright notice at top of file
+  |
+1 | # Copyright (C) 2022,2023 Ruff
+  |  CPY001
+2 | 
+3 | import os
+  |
diff --git a/.../ruff_linter__rules__flake8_copyright__tests__valid_author_with_comma_invalid_spaces.snap b/.../ruff_linter__rules__flake8_copyright__tests__valid_author_with_comma_invalid_spaces.snap
@@ -0,0 +1,10 @@
+---
+source: crates/ruff_linter/src/rules/flake8_copyright/mod.rs
+---
+<filename>:1:1: CPY001 Missing copyright notice at top of file
+  |
+1 | # Copyright (C) 2022 , 2023 Ruff
+  |  CPY001
+2 | 
+3 | import os
+  |
diff --git a/...ots/ruff_linter__rules__flake8_copyright__tests__valid_author_with_comma_valid_space.snap b/...ots/ruff_linter__rules__flake8_copyright__tests__valid_author_with_comma_valid_space.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff_linter/src/rules/flake8_copyright/mod.rs
+---
+
diff --git a/...yright/snapshots/ruff_linter__rules__flake8_copyright__tests__valid_author_with_dash.snap b/...yright/snapshots/ruff_linter__rules__flake8_copyright__tests__valid_author_with_dash.snap
@@ -0,0 +1,4 @@
+---
+source: crates/ruff_linter/src/rules/flake8_copyright/mod.rs
+---
+
diff --git a/...ts/ruff_linter__rules__flake8_copyright__tests__valid_author_with_dash_invalid_space.snap b/...ts/ruff_linter__rules__flake8_copyright__tests__valid_author_with_dash_invalid_space.snap
@@ -0,0 +1,10 @@
+---
+source: crates/ruff_linter/src/rules/flake8_copyright/mod.rs
+---
+<filename>:1:1: CPY001 Missing copyright notice at top of file
+  |
+1 | # Copyright (C) 2022- 2023 Ruff
+  |  CPY001
+2 | 
+3 | import os
+  |
diff --git a/...s/ruff_linter__rules__flake8_copyright__tests__valid_author_with_dash_invalid_spaces.snap b/...s/ruff_linter__rules__flake8_copyright__tests__valid_author_with_dash_invalid_spaces.snap
@@ -0,0 +1,10 @@
+---
+source: crates/ruff_linter/src/rules/flake8_copyright/mod.rs
+---
+<filename>:1:1: CPY001 Missing copyright notice at top of file
+  |
+1 | # Copyright (C) 2022 - 2023 Ruff
+  |  CPY001
+2 | 
+3 | import os
+  |
diff --git a/crates/ruff_workspace/src/options.rs b/crates/ruff_workspace/src/options.rs
@@ -1131,15 +1131,15 @@ impl Flake8ComprehensionsOptions {
 pub struct Flake8CopyrightOptions {
     /// The regular expression used to match the copyright notice, compiled
     /// with the [`regex`](https://docs.rs/regex/latest/regex/) crate.
-    /// Defaults to `(?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}([-,]\d{4})*`, which matches
+    /// Defaults to `(?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|,\s)\d{4})*`, which matches
     /// the following:
     /// - `Copyright 2023`
     /// - `Copyright (C) 2023`
     /// - `Copyright 2021-2023`
     /// - `Copyright (C) 2021-2023`
-    /// - `Copyright (C) 2021,2023`
+    /// - `Copyright (C) 2021, 2023`
     #[option(
-        default = r#"(?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}([-,]\d{4})*"#,
+        default = r#"(?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|,\s)\d{4})*"#,
         value_type = "str",
         example = r#"notice-rgx = "(?i)Copyright \\(C\\) \\d{4}""#
     )]

diff --git a/ruff.schema.json b/ruff.schema.json