From c2f1a39e9c522589c50a972da487dc4e2af336dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9mie=20B=C3=A9nard?= Date: Fri, 17 Apr 2026 08:51:00 +0200 Subject: [PATCH 1/4] fix incorrect test --- .../default/src/main/java/checks/FileHeaderCheck/Regex5.java | 4 ++++ .../default/src/main/java/checks/FileHeaderCheck/Regex6.java | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 java-checks-test-sources/default/src/main/java/checks/FileHeaderCheck/Regex5.java create mode 100644 java-checks-test-sources/default/src/main/java/checks/FileHeaderCheck/Regex6.java diff --git a/java-checks-test-sources/default/src/main/java/checks/FileHeaderCheck/Regex5.java b/java-checks-test-sources/default/src/main/java/checks/FileHeaderCheck/Regex5.java new file mode 100644 index 0000000000..ef1f89c8c9 --- /dev/null +++ b/java-checks-test-sources/default/src/main/java/checks/FileHeaderCheck/Regex5.java @@ -0,0 +1,4 @@ +package checks.FileHeaderCheck; + +public class Regex5 { +} diff --git a/java-checks-test-sources/default/src/main/java/checks/FileHeaderCheck/Regex6.java b/java-checks-test-sources/default/src/main/java/checks/FileHeaderCheck/Regex6.java new file mode 100644 index 0000000000..4b65833236 --- /dev/null +++ b/java-checks-test-sources/default/src/main/java/checks/FileHeaderCheck/Regex6.java @@ -0,0 +1,4 @@ +package checks.FileHeaderCheck; + +public class Regex6 { +} From 6a21ed4b267cce8256837e392e18e379522d31b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9mie=20B=C3=A9nard?= Date: Fri, 17 Apr 2026 08:51:53 +0200 Subject: [PATCH 2/4] add tests for regex --- .../default/src/main/java/checks/FileHeaderCheck/Regex5.java | 2 ++ .../default/src/main/java/checks/FileHeaderCheck/Regex6.java | 1 + 2 files changed, 3 insertions(+) diff --git a/java-checks-test-sources/default/src/main/java/checks/FileHeaderCheck/Regex5.java b/java-checks-test-sources/default/src/main/java/checks/FileHeaderCheck/Regex5.java index ef1f89c8c9..470b095a85 100644 --- a/java-checks-test-sources/default/src/main/java/checks/FileHeaderCheck/Regex5.java +++ b/java-checks-test-sources/default/src/main/java/checks/FileHeaderCheck/Regex5.java @@ -1,4 +1,6 @@ + package checks.FileHeaderCheck; public class Regex5 { } +// Compliant diff --git a/java-checks-test-sources/default/src/main/java/checks/FileHeaderCheck/Regex6.java b/java-checks-test-sources/default/src/main/java/checks/FileHeaderCheck/Regex6.java index 4b65833236..e61c9a4503 100644 --- a/java-checks-test-sources/default/src/main/java/checks/FileHeaderCheck/Regex6.java +++ b/java-checks-test-sources/default/src/main/java/checks/FileHeaderCheck/Regex6.java @@ -2,3 +2,4 @@ public class Regex6 { } +// Compliant From 3e2182bbd3abf8f035a635c78a80df9793430a20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9mie=20B=C3=A9nard?= Date: Fri, 17 Apr 2026 10:47:46 +0200 Subject: [PATCH 3/4] update tests accordingly to default header --- .../src/main/java/checks/FileHeaderCheck/Class6.java | 11 +++++++++++ .../org/sonar/java/checks/FileHeaderCheckTest.java | 7 +++++++ 2 files changed, 18 insertions(+) create mode 100644 java-checks-test-sources/default/src/main/java/checks/FileHeaderCheck/Class6.java diff --git a/java-checks-test-sources/default/src/main/java/checks/FileHeaderCheck/Class6.java b/java-checks-test-sources/default/src/main/java/checks/FileHeaderCheck/Class6.java new file mode 100644 index 0000000000..a6df19f738 --- /dev/null +++ b/java-checks-test-sources/default/src/main/java/checks/FileHeaderCheck/Class6.java @@ -0,0 +1,11 @@ +/* + * + * Copyright (c) - + * + * Please configure this header in your SonarCloud/SonarQube quality profile. + */ +package checks.FileHeaderCheck; + +public class Class6 { +} +// Compliant (default header) diff --git a/java-checks/src/test/java/org/sonar/java/checks/FileHeaderCheckTest.java b/java-checks/src/test/java/org/sonar/java/checks/FileHeaderCheckTest.java index ce63e249b4..7f8d71a147 100644 --- a/java-checks/src/test/java/org/sonar/java/checks/FileHeaderCheckTest.java +++ b/java-checks/src/test/java/org/sonar/java/checks/FileHeaderCheckTest.java @@ -114,10 +114,17 @@ void test() { .verifyNoIssues(); check = new FileHeaderCheck(); + check.headerFormat = ""; CheckVerifier.newVerifier() .onFile(mainCodeSourcesPath("checks/FileHeaderCheck/ClassDefaultHeader.java")) .withCheck(check) .verifyNoIssues(); + + check = new FileHeaderCheck(); + CheckVerifier.newVerifier() + .onFile(mainCodeSourcesPath("checks/FileHeaderCheck/Class6.java")) + .withCheck(check) + .verifyNoIssues(); } @Test From b5eee2c524488070d5c23171fd608dad24733932 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9mie=20B=C3=A9nard?= Date: Tue, 21 Apr 2026 16:15:59 +0200 Subject: [PATCH 4/4] add default header after rebase --- .../src/main/java/checks/FileHeaderCheck/Class6.java | 11 ----------- .../src/main/java/checks/FileHeaderCheck/Regex5.java | 6 ------ .../src/main/java/checks/FileHeaderCheck/Regex6.java | 5 ----- .../java/org/sonar/java/checks/FileHeaderCheck.java | 8 +++++++- .../org/sonar/java/checks/FileHeaderCheckTest.java | 7 ------- 5 files changed, 7 insertions(+), 30 deletions(-) delete mode 100644 java-checks-test-sources/default/src/main/java/checks/FileHeaderCheck/Class6.java delete mode 100644 java-checks-test-sources/default/src/main/java/checks/FileHeaderCheck/Regex5.java delete mode 100644 java-checks-test-sources/default/src/main/java/checks/FileHeaderCheck/Regex6.java diff --git a/java-checks-test-sources/default/src/main/java/checks/FileHeaderCheck/Class6.java b/java-checks-test-sources/default/src/main/java/checks/FileHeaderCheck/Class6.java deleted file mode 100644 index a6df19f738..0000000000 --- a/java-checks-test-sources/default/src/main/java/checks/FileHeaderCheck/Class6.java +++ /dev/null @@ -1,11 +0,0 @@ -/* - * - * Copyright (c) - - * - * Please configure this header in your SonarCloud/SonarQube quality profile. - */ -package checks.FileHeaderCheck; - -public class Class6 { -} -// Compliant (default header) diff --git a/java-checks-test-sources/default/src/main/java/checks/FileHeaderCheck/Regex5.java b/java-checks-test-sources/default/src/main/java/checks/FileHeaderCheck/Regex5.java deleted file mode 100644 index 470b095a85..0000000000 --- a/java-checks-test-sources/default/src/main/java/checks/FileHeaderCheck/Regex5.java +++ /dev/null @@ -1,6 +0,0 @@ - -package checks.FileHeaderCheck; - -public class Regex5 { -} -// Compliant diff --git a/java-checks-test-sources/default/src/main/java/checks/FileHeaderCheck/Regex6.java b/java-checks-test-sources/default/src/main/java/checks/FileHeaderCheck/Regex6.java deleted file mode 100644 index e61c9a4503..0000000000 --- a/java-checks-test-sources/default/src/main/java/checks/FileHeaderCheck/Regex6.java +++ /dev/null @@ -1,5 +0,0 @@ -package checks.FileHeaderCheck; - -public class Regex6 { -} -// Compliant diff --git a/java-checks/src/main/java/org/sonar/java/checks/FileHeaderCheck.java b/java-checks/src/main/java/org/sonar/java/checks/FileHeaderCheck.java index fd150b96c1..9c93f3bb4d 100644 --- a/java-checks/src/main/java/org/sonar/java/checks/FileHeaderCheck.java +++ b/java-checks/src/main/java/org/sonar/java/checks/FileHeaderCheck.java @@ -31,7 +31,13 @@ @Rule(key = "S1451") public class FileHeaderCheck extends IssuableSubscriptionVisitor { - private static final String DEFAULT_HEADER_FORMAT = ""; + private static final String DEFAULT_HEADER_FORMAT = """ + /* + * + * Copyright (c) - + * + * Please configure this header in your SonarCloud/SonarQube quality profile. + */"""; private static final String MESSAGE = "Add or update the header of this file."; @RuleProperty( diff --git a/java-checks/src/test/java/org/sonar/java/checks/FileHeaderCheckTest.java b/java-checks/src/test/java/org/sonar/java/checks/FileHeaderCheckTest.java index 7f8d71a147..ce63e249b4 100644 --- a/java-checks/src/test/java/org/sonar/java/checks/FileHeaderCheckTest.java +++ b/java-checks/src/test/java/org/sonar/java/checks/FileHeaderCheckTest.java @@ -114,17 +114,10 @@ void test() { .verifyNoIssues(); check = new FileHeaderCheck(); - check.headerFormat = ""; CheckVerifier.newVerifier() .onFile(mainCodeSourcesPath("checks/FileHeaderCheck/ClassDefaultHeader.java")) .withCheck(check) .verifyNoIssues(); - - check = new FileHeaderCheck(); - CheckVerifier.newVerifier() - .onFile(mainCodeSourcesPath("checks/FileHeaderCheck/Class6.java")) - .withCheck(check) - .verifyNoIssues(); } @Test