test SonarOpenCommunity#2118

guwirth · Apr 26, 2021 · 05644e9 · 05644e9
1 parent 5b241ad
commit 05644e9
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 15 deletions.
diff --git a/cxx-checks/src/test/java/org/sonar/cxx/checks/regex/FileHeaderCheckTest.java b/cxx-checks/src/test/java/org/sonar/cxx/checks/regex/FileHeaderCheckTest.java
@@ -41,9 +41,7 @@ public void test() throws UnsupportedEncodingException, IOException {
     CxxFileTester tester = CxxFileTesterHelper
       .CreateCxxFileTester("src/test/resources/checks/FileHeaderCheck/Class1.cc", ".");
     SourceFile file = CxxAstScanner.scanSingleFile(tester.asFile(), check);
-
-    CheckMessagesVerifier.verify(file.getCheckMessages())
-      .noMore();
+    assertThat(file.getCheckMessages()).isNullOrEmpty();
 
     check = new FileHeaderCheck();
     check.headerFormat = "// copyright 20\\d\\d";
@@ -63,29 +61,25 @@ public void test() throws UnsupportedEncodingException, IOException {
     check = new FileHeaderCheck();
     check.headerFormat = "// copyright 2012";
     file = CxxAstScanner.scanSingleFile(tester.asFile(), check);
-    CheckMessagesVerifier.verify(file.getCheckMessages())
-      .noMore();
+    assertThat(file.getCheckMessages()).isNullOrEmpty();
 
     check = new FileHeaderCheck();
     check.headerFormat = "// copyright 2012\n// foo";
 
     file = CxxAstScanner.scanSingleFile(tester.asFile(), check);
-    CheckMessagesVerifier.verify(file.getCheckMessages())
-      .noMore();
+    assertThat(file.getCheckMessages()).isNullOrEmpty();
 
     check = new FileHeaderCheck();
     check.headerFormat = "// copyright 2012\r\n// foo";
 
     file = CxxAstScanner.scanSingleFile(tester.asFile(), check);
-    CheckMessagesVerifier.verify(file.getCheckMessages())
-      .noMore();
+    assertThat(file.getCheckMessages()).isNullOrEmpty();
 
     check = new FileHeaderCheck();
     check.headerFormat = "// copyright 2012\r// foo";
 
     file = CxxAstScanner.scanSingleFile(tester.asFile(), check);
-    CheckMessagesVerifier.verify(file.getCheckMessages())
-      .noMore();
+    assertThat(file.getCheckMessages()).isNullOrEmpty();
 
     check = new FileHeaderCheck();
     check.headerFormat = "// copyright 2012\r\r// foo";
@@ -106,8 +100,7 @@ public void test() throws UnsupportedEncodingException, IOException {
 
     tester = CxxFileTesterHelper.CreateCxxFileTester("src/test/resources/checks/FileHeaderCheck/Class3.cc", ".");
     file = CxxAstScanner.scanSingleFile(tester.asFile(), check);
-    CheckMessagesVerifier.verify(file.getCheckMessages())
-      .noMore();
+    assertThat(file.getCheckMessages()).isNullOrEmpty();
   }
 
   @Test
@@ -144,7 +137,7 @@ public void regex() throws UnsupportedEncodingException, IOException {
 
     tester = CxxFileTesterHelper.CreateCxxFileTester("src/test/resources/checks/FileHeaderCheck/Regex3.cc", ".");
     file = CxxAstScanner.scanSingleFile(tester.asFile(), check);
-    CheckMessagesVerifier.verify(file.getCheckMessages()).noMore();
+    assertThat(file.getCheckMessages()).isNullOrEmpty();
 
     check = new FileHeaderCheck();
     check.headerFormat = "// copyright \\d{4}\\n// mycompany";
@@ -161,14 +154,24 @@ public void regex() throws UnsupportedEncodingException, IOException {
 
     tester = CxxFileTesterHelper.CreateCxxFileTester("src/test/resources/checks/FileHeaderCheck/Regex5.cc", ".");
     file = CxxAstScanner.scanSingleFile(tester.asFile(), check);
-    CheckMessagesVerifier.verify(file.getCheckMessages()).noMore();
+    assertThat(file.getCheckMessages()).isNullOrEmpty();
 
     check = new FileHeaderCheck();
 
     tester = CxxFileTesterHelper.CreateCxxFileTester("src/test/resources/checks/FileHeaderCheck/Regex6.cc", ".");
     file = CxxAstScanner.scanSingleFile(tester.asFile(), check);
     CheckMessagesVerifier.verify(file.getCheckMessages()).next().atLine(null).withMessage(
       "Add or update the header of this file.");
+
+    check = new FileHeaderCheck();
+    check.headerFormat = "//\\s*<copyright>\\s*"
+                           + "//\\s*Copyright \\(c\\) (XYZ|ABC) GmbH. All rights reserved.\\s*"
+                           + "//\\s*</copyright>\\s*";
+    check.isRegularExpression = true;
+
+    tester = CxxFileTesterHelper.CreateCxxFileTester("src/test/resources/checks/FileHeaderCheck/Regex7.cc", ".");
+    file = CxxAstScanner.scanSingleFile(tester.asFile(), check);
+    assertThat(file.getCheckMessages()).isNullOrEmpty();
   }
 
   @Test

diff --git a/cxx-checks/src/test/resources/checks/FileHeaderCheck/Regex7.cc b/cxx-checks/src/test/resources/checks/FileHeaderCheck/Regex7.cc
@@ -0,0 +1,7 @@
+// <copyright>
+//     Copyright (c) XYZ GmbH. All rights reserved.
+// </copyright>
+
+public class Regex7 {
+
+}